X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=8022d46668100eb5857ea522cd785f392c972602;hb=636dd1f25af52d35efe7a323a5765ff5adeadf83;hp=9b0aaeca9836b7d644dad7bf74ec7f1e4946d437;hpb=e8e43b0e59cf50e7a3c0789f589046459bc658c1;p=freeside.git diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi index 9b0aaeca9..8022d4666 100755 --- a/httemplate/search/cust_pay_batch.cgi +++ b/httemplate/search/cust_pay_batch.cgi @@ -1,123 +1,12 @@ -%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 ( $fixed ) { -% $html_init .= qq!!; -% } else { -% $html_init .= qq!Download batch in format !; -% } -% $html_init .= qq!

!; -% } -% -% if ( -% $pay_batch->status eq 'I' -% || ( $pay_batch->status eq 'R' -% && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches') -% ) -% ) { -% $html_init .= qq!
!. -% qq!Upload results
!. -% qq!Filename
!; -% if ( $fixed ) { -% $html_init .= qq!!; -% } else { -% $html_init .= qq!Format
!; -% } -% $html_init .= qq!!; -% $html_init .= '

'; -% } -% -%} -% -%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 : '', + 'html_init' => $pay_batch ? + include('elements/cust_pay_batch_top.html', + 'pay_batch' => $pay_batch + ) : '', 'header' => [ '#', 'Inv #', 'Customer', @@ -169,4 +58,77 @@ ], ) %> +<%init> +my $conf = new FS::Conf; + +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->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, $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 ) { + $html_init = include('elements/cust_pay_batch_top.html', + 'pay_batch' => $pay_batch); +} +