X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_tax_exempt_pkg.cgi;h=267c9383a62a90c13e4472ba30ea58cbe849eedb;hb=baf5cfb99275c060748ec1c212e646759af6e96b;hp=e61947b7d8dd6a8da7e0bc08c6cba3780190d09f;hpb=b5ecccfac56fc5d4eaa617a8c08dd168ffb74bac;p=freeside.git

diff --git a/httemplate/search/cust_tax_exempt_pkg.cgi b/httemplate/search/cust_tax_exempt_pkg.cgi
index e61947b7d..267c9383a 100644
--- a/httemplate/search/cust_tax_exempt_pkg.cgi
+++ b/httemplate/search/cust_tax_exempt_pkg.cgi
@@ -1,11 +1,88 @@
-<%
+<& elements/search.html,
+                 'title'       => 'Tax exemptions',
+                 'name'        => 'tax exemptions',
+                 'query'       => $query,
+                 'count_query' => $count_query,
+                 'count_addl'  => [ $money_char. '%.2f total', ],
+                 'header'      => [
+                   '#',
+                   'Month',
+                   'Amount',
+                   'Line item',
+                   'Invoice',
+                   'Date',
+                   FS::UI::Web::cust_header(),
+                 ],
+                 'fields'      => [
+                   'exemptpkgnum',
+                   sub { $_[0]->month. '/'. $_[0]->year; },
+                   sub { $money_char. $_[0]->amount; },
 
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+                   sub {
+                     $_[0]->billpkgnum. ': '.
+                     ( $_[0]->pkgnum > 0
+                         ? $_[0]->get('pkg')
+                         : $_[0]->get('itemdesc')
+                     ).
+                     ' ('.
+                     ( $_[0]->setup > 0
+                         ? $money_char. $_[0]->setup. ' setup'
+                         : ''
+                     ).
+                     ( $_[0]->setup > 0 && $_[0]->recur > 0
+                       ? ' / '
+                       : ''
+                     ).
+                     ( $_[0]->recur > 0
+                         ? $money_char. $_[0]->recur. ' recur'
+                         : ''
+                     ).
+                     ')';
+                   },
+
+                   'invnum',
+                   sub { time2str('%b %d %Y', shift->_date ) },
+
+                   \&FS::UI::Web::cust_fields,
+                 ],
+                 'links'       => [
+                   '',
+                   '',
+                   '',
+
+                   '',
+                   $ilink,
+                   $ilink,
+
+                   ( map { $_ ne 'Cust. Status' ? $clink : '' }
+                         FS::UI::Web::cust_header()
+                   ),
+                 ],
+                 'align' => 'rrrlrc'.FS::UI::Web::cust_aligns(), # 'rlrrrc',
+                 'color' => [ 
+                              '',
+                              '',
+                              '',
+                              '',
+                              '',
+                              '',
+                              FS::UI::Web::cust_colors(),
+                            ],
+                 'style' => [ 
+                              '',
+                              '',
+                              '',
+                              '',
+                              '',
+                              '',
+                              FS::UI::Web::cust_styles(),
+                            ],
+&>
+<%once>
 
 my $join_cust = "
-    JOIN cust_bill USING ( invnum )
-    LEFT JOIN cust_main USING ( custnum )
-";
+    JOIN cust_bill USING ( invnum )" .
+    FS::UI::Web::join_cust_main('cust_bill', 'cust_pkg');
 
 my $join_pkg = "
     LEFT JOIN cust_pkg USING ( pkgnum )
@@ -14,23 +91,44 @@ my $join_pkg = "
 
 my $join = "
     JOIN cust_bill_pkg USING ( billpkgnum )
-    $join_cust
     $join_pkg
+    $join_cust
 ";
 
-my $where = "
-  WHERE _date >= $beginning AND _date <= $ending
-";
-#    AND payby != 'COMP'
+</%once>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('View customer tax exemptions');
+
+my @where = ("exempt_monthly = 'Y'");
+
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+if ( $beginning || $ending ) {
+  push @where, "_date >= $beginning",
+               "_date <= $ending";
+               #"payby != 'COMP';
+}
 
 if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-  $where .= " AND agentnum = $1 ";
