obey tax-ship_address in 'manual' geocoding

[freeside.git] / httemplate / edit / cust_main.cgi

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 8f29c5d..098de84 100755 (executable)
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -361,11 +361,23 @@ function update_address(arg) {
 
 % if ( $conf->exists('enable_taxproducts') ) {
 
-  if ( error || ship_error ) {
+  if ( <% $taxpre %>error ) {
 
-    var url = "cust_main/choose_tax_location.html?data_vendor=cch-zip;city="+document.bottomform.elements['city'].value+";state="+document.bottomform.elements['state'].value+";zip="+document.bottomform.elements['zip'].value+";";
-    // popup a chooser
-    OLgetAJAX( url, update_geocode, 300 );
+    if ( document.bottomform.elements['<% $taxpre %>country'].value == 'CA' ||
+         document.bottomform.elements['<% $taxpre %>country'].value == 'US'
+       )
+    {
+
+      var url = "cust_main/choose_tax_location.html?data_vendor=cch-zip;city="+document.bottomform.elements['<% $taxpre %>city'].value+";state="+document.bottomform.elements['<% $taxpre %>state'].value+";zip="+document.bottomform.elements['<% $taxpre %>zip'].value+";country="+document.bottomform.elements['<% $taxpre %>country'].value+";";
+      // popup a chooser
+      OLgetAJAX( url, update_geocode, 300 );
+
+    } else {
+
+      document.bottomform.elements['geocode'].value = 'DEFAULT';
+      document.bottomform.submit();
+
+    }
 
   } else
 
@@ -471,9 +483,9 @@ function update_geocode() {
 
     //alert(what.options[what.selectedIndex].value);
     var argsHash = eval('(' + what.options[what.selectedIndex].value + ')');
-    document.bottomform.elements['city'].value = argsHash['city'];
-    document.bottomform.elements['state'].value = argsHash['state'];
-    document.bottomform.elements['zip'].value = argsHash['zip'];
+    document.bottomform.elements['<% $taxpre %>city'].value = argsHash['city'];
+    document.bottomform.elements['<% $taxpre %>state'].value = argsHash['state'];
+    document.bottomform.elements['<% $taxpre %>zip'].value = argsHash['zip'];
     document.bottomform.elements['geocode'].value = argsHash['geocode'];
 
   }
@@ -568,22 +580,33 @@ function copyelement(from, to) {
 %
 %  #false laziness, copied from FS::cust_pkg::order
 %  my $pkgpart;
+%  my $agentnum = '';
 %  my @agents = $FS::CurrentUser::CurrentUser->agents;
 %  if ( scalar(@agents) == 1 ) {
 %    # $pkgpart->{PKGPART} is true iff $custnum may purchase PKGPART
 %    $pkgpart = $agents[0]->pkgpart_hashref;
+%    $agentnum = $agents[0]->agentnum;
 %  } else {
 %    #can't know (agent not chosen), so, allow all
+%    $agentnum = 'all';
 %    my %typenum;
 %    foreach my $agent ( @agents ) {
 %      next if $typenum{$agent->typenum}++;
-%      #fixed in 5.004_05 #$pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
-%      foreach ( keys %{ $agent->pkgpart_hashref } ) { $pkgpart->{$_}++; } #5.004_04 workaround
+%      $pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
 %    }
 %  }
 %  #eslaf
 %
-%  my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
+%  my @part_pkg = grep { $_->svcpart('svc_acct')
+%                        && ( $pkgpart->{ $_->pkgpart } 
+%                             || $agentnum eq 'all'
+%                             || ( $agentnum ne 'all'
+%                                  && $agentnum
+%                                  && $_->agentnum
+%                                  && $_->agentnum == $agentnum
+%                                )
+%                           )
+%                      }
 %    qsearch( 'part_pkg', { 'disabled' => '' }, '', 'ORDER BY pkg' ); # case?
 %
 %  if ( @part_pkg ) {
@@ -674,6 +697,7 @@ die "access denied"
 
 my $conf = new FS::Conf;
 
+my $taxpre = $conf->exists('tax-ship_address') ? 'ship_' : '';
 #get record
 
 my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart, $saved_domsvc);