new setuptax and recurtax fields

[freeside.git] / httemplate / edit / process / cust_main_county.cgi

diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index 1ff2047..9287ed1 100755 (executable)
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,61 +1,27 @@
 <%
-#
-# $Id: cust_main_county.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# ivan@sisd.com 97-dec-16
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# lose background, FS::CGI ivan@sisd.com 98-sep-2
-#
-# $Log: cust_main_county.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  1999/01/25 12:19:08  ivan
-# yet more mod_perl stuff
-#
-# Revision 1.5  1999/01/19 05:13:52  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.4  1999/01/18 22:47:53  ivan
-# s/create/new/g; and use fields('table_name')
-#
-# Revision 1.3  1998/12/17 08:40:21  ivan
-# s/CGI::Request/CGI.pm/; etc
-#
-# Revision 1.2  1998/11/18 09:01:41  ivan
-# i18n! i18n!
-#
 
-use strict;
-use vars qw( $cgi );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-foreach ( $cgi->param ) {
+foreach ( grep { /^tax\d+$/ } $cgi->param ) {
   /^tax(\d+)$/ or die "Illegal form $_!";
-  my($taxnum)=$1;
-  my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+  my $taxnum = $1;
+  my $old = qsearchs('cust_main_county', { 'taxnum' => $taxnum })
     or die "Couldn't find taxnum $taxnum!";
-  next unless $old->getfield('tax') ne $cgi->param("tax$taxnum");
-  my(%hash)=$old->hash;
-  $hash{tax}=$cgi->param("tax$taxnum");
-  my($new)=new FS::cust_main_county \%hash;
-  my($error)=$new->replace($old);
+  next unless    $old->tax           != $cgi->param("tax$taxnum")
+              || $old->exempt_amount != $cgi->param("exempt_amount$taxnum")
+              || $old->taxname       ne $cgi->param("taxname$taxnum")
+              || $old->setuptax      ne $cgi->param("setuptax$taxnum")
+              || $old->recurtax      ne $cgi->param("recurtax$taxnum");
+  my %hash = $old->hash;
+  $hash{tax} = $cgi->param("tax$taxnum");
+  $hash{exempt_amount} = $cgi->param("exempt_amount$taxnum");
+  $hash{taxname} = $cgi->param("taxname$taxnum");
+  $hash{setuptax} = $cgi->param("setuptax$taxnum");
+  $hash{recurtax} = $cgi->param("recurtax$taxnum");
+  my $new = new FS::cust_main_county \%hash;
+  my $error = $new->replace($old);
   if ( $error ) {
     $cgi->param('error', $error);
     print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
-    exit;
+    myexit();
   }
 }