fix RT per-transaction recipient squelching, RT#25260

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

diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index 34297a5..29a6125 100755 (executable)
--- a/httemplate/search/pay_batch.cgi
+++ b/httemplate/search/pay_batch.cgi
@@ -1,4 +1,4 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
                  'title'         => 'Payment Batches',
                 'name_singular' => 'batch',
                 'query'         => { 'table'     => 'pay_batch',
@@ -7,6 +7,9 @@
                                       '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',
@@ -81,9 +84,8 @@
                                      sub { shift->status eq 'I' ? "b" : '' },
                                    ],
                  'html_init'     => $html_init,
-      )
-
-%>
+      
+&>
 <%init>
 
 die "access denied"
@@ -97,16 +99,10 @@ my $count_query = 'SELECT COUNT(*) FROM pay_batch';
 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') ) {