X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Fcust_main_county.cgi;h=9916060872c24c4a51df866fd3daa79d40467138;hp=f7c749c1f8ccebf77abc41bf1cfe2d95e6eba4f8;hb=1a4ba4fc23449a4bb189c8e7a69a10a2a793efc3;hpb=6ef34dda51afba96d8dc6c4dd72427c3d4003945

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index f7c749c1f..991606087 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,41 +1,36 @@
+<!-- mason kludge -->
 <%
-#<!-- $Id: cust_main_county.cgi,v 1.3 2001-08-21 09:34:13 ivan Exp $ -->
 
-use strict;
-use vars qw( $cgi $p $cust_main_county );
-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 table);
-use FS::cust_main_county;
+my $conf = new FS::Conf;
+my $enable_taxclasses = $conf->exists('enable_taxclasses');
 
-$cgi = new CGI;
-
-&cgisuidsetup($cgi);
-
-$p = popurl(2);
-
-print $cgi->header( '-expires' => 'now' ), header("Tax Rate Listing", menubar(
+print header("Tax Rate Listing", menubar(
   'Main Menu' => $p,
   'Edit tax rates' => $p. "edit/cust_main_county.cgi",
 )),<<END;
     Click on <u>expand country</u> to specify a country's tax rates by state.
     <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
-    <BR><BR>
 END
-print &table(), <<END;
+
+if ( $enable_taxclasses ) {
+  print '<BR>Click on <u>expand taxclasses</u> to specify tax classes';
+}
+
+print '<BR><BR>'. &table(). <<END;
       <TR>
         <TH><FONT SIZE=-1>Country</FONT></TH>
         <TH><FONT SIZE=-1>State</FONT></TH>
         <TH>County</TH>
+        <TH>Taxclass</TH>
         <TH><FONT SIZE=-1>Tax</FONT></TH>
+        <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
       </TR>
 END
 
-my @regions = sort {    $a->country cmp $b->country
-                     or $a->state   cmp $b->state
-                     or $a->county  cmp $b->county
+my @regions = sort {    $a->country  cmp $b->country
+                     or $a->state    cmp $b->state
+                     or $a->county   cmp $b->county
+                     or $a->taxclass cmp $b->taxclass
                    } qsearch('cust_main_county',{});
 
 my $sup=0;
@@ -45,7 +40,7 @@ for ( my $i=0; $i<@regions; $i++ ) {
   my $hashref = $cust_main_county->hashref;
   print <<END;
       <TR>
-        <TD>$hashref->{country}</TD>
+        <TD BGCOLOR="#ffffff">$hashref->{country}</TD>
 END
 
   my $j;
@@ -57,7 +52,8 @@ END
     for ( $j=1; $i+$j<@regions; $j++ ) {
       last if $hashref->{country} ne $regions[$i+$j]->country
            || $hashref->{state} ne $regions[$i+$j]->state
-           || $hashref->{tax} != $regions[$i+$j]->tax;
+           || $hashref->{tax} != $regions[$i+$j]->tax
+           || $hashref->{exempt_amount} != $regions[$i+$j]->exempt_amount;
     }
 
     my $newsup=0;
@@ -75,9 +71,9 @@ END
       $j = 1;
     }
 
-    print "<TD ROWSPAN=$j>", $hashref->{state}
-        ? $hashref->{state}
-        : qq!(ALL) <FONT SIZE=-1>!.
+    print "<TD ROWSPAN=$j", $hashref->{state}
+        ? ' BGCOLOR="#ffffff">'. $hashref->{state}
+        : qq! BGCOLOR="#cccccc">(ALL) <FONT SIZE=-1>!.
           qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
           qq!">expand country</A></FONT>!;
 
@@ -88,11 +84,11 @@ END
 
 #  $sup=$newsup;
 
-  print "<TD>";
+  print "<TD";
   if ( $hashref->{county} ) {
-    print $hashref->{county};
+    print ' BGCOLOR="#ffffff">'. $hashref->{county};
   } else {
-    print "(ALL)";
+    print ' BGCOLOR="#cccccc">(ALL)';
     if ( $hashref->{state} ) {
       print qq!<FONT SIZE=-1>!.
           qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
@@ -101,16 +97,29 @@ END
   }
   print "</TD>";
 
-  print <<END;
-        <TD>$hashref->{tax}%</TD>
-      </TR>
-END
+  print "<TD";
+  if ( $hashref->{taxclass} ) {
+    print ' BGCOLOR="#ffffff">'. $hashref->{taxclass};
+  } else {
+    print ' BGCOLOR="#cccccc">(ALL)';
+    if ( $enable_taxclasses ) {
+      print qq!<FONT SIZE=-1>!.
+            qq!<A HREF="${p}edit/cust_main_county-expand.cgi?taxclass!.
+            $hashref->{taxnum}. qq!">expand taxclasses</A></FONT>!;
+    }
+
+  }
+  print "</TD>";
+
+  print "<TD BGCOLOR=\"#ffffff\">$hashref->{tax}%</TD>".
+        '<TD BGCOLOR="#ffffff">$'.
+          sprintf("%.2f", $hashref->{exempt_amount} || 0). '</TD>'.
+        '</TR>';
 
 }
 
 print <<END;
     </TABLE>
-    </CENTER>
   </BODY>
 </HTML>
 END