contact self-service pw changes, RT#37023

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

diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index 830a6c6..c0f84ec 100755 (executable)
--- a/httemplate/search/cust_pay_batch.cgi
+++ b/httemplate/search/cust_pay_batch.cgi
@@ -1,4 +1,4 @@
-<% include('elements/search.html',
+<& elements/search.html,
               'title'       => 'Batch payment details',
               'name'        => 'batch details',
              'query'       => $sql_query,
@@ -30,10 +30,10 @@
                                   sub {
                                     sprintf('%.02f', $_[0]->amount)
                                   },
-                                  'status',
+                                  sub { $_[0]->display_status },
                                   'error_message',
                                 ],
-             'align'       => 'rrrlllcrll',
+             'align'       => 'rrrlllcrlll',
              'links'       => [ '',
                                 ["${p}view/cust_bill.cgi?", 'invnum'],
                                 (["${p}view/cust_main.cgi?", 'custnum']) x 2,
@@ -41,8 +41,7 @@
               'link_onclicks' => [ ('') x 8,
                                    $sub_receipt
                                  ],
-      )
-%>
+&>
 <%init>
 
 my $conf = new FS::Conf;
@@ -73,7 +72,7 @@ if ( $cgi->param('batchnum') && $cgi->param('batchnum') =~ /^(\d+)$/ ) {
 }
 
 if ( $cgi->param('custnum') && $cgi->param('custnum') =~ /^(\d+)$/ ) {
-  push @search, "custnum = $1";
+  push @search, "cust_pay_batch.custnum = $1";
 }
 
 if ( $cgi->param('status') && $cgi->param('status') =~ /^(\w)$/ ) {
@@ -88,7 +87,7 @@ if ( $cgi->param('payby') ) {
 }
 
 if ( not $cgi->param('dcln') ) {
-  push @search, "cpb.status IS DISTINCT FROM 'Approved'";
+  push @search, "cust_pay_batch.status IS DISTINCT FROM 'Approved'";
 }
 
 my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
@@ -106,7 +105,7 @@ push @search, $curuser->agentnums_sql({ table      => 'pay_batch',
 
 my $search = ' WHERE ' . join(' AND ', @search);
 
-$count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' .
+$count_query = 'SELECT COUNT(*) FROM cust_pay_batch ' .
                   'LEFT JOIN cust_main USING ( custnum ) ' .
                   'LEFT JOIN pay_batch USING ( batchnum )' .
                  $search;
@@ -117,7 +116,6 @@ $sql_query = {
   'hashref'   => {},
   'addl_from' => 'LEFT JOIN pay_batch USING ( batchnum ) '.
                  'LEFT JOIN cust_main USING ( custnum ) '.
-                 
                  'LEFT JOIN cust_pay  USING ( batchnum, custnum ) ',
   'extra_sql' => $search,
   'order_by'  => "ORDER BY $orderby",