X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fcust_main_county-expand.cgi;h=42e46734a28048470fe02c6973edd4ae989dccc3;hb=b71b1576c68bc40ad26592b354feace37a029f0e;hp=a452711c12973727accf381b4f03c60549816267;hpb=a63b2729682586d8860290576e9307629424dbe0;p=freeside.git

diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index a452711c1..42e46734a 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,4 +1,15 @@
-<%
+<% include('/elements/header-popup.html', 'Addition successful' ) %>
+
+<SCRIPT TYPE="text/javascript">
+  topreload();
+</SCRIPT>
+
+</BODY>
+</HTML>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
 my $taxnum = $1;
@@ -6,22 +17,28 @@ my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
 my @expansion;
-if ( $cgi->param('delim') eq 'n' ) {
-  @expansion=split(/\n/,$cgi->param('expansion'));
-} elsif ( $cgi->param('delim') eq 's' ) {
-  @expansion=split(' ',$cgi->param('expansion'));
+if ( $cgi->param('taxclass') ) {
+  my $sth = dbh->prepare('SELECT taxclass FROM part_pkg_taxclass')
+    or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  @expansion = map $_->[0], @{$sth->fetchall_arrayref};
+  errorpage "No taxclasses - add one first" unless @expansion;
 } else {
-  die "Illegal delim!";
-}
+  @expansion = split /[\n\r]{1,2}/, $cgi->param('expansion');
 
-@expansion=map {
-  unless ( /^\s*([\w\- ]+)\s*$/ ) {
-    $cgi->param('error', "Illegal item in expansion");
-    print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
-    myexit();
-  }
-  $1;
-} @expansion;
+  #warn scalar(@expansion);
+  #warn "$_: $expansion[$_]\n" foreach (0..$#expansion);
+
+  @expansion=map {
+    unless ( /^\s*([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=\[\]]+)\s*$/ ) {
+      $cgi->param('error', "Illegal item in expansion: $_");
+      print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
+      myexit();
+    }
+    $1;
+  } @expansion;
+
+}
 
 foreach ( @expansion) {
   my(%hash)=$cust_main_county->hash;
@@ -31,28 +48,36 @@ foreach ( @expansion) {
     $new->setfield('taxclass', $_);
   } elsif ( ! $cust_main_county->state ) {
     $new->setfield('state',$_);
-  } else {
+  } elsif ( ! $cust_main_county->county ) {
     $new->setfield('county',$_);
+  } else {
+    #uppercase cities in the US to try and agree with USPS validation
+    $new->setfield('city', $new->country eq 'US' ? uc($_) : $_ );
   }
-  #if (datasrc =~ m/Pg/)
-  #{
-  #    $new->setfield('tax',0.0);
-  #}
-  my($error)=$new->insert;
+  my $error = $new->insert;
   die $error if $error;
 }
 
 unless ( qsearch( 'cust_main', {
-                                 'state'  => $cust_main_county->state,
-                                 'county' => $cust_main_county->county,
-                                 'country' =>  $cust_main_county->country,
+                                 'city'    => $cust_main_county->city,
+                                 'county'  => $cust_main_county->county,
+                                 'state'   => $cust_main_county->state,
+                                 'country' => $cust_main_county->country,
                                } )
          || ! @expansion
 ) {
-  my($error)=($cust_main_county->delete);
+  my $error = $cust_main_county->delete;
   die $error if $error;
 }
 
-print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
+if ( $cgi->param('taxclass') ) {
+  print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi?".
+                         'city='.    uri_escape($cust_main_county->city   ).';'.
+                         'county='.  uri_escape($cust_main_county->county ).';'.
+                         'state='.   uri_escape($cust_main_county->state  ).';'.
+                         'country='. uri_escape($cust_main_county->country)
+                      );
+  myexit;
+}
 
-%>
+</%init>