X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=830a6c699f9d082145cda73ec5dc216d565b3555;hb=61097b876e692dbf5571a17b9aa415949607085f;hp=8022d46668100eb5857ea522cd785f392c972602;hpb=f8b35040badefb02652f875e147ee2b4b2f7c4a9;p=freeside.git

diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index 8022d4666..830a6c699 100755
--- a/httemplate/search/cust_pay_batch.cgi
+++ b/httemplate/search/cust_pay_batch.cgi
@@ -3,68 +3,56 @@
               'name'        => 'batch details',
 	      'query'       => $sql_query,
 	      'count_query' => $count_query,
-              'html_init'   => $pay_batch ? 
-                                  include('elements/cust_pay_batch_top.html',
-                                          'pay_batch' => $pay_batch
-                                  ) : '',
+              'html_init'   => $pay_batch ? $html_init : '',
+              'disable_download' => 1,
 	      'header'      => [ '#',
 	                         'Inv #',
-	                         'Customer',
+                                 'Cust #',
 	                         'Customer',
 	                         'Card Name',
 	                         'Card',
 	                         'Exp',
 	                         'Amount',
 	                         'Status',
+                                 '', # error_message
 			       ],
-	      'fields'      => [ sub {
-	                           shift->[0];
-				 },
-	                         sub {
-	                           shift->[1];
-				 },
-	                         sub {
-	                           shift->[2];
-				 },
-			  	 sub {
-	                           my $cpb = shift;
-				   $cpb->[3] . ', ' . $cpb->[4];
-				 },
-	                         sub {
-	                           shift->[5];
-				 },
-				 sub {
-	                           my $cardnum = shift->[6];
-                                   'x'x(length($cardnum)-4). substr($cardnum,(length($cardnum)-4));
-				 },
-				 sub {
-				   shift->[7] =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/;
-                                   my( $mon, $year ) = ( $2, $1 );
-                                   $mon = "0$mon" if length($mon) == 1;
-                                   "$mon/$year";
-				 },
-	                         sub {
-	                           shift->[8];
-				 },
-	                         sub {
-	                           shift->[9];
-				 },
-			       ],
-	      'align'       => 'lllllllrl',
-	      'links'       => [ ['', sub{'#';}],
-	                         ["${p}view/cust_bill.cgi?", sub{shift->[1];},],
-	                         ["${p}view/cust_main.cgi?", sub{shift->[2];},],
-	                         ["${p}view/cust_main.cgi?", sub{shift->[2];},],
+              'fields'      => [  'paybatchnum',
+                                  'invnum',
+                                  'custnum',
+                                  sub { $_[0]->cust_main->name_short },
+                                  'payname',
+                                  'mask_payinfo',
+                                  sub {
+                                    return('') if $_[0]->payby ne 'CARD';
+                                    $_[0]->get('exp') =~ /^\d\d(\d\d)-(\d\d)/;
+                                    sprintf('%02d/%02d',$1,$2);
+                                  },
+                                  sub {
+                                    sprintf('%.02f', $_[0]->amount)
+                                  },
+                                  'status',
+                                  'error_message',
+                                ],
+	      'align'       => 'rrrlllcrll',
+	      'links'       => [ '',
+	                         ["${p}view/cust_bill.cgi?", 'invnum'],
+	                         (["${p}view/cust_main.cgi?", 'custnum']) x 2,
 			       ],
+              'link_onclicks' => [ ('') x 8,
+                                   $sub_receipt
+                                 ],
       )
 %>
 <%init>
 
 my $conf = new FS::Conf;
 
+my $curuser = $FS::CurrentUser::CurrentUser;
+
 die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports')
-      || $FS::CurrentUser::CurrentUser->access_right('Process batches')
+  unless $curuser->access_right('Financial reports')
+      || $curuser->access_right('Process batches')
+      || $curuser->access_right('Process global batches')
       || ( $cgi->param('custnum') 
            && (    $conf->exists('batch-enable')
                 || $conf->config('batch-enable_payby')
@@ -110,7 +98,12 @@ unless ($pay_batch){
   $orderby = "pay_batch.download,paybatchnum";
 }
 
-push @search, $FS::CurrentUser::CurrentUser->agentnums_sql;
+push @search, $curuser->agentnums_sql({ table => 'cust_main' });
+
+push @search, $curuser->agentnums_sql({ table      => 'pay_batch',
+                                        null_right => 'Process global batches',
+                                     });
+
 my $search = ' WHERE ' . join(' AND ', @search);
 
 $count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' .
@@ -118,13 +111,25 @@ $count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' .
                   'LEFT JOIN pay_batch USING ( batchnum )' .
 		  $search;
 
-#grr
-$sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," .
-             "cpb.payname,cpb.payinfo,cpb.exp,amount,cpb.status " .
-	     "FROM cust_pay_batch AS cpb " .
-             'LEFT JOIN cust_main USING ( custnum ) ' .
-             'LEFT JOIN pay_batch USING ( batchnum ) ' .
-             "$search ORDER BY $orderby";
+$sql_query = {
+  'table'     => 'cust_pay_batch',
+  'select'    => 'cust_pay_batch.*, cust_main.*, cust_pay.paynum',
+  '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",
+};
+
+my $sub_receipt = sub {
+  my $paynum = shift->paynum or return '';
+  include('/elements/popup_link_onclick.html',
+    'action'  => $p.'view/cust_pay.html?link=popup;paynum='.$paynum,
+    'actionlabel' => emt('Payment Receipt'),
+  );
+};
 
 my $html_init = '';
 if ( $pay_batch ) {