[freeside-commits] freeside/httemplate/search cust_tax_exempt_pkg.cgi, 1.3, 1.4

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv21910/httemplate/search

Modified Files:
	cust_tax_exempt_pkg.cgi 
Log Message:
add link to customer tax exemptions to customer view page

Index: cust_tax_exempt_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_tax_exempt_pkg.cgi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cust_tax_exempt_pkg.cgi	23 Aug 2006 22:25:38 -0000	1.3
+++ cust_tax_exempt_pkg.cgi	15 Sep 2006 19:15:34 -0000	1.4
@@ -1,92 +1,3 @@
-%
-%
-%my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-%
-%my $join_cust = "
-%    JOIN cust_bill USING ( invnum )
-%    LEFT JOIN cust_main USING ( custnum )
-%";
-%
-%my $join_pkg = "
-%    LEFT JOIN cust_pkg USING ( pkgnum )
-%    LEFT JOIN part_pkg USING ( pkgpart )
-%";
-%
-%my $join = "
-%    JOIN cust_bill_pkg USING ( billpkgnum )
-%    $join_cust
-%    $join_pkg
-%";
-%
-%my $where = "
-%  WHERE _date >= $beginning AND _date <= $ending
-%";
-%#    AND payby != 'COMP'
-%
-%if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-%  $where .= " AND agentnum = $1 ";
-%}
-%
-%if ( $cgi->param('out') ) {
-%
-%  $where .= "
-%    AND 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  =  '' )
-%              OR ( county_out.county  =  ''  AND cust_main.county IS NULL)
-%              OR ( county_out.county IS NULL AND cust_main.county IS NULL)
-%            )
-%        AND (    county_out.state   = cust_main.state
-%              OR ( county_out.state  IS NULL AND cust_main.state  =  ''  )
-%              OR ( county_out.state   =  ''  AND cust_main.state IS NULL )
-%              OR ( county_out.state  IS NULL AND cust_main.state IS NULL )
-%            )
-%        AND county_out.country = cust_main.country
-%        AND county_out.tax > 0
-%    )
-%  ";
-%
-%} elsif ( $cgi->param('country' ) ) {
-%
-%  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') )
-%    if $cgi->param('taxclass');
-%
-%}
-%
-%my $count_query = "SELECT COUNT(*), SUM(amount)".
-%                  "  FROM cust_tax_exempt_pkg $join $where";
-%
-%my $query = {
-%  'table'     => 'cust_tax_exempt_pkg',
-%  'addl_from' => $join,
-%  'hashref'   => {},
-%  'select'    => join(', ',
-%                   'cust_tax_exempt_pkg.*',
-%                   'cust_bill_pkg.*',
-%                   'cust_bill.*',
-%                   'part_pkg.pkg',
-%                   'cust_main.custnum',
-%                   FS::UI::Web::cust_sql_fields(),
-%                 ),
-%  'extra_sql' => $where,
-%};
-%
-%my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ];
-%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',
@@ -148,4 +59,101 @@
                  'align' => 'rrrlrc', # 'rlrrrc',
            )
 %>
+<%once>
+
+my $join_cust = "
+    JOIN cust_bill USING ( invnum )
+    LEFT JOIN cust_main USING ( custnum )
+";
+
+my $join_pkg = "
+    LEFT JOIN cust_pkg USING ( pkgnum )
+    LEFT JOIN part_pkg USING ( pkgpart )
+";
+
+my $join = "
+    JOIN cust_bill_pkg USING ( billpkgnum )
+    $join_cust
+    $join_pkg
+";
+
+</%once>
+<%init>
+
+my @where = ();
 
+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+)$/ ) {
+  push @where, "agentnum = $1";
+}
+
+if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+  push @where,  "cust_main.custnum = $1";
+}
+
+if ( $cgi->param('out') ) {
+
+  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  =  '' )
+              OR ( county_out.county  =  ''  AND cust_main.county IS NULL)
+              OR ( county_out.county IS NULL AND cust_main.county IS NULL)
+            )
+        AND (    county_out.state   = cust_main.state
+              OR ( county_out.state  IS NULL AND cust_main.state  =  ''  )
+              OR ( county_out.state   =  ''  AND cust_main.state IS NULL )
+              OR ( county_out.state  IS NULL AND cust_main.state IS NULL )
+            )
+        AND county_out.country = cust_main.country
+        AND county_out.tax > 0
+    )
+  ";
+
+} elsif ( $cgi->param('country' ) ) {
+
+  my $county  = dbh->quote( $cgi->param('county')  );
+  my $state   = dbh->quote( $cgi->param('state')   );
+  my $country = dbh->quote( $cgi->param('country') );
+  push @where, "( county  = $county OR $county = '' )",
+               "( state   = $state  OR $state = ''  )",
+               "  country = $country";
+  push @where, 'taxclass = '. dbh->quote( $cgi->param('taxclass') )
+    if $cgi->param('taxclass');
+
+}
+
+my $where = scalar(@where) ? 'WHERE '.join(' AND ', @where) : '';
+
+my $count_query = "SELECT COUNT(*), SUM(amount)".
+                  "  FROM cust_tax_exempt_pkg $join $where";
+
+my $query = {
+  'table'     => 'cust_tax_exempt_pkg',
+  'addl_from' => $join,
+  'hashref'   => {},
+  'select'    => join(', ',
+                   'cust_tax_exempt_pkg.*',
+                   'cust_bill_pkg.*',
+                   'cust_bill.*',
+                   'part_pkg.pkg',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
+                 ),
+  'extra_sql' => $where,
+};
+
+my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ];
+my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
+</%init>