X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fstandardize_locations.js;h=debd9e7c45ee27f3e4b5fe97fdc7094d1681332b;hb=67501ae6d2b92fc9a233f66d3a4d9b2cfd1ba3dc;hp=e98039d9d416a1c156a983979d828fe1e87ab806;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe;p=freeside.git

diff --git a/httemplate/elements/standardize_locations.js b/httemplate/elements/standardize_locations.js
index e98039d9d..debd9e7c4 100644
--- a/httemplate/elements/standardize_locations.js
+++ b/httemplate/elements/standardize_locations.js
@@ -11,13 +11,13 @@ function form_address_info() {
 % if ( $billship ) {
   returnobj['same'] = cf.elements['same'].checked;
 % }
-% if ( $withfirm ) {
-% # not part of either address, really
-  returnobj['company'] = cf.elements['company'].value;
-% }
 % if ( $withcensus ) {
 % # "entered" censustract always goes with the ship_ address if there is one
-  returnobj['ship_censustract'] = cf.elements['enter_censustract'].value;
+%   if ( $billship ) {
+    returnobj['ship_censustract'] = cf.elements['enter_censustract'].value;
+%   } else { # there's only a package address, so it's just "censustract"
+    returnobj['censustract'] = cf.elements['enter_censustract'].value;
+%   }
 % }
 % for my $pre (@prefixes) {
   if ( <% $pre eq 'ship_' ? 1 : 0 %> && returnobj['same'] ) {
@@ -78,6 +78,7 @@ function standardize_locations() {
 % # censustract so that we don't ask the user to confirm it again.
 
   if ( !changed && <% $withcensus %> ) {
+%   if ( $billship ) {
     if ( address_info['same'] ) {
       cf.elements['bill_censustract'].value =
         address_info['bill_censustract'];
@@ -85,6 +86,10 @@ function standardize_locations() {
       cf.elements['ship_censustract'].value =
         address_info['ship_censustract'];
     }
+%   } else {
+      cf.elements['censustract'].value =
+        address_info['censustract'];
+%   }
   }
 
 % if ( $conf->config('address_standardize_method') ) {
@@ -176,6 +181,7 @@ function confirm_manual_address() {
 %# not much to do in this case, just confirm the censustract
 % if ( $withcensus ) {
   var cf = document.<% $formname %>;
+%   if ( $billship ) {
   if ( cf.elements['same'] && cf.elements['same'].checked ) {
     cf.elements['bill_censustract'].value =
       cf.elements['enter_censustract'].value;
@@ -183,6 +189,9 @@ function confirm_manual_address() {
     cf.elements['ship_censustract'].value =
       cf.elements['enter_censustract'].value;
   }
+%   } else {
+  cf.elements['censustract'].value = cf.elements['enter_censustract'].value;
+%   }
 % }
   post_standardization();
 }
@@ -193,23 +202,32 @@ function post_standardization() {
 
   var cf = document.<% $formname %>;
 
-  if ( new String(cf.elements['<% $taxpre %>zip'].value).length < 10 )
+  var prefix = '<% $taxpre %>';
+  // fix edge case with cust_main
+  if ( cf.elements['same']
+    && cf.elements['same'].checked
+    && prefix == 'ship_' ) {
+
+    prefix = 'bill_';
+  }
+
+  if ( new String(cf.elements[prefix + 'zip'].value).length < 10 )
   {
 
-    var country_el = cf.elements['<% $taxpre %>country'];
+    var country_el = cf.elements[prefix + 'country'];
     var country = country_el.options[ country_el.selectedIndex ].value;
-    var geocode = cf.elements['bill_geocode'].value;
+    var geocode = cf.elements[prefix + 'geocode'].value;
 
     if ( country == 'CA' || country == 'US' ) {
 
-      var state_el = cf.elements['<% $taxpre %>state'];
+      var state_el = cf.elements[prefix + 'state'];
       var state = state_el.options[ state_el.selectedIndex ].value;
 
       var url = "<% $p %>/misc/choose_tax_location.html" +
                   "?data_vendor=cch-zip" + 
-                  ";city="     + cf.elements['<% $taxpre %>city'].value +
+                  ";city="     + cf.elements[prefix + 'city'].value +
                   ";state="    + state + 
-                  ";zip="      + cf.elements['<% $taxpre %>zip'].value +
+                  ";zip="      + cf.elements[prefix + 'zip'].value +
                   ";country="  + country +
                   ";geocode="  + geocode +
                   ";formname=" + '<% $formname %>' +
@@ -220,14 +238,14 @@ function post_standardization() {
 
     } else {
 
-      cf.elements['bill_geocode'].value = 'DEFAULT';
+      cf.elements[prefix + 'geocode'].value = 'DEFAULT';
       <% $post_geocode %>;
 
     }
 
   } else {
 
-    cf.elements['bill_geocode'].value = '';
+    cf.elements[prefix + 'geocode'].value = '';
     <% $post_geocode %>;
 
   }
@@ -246,13 +264,19 @@ function update_geocode() {
   set_geocode = function (what) {
 
     var cf = document.<% $formname %>;
+    var prefix = '<% $taxpre %>';
+    if ( cf.elements['same']
+      && cf.elements['same'].checked
+      && prefix == 'ship_' ) {
+      prefix = 'bill_';
+    }
 
     //alert(what.options[what.selectedIndex].value);
     var argsHash = eval('(' + what.options[what.selectedIndex].value + ')');
-    cf.elements['<% $taxpre %>city'].value     = argsHash['city'];
-    setselect(cf.elements['<% $taxpre %>state'], argsHash['state']);
-    cf.elements['<% $taxpre %>zip'].value      = argsHash['zip'];
-    cf.elements['bill_geocode'].value  = argsHash['geocode'];
+    cf.elements[prefix + 'city'].value     = argsHash['city'];
+    setselect(cf.elements[prefix + 'state'], argsHash['state']);
+    cf.elements[prefix + 'zip'].value      = argsHash['zip'];
+    cf.elements[prefix + 'geocode'].value  = argsHash['geocode'];
     <% $post_geocode %>;
 
   }
@@ -277,12 +301,13 @@ function setselect(el, value) {
 my %opt = @_;
 my $conf = new FS::Conf;
 
-my $withfirm = $opt{'with_firm'} ? 1 : 0;
 my $withcensus = $opt{'with_census'} ? 1 : 0;
 
 my @prefixes = '';
 my $billship = $opt{'billship'} ? 1 : 0; # whether to have bill_ and ship_ prefixes
 my $taxpre = '';
+# probably should just geocode both addresses, since either one could
+# be a package address in the future
 if ($billship) {
   @prefixes = qw(bill_ ship_);
   $taxpre = $conf->exists('tax-ship_address') ? 'ship_' : 'bill_';