X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=15769636618c236a67c5b14c926405d21aa2ddfe;hb=097a12385d80ef52f37d4cc2bb93bc3f81e6f8e6;hp=fec3dfdeb4559c6440f86ede5cff4872c013e6b5;hpb=590603ecaea3184f64530755a76626be8205da49;p=freeside.git
diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index fec3dfdeb..157696366 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 : '',
@@ -58,9 +57,17 @@
%>
<%init>
+my $conf = new FS::Conf;
+
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Financial reports')
- || $FS::CurrentUser::CurrentUser->access_right('Process batches');
+ || $FS::CurrentUser::CurrentUser->access_right('Process batches')
+ || ( $cgi->param('custnum')
+ && ( $conf->exists('batch-enable')
+ || $conf->config('batch-enable_payby')
+ )
+ #&& $FS::CurrentUser::CurrentUser->access_right('View customer batched payments')
+ );
my( $count_query, $sql_query );
my $hashref = {};
@@ -75,6 +82,14 @@ if ( $cgi->param('batchnum') && $cgi->param('batchnum') =~ /^(\d+)$/ ) {
$batchnum = $pay_batch->batchnum;
}
+if ( $cgi->param('custnum') && $cgi->param('custnum') =~ /^(\d+)$/ ) {
+ push @search, "custnum = $1";
+}
+
+if ( $cgi->param('status') && $cgi->param('status') =~ /^(\w)$/ ) {
+ push @search, "pay_batch.status = '$1'";
+}
+
if ( $cgi->param('payby') ) {
$cgi->param('payby') =~ /^(CARD|CHEK)$/
or die "illegal payby " . $cgi->param('payby');
@@ -111,7 +126,6 @@ $sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," .
my $html_init = '';
if ( $pay_batch ) {
- my $conf = new FS::Conf;
my $fixed = $conf->config('batch-fixed_format-'. $pay_batch->payby);
if (
$pay_batch->status eq 'O'
@@ -129,6 +143,7 @@ if ( $pay_batch ) {
qq!!.
qq!!.
qq!!.
+ qq!!.
qq!!;
}
$html_init .= qq!
!;
@@ -152,6 +167,7 @@ if ( $pay_batch ) {
qq!!.
qq!!.
qq!!.
+ qq!!.
qq!
!;
}
$html_init .= qq!!;