default to a session cookie instead of setting an explicit timeout, weird timezone...

[freeside.git] / httemplate / search / pay_batch.cgi

diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index 620996a..fd14d05 100755 (executable)
--- 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;