X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main_county-expand.cgi;h=f56d31941b4d5e846f8a816db145beb2e850244d;hb=ab02d4756be1fca80ef12ae74f4dda9ee5f01106;hp=6b422cca6e904a8cada22194e3a83c245c7af4a3;hpb=3d671921441ba8422650b54435a1959ad1d4c71d;p=freeside.git

diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 6b422cca6..f56d31941 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,62 +1,59 @@
-<%
-#<!-- $Id: cust_main_county-expand.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
+<!-- mason kludge -->
+%
+%
+%my($taxnum, $delim, $expansion, $taxclass );
+%my($query) = $cgi->keywords;
+%if ( $cgi->param('error') ) {
+%  $taxnum = $cgi->param('taxnum');
+%  $delim = $cgi->param('delim');
+%  $expansion = $cgi->param('expansion');
+%  $taxclass = $cgi->param('taxclass');
+%} else {
+%  $query =~ /^(taxclass)?(\d+)$/
+%    or die "Illegal taxnum (query $query)";
+%  $taxclass = $1 ? 'taxclass' : '';
+%  $taxnum = $2;
+%  $delim = 'n';
+%  $expansion = '';
+%}
+%
+%my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
+%  or die "cust_main_county.taxnum $taxnum not found";
+%if ( $taxclass ) {
+%  die "Can't expand entry!" if $cust_main_county->getfield('taxclass');
+%} else {
+%  die "Can't expand entry!" if $cust_main_county->getfield('county');
+%}
+%
+%my $p1 = popurl(1);
+%print header("Tax Rate (expand)", menubar(
+%  'Main Menu' => popurl(2),
+%));
+%
+%print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
+%      "</FONT>"
+%  if $cgi->param('error');
+%
+%print <<END;
+%    <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">
+%      Separate by
+%END
+%print '<INPUT TYPE="radio" NAME="delim" VALUE="n"';
+%print ' CHECKED' if $delim eq 'n';
+%print '>line (broken on some browsers) or',
+%      '<INPUT TYPE="radio" NAME="delim" VALUE="s"';
+%print ' CHECKED' if $delim eq 's';
+%print '>whitespace.';
+%print <<END;
+%      <BR><INPUT TYPE="submit" VALUE="Submit">
+%      <BR><TEXTAREA NAME="expansion" ROWS=100>$expansion</TEXTAREA>
+%    </FORM>
+%    </CENTER>
+%  </BODY>
+%</HTML>
+%END
+%
+%
 
-use strict;
-use vars qw( $cgi $taxnum $cust_main_county $p1 $delim $expansion );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar popurl);
-use FS::cust_main_county;
-
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-if ( $cgi->param('error') ) {
-  $taxnum = $cgi->param('taxnum');
-  $delim = $cgi->param('delim');
-  $expansion = $cgi->param('expansion');
-} else {
-  my ($query) = $cgi->keywords;
-  $query =~ /^(\d+)$/
-    or die "Illegal taxnum!";
-  $taxnum = $1;
-  $delim = 'n';
-  $expansion = '';
-}
-
-$cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum});
-die "Can't expand entry!" if $cust_main_county->getfield('county');
-
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Tax Rate (expand)", menubar(
-  'Main Menu' => popurl(2),
-));
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-print <<END;
-    <FORM ACTION="${p1}process/cust_main_county-expand.cgi" METHOD=POST>
-      <INPUT TYPE="hidden" NAME="taxnum" VALUE="$taxnum">
-      Separate by
-END
-print '<INPUT TYPE="radio" NAME="delim" VALUE="n"';
-print ' CHECKED' if $delim eq 'n';
-print '>line (rumor has it broken on some browsers) or',
-      '<INPUT TYPE="radio" NAME="delim" VALUE="s"';
-print ' CHECKED' if $delim eq 's';
-print '>whitespace.';
-print <<END;
-      <BR><INPUT TYPE="submit" VALUE="Submit">
-      <BR><TEXTAREA NAME="expansion" ROWS=100>$expansion</TEXTAREA>
-    </FORM>
-    </CENTER>
-  </BODY>
-</HTML>
-END
-
-%>