This commit was manufactured by cvs2svn to create branchfreeside_1_9_1

'FREESIDE_1_9_BRANCH'.

1 files changed, 11 insertions, 47 deletions

diff --git a/httemplate/edit/process/part_pkg_taxclass.html b/httemplate/edit/process/part_pkg_taxclass.html
index 8f149bb94..b37279fb3 100644
--- a/httemplate/edit/process/part_pkg_taxclass.html
+++ b/httemplate/edit/process/part_pkg_taxclass.html
@@ -1,53 +1,17 @@
-% if ( $error ) {
-%  $cgi->param('error', $error);
-<% $cgi->redirect(popurl(2). "part_pkg_taxclass.html?". $cgi->query_string ) %>
-%} else {
-<% $cgi->redirect(popurl(3). "browse/cust_main_county.cgi?taxclass=". uri_escape($part_pkg_taxclass->taxclass) ) %>
-%}
+<% include( 'elements/process.html',
+              'table'    => 'part_pkg_taxclass',
+              'redirect' => sub {
+                my( $cgi, $part_pkg_taxclass ) = @_;
+
+                popurl(3). 'browse/cust_main_county.cgi?'.
+                  'taxclass='. uri_escape($part_pkg_taxclass->taxclass).
+                  ';dummy=';
+              },
+          )
+%>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-my $part_pkg_taxclass = new FS::part_pkg_taxclass {
-  'taxclass' => $cgi->param('taxclass'),
-};
-
-#maybe this whole thing should be in a transaction.  at some point, no biggie
-#none of the follow-up stuff will fail unless there's a more serious problem
-#than a hanging record in part_pkg_taxclass...
-
-my $error = $part_pkg_taxclass->insert;
-
-unless ( $error ) {
-  #auto-add the new taxclass to any regions that have taxclasses already
-
-  my $sth = dbh->prepare("
-    SELECT country, state, county FROM cust_main_county
-      WHERE taxclass IS NOT NULL AND taxclass != ''
-      GROUP BY country, state, county
-  ") or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
-
-  while ( my $row = $sth->fetchrow_hashref ) {
-    warn "inserting for $row";
-    my $cust_main_county = new FS::cust_main_county {
-      'country'  => $row->{country},
-      'state'    => $row->{state},
-      'county'   => $row->{county},
-      'tax'      => 0,
-      'taxclass' => $part_pkg_taxclass->taxclass,
-      #exempt_amount
-      #taxname
-      #setuptax
-      #recurtax
-    };
-    $error = $cust_main_county->insert;
-    #last if $error;
-    die $error if $error;
-  }
-
-
-}
-
 </%init>