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 fb45287..05415f3 100755 (executable)
--- a/httemplate/search/pay_batch.cgi
+++ b/httemplate/search/pay_batch.cgi
@@ -3,14 +3,19 @@
                 'name_singular' => 'batch',
                 'query'         => { 'table'     => 'pay_batch',
                                      'hashref'   => $hashref,
-                                     'extra_sql' => "$extra_sql ORDER BY batchnum DESC",
+                                     'extra_sql' => $extra_sql,
+                                      'order_by'  => 'ORDER BY batchnum DESC',
                                    },
                 'count_query'   => "$count_query $extra_sql",
+                 'agent_virt'    => 1,
+                 'agent_null_right' => 'Process batches', #'Process global batches',
+                 'agent_pos'     => 1,
                 'header'        => [ 'Batch',
                                      'Type',
                                      'First Download',
                                      'Last Upload',
-                                     'Item Count',
+                                     'Items',
+                                      'Unresolved',
                                      'Amount',
                                      'Status',
                                     ],
@@ -42,13 +47,16 @@
                                        }
                                      },
                                      sub {
-                                        my $st = "SELECT COUNT(*) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
-                                        my $sth = dbh->prepare($st)
-                                          or die dbh->errstr. "doing $st";
-                                        $sth->execute
-                                         or die "Error executing \"$st\": ". $sth->errstr;
-                                        $sth->fetchrow_arrayref->[0];
-                                     },
+                                        FS::cust_pay_batch->count(
+                                          'batchnum = '.$_[0]->batchnum
+                                        )
+                                      },
+                                      sub {
+                                        FS::cust_pay_batch->count(
+                                          'status is null and batchnum = '.
+                                            $_[0]->batchnum
+                                        )
+                                      },
                                      sub {
                                         my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=" . shift->batchnum;
                                         my $sth = dbh->prepare($st)
@@ -79,6 +87,7 @@
                                      sub { shift->status eq 'O' ? "b" : '' },
                                      sub { shift->status eq 'I' ? "b" : '' },
                                    ],
+                 'html_init'     => $html_init,
       )
 
 %>
@@ -97,12 +106,12 @@ my($begin, $end) = ( '', '' );
 my @where;
 if ( $cgi->param('beginning')
      && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-  $begin = str2time($1);
+  $begin = parse_datetime($1);
   push @where, "download >= $begin";
 }
 if ( $cgi->param('ending')
       && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-  $end = str2time($1) + 86399;
+  $end = parse_datetime($1) + 86399;
   push @where, "download < $end";
 }
 
@@ -127,4 +136,9 @@ my $extra_sql = scalar(@where) ? 'WHERE ' . join(' AND ', @where) : '';
 
 my $link = [ "${p}search/cust_pay_batch.cgi?dcln=1;batchnum=", 'batchnum' ];
 
+my $resolved = $cgi->param('resolved') || 0;
+$cgi->param('resolved' => !$resolved);
+my $html_init = '<A HREF="' . $cgi->self_url . '"><I>'.
+    ($resolved ? 'Hide' : 'Show') . ' resolved batches</I></A><BR>';
+
 </%init>