X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fsearch%2Fcust_pay_batch.cgi;h=73ead9196ab78cb3a5b627c67b4df5342bda09b6;hb=8dba5cb96454bf8ec81333ebac381180731396f1;hp=6d628d39d0af47ac41b82dd6d7edc7e468b4c2b3;hpb=74b0a0190e99064a501f7168b0a00af1d9da380b;p=freeside.git
diff --git a/httemplate/search/cust_pay_batch.cgi b/httemplate/search/cust_pay_batch.cgi
index 6d628d39d..73ead9196 100755
--- a/httemplate/search/cust_pay_batch.cgi
+++ b/httemplate/search/cust_pay_batch.cgi
@@ -4,6 +4,7 @@
'query' => $sql_query,
'count_query' => $count_query,
'html_init' => $pay_batch ? $html_init : '',
+ 'disable_download' => 1,
'header' => [ '#',
'Inv #',
'Customer',
@@ -66,7 +67,6 @@ die "access denied"
&& ( $conf->exists('batch-enable')
|| $conf->config('batch-enable_payby')
)
- #&& $FS::CurrentUser::CurrentUser->access_right('View customer batched payments')
);
my( $count_query, $sql_query );
@@ -124,110 +124,9 @@ $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 (
- $pay_batch->status eq 'O'
- || ( $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!
!;
- }
-
- if (
- $pay_batch->status eq 'I'
- || ( $pay_batch->status eq 'R'
- && $FS::CurrentUser::CurrentUser->access_right('Reprocess batches')
- )
- ) {
- $html_init .= ''.
- include('/elements/form-file_upload.html',
- 'name' => 'FileUpload',
- 'action' => "$p/misc/upload-batch.cgi",
- 'num_files' => 1,
- 'fields' => [ 'batchnum', 'format' ],
- 'message' => 'Batch results uploaded.',
- ) .
- 'Upload results
'.
- include('/elements/file-upload.html',
- 'field' => 'file',
- 'label' => 'Filename',
- 'no_table'=> 1
- ).
- '
'
- ;
- if ( $fixed and $fixed eq 'td_eft1464' ) {
- # special case, this one has two upload formats
- $html_init .= qq!Format !.
- qq!
!;
- }
- elsif ( $fixed ) {
- $html_init .= qq!!;
- } else {
- # should pull this from %import_info
- $html_init .= qq!Format !.
- qq!
!;
- }
- $html_init .= qq!!;
- $html_init .= '
';
- if ( $conf->exists('batch-manual_approval') and $pay_batch->status eq 'I') {
- $html_init .= qq!
!
- }
- }
- $html_init .= '
';
+ $html_init = include('elements/cust_pay_batch_top.html',
+ 'pay_batch' => $pay_batch);
}
-
-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
";
-}
-
%init>