diff options
author | ivan <ivan> | 2008-02-20 01:15:16 +0000 |
---|---|---|
committer | ivan <ivan> | 2008-02-20 01:15:16 +0000 |
commit | 7e5ae6bd612f2eff6065b4aea0a52edc696e5d36 (patch) | |
tree | afc93b47df0355f9179ad209ec4e58e00983c445 /httemplate/edit | |
parent | 89378959468e385caca6be5790897f800dd81baa (diff) |
oops, this got commited to HEAD by a bad command, its part of the commit to update the tax class editor to enable taxclass adding, RT#2929
Diffstat (limited to 'httemplate/edit')
-rwxr-xr-x | httemplate/edit/cust_main_county-expand.cgi | 32 | ||||
-rwxr-xr-x | httemplate/edit/process/cust_main_county-expand.cgi | 44 |
2 files changed, 39 insertions, 37 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); diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi index a8b4c2511..758345e8c 100755 --- a/httemplate/edit/process/cust_main_county-expand.cgi +++ b/httemplate/edit/process/cust_main_county-expand.cgi @@ -16,18 +16,29 @@ my $taxnum = $1; my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum}) or die ("Unknown taxnum!"); -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: $_"); - print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string ); - myexit(); - } - $1; -} @expansion; +my @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}; + die "no taxclasses - add one first" unless @expansion;#XXX better err handling +} else { + @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: $_"); + print $cgi->redirect(popurl(2). "cust_main_county-expand.cgi?". $cgi->query_string ); + myexit(); + } + $1; + } @expansion; + +} foreach ( @expansion) { my(%hash)=$cust_main_county->hash; @@ -55,4 +66,13 @@ unless ( qsearch( 'cust_main', { die $error if $error; } +if ( $cgi->param('taxclass') ) { + print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi?". + 'state='. uri_escape($cust_main_county->state ).';'. + 'county='. uri_escape($cust_main_county->county ).';'. + 'country='. uri_escape($cust_main_county->country) + ); + myexit; +} + </%init> |