summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorChristopher Burger <burgerc@freeside.biz>2019-03-13 09:17:02 -0400
committerChristopher Burger <burgerc@freeside.biz>2019-03-13 09:17:02 -0400
commitbb201b08e3f48784cd77979dd4e31e866aa4f15d (patch)
tree22f19cdc7458f9e562861484911f1094e5b11fc0 /httemplate
parent8d4c0d746c208dd1cbc7d1d456d9bad2fa4bd0c0 (diff)
RT# 82988 - updated paybatch upgrade to move credits from combined batch file to credit batch file
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/search/elements/cust_pay_batch_top.html4
-rwxr-xr-xhttemplate/search/pay_batch.cgi6
2 files changed, 8 insertions, 2 deletions
diff --git a/httemplate/search/elements/cust_pay_batch_top.html b/httemplate/search/elements/cust_pay_batch_top.html
index eee81dd..90fc9e4 100644
--- a/httemplate/search/elements/cust_pay_batch_top.html
+++ b/httemplate/search/elements/cust_pay_batch_top.html
@@ -149,6 +149,10 @@ $upload_formats{'PAP'} = '264 byte results for TD Canada Trust PAP Batch';
if ($pay_batch->type eq "CREDIT") {
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"));
+ }
}
}
diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index 8fe4351..fd14d05 100755
--- a/httemplate/search/pay_batch.cgi
+++ b/httemplate/search/pay_batch.cgi
@@ -43,8 +43,10 @@
my $_date = $self->download;
if ( $_date ) {
time2str("%a %b %e %T %Y", $_date);
- } elsif ( $self->status eq 'O' ) {
- 'Download batch';
+ } elsif ( $self->status eq 'O' && $self->type eq 'CREDIT') {
+ 'Download credit batch';
+ } elsif ( $self->status eq 'O' && $self->type eq 'DEBIT') {
+ 'Download batch';
} else {
'';
}