[freeside-commits] freeside/httemplate/browse cust_main_county.cgi, 1.16, 1.17

Ivan,,, ivan at wavetail.420.am
Thu Jan 3 18:42:09 PST 2008


Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail:/tmp/cvs-serv10501/httemplate/browse

Modified Files:
	cust_main_county.cgi 
Log Message:
new tax rate editor

Index: cust_main_county.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/cust_main_county.cgi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cust_main_county.cgi	30 Jan 2007 20:59:13 -0000	1.16
+++ cust_main_county.cgi	4 Jan 2008 02:42:07 -0000	1.17
@@ -1,170 +1,225 @@
-<% include('/elements/header.html', "Tax Rate Listing", menubar(
-  'Edit tax rates' => $p. "edit/cust_main_county.cgi",
-)) %>
-
-    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.
+<% include( 'elements/browse.html',
+     'title'          => 'Tax Rates',
+     'name_singular'  => 'tax rate',
+     'html_init'      => $html_init,
+     'html_posttotal' => $html_posttotal,
+     'query'          => {
+                           'table'    => 'cust_main_county',
+                           'hashref'  => $hashref,
+                           'order_by' =>
+                             'ORDER BY country, state, county, taxclass',
+                         },
+     'count_query'    => $count_query,
+     'header'         => \@header,
+     'header2'        => \@header2,
+     'fields'         => \@fields,
+     'align'          => $align,
+     'color'          => \@color,
+     'cell_style'     => \@cell_style,
+     'links'          => \@links,
+     'link_onclicks'  => \@link_onclicks,
+  )
+%>
 %
-%my $conf = new FS::Conf;
-%my $enable_taxclasses = $conf->exists('enable_taxclasses');
+% #         <FONT SIZE=-1><A HREF="<% $p %>edit/process/cust_main_county-collapse.cgi?<% $hashref->{taxnum} %>">collapse state</A></FONT>
+% # % } 
 %
-%if ( $enable_taxclasses ) { 
+<%once>
 
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
 
-  <BR>Click on <u>expand taxclasses</u> to specify tax classes
-% } 
+my @manual_countries = ( 'US', 'CA', 'AU', 'NZ', 'GB' ); #some manual ordering
+my @all_countries = ( @manual_countries, 
+                      grep { my $c = $_; ! grep { $c eq $_ } @manual_countries }
+                      map { $_->country } 
+                          qsearch({
+                                    'select'    => 'country',
+                                    'table'     => 'cust_main_county',
+                                    'hashref'   => {},
+                                    'extra_sql' => 'GROUP BY country',
+                                 })
+                    );
 
