From 70838ab866bfcb2d596ed2ca96bb2c23c6cba5c1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 20 Feb 2008 01:10:32 +0000
Subject: process/part_pkg_taxclass.html

---
 .../edit/process/cust_main_county-expand.cgi       | 44 ++++++++++++++++------
 httemplate/edit/process/invoice_logo.html          |  1 -
 httemplate/edit/process/reg_code.cgi               |  1 -
 3 files changed, 32 insertions(+), 14 deletions(-)

(limited to 'httemplate/edit/process')

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>
diff --git a/httemplate/edit/process/invoice_logo.html b/httemplate/edit/process/invoice_logo.html
index d641a9959..757fa94b7 100644
--- a/httemplate/edit/process/invoice_logo.html
+++ b/httemplate/edit/process/invoice_logo.html
@@ -23,4 +23,3 @@ $conf->set("logo$name.$type", $data);
 $cgi->redirect(popurl(3). "edit/invoice_logo.html?type=$type;name=$name;msg=Logo%20changed");
 
 </%init>
-
diff --git a/httemplate/edit/process/reg_code.cgi b/httemplate/edit/process/reg_code.cgi
index c4327991d..035e10b90 100644
--- a/httemplate/edit/process/reg_code.cgi
+++ b/httemplate/edit/process/reg_code.cgi
@@ -43,4 +43,3 @@ my @pkgparts =
 $error ||= $agent->generate_reg_codes($num, \@pkgparts);
 
 </%init>
-
-- 
cgit v1.2.1