fix prospect state dropdown, RT#76043, fallout from #76000

[freeside.git] / httemplate / elements / tr-select-cust_location.html

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 780bf96..028c8b9 100644 (file)
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -31,6 +31,9 @@ Example:
       else what.form.<%$_%>.value = '';
       if( ftype != 'SELECT') what.form.<%$_%>.style.backgroundColor = '#dddddd';
 %   } 
+    if(what.form.enter_censustract) {
+      what.form.enter_censustract.disabled = true;
+    }
   }
 
   function location_clear(what) {
@@ -38,6 +41,9 @@ Example:
       var ftype = what.form.<%$_%>.tagName;
       if( ftype == 'INPUT' ) what.form.<%$_%>.value = '';
 %   }
+    if(what.form.enter_censustract) {
+      what.form.enter_censustract.value = '';
+    }
 %   if ( $opt{'alt_format'} ) {
       changeSelect(what.form.location_kind, '');
       changeSelect(what.form.location_type, '');
@@ -51,6 +57,9 @@ Example:
       var ftype = what.form.<%$_%>.tagName;
       if( ftype != 'SELECT') what.form.<%$_%>.style.backgroundColor = '#ffffff';
 %   } 
+    if(what.form.enter_censustract) {
+      what.form.enter_censustract.disabled = false;
+    }
 %   if ( $opt{'alt_format'} ) {
       if ( what.form.location_type &&
            what.form.location_type.options[what.form.location_type.selectedIndex].value ) {
@@ -190,7 +199,10 @@ Example:
 %       next if $cust_main && $cust_main->ship_locationnum == $loc->locationnum;
         <OPTION VALUE="<% $loc->locationnum %>"
                 <% $locationnum == $loc->locationnum ? 'SELECTED' : '' %>
-        ><% $loc->line |h %>
+        ><% $loc->line( cust_main      => $cust_main,
+                        countrydefault => $countrydefault,
+                      )
+         |h %>
 %     }
 %     if ( $addnew ) {
         <OPTION VALUE="-1"
@@ -209,11 +221,25 @@ Example:
              'no_bold'      => $opt{'no_bold'},
              'alt_format'   => $opt{'alt_format'},
              'enable_coords'=> 1,
+             'enable_censustract' => 1,
           )
 %>
+
 <SCRIPT TYPE="text/javascript">
-  locationnum_changed(document.getElementById('locationnum'));
+% if ( $prospect_main ) { # && ! $opt{is_optional} ) {
+
+    changeSelect(document.getElementById('country'), <% $cust_location->country || $countrydefault |js_string %>);
+
+    country_changed( document.getElementById('country'),
+                     fix_state_factory( <% $cust_location->state || $statedefault |js_string %>,
+                                        ''
+                                      )
+                   );
+% } else {
+    locationnum_changed(document.getElementById('locationnum'));
+% }
 </SCRIPT>
+
 <%init>
 
 my $conf = new FS::Conf;