+my $exempt_sub = sub {
+  my $cust_main_county = shift;
 
-<BR><BR>
-<% table() %>
+  my @exempt = ();
+  push @exempt,
+       sprintf("$money_char%.2f&nbsp;per&nbsp;month", $cust_main_county->exempt_amount )
+    if $cust_main_county->exempt_amount > 0;
 
-  <TR>
-    <TH><FONT SIZE=-1>Country</FONT></TH>
-    <TH><FONT SIZE=-1>State</FONT></TH>
-    <TH>County</TH>
-    <TH>Taxclass<BR><FONT SIZE=-1>(per-package classification)</FONT></TH>
-    <TH>Tax name<BR><FONT SIZE=-1>(printed on invoices)</FONT></TH>
-    <TH><FONT SIZE=-1>Tax</FONT></TH>
-    <TH><FONT SIZE=-1>Exemption</TH>
-  </TR>
-%
-%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;
-%#foreach $cust_main_county ( @regions ) {
-%for ( my $i=0; $i<@regions; $i++ ) { 
-%  my $cust_main_county = $regions[$i];
-%  my $hashref = $cust_main_county->hashref;
-%
-%  
+  push @exempt, 'Setup&nbsp;fee'
+    if $cust_main_county->setuptax =~ /^Y$/i;
 
-      <TR>
-        <TD BGCOLOR="#ffffff"><% $hashref->{country} %></TD>
-%
-%
-%  my $j;
-%  if ( $sup ) {
-%    $sup--;
-%  } else {
-%
-%    #lookahead
-%    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->{exempt_amount} != $regions[$i+$j]->exempt_amount
-%           || $hashref->{setuptax} ne $regions[$i+$j]->setuptax
-%           || $hashref->{recurtax} ne $regions[$i+$j]->recurtax;
-%    }
-%
-%    my $newsup=0;
-%    if ( $j>1 && $i+$j+1 < @regions
-%         && ( $hashref->{state} ne $regions[$i+$j+1]->state 
-%              || $hashref->{country} ne $regions[$i+$j+1]->country
-%              )
-%         && ( ! $i
-%              || $hashref->{state} ne $regions[$i-1]->state 
-%              || $hashref->{country} ne $regions[$i-1]->country
-%              )
-%       ) {
-%       $sup = $j-1;
-%    } else {
-%      $j = 1;
-%    }
-%
-%    
+  push @exempt, 'Recurring&nbsp;fee'
+    if $cust_main_county->recurtax =~ /^Y$/i;
 
+  [ map [ {'data'=>$_} ], @exempt ];
+};
 
-    <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>!
-      %>
-% if ( $j>1 ) { 
+my $oldrow;
+my $cell_style;
+my $cell_style_sub = sub {
+  my $row = shift;
+  if ( $oldrow ne $row ) {
+    if ( $oldrow ) {
+      if ( $oldrow->country ne $row->country ) {
+        $cell_style = 'border-top:1px solid #000000';
+      } elsif ( $oldrow->state ne $row->state ) {
+        $cell_style = 'border-top:1px solid #cccccc'; #default?
+      } elsif ( $oldrow->state eq $row->state ) {
+        #$cell_style = 'border-top:dashed 1px dark gray';
+        $cell_style = 'border-top:1px dashed #cccccc';
+      }
+    }
+    $oldrow = $row;
+  }
+  return $cell_style;
+};
 
-        <FONT SIZE=-1><A HREF="<% $p %>edit/process/cust_main_county-collapse.cgi?<% $hashref->{taxnum} %>">collapse state</A></FONT>
-% } 
+#my $edit_link = [ "${p}edit/cust_main_county.html", 'taxnum' ];
+my $edit_link = [ 'javascript:void(0);', sub { ''; } ];
 
+my $edit_onclick = sub {
+  my $row = shift;
+  my $taxnum = $row->taxnum;
+  my $color = '#333399';
+  qq!overlib( OLiframeContent('${p}edit/cust_main_county.html?$taxnum', 540, 420, 'edit_cust_main_county_popup' ), CAPTION, 'Edit tax rate', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '$color', CGCOLOR, '$color' ); return false;!;
+};
 
-    </TD>
-% } 
-% #  $sup=$newsup; 
+sub expand_link {
+  my( $row, $desc, %opt ) = @_;
+  my $taxnum = $row->taxnum;
+  $taxnum = "taxclass$taxnum" if $opt{'taxclass'};
+  my $color = '#333399';
+  qq!<FONT SIZE="-1"><A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}edit/cust_main_county-expand.cgi?$taxnum', 540, 420, 'edit_cust_main_county_popup' ), CAPTION, '$desc', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK, BGCOLOR, '$color', CGCOLOR, '$color' ); return false;">!;
+}
 
+</%once>
+<%init>
 
-    <TD
-% if ( $hashref->{county} ) {
-%            
- BGCOLOR="#ffffff"><% $hashref->{county} %>
-% } else {
-%            
- BGCOLOR="#cccccc">(ALL)
-% if ( $hashref->{state} ) { 
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-                 <FONT SIZE=-1><A HREF="<% $p %>edit/cust_main_county-expand.cgi?<% $hashref->{taxnum} %>">expand state</A></FONT>
-% } 
-% } 
+#my $conf = new FS::Conf;
+#my $money_char = $conf->config('money_char') || '$';
+my $enable_taxclasses = $conf->exists('enable_taxclasses');
 
-    </TD>
+my $html_init =
+  "Click on <u>add states</u> to specify a country's tax rates by state or province.
+   <BR>Click on <u>add counties</u> to specify a state's tax rates by county.";
+$html_init .= "<BR>Click on <u>add taxclasses</u> to specify tax classes."
+  if $enable_taxclasses;
+$html_init .= '<BR><BR>';
 
-    <TD
-% if ( $hashref->{taxclass} ) {
-%            
- BGCOLOR="#ffffff"><% $hashref->{taxclass} %>
-% } else {
-%            
- BGCOLOR="#cccccc">(ALL)
-% if ( $enable_taxclasses ) { 
+$html_init .= qq(
+  <SCRIPT TYPE="text/javascript" SRC="${fsurl}elements/overlibmws.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript" SRC="${fsurl}elements/overlibmws_iframe.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript" SRC="${fsurl}elements/overlibmws_draggable.js"></SCRIPT>
+  <SCRIPT TYPE="text/javascript" SRC="${fsurl}elements/iframecontentmws.js"></SCRIPT>
+);
 
-                 <FONT SIZE=-1><A HREF="<% $p %>edit/cust_main_county-expand.cgi?taxclass<% $hashref->{taxnum} %>">expand taxclasses</A></FONT>
-% } 
-% } 
+my $filter_country = '';
+if ( $cgi->param('filter_country') =~ /^(\w\w)$/ ) {
+  $filter_country = $1;
+}
+$cgi->delete('filter_country');
+$cgi->param('dummy', 1);
 
