diff options
author | ivan <ivan> | 2008-02-20 01:10:32 +0000 |
---|---|---|
committer | ivan <ivan> | 2008-02-20 01:10:32 +0000 |
commit | 70838ab866bfcb2d596ed2ca96bb2c23c6cba5c1 (patch) | |
tree | d4c10e8374c6ee92c52fe329cdb92c6a812f13b2 /httemplate/edit/cust_main_county-expand.cgi | |
parent | 3a7497433b36b3aa882d30d2d0b6b519a7e1a675 (diff) |
process/part_pkg_taxclass.html
Diffstat (limited to 'httemplate/edit/cust_main_county-expand.cgi')
-rwxr-xr-x | httemplate/edit/cust_main_county-expand.cgi | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi index 22e823021..d5297ab0a 100755 --- a/httemplate/edit/cust_main_county-expand.cgi +++ b/httemplate/edit/cust_main_county-expand.cgi @@ -5,7 +5,6 @@ <FORM ACTION="<% $p1 %>process/cust_main_county-expand.cgi" METHOD=POST> <INPUT TYPE="hidden" NAME="taxnum" VALUE="<% $taxnum %>"> -<INPUT TYPE="hidden" NAME="taxclass" VALUE="<% $taxclass |h %>"> <TEXTAREA NAME="expansion" COLS="50" ROWS="16"><% $expansion |h %></TEXTAREA> @@ -21,17 +20,15 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); -my($taxnum, $expansion, $taxclass); +my($taxnum, $expansion); my($query) = $cgi->keywords; if ( $cgi->param('error') ) { $taxnum = $cgi->param('taxnum'); $expansion = $cgi->param('expansion'); - $taxclass = $cgi->param('taxclass'); } else { - $query =~ /^(taxclass)?(\d+)$/ + $query =~ /^(\d+)$/ or die "Illegal taxnum (query $query)"; - $taxclass = $1 ? 'taxclass' : ''; - $taxnum = $2; + $taxnum = $1; $expansion = ''; } @@ -39,28 +36,13 @@ my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum}) or die "cust_main_county.taxnum $taxnum not found"; my $title; -if ( $taxclass ) { - die "Can't expand entry!" if $cust_main_county->taxclass; - $title = 'Tax Classes'; +die "Can't expand entry!" if $cust_main_county->county; - # prepopuplate with other tax classes... which should really have a primary - # key of their own... also this could be more efficient in the error case... - my $sth = dbh->prepare("SELECT DISTINCT taxclass FROM cust_main_county") - or die dbh->errstr; - $sth->execute or die $sth->errstr; - my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref}; - $expansion ||= join("\n", grep $_, keys %taxclasses ); - +if ( $cust_main_county->state ) { + $title = 'Counties'; } else { - die "Can't expand entry!" if $cust_main_county->county; - - if ( $cust_main_county->state ) { - $title = 'Counties'; - } else { - $title = 'States/Provinces'; - } - + $title = 'States/Provinces'; } my $p1 = popurl(1); |