[freeside-commits] branch master updated. 0882e975e31c0b5d362983f008719101db2a88a9

Ivan ivan at 420.am
Mon Feb 18 19:42:10 PST 2013


The branch, master has been updated
       via  0882e975e31c0b5d362983f008719101db2a88a9 (commit)
       via  f45527f4281a1b2a5e2efd0de3f78539916b61dd (commit)
      from  c1bc17318fff6d7636601ef8de7fbce3734a785a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0882e975e31c0b5d362983f008719101db2a88a9
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Feb 18 19:42:07 2013 -0800

    fix at least the popup w/CCH taxation on 3.0, RT#21485

diff --git a/httemplate/elements/standardize_locations.js b/httemplate/elements/standardize_locations.js
index 88c87c1..4f1ec3d 100644
--- a/httemplate/elements/standardize_locations.js
+++ b/httemplate/elements/standardize_locations.js
@@ -191,12 +191,14 @@ function post_standardization() {
 
 % if ( $conf->exists('enable_taxproducts') ) {
 
+  var cf = document.<% $formname %>;
+
   if ( new String(cf.elements['<% $taxpre %>zip'].value).length < 10 )
   {
 
     var country_el = cf.elements['<% $taxpre %>country'];
     var country = country_el.options[ country_el.selectedIndex ].value;
-    var geocode = cf.elements['geocode'].value;
+    var geocode = cf.elements['bill_geocode'].value;
 
     if ( country == 'CA' || country == 'US' ) {
 
@@ -218,14 +220,14 @@ function post_standardization() {
 
     } else {
 
-      cf.elements['geocode'].value = 'DEFAULT';
+      cf.elements['bill_geocode'].value = 'DEFAULT';
       <% $post_geocode %>;
 
     }
 
   } else {
 
-    cf.elements['geocode'].value = '';
+    cf.elements['bill_geocode'].value = '';
     <% $post_geocode %>;
 
   }
@@ -250,7 +252,7 @@ function update_geocode() {
     cf.elements['<% $taxpre %>city'].value     = argsHash['city'];
     setselect(cf.elements['<% $taxpre %>state'], argsHash['state']);
     cf.elements['<% $taxpre %>zip'].value      = argsHash['zip'];
-    cf.elements['geocode'].value  = argsHash['geocode'];
+    cf.elements['bill_geocode'].value  = argsHash['geocode'];
     <% $post_geocode %>;
 
   }

commit f45527f4281a1b2a5e2efd0de3f78539916b61dd
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Feb 18 18:22:14 2013 -0800

    removing obsolete file, it moved to httemplate/misc/

diff --git a/httemplate/edit/cust_main/choose_tax_location.html b/httemplate/edit/cust_main/choose_tax_location.html
deleted file mode 100644
index ac475c5..0000000
--- a/httemplate/edit/cust_main/choose_tax_location.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<FORM NAME="choosegeocodeform">
-<CENTER><BR><B>Choose tax location</B><BR><BR>
-<P>the geocode is:<% $header %></P>
-<P STYLE="<% $style %>"><% $header %></P>
-
-<SELECT NAME='geocodes' ID='geocodes' STYLE="<% $style %>">
-% foreach my $location (@cust_tax_location) {
-%   my %value = ( zip => $zip5,
-%                 map { $_ => $location->$_ }
-%                   qw ( city state geocode )
-%               );
-%   map { $value{$_} = $location{$_} } qw ( city state )
-%     if $location{country} eq 'CA';
-%
-%   my $value = encode_entities(objToJson({ %value })
-%                              );
-%   my $content = '';
-%   $content .= $location->$_. ' ' x ( $max{$_} - length($location->$_) )
-%     foreach qw( city county state );
-%   $content .=   $location->cityflag eq 'I' ? 'Y' : 'N' ;
-%   my $selected = '' ;
-%   if ($geocode && $location->geocode eq $geocode) {
-%     $selected = 'SELECTED';
-%   }
-  <OPTION VALUE="<% $value %>" STYLE="<% $style %>" <% $selected %>><% $content %>
-% }
-</SELECT><BR><BR>
-
-<TABLE><TR>
-  <TD> <BUTTON TYPE="button" onClick="set_geocode(document.getElementById('geocodes'));"><IMG SRC="<%$p%>images/tick.png" ALT=""> Set location </BUTTON></TD>
-  <TD><BUTTON TYPE="button" onClick="document.CustomerForm.submitButton.disabled=false; parent.cClick();"><IMG SRC="<%$p%>images/cross.png" ALT=""> Cancel submission </BUTTON></TD>
-</TR>
-</TABLE>
-
-</CENTER>
-</FORM>
-<%init>
-
-my $conf = new FS::Conf;
-
-my %location = ();
-
-($location{data_vendor}) = $cgi->param('data_vendor') =~ /^([-\w]+)$/;
-($location{city})        = $cgi->param('city')        =~ /^([\w ]+)$/;
-($location{state})       = $cgi->param('state')       =~ /^(\w+)$/;
-($location{zip})         = $cgi->param('zip')         =~ /^([-\w ]+)$/;
-($location{country})     = $cgi->param('country')     =~ /^([\w ]+)$/;
-
-my($geocode)             = $cgi->param('geocode')     =~ /^([\w]+)$/;
-
-my($zip5, $zip4) = split('-', $location{zip});
-
-#only support US & CA
-my $hashref = { 'data_vendor' => $location{data_vendor} };
-$hashref->{zip} = $location{country} eq 'CA' ? substr($zip5,0,1) : $zip5,
-
-my @keys = keys(%$hashref);
-my @cust_tax_location = ();
-until ( @cust_tax_location ) {
-  @cust_tax_location = qsearch({ table    => 'cust_tax_location',
-                                 hashref  =>  $hashref,
-                                 order_by =>  'LIMIT 50',
-                              });
-  last unless scalar(@keys);
-  delete $hashref->{ shift @keys };
-} 
-
-my %max = ( city => 4, county => 6, state => 5);
-foreach my $location (@cust_tax_location) {
-  foreach ( qw( city county state ) ) {
-    my $length = length($location->$_);
-    $max{$_} = ($length > $max{$_}) ? $length : $max{$_};
-  }
-}
-foreach ( qw( city county state ) ) {
-  $max{$_} = $location{$_} if $location{$_} > $max{$_};
-  $max{$_}++;
-}
-
-my $header = '  ';
-$header .= $_. ' ' x ( $max{lc($_)} - length($_) )
-  foreach qw( City County State );
-$header .=   "In city?";
-
-my $style = "font-family:monospace;";
-
-</%init>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/cust_main/choose_tax_location.html |   87 --------------------
 httemplate/elements/standardize_locations.js       |   10 ++-
 2 files changed, 6 insertions(+), 91 deletions(-)
 delete mode 100644 httemplate/edit/cust_main/choose_tax_location.html




More information about the freeside-commits mailing list