[freeside-commits] branch FREESIDE_4_BRANCH updated. ff2f162d30fc9485464694e714fcb02b1b767f3d
Christopher Burger
burgerc at freeside.biz
Mon Jul 30 10:25:55 PDT 2018
The branch, FREESIDE_4_BRANCH has been updated
via ff2f162d30fc9485464694e714fcb02b1b767f3d (commit)
from 1af581404eae84707fa1c66e3f455eb433e3b16b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ff2f162d30fc9485464694e714fcb02b1b767f3d
Author: Christopher Burger <burgerc at freeside.biz>
Date: Mon Jul 30 12:37:52 2018 -0400
RT# 80898 - added config option to allow for the changing of the name for credit card surcharge on invoice.
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 1b25cb5f0..a48a79be2 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -812,6 +812,14 @@ my $validate_email = sub { $_[0] =~
},
{
+ 'key' => 'credit-card-surcharge-text',
+ 'section' => 'credit_cards',
+ 'description' => 'Text for the credit card surcharge invoice line. If not set, it will default to Credit Card Surcharge.',
+ 'type' => 'text',
+ 'per_agent' => 1,
+ },
+
+ {
'key' => 'discount-show-always',
'section' => 'invoicing',
'description' => 'Generate a line item on an invoice even when a package is discounted 100%',
diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index 0769eb578..70dc9d1c0 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -1078,9 +1078,11 @@ sub _realtime_bop_result {
}
my $cust_pkg;
+ my $cc_surcharge_text = 'Credit Card Surcharge';
+ $cc_surcharge_text = $conf->config('credit-card-surcharge-text', $self->agentnum) if $conf->exists('credit-card-surcharge-text', $self->agentnum);
my $charge_error = $self->charge({
'amount' => $options{'cc_surcharge'},
- 'pkg' => 'Credit Card Surcharge',
+ 'pkg' => $cc_surcharge_text,
'setuptax' => 'Y',
'cust_pkg_ref' => \$cust_pkg,
});
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Conf.pm | 8 ++++++++
FS/FS/cust_main/Billing_Realtime.pm | 4 +++-
2 files changed, 11 insertions(+), 1 deletion(-)
More information about the freeside-commits
mailing list