X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=4a2248726d3a960634cd0a930b6b530089a3c2c2;hb=38dd3ed3eeda0a467e1b4d8cedd741fc62aedc9c;hp=e378ffae77ed2671c8d798e7a3694a1eaafe4682;hpb=5d9a5e54a74950b0e62264abcd53e77607f04b48;p=freeside.git
diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index e378ffae7..4a2248726 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,20 +132,29 @@ 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 .= '
';
+ if ( $conf->exists('batch-manual_approval')
+ and $conf->config('batch-fixed_format-CHEK') eq 'td_eft1464'
+ and $pay_batch->status eq 'I'
+ and $pay_batch->payby eq 'CHEK' ) {
+ $html_init .= qq!
!
+ }
}
-
+ $html_init .= '
';
}
if ($pay_batch) {