X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fpay_batch.cgi;h=29a612568ed2ae2b0840c49b378082a895130107;hb=cc9fc5ea4477bd50cb67f8aae1482bb7606761db;hp=7b2b9f00bac6d2a3d5614505e1d0e3795b3578da;hpb=22c70177969f30e2e419b32cb5d475c143f10b12;p=freeside.git
diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index 7b2b9f00b..29a612568 100755
--- 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',
+<& 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,51 @@
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;
+
+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') ) {
+ 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 = ''.
+ ($resolved ? 'Hide' : 'Show') . ' resolved batches
';
+
+%init>