-<%
+<% include('/elements/header-popup.html', 'Addition successful' ) %>
+
+<SCRIPT TYPE="text/javascript">
+ window.top.location.reload();
+</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;
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'));
-} 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 );
myexit();
}
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;
}
} )
|| ! @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>