X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=cc958b96d7dc7e106c4c46445ffe899f99a06dde;hb=992c6d61adaaf658a52d1bdcc87b6e1780663a64;hp=4a2248726d3a960634cd0a930b6b530089a3c2c2;hpb=38dd3ed3eeda0a467e1b4d8cedd741fc62aedc9c;p=freeside.git diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi index 4a2248726..cc958b96d 100755 --- a/httemplate/search/cust_pay_batch.cgi +++ b/httemplate/search/cust_pay_batch.cgi @@ -1,72 +1,63 @@ -<% include('elements/search.html', +<& elements/search.html, 'title' => 'Batch payment details', 'name' => 'batch details', 'query' => $sql_query, 'count_query' => $count_query, 'html_init' => $pay_batch ? $html_init : '', + 'disable_download' => 1, 'header' => [ '#', 'Inv #', - 'Customer', + 'Cust #', 'Customer', 'Card Name', 'Card', 'Exp', 'Amount', 'Status', + '', # delete link + '', # error_message ], - 'fields' => [ sub { - shift->[0]; - }, - sub { - shift->[1]; - }, - sub { - shift->[2]; - }, - sub { - my $cpb = shift; - $cpb->[3] . ', ' . $cpb->[4]; - }, - sub { - shift->[5]; - }, - sub { - my $cardnum = shift->[6]; - 'x'x(length($cardnum)-4). substr($cardnum,(length($cardnum)-4)); - }, - sub { - shift->[7] =~ /^\d{2}(\d{2})[\/\-](\d+)[\/\-]\d+$/; - my( $mon, $year ) = ( $2, $1 ); - $mon = "0$mon" if length($mon) == 1; - "$mon/$year"; - }, - sub { - shift->[8]; - }, - sub { - shift->[9]; - }, - ], - 'align' => 'lllllllrl', - 'links' => [ ['', sub{'#';}], - ["${p}view/cust_bill.cgi?", sub{shift->[1];},], - ["${p}view/cust_main.cgi?", sub{shift->[2];},], - ["${p}view/cust_main.cgi?", sub{shift->[2];},], + 'fields' => [ 'paybatchnum', + 'invnum', + 'custnum', + sub { $_[0]->cust_main->name_short }, + 'payname', + 'mask_payinfo', + sub { + return('') if $_[0]->payby ne 'CARD'; + $_[0]->get('exp') =~ /^\d\d(\d\d)-(\d\d)/; + sprintf('%02d/%02d',$1,$2); + }, + sub { + sprintf('%.02f', $_[0]->amount) + }, + sub { $_[0]->display_status }, + $sub_unbatch, + 'error_message', + ], + 'align' => 'rrrlllcrllll', + 'links' => [ '', + ["${p}view/cust_bill.cgi?", 'invnum'], + (["${p}view/cust_main.cgi?", 'custnum']) x 2, ], - ) -%> + 'link_onclicks' => [ ('') x 8, + $sub_receipt + ], +&> <%init> my $conf = new FS::Conf; +my $curuser = $FS::CurrentUser::CurrentUser; + die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('Financial reports') - || $FS::CurrentUser::CurrentUser->access_right('Process batches') + 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') ) - #&& $FS::CurrentUser::CurrentUser->access_right('View customer batched payments') ); my( $count_query, $sql_query ); @@ -83,7 +74,7 @@ if ( $cgi->param('batchnum') && $cgi->param('batchnum') =~ /^(\d+)$/ ) { } if ( $cgi->param('custnum') && $cgi->param('custnum') =~ /^(\d+)$/ ) { - push @search, "custnum = $1"; + push @search, "cust_pay_batch.custnum = $1"; } if ( $cgi->param('status') && $cgi->param('status') =~ /^(\w)$/ ) { @@ -98,7 +89,7 @@ if ( $cgi->param('payby') ) { } if ( not $cgi->param('dcln') ) { - push @search, "cpb.status IS DISTINCT FROM 'Approved'"; + push @search, "cust_pay_batch.status IS DISTINCT FROM 'Approved'"; } my ($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); @@ -108,129 +99,71 @@ unless ($pay_batch){ $orderby = "pay_batch.download,paybatchnum"; } -push @search, $FS::CurrentUser::CurrentUser->agentnums_sql; +push @search, $curuser->agentnums_sql({ table => 'cust_main' }); + +push @search, $curuser->agentnums_sql({ table => 'pay_batch', + null_right => 'Process global batches', + }); + my $search = ' WHERE ' . join(' AND ', @search); -$count_query = 'SELECT COUNT(*) FROM cust_pay_batch AS cpb ' . +$count_query = 'SELECT COUNT(*) FROM cust_pay_batch ' . '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 = '