X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Felements%2Fcust_pay_batch_top.html;h=d29e487b21e2a6483f1345779701d948fb401ab0;hb=3f2a7b01b59902faed5767d81e2959e131bdbdfd;hp=bf3047769c6ecc0273d9eb41dd6cc266a4c6957d;hpb=54a357b171aa44f9399b4c146acd2afd3b686075;p=freeside.git diff --git a/httemplate/search/elements/cust_pay_batch_top.html b/httemplate/search/elements/cust_pay_batch_top.html index bf3047769..d29e487b2 100644 --- a/httemplate/search/elements/cust_pay_batch_top.html +++ b/httemplate/search/elements/cust_pay_batch_top.html @@ -1,24 +1,43 @@ +<& /elements/xmlhttp.html, + 'url' => $p.'misc/xmlhttp-pay_batch-note.html', + 'subs' => [ 'get_note' ] +&> + % # Download batch % if ( $status eq 'O' % or ( $status eq 'I' and $curuser->access_right('Reprocess batches') ) % or ( $status eq 'R' and $curuser->access_right('Redownload resolved batches') ) % ) { - - - + + % if ( $fixed ) { - + % } % else { -Download batch in format % foreach ( keys %download_formats ) { - + % } - -<& .select_gateway &> + + <& .select_gateway &> % } -

+
+
+ % } # end of download + +
% # Upload batch % if ( $pay_batch->status eq 'I' @@ -27,44 +46,42 @@ Download batch in format -<% include('/elements/form-file_upload.html', +<& /elements/form-file_upload.html, 'name' => 'FileUpload', 'action' => "${p}misc/upload-batch.cgi", 'num_files' => 1, 'fields' => [ 'batchnum', 'format', 'gatewaynum' ], 'url' => $cgi->self_url, 'message' => 'Batch results uploaded.', -) %> -Upload results
- -<% include('/elements/file-upload.html', +&> + Upload results
+ <& /elements/file-upload.html, 'field' => 'file', 'label' => 'Filename', 'no_table' => 1, -) %> - -
+ &> + +
% if ( $fixed ) { % if ( $fixed eq 'td_eft1464' ) { # special case -Upload in format + Upload in format % } % else { - + % } % } % else { -Upload in format % foreach ( keys(%upload_formats) ) { - + % } - -<& .select_gateway &> + + <& .select_gateway &> % } # if $fixed - +
% } # end upload @@ -74,12 +91,12 @@ Upload results
% and $payby eq 'CHEK' % and $conf->exists('batch-manual_approval') % ) { - +"> +
% } # end manual approval -
% # summary info Batch is <% $statustext{$status} %>
@@ -118,22 +135,7 @@ my $batchnum = $pay_batch->batchnum; my $fixed = $conf->config("batch-fixed_format-$payby"); -tie my %download_formats, 'Tie::IxHash', ( -'' => 'Default batch mode', -'NACHA' => '94 byte NACHA', -'csv-td_canada_trust-merchant_pc_batch' => - 'CSV file for TD Canada Trust Merchant PC Batch', -'csv-chase_canada-E-xactBatch' => - 'CSV file for Chase Canada E-xactBatch', -'PAP' => '80 byte file for TD Canada Trust PAP Batch', -'BoM' => 'Bank of Montreal ECA batch', -'ach-spiritone' => 'Spiritone ACH batch', -'paymentech' => 'XML file for Chase Paymentech', -'RBC' => 'Royal Bank of Canada PDS batch', -'td_eft1464' => '1464 byte file for TD Commercial Banking EFT', -'eft_canada' => 'EFT Canada CSV batch', -# insert new batch formats here -); +tie my %download_formats, 'Tie::IxHash', FS::pay_batch::batch_download_formats; tie my %upload_formats, 'Tie::IxHash', ( %download_formats, @@ -142,7 +144,17 @@ tie my %upload_formats, 'Tie::IxHash', ( 'td_eftret' => 'TD EFT Returned Items', ); delete $upload_formats{'td_eft1464'}; -$upload_formats{'PAP'} = '264 byte results for TD Canada Trust PAP Batch', +$upload_formats{'PAP'} = '264 byte results for TD Canada Trust PAP Batch'; + +if ($pay_batch->type eq "CREDIT" && $pay_batch->payby eq "CHEK") { + foreach my $key (keys %download_formats) { + delete $download_formats{$key} unless FS::pay_batch->can_handle_electronic_refunds($key); + ## remove default format if unable to handle electronic refunds + if ($key eq '') { + delete $download_formats{$key} unless FS::pay_batch->can_handle_electronic_refunds($conf->config("batch-default_format")); + } + } +} my %statustext = ( 'O' => 'open', 'I' => 'in transit', 'R' => 'resolved' ); @@ -150,4 +162,5 @@ my $count_query = "SELECT COUNT(*) FROM cust_pay_batch WHERE batchnum=$batchnum" my $count = FS::Record->scalar_sql($count_query); my $sum_query = "SELECT SUM(amount) FROM cust_pay_batch WHERE batchnum=$batchnum"; my $total = sprintf("%.2f", FS::Record->scalar_sql($sum_query)); +