so Search.tsf and Search.rdf work

[freeside.git] / httemplate / search / cust_pay.cgi

diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 42b3c01..c23653a 100755 (executable)
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -3,7 +3,6 @@
    my( $count_query, $sql_query );
    if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
    
-     my %search = ();
      my @search = ();
 
      if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
@@ -16,24 +15,27 @@
      if ( $cgi->param('payby') ) {
        $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
          or die "illegal payby ". $cgi->param('payby');
-       $search{'payby'} = $1;
+       push @search, "cust_pay.payby = '$1'";
        if ( $3 ) {
          if ( $3 eq 'VisaMC' ) {
            #avoid posix regexes for portability
-           push @search, " (    substring(payinfo from 1 for 1) = '4'  ".
-                         "   OR substring(payinfo from 1 for 2) = '51' ".
-                         "   OR substring(payinfo from 1 for 2) = '52' ".
-                         "   OR substring(payinfo from 1 for 2) = '53' ".
-                         "   OR substring(payinfo from 1 for 2) = '54' ".
-                         "   OR substring(payinfo from 1 for 2) = '54' ".
-                         "   OR substring(payinfo from 1 for 2) = '55' ".
-                         " ) ";
+           push @search,
+             " (    substring(cust_pay.payinfo from 1 for 1) = '4'  ".
+             "   OR substring(cust_pay.payinfo from 1 for 2) = '51' ".
+             "   OR substring(cust_pay.payinfo from 1 for 2) = '52' ".
+             "   OR substring(cust_pay.payinfo from 1 for 2) = '53' ".
+             "   OR substring(cust_pay.payinfo from 1 for 2) = '54' ".
+             "   OR substring(cust_pay.payinfo from 1 for 2) = '54' ".
+             "   OR substring(cust_pay.payinfo from 1 for 2) = '55' ".
+             " ) ";
          } elsif ( $3 eq 'Amex' ) {
-           push @search, " (    substring(payinfo from 1 for 2 ) = '34' ".
-                         "   OR substring(payinfo from 1 for 2 ) = '37' ".
-                         " ) ";
+           push @search,
+             " (    substring(cust_pay.payinfo from 1 for 2 ) = '34' ".
+             "   OR substring(cust_pay.payinfo from 1 for 2 ) = '37' ".
+             " ) ";
          } elsif ( $3 eq 'Discover' ) {
-           push @search, " substring(payinfo from 1 for 4 ) = '6011' ";
+           push @search,
+             " substring(cust_pay.payinfo from 1 for 4 ) = '6011' ";
          } else {
            die "unknown card type $3";
          }
@@ -60,24 +62,21 @@
        push @search, " _date < $1 ";
      }
    
-     my $search;
+     my $search = '';
      if ( @search ) {
-       $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
-                 join(' AND ', @search);
+       $search = ' WHERE '. join(' AND ', @search);
      }
 
-     my $hsearch = join(' AND ', map { "$_ = '$search{$_}'" } keys %search );
      $count_query = "SELECT COUNT(*), SUM(paid) ".
-                    "FROM cust_pay JOIN cust_main USING ( custnum )".
-                    ( $hsearch ? " WHERE $hsearch " : '' ).
+                    "FROM cust_pay LEFT JOIN cust_main USING ( custnum )".
                     $search;
    
-     warn join('-', keys %search);
      $sql_query = {
        'table'     => 'cust_pay',
-       'hashref'   => \%search,
+       'select'    => 'cust_pay.*, cust_main.last, cust_main.first, cust_main.company',
+       'hashref'   => {},
        'extra_sql' => "$search ORDER BY _date",
-       'addl_from' => 'JOIN cust_main USING ( custnum )',
+       'addl_from' => 'LEFT JOIN cust_main USING ( custnum )',
      };
    
    } else {
@@ -102,43 +101,42 @@
 
    my $link = [ "${p}view/cust_main.cgi?", 'custnum' ];
 
-%>
-<%= include( 'elements/search.html',
-               'title'       => $title,
-               'name'        => 'payments',
-               'query'       => $sql_query,
-               'count_query' => $count_query,
-               'count_addl'  => [ '$%.2f total paid', ],
-               'header'      =>
-                 [ qw(Payment Amount Date), 'Cust #', 'Contact name',
-                   'Company', ],
-               'fields'      => [
-                 sub {
-                   my $cust_pay = shift;
-                   if ( $cust_pay->payby eq 'CARD' ) {
-                     'Card #'. $cust_pay->payinfo_masked;
-                   } elsif ( $cust_pay->payby eq 'CHEK' ) {
-                     'E-check acct#'. $cust_pay->payinfo;
-                   } elsif ( $cust_pay->payby eq 'BILL' ) {
-                     'Check #'. $cust_pay->payinfo;
-                   } else {
-                     $cust_pay->payby. ' '. $cust_pay->payinfo;
-                   }
-                 },
-                 sub { sprintf('$%.2f', shift->paid ) },
-                 sub { time2str('%b %d %Y', shift->_date ) },
-                 'custnum',
-                 sub { $_[0]->get('last'). ', '. $_[0]->first; },
-                 'company',
-               ],
-               'align' => 'lrrrll',
-               'links' => [
-                 '',
-                 '',
-                 '',
-                 $link,
-                 $link,
-                 $link,
-               ],
-    )
+%><%= include( 'elements/search.html',
+                 'title'       => $title,
+                 'name'        => 'payments',
+                 'query'       => $sql_query,
+                 'count_query' => $count_query,
+                 'count_addl'  => [ '$%.2f total paid', ],
+                 'header'      =>
+                   [ qw(Payment Amount Date), 'Cust #', 'Contact name',
+                     'Company', ],
+                 'fields'      => [
+                   sub {
+                     my $cust_pay = shift;
+                     if ( $cust_pay->payby eq 'CARD' ) {
+                       'Card #'. $cust_pay->payinfo_masked;
+                     } elsif ( $cust_pay->payby eq 'CHEK' ) {
+                       'E-check acct#'. $cust_pay->payinfo;
+                     } elsif ( $cust_pay->payby eq 'BILL' ) {
+                       'Check #'. $cust_pay->payinfo;
+                     } else {
+                       $cust_pay->payby. ' '. $cust_pay->payinfo;
+                     }
+                   },
+                   sub { sprintf('$%.2f', shift->paid ) },
+                   sub { time2str('%b %d %Y', shift->_date ) },
+                   'custnum',
+                   sub { $_[0]->get('last'). ', '. $_[0]->first; },
+                   'company',
+                 ],
+                 'align' => 'lrrrll',
+                 'links' => [
+                   '',
+                   '',
+                   '',
+                   $link,
+                   $link,
+                   $link,
+                 ],
+      )
 %>