-    </TD>
+my $country_filter_change =
+  "window.location = '".
+  $cgi->self_url. ";filter_country=' + this.options[this.selectedIndex].value;";
 
-    <TD
-% if ( $hashref->{taxname} ) {
-%            
- BGCOLOR="#ffffff"><% $hashref->{taxname} %>
-% } else {
-%            
- BGCOLOR="#cccccc">Tax
-% } 
+my $html_posttotal =
+  '(show country: '.
+  qq(<SELECT NAME="filter_country" onChange="$country_filter_change">).
+  qq(<OPTION VALUE="">(all)\n).
+  join("\n", map qq[<OPTION VALUE="$_"].
+                   ( $_ eq $filter_country ? 'SELECTED' : '' ).
+                   '>'. code2country($_). " ($_)",
+                 @all_countries
+      ).
+  '</SELECT>)';
 
-    </TD>
+my $hashref = {};
+my $count_query = 'SELECT COUNT(*) FROM cust_main_county';
+if ( $filter_country ) {
+  $hashref->{'country'} = $filter_country;
+  $count_query .= " WHERE country = '$filter_country'";
+}
 
-    <TD BGCOLOR="#ffffff"><% $hashref->{tax} %>%</TD>
+$cell_style = '';
 
-    <TD BGCOLOR="#ffffff">
-% if ( $hashref->{exempt_amount} > 0 ) { 
+my @header        = ( 'Country', 'State/Province', 'County',);
+my @header2       = ( '', '', '', );
+my @links         = ( '', '', '', );
+my @link_onclicks = ( '', '', '', );
+my $align = 'lll';
 
-        $<% sprintf("%.2f", $hashref->{exempt_amount} ) %>&nbsp;per&nbsp;month<BR>
-% } 
-% if ( $hashref->{setuptax} =~ /^Y$/i ) { 
+my @fields = (
+  sub { my $country = shift->country;
+        code2country($country). " ($country)";
+      },
+  sub { state_label($_[0]->state, $_[0]->country).
+        ( $_[0]->state
+            ? ''
+            : '&nbsp'. expand_link($_[0], 'Add States').
+                       'add&nbsp;states</A></FONT>'
+        )
+      },
+  sub { $_[0]->county || '(all)&nbsp'.
+                         expand_link($_[0], 'Add Counties').
+                         'add&nbsp;counties</A></FONT>'
+      },
+);
 
-        Setup&nbsp;fee<BR>
-% } 
-% if ( $hashref->{recurtax} =~ /^Y$/i ) { 
+my @color = (
+  '000000',
+  sub { shift->state  ? '000000' : '999999' },
+  sub { shift->county ? '000000' : '999999' },
+);
 
-        Recurring&nbsp;fee<BR>
-% } 
+if ( $conf->exists('enable_taxclasses') ) {
+  push @header,  'Tax class';
+  push @header2, '(per-package classification)';
+  push @fields,  sub { $_[0]->taxclass || '(all)&nbsp'.
+                         expand_link($_[0], 'Add Taxclasses', 'taxclass'=>1).
+                         'add&nbsp;taxclasses</A></FONT>'
+                     };
+  push @color,   sub { shift->taxclass ? '000000' : '999999' };
+  push @links,   '';
+  push @link_onclicks, '';
+  $align .= 'l';
+}
 
+push @header, 'Tax name',
+              'Rate', #'Tax',
+              'Exemptions',
+              ;
 
-    </TD>
+push @header2, '(printed on invoices)',
+               '',
+               '',
+               ;
 
-  </TR>
-% } 
+push @fields, 
+  sub { shift->taxname || 'Tax' },
+  sub { shift->tax. '%&nbsp;<FONT SIZE="-1">(edit)</FONT>' },
+  $exempt_sub,
+;
 
+push @color,
+  sub { shift->taxname ? '000000' : '666666' },
+  sub { shift->tax     ? '000000' : '666666' },
+  '000000',
+;
 
-</TABLE>
+$align .= 'lrl';
+
+my @cell_style = map $cell_style_sub, (1..scalar(@header));
+
+push @links,         '', $edit_link,    '';
+push @link_onclicks, '', $edit_onclick, '';
 
-<% include('/elements/footer.html') %>
-<%init>
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 </%init>



More information about the freeside-commits mailing list