projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
search
/
pay_batch.cgi
diff --git
a/httemplate/search/pay_batch.cgi
b/httemplate/search/pay_batch.cgi
index
620996a
..
40df5aa
100755
(executable)
--- a/
httemplate/search/pay_batch.cgi
+++ b/
httemplate/search/pay_batch.cgi
@@
-14,12
+14,23
@@
'Type',
'First Download',
'Last Upload',
'Type',
'First Download',
'Last Upload',
- '', # requests
- '',
# req amt
- '', # payments
- '',
# pay amt
+ { label => 'Requested', colspan => 2 },
+ '',
+ { label => 'Paid', colspan => 2 },
+ '',
'Status',
],
'Status',
],
+ 'header2' => [ '',
+ '',
+ '',
+ '',
+ '',
+ 'Items',
+ 'Amount',
+ 'Items',
+ 'Amount',
+ '',
+ ],
'align' => 'rcllrrrrc',
'fields' => [ 'batchnum',
sub {
'align' => 'rcllrrrrc',
'fields' => [ 'batchnum',
sub {
@@
-49,7
+60,7
@@
},
sub {
my $c = FS::cust_pay_batch->count('batchnum = '.$_[0]->batchnum);
},
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;
},
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);
},
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;
},
sub {
my $st = "SELECT SUM(paid) from cust_pay WHERE batchnum=" . shift->batchnum;