X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fpay_batch.cgi;h=7b2b9f00bac6d2a3d5614505e1d0e3795b3578da;hb=43d3389061e5c2a428230792b67d42bbf6549a86;hp=fcfa8bef23e56d1d0a1ed6f987557e4dedaa9369;hpb=6af1b1bfa25e5ececef5e0dcd38b55917121cee2;p=freeside.git

diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index fcfa8bef2..7b2b9f00b 100755
--- a/httemplate/search/pay_batch.cgi
+++ b/httemplate/search/pay_batch.cgi
@@ -37,55 +37,89 @@
 %
 %my $extra_sql = scalar(@where) ? 'WHERE ' . join(' AND ', @where) : ''; 
 %
+%my $link = [ "${p}search/cust_pay_batch.cgi?batchnum=", 'batchnum' ];
 %
 <% include( 'elements/search.html',
-                 'title'        => 'Credit Card Batches',
-		 'menubar'      => [ 'Main Menu' => $p, ],
-		 'name'         => 'batches',
-		 'query'        => { 'table'     => 'pay_batch',
-		                     'hashref'   => $hashref,
-				     'extra_sql' => "$extra_sql ORDER BY batchnum DESC",
-				   },
-		 'count_query'  => "$count_query $extra_sql",
-		 'header'       => [ 'Batch',
-		                     'First Download',
-				     'Last Upload',
-				     'Item Count',
-				     'Amount',
-				     'Status',
-				   ],
-		 'align'        => 'lllrrl',
-		 'fields'       => [ 'batchnum',
-                                     sub {
-				       my $_date = shift->download;
-				       $_date ? time2str("%a %b %e %T %Y", $_date) : '' 
-				     },
-                                     sub {
-				       my $_date = shift->upload;
-				       $_date ? time2str("%a %b %e %T %Y", $_date) : '' 
-				     },
-				     sub {
-                                       my $st = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
-                                       my $sth = dbh->prepare($st)
-                                         or die dbh->errstr. "doing $st";
-                                       $sth->execute
-				         or die "Error executing \"$st\": ". $sth->errstr;
-                                       $sth->fetchrow_arrayref->[0];
-				     },
-				     sub {
-                                       my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
-                                       my $sth = dbh->prepare($st)
-				         or die dbh->errstr. "doing $st";
-                                       $sth->execute
-				         or die "Error executing \"$st\": ". $sth->errstr;
-                                       $sth->fetchrow_arrayref->[0];
-				     },
-                                     sub {
-				       $statusmap{shift->status};
-				     },
-				   ],
-		 'links'        => [ [ "${p}search/cust_pay_batch.cgi?batchnum=", 'batchnum',],
-				   ],
+                 'title'         => 'Payment Batches',
+		 'name_singular' => 'batch',
+		 'query'         => { 'table'     => 'pay_batch',
+		                      'hashref'   => $hashref,
+				      'extra_sql' => "$extra_sql ORDER BY batchnum DESC",
+				    },
+		 'count_query'   => "$count_query $extra_sql",
+		 'header'        => [ 'Batch',
+		                      'Type',
+		                      'First Download',
+				      'Last Upload',
+				      'Item Count',
+				      'Amount',
+				      'Status',
+                                    ],
+		 'align'         => 'rcllrrc',
+		 'fields'        => [ 'batchnum',
+		                      sub { 
+				        FS::payby->shortname(shift->payby);
+				      },
+                                      sub {
+				        my $self = shift;
+				        my $_date = $self->download;
+				        if ( $_date ) {
+					  time2str("%a %b %e %T %Y", $_date);
+					} elsif ( $self->status eq 'O' ) {
+					  'Download batch';
+					} else {
+					  '';
+					}
+				      },
+                                      sub {
+				        my $self = shift;
+				        my $_date = $self->upload;
+				        if ( $_date ) {
+					  time2str("%a %b %e %T %Y", $_date);
+					} elsif ( $self->status eq 'I' ) {
+					  'Upload results';
+					} else {
+					  '';
+					}
+				      },
+				      sub {
+                                        my $st = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
+                                        my $sth = dbh->prepare($st)
+                                          or die dbh->errstr. "doing $st";
+                                        $sth->execute
+				          or die "Error executing \"$st\": ". $sth->errstr;
+                                        $sth->fetchrow_arrayref->[0];
+				      },
+				      sub {
+                                        my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
+                                        my $sth = dbh->prepare($st)
+				          or die dbh->errstr. "doing $st";
+                                        $sth->execute
+				          or die "Error executing \"$st\": ". $sth->errstr;
+                                        $sth->fetchrow_arrayref->[0];
+				      },
+                                      sub {
+				        $statusmap{shift->status};
+				      },
+				    ],
+		 'links'         => [
+		                      $link,
+				      '',
+				      sub { shift->status eq 'O' ? $link : '' },
+				      sub { shift->status eq 'I' ? $link : '' },
+				    ],
+		 'size'         => [
+		                      '',
+				      '',
+				      sub { shift->status eq 'O' ? "+1" : '' },
+				      sub { shift->status eq 'I' ? "+1" : '' },
+				    ],
+		 'style'         => [
+		                      '',
+				      '',
+				      sub { shift->status eq 'O' ? "b" : '' },
+				      sub { shift->status eq 'I' ? "b" : '' },
+				    ],
       )
 
 %>