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

diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index 00c6ba1b9..40df5aa56 100755
--- a/httemplate/search/pay_batch.cgi
+++ b/httemplate/search/pay_batch.cgi
@@ -14,12 +14,23 @@
 		                      '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 { 
@@ -49,7 +60,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 +73,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 +161,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') ) {