X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=825d21c8ab77e8c6fe1f49c29c82517a71fbab6e;hb=995a145c931164347683071c95c6754379d36604;hp=c678febf13231a258ba374ab42bf076032d99bf4;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git
diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index c678febf1..825d21c8a 100755
--- a/httemplate/search/cust_pay_batch.cgi
+++ b/httemplate/search/cust_pay_batch.cgi
@@ -1,7 +1,6 @@
<% include('elements/search.html',
'title' => 'Batch payment details',
'name' => 'batch details',
- 'menubar' => ['Main Menu' => $p,],
'query' => $sql_query,
'count_query' => $count_query,
'html_init' => $pay_batch ? $html_init : '',
@@ -64,7 +63,9 @@ die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Financial reports')
|| $FS::CurrentUser::CurrentUser->access_right('Process batches')
|| ( $cgi->param('custnum')
- && $conf->exists('batch-enable')
+ && ( $conf->exists('batch-enable')
+ || $conf->config('batch-enable_payby')
+ )
#&& $FS::CurrentUser::CurrentUser->access_right('View customer batched payments')
);
@@ -123,7 +124,7 @@ $sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," .
'LEFT JOIN pay_batch USING ( batchnum ) ' .
"$search ORDER BY $orderby";
-my $html_init = '';
+my $html_init = '
';
if ( $pay_batch ) {
my $fixed = $conf->config('batch-fixed_format-'. $pay_batch->payby);
if (
@@ -131,21 +132,27 @@ if ( $pay_batch ) {
|| ( $pay_batch->status eq 'I'
&& $FS::CurrentUser::CurrentUser->access_right('Reprocess batches')
)
+ || ( $pay_batch->status eq 'R'
+ && $FS::CurrentUser::CurrentUser->access_right('Redownload resolved batches')
+ )
) {
- $html_init .= qq!
';
+ $html_init .= '
';
}
-
+ $html_init .= '
'
}
if ($pay_batch) {