'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 {
'';
}
},
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 $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;
my($begin, $end) = ( '', '' );
my @where;
-if ( $cgi->param('beginning')
- && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- $begin = parse_datetime($1);
- push @where, "download >= $begin";
-}
-if ( $cgi->param('ending')
- && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- $end = parse_datetime($1) + 86399;
- push @where, "download < $end";
-}
+
+my($beginning,$ending) = FS::UI::Web::parse_beginning_ending($cgi);
+push @where, "( (download >= $beginning AND download <= $ending) ".
+ ' OR download IS NULL )';
my @status;
if ( $cgi->param('open') ) {