+  push @where, "cust_main.agentnum = $1";
+}
+
+if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+  push @where,  "cust_main.custnum = $1";
+}
+
+if ( $cgi->param('classnum') eq '0' ) {
+  push @where,  "part_pkg.classnum IS NULL";
+} elsif ( $cgi->param('classnum') =~ /^(\d+)$/ ) {
+  push @where,  "part_pkg.classnum = $1";
 }
 
 if ( $cgi->param('out') ) {
+  # wtf? how would you ever get exemptions on a non-taxable package location?
 
-  $where .= "
-    AND 0 = (
+  push @where, "
+    0 = (
       SELECT COUNT(*) FROM cust_main_county AS county_out
       WHERE (    county_out.county  = cust_main.county
               OR ( county_out.county IS NULL AND cust_main.county  =  '' )
@@ -52,16 +150,21 @@ if ( $cgi->param('out') ) {
   my $county  = dbh->quote( $cgi->param('county')  );
   my $state   = dbh->quote( $cgi->param('state')   );
   my $country = dbh->quote( $cgi->param('country') );
-  $where .= "
-    AND ( county  = $county OR $county = '' )
-    AND ( state   = $state  OR $state = '' )
-    AND   country = $country
-  ";
-  $where .= ' AND taxclass = '. dbh->quote( $cgi->param('taxclass') )
+  push @where, "( county  = $county OR $county = '' )",
+               "( state   = $state  OR $state = ''  )",
+               "  country = $country";
+  push @where, 'taxclass = '. dbh->quote( $cgi->param('taxclass') )
     if $cgi->param('taxclass');
 
+} elsif ( $cgi->param('taxnum') ) {
+
+  my $taxnum_in = join(',', grep /^\d+$/, $cgi->param('taxnum') );
+  push @where, "taxnum IN ($taxnum_in)" if $taxnum_in;
+
 }
 
+my $where = scalar(@where) ? 'WHERE '.join(' AND ', @where) : '';
+
 my $count_query = "SELECT COUNT(*), SUM(amount)".
                   "  FROM cust_tax_exempt_pkg $join $where";
 
@@ -86,65 +189,4 @@ my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
 my $conf = new FS::Conf;
 my $money_char = $conf->config('money_char') || '$';
 
-%><%= include( 'elements/search.html',
-                 'title'       => 'Tax exemptions',
-                 'name'        => 'tax exemptions',
-                 'query'       => $query,
-                 'count_query' => $count_query,
-                 'count_addl'  => [ $money_char. '%.2f total', ],
-                 'header'      => [
-                   '#',
-                   'Month',
-                   'Amount',
-                   'Line item',
-                   'Invoice',
-                   'Date',
-                   FS::UI::Web::cust_header(),
-                 ],
-                 'fields'      => [
-                   'exemptpkgnum',
-                   sub { $_[0]->month. '/'. $_[0]->year; },
-                   sub { $money_char. $_[0]->amount; },
-
-                   sub {
-                     $_[0]->billpkgnum. ': '.
-                     ( $_[0]->pkgnum > 0
-                         ? $_[0]->get('pkg')
-                         : $_[0]->get('itemdesc')
-                     ).
-                     ' ('.
-                     ( $_[0]->setup > 0
-                         ? $money_char. $_[0]->setup. ' setup'
-                         : ''
-                     ).
-                     ( $_[0]->setup > 0 && $_[0]->recur > 0
-                       ? ' / '
-                       : ''
-                     ).
-                     ( $_[0]->recur > 0
-                         ? $money_char. $_[0]->recur. ' recur'
-                         : ''
-                     ).
-                     ')';
-                   },
-
-                   'invnum',
-                   sub { time2str('%b %d %Y', shift->_date ) },
-
-                   \&FS::UI::Web::cust_fields,
-                 ],
-                 'links'       => [
-                   '',
-                   '',
-                   '',
-
-                   '',
-                   $ilink,
-                   $ilink,
-
-                   ( map { $clink } FS::UI::Web::cust_header() ),
-                 ],
-                 'align' => 'rrrlrc', # 'rlrrrc',
-           )
-%>
-
+</%init>