X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=098de848ec9673f7b2b9bc51cd629ffa3f2cd77b;hb=00bb047761ea320fb7f1a2b8e45820d6c539b3e0;hp=f0d719c2e58ea6855def58dddc49902772fe9ce1;hpb=65aab7693066ed02669a9d499d4578ab1c293859;p=freeside.git

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index f0d719c2e..098de848e 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -12,7 +12,7 @@
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
 
 % if ( $custnum ) { 
-  Customer #<B><% $custnum %></B> - 
+  Customer #<B><% $cust_main->display_custnum %></B> - 
   <B><FONT COLOR="#<% $cust_main->statuscolor %>">
     <% ucfirst($cust_main->status) %>
   </FONT></B>
@@ -249,6 +249,8 @@ function bottomfixup(what) {
     'ship_county', 'ship_state', 'ship_zip', 'ship_country',
     'ship_daytime','ship_night', 'ship_fax',
 
+    'geocode',
+
     'select' // XXX key
   );
 
@@ -265,7 +267,8 @@ function bottomfixup(what) {
     'tax',
     'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX',
     'invoice_terms',
-    'spool_cdr'
+    'spool_cdr',
+    'squelch_cdr'
   );
 
   for ( f=0; f < topvars.length; f++ ) {
@@ -328,6 +331,8 @@ function update_address(arg) {
 
   var changed  = argsHash['address_standardized'];
   var ship_changed = argsHash['ship_address_standardized'];
+  var error = argsHash['error'];
+  var ship_error = argsHash['ship_error'];
 
   //yay closures
   standardize_address = function () {
@@ -354,6 +359,30 @@ function update_address(arg) {
 
   }
 
+% if ( $conf->exists('enable_taxproducts') ) {
+
+  if ( <% $taxpre %>error ) {
+
+    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
+
+% }
+
   if ( changed || ship_changed ) {
 
 %   if ( $conf->exists('cust_main-auto_standardize_address') ) {
@@ -447,6 +476,26 @@ function update_address(arg) {
 
 }
 
+function update_geocode() {
+
+  //yay closures
+  set_geocode = function (what) {
+
+    //alert(what.options[what.selectedIndex].value);
+    var argsHash = eval('(' + what.options[what.selectedIndex].value + ')');
+    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'];
+
+  }
+
+  // popup a chooser
+
+  overlib( OLresponseAJAX, CAPTION, 'Select tax location', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 268, BGCOLOR, '#333399', CGCOLOR, '#333399', TEXTSIZE, 3 );
+
+}
+
 function copyelement(from, to) {
   if ( from == undefined ) {
     to.value = '';
@@ -489,6 +538,8 @@ function copyelement(from, to) {
 %     'ship_county', 'ship_state', 'ship_zip', 'ship_country',
 %     'ship_daytime','ship_night', 'ship_fax',
 %     
+%     'geocode',
+%     
 %     'select', #XXX key
 %
 %     'payauto',
@@ -501,7 +552,8 @@ function copyelement(from, to) {
 %     'tax',
 %     'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX',
 %     'invoice_terms',
-%     'spool_cdr'
+%     'spool_cdr',
+%     'squelch_cdr'
 %   ) {
 %
 
@@ -528,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 ) {
@@ -634,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);