X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=f3826441058397e5a6ef2efcafdf747d48e39f9b;hb=6b422c02045e73bac0e0c73553da62a99a9698a4;hp=d12e3c44f870826322d068e46b87f1dfb562b1bf;hpb=c8cccb4a92adceb943c635fe62dad0d034462ce0;p=freeside.git
diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index d12e3c44f..f38264410 100755
--- a/httemplate/search/cust_pay_batch.cgi
+++ b/httemplate/search/cust_pay_batch.cgi
@@ -1,120 +1,10 @@
-%my( $count_query, $sql_query );
-%my $hashref = {};
-%my @search = ();
-%my $orderby = 'paybatchnum';
-%
-%my( $pay_batch, $batchnum ) = ( '', '');
-%if ( $cgi->param('batchnum') && $cgi->param('batchnum') =~ /^(\d+)$/ ) {
-% push @search, "batchnum = $1";
-% $pay_batch = qsearchs('pay_batch', { 'batchnum' => $1 } );
-% die "Batch $1 not found!" unless $pay_batch;
-% $batchnum = $pay_batch->batchnum;
-%}
-%
-%if ( $cgi->param('payby') ) {
-% $cgi->param('payby') =~ /^(CARD|CHEK)$/
-% or die "illegal payby " . $cgi->param('payby');
-%
-% push @search, "cust_pay_batch.payby = '$1'";
-%}
-%
-%if ( not $cgi->param('dcln') ) {
-% push @search, "cpb.status IS DISTINCT FROM 'Approved'";
-%}
-%
-%my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-%unless ($pay_batch){
-% push @search, "pay_batch.upload >= $beginning" if ($beginning);
-% push @search, "pay_batch.upload <= $ending" if ($ending < 4294967295);#2^32-1
-% $orderby = "pay_batch.download,paybatchnum";
-%}
-%
-%push @search, $FS::CurrentUser::CurrentUser->agentnums_sql;
-%my $search = ' WHERE ' . join(' AND ', @search);
-%
-%$count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' .
-% 'LEFT JOIN cust_main USING ( custnum ) ' .
-% 'LEFT JOIN pay_batch USING ( batchnum )' .
-% $search;
-%
-%#grr
-%$sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," .
-% "cpb.payname,cpb.payinfo,cpb.exp,amount,cpb.status " .
-% "FROM cust_pay_batch AS cpb " .
-% 'LEFT JOIN cust_main USING ( custnum ) ' .
-% 'LEFT JOIN pay_batch USING ( batchnum ) ' .
-% "$search ORDER BY $orderby";
-%
-%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'
-% || ( $pay_batch->status eq 'I'
-% && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches')
-% )
-% ) {
-% $html_init .= qq!
!;
-% }
-%
-% if (
-% $pay_batch->status eq 'I'
-% || ( $pay_batch->status eq 'R'
-% && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches')
-% )
-% ) {
-% $html_init .= qq!
';
-% }
-%
-%}
-%
-%if ($pay_batch) {
-% my $sth = dbh->prepare($count_query) or die dbh->errstr. "doing $count_query";
-% $sth->execute or die "Error executing \"$count_query\": ". $sth->errstr;
-% my $cards = $sth->fetchrow_arrayref->[0];
-%
-% my $st = "SELECT SUM(amount) from cust_pay_batch WHERE batchnum=". $batchnum;
-% $sth = dbh->prepare($st) or die dbh->errstr. "doing $st";
-% $sth->execute or die "Error executing \"$st\": ". $sth->errstr;
-% my $total = $sth->fetchrow_arrayref->[0];
-%
-% $html_init .= "$cards credit card payments batched
\$" .
-% sprintf("%.2f", $total) ." total in batch
";
-%}
-%
-%
<% 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 : '',
+ 'disable_download' => 1,
'header' => [ '#',
'Inv #',
'Customer',
@@ -166,4 +56,81 @@
],
)
%>
+<%init>
+my $conf = new FS::Conf;
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+ unless $curuser->access_right('Financial reports')
+ || $curuser->access_right('Process batches')
+ || $curuser->access_right('Process global batches')
+ || ( $cgi->param('custnum')
+ && ( $conf->exists('batch-enable')
+ || $conf->config('batch-enable_payby')
+ )
+ );
+
+my( $count_query, $sql_query );
+my $hashref = {};
+my @search = ();
+my $orderby = 'paybatchnum';
+
+my( $pay_batch, $batchnum ) = ( '', '');
+if ( $cgi->param('batchnum') && $cgi->param('batchnum') =~ /^(\d+)$/ ) {
+ push @search, "batchnum = $1";
+ $pay_batch = qsearchs('pay_batch', { 'batchnum' => $1 } );
+ die "Batch $1 not found!" unless $pay_batch;
+ $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');
+
+ push @search, "cust_pay_batch.payby = '$1'";
+}
+
+if ( not $cgi->param('dcln') ) {
+ push @search, "cpb.status IS DISTINCT FROM 'Approved'";
+}
+
+my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+unless ($pay_batch){
+ push @search, "pay_batch.upload >= $beginning" if ($beginning);
+ push @search, "pay_batch.upload <= $ending" if ($ending < 4294967295);#2^32-1
+ $orderby = "pay_batch.download,paybatchnum";
+}
+
+push @search, $curuser->agentnums_sql({ table=>'cust_main' });
+
+my $search = ' WHERE ' . join(' AND ', @search);
+
+$count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' .
+ 'LEFT JOIN cust_main USING ( custnum ) ' .
+ 'LEFT JOIN pay_batch USING ( batchnum )' .
+ $search;
+
+#grr
+$sql_query = "SELECT paybatchnum,invnum,custnum,cpb.last,cpb.first," .
+ "cpb.payname,cpb.payinfo,cpb.exp,amount,cpb.status " .
+ "FROM cust_pay_batch AS cpb " .
+ 'LEFT JOIN cust_main USING ( custnum ) ' .
+ 'LEFT JOIN pay_batch USING ( batchnum ) ' .
+ "$search ORDER BY $orderby";
+
+my $html_init = '';
+if ( $pay_batch ) {
+ $html_init = include('elements/cust_pay_batch_top.html',
+ 'pay_batch' => $pay_batch);
+}
+%init>