projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
fb45287
..
b2a15ef
100755
(executable)
--- a/
httemplate/search/pay_batch.cgi
+++ b/
httemplate/search/pay_batch.cgi
@@
-3,9
+3,13
@@
'name_singular' => 'batch',
'query' => { 'table' => 'pay_batch',
'hashref' => $hashref,
'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",
},
'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',
'header' => [ 'Batch',
'Type',
'First Download',
@@
-79,6
+83,7
@@
sub { shift->status eq 'O' ? "b" : '' },
sub { shift->status eq 'I' ? "b" : '' },
],
sub { shift->status eq 'O' ? "b" : '' },
sub { shift->status eq 'I' ? "b" : '' },
],
+ 'html_init' => $html_init,
)
%>
)
%>
@@
-97,12
+102,12
@@
my($begin, $end) = ( '', '' );
my @where;
if ( $cgi->param('beginning')
&& $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
my @where;
if ( $cgi->param('beginning')
&& $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- $begin =
str2
time($1);
+ $begin =
parse_date
time($1);
push @where, "download >= $begin";
}
if ( $cgi->param('ending')
&& $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
push @where, "download >= $begin";
}
if ( $cgi->param('ending')
&& $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- $end =
str2
time($1) + 86399;
+ $end =
parse_date
time($1) + 86399;
push @where, "download < $end";
}
push @where, "download < $end";
}
@@
-127,4
+132,9
@@
my $extra_sql = scalar(@where) ? 'WHERE ' . join(' AND ', @where) : '';
my $link = [ "${p}search/cust_pay_batch.cgi?dcln=1;batchnum=", 'batchnum' ];
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>
</%init>