X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fpay_batch.cgi;h=fd14d05bc0b17fce35a3c9b843ebfbc8420eb8d6;hp=00c6ba1b956d6bfc9101cd789d7540dc92ed491b;hb=HEAD;hpb=6897aea6913f9f8ab39803e8f8e06c1adefcd916

diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index 00c6ba1b9..fd14d05bc 100755
--- a/httemplate/search/pay_batch.cgi
+++ b/httemplate/search/pay_batch.cgi
@@ -14,24 +14,39 @@
 		                      'Type',
 		                      'First Download',
 				      'Last Upload',
-                                      '', # requests
-                                      '', # req amt
-                                      '', # payments
-                                      '', # pay amt
+                                      { label => 'Requested', colspan => 2 },
+                                      '',
+                                      { label => 'Paid', colspan => 2 },
+                                      '',
 				      'Status',
                                     ],
+                 'header2'       => [ '',
+                                      '',
+                                      '',
+                                      '',
+                                      '',
+                                      'Items',
+                                      'Amount',
+                                      'Items',
+                                      'Amount',
+                                      '',
+                                    ],
 		 'align'         => 'rcllrrrrc',
 		 'fields'        => [ 'batchnum',
-		                      sub { 
-				        FS::payby->shortname(shift->payby);
-				      },
+		                      sub {
+                my $self = shift;
+                my $type = $self->type eq 'CREDIT' ? 'CREDIT' : '';
+                $type ." " . FS::payby->shortname($self->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';
+					} elsif ( $self->status eq 'O' && $self->type eq 'CREDIT') {
+					  'Download credit batch';
+          } elsif ( $self->status eq 'O' && $self->type eq 'DEBIT') {
+            'Download batch';
 					} else {
 					  '';
 					}
@@ -49,7 +64,7 @@
 				      },
 				      sub {
                                         my $c = FS::cust_pay_batch->count('batchnum = '.$_[0]->batchnum);
-                                        $c ? "$c requested" : ''
+                                        $c || ''
                                       },
                                       sub {
                                         my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
@@ -62,7 +77,7 @@
                                       },
                                       sub {
                                         my $c = FS::cust_pay->count('batchnum = '.$_[0]->batchnum);
-                                        $c ? "$c paid" : ''
+                                        $c || '';
                                       },
                                       sub {
                                         my $st = "SELECT SUM(paid) from cust_pay WHERE batchnum=" . shift->batchnum;
@@ -150,8 +165,8 @@ my($begin, $end) = ( '', '' );
 my @where;
 
 my($beginning,$ending) = FS::UI::Web::parse_beginning_ending($cgi);
-push @where, "download >= $beginning",
-             "download <= $ending";
+push @where, "( (download >= $beginning AND download <= $ending) ".
+             ' OR download IS NULL )';
 
 my @status;
 if ( $cgi->param('open') ) {