agent-virt batches and batchconfig-eftcanada config (argh!), RT#14859

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

diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index 7b2b9f0..b2a15ef 100755 (executable)
--- a/httemplate/search/pay_batch.cgi
+++ b/httemplate/search/pay_batch.cgi
@@ -1,52 +1,15 @@
-%
-%
-%my %statusmap = ('I'=>'In Transit', 'O'=>'Open', 'R'=>'Resolved');
-%my $hashref = {};
-%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 = str2time($1);
-%  push @where, "download >= $begin";
-%}
-%if ( $cgi->param('ending')
-%      && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-%  $end = str2time($1) + 86399;
-%  push @where, "download < $end";
-%}
-%
-%my @status;
-%if ( $cgi->param('open') ) {
-%  push @status, "O";
-%}
-%
-%if ( $cgi->param('intransit') ) {
-%  push @status, "I";
-%}
-%
-%if ( $cgi->param('resolved') ) {
-%  push @status, "R";
-%}
-%
-%push @where,
-%     scalar(@status) ? q!(status='! . join(q!' OR status='!, @status) . q!')!
-%                     : q!status='X'!;  # kludgy, X is unused at present
-%
-%my $extra_sql = scalar(@where) ? 'WHERE ' . join(' AND ', @where) : ''; 
-%
-%my $link = [ "${p}search/cust_pay_batch.cgi?batchnum=", 'batchnum' ];
-%
 <% include( 'elements/search.html',
                  'title'         => 'Payment Batches',
                 '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',
@@ -120,8 +83,58 @@
                                      sub { shift->status eq 'O' ? "b" : '' },
                                      sub { shift->status eq 'I' ? "b" : '' },
                                    ],
+                 'html_init'     => $html_init,
       )
 
 %>
+<%init>
 
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports')
+      || $FS::CurrentUser::CurrentUser->access_right('Process batches');
 
+my %statusmap = ('I'=>'In Transit', 'O'=>'Open', 'R'=>'Resolved');
+my $hashref = {};
+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 @status;
+if ( $cgi->param('open') ) {
+  push @status, "O";
+}
+
+if ( $cgi->param('intransit') ) {
+  push @status, "I";
+}
+
+if ( $cgi->param('resolved') ) {
+  push @status, "R";
+}
+
+push @where,
+     scalar(@status) ? q!(status='! . join(q!' OR status='!, @status) . q!')!
+                     : q!status='X'!;  # kludgy, X is unused at present
+
+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>