[freeside-commits] branch master updated. c23753d010e11b83ed19e0f3347adc7161ce7de9

[Mark Wells]

The branch, master has been updated
       via  c23753d010e11b83ed19e0f3347adc7161ce7de9 (commit)
      from  f3a97201def678ff5cb382520132f303a16d0d12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c23753d010e11b83ed19e0f3347adc7161ce7de9
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Aug 8 14:35:00 2013 -0700

    column headings, #24170

diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index 620996a..40df5aa 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;

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/pay_batch.cgi |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)