X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fcust_main_county-expand.cgi;h=a8b4c25114636756a1d8271c78ba57960dddd908;hb=0930d22ffc440f80c1b222b2e750cadbabd9e8f6;hp=5adffc62fb2fcc070f21405c7c2a09eddc77f224;hpb=237bea175ad19676bda76c3ac756a4c0b5bd899a;p=freeside.git

diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index 5adffc62f..a8b4c2511 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,37 +1,30 @@
-<%
-# <!-- $Id: cust_main_county-expand.cgi,v 1.3 2001-08-31 07:17:33 ivan Exp $ -->
+<% include('/elements/header-popup.html', 'Addition successful' ) %>
 
-use strict;
-use vars qw ( $cgi $taxnum $cust_main_county @expansion $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup datasrc);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(popurl);
-use FS::cust_main_county;
-use FS::cust_main;
+<SCRIPT TYPE="text/javascript">
+  window.top.location.reload();
+</SCRIPT>
 
-$cgi = new CGI;
-&cgisuidsetup($cgi);
+</BODY>
+</HTML>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
-$taxnum = $1;
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+my $taxnum = $1;
+my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
   or die ("Unknown taxnum!");
 
-if ( $cgi->param('delim') eq 'n' ) {
-  @expansion=split(/\n/,$cgi->param('expansion'));
-} elsif ( $cgi->param('delim') eq 's' ) {
-  @expansion=split(' ',$cgi->param('expansion'));
-} else {
-  die "Illegal delim!";
-}
+my @expansion = split /[\n\r]{1,2}/, $cgi->param('expansion');
+#warn scalar(@expansion);
+#warn "$_: $expansion[$_]\n" foreach (0..$#expansion);
 
 @expansion=map {
   unless ( /^\s*([\w\- ]+)\s*$/ ) {
-    $cgi->param('error', "Illegal item in expansion");
+    $cgi->param('error', "Illegal item in expansion: $_");
     print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string );
-    exit;
+    myexit();
   }
   $1;
 } @expansion;
@@ -40,16 +33,14 @@ foreach ( @expansion) {
   my(%hash)=$cust_main_county->hash;
   my($new)=new FS::cust_main_county \%hash;
   $new->setfield('taxnum','');
-  if ( ! $cust_main_county->state ) {
+  if ( $cgi->param('taxclass') ) {
+    $new->setfield('taxclass', $_);
+  } elsif ( ! $cust_main_county->state ) {
     $new->setfield('state',$_);
   } else {
     $new->setfield('county',$_);
   }
-  #if (datasrc =~ m/Pg/)
-  #{
-  #    $new->setfield('tax',0.0);
-  #}
-  my($error)=$new->insert;
+  my $error = $new->insert;
   die $error if $error;
 }
 
@@ -60,10 +51,8 @@ unless ( qsearch( 'cust_main', {
                                } )
          || ! @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");
-
-%>
+</%init>