[freeside-commits] branch FREESIDE_3_BRANCH updated. 6806daf3bbe72a73cf952c1e145eb7b1a3c4edad

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  6806daf3bbe72a73cf952c1e145eb7b1a3c4edad (commit)
       via  8092cbafeef427df34beeea1342015c43b696f14 (commit)
      from  a670e8b14f5f09b0109938a4d643c0719873d2cf (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 6806daf3bbe72a73cf952c1e145eb7b1a3c4edad
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon Jul 30 14:36:12 2018 -0400

    RT# 80898 - V3 fix for new configuration. set to section billing.

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index f916924af..d551c609f 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -896,7 +896,7 @@ my $validate_email = sub { $_[0] =~
 
   {
     'key'         => 'credit-card-surcharge-text',
-    'section'     => 'credit_cards',
+    'section'     => 'billing',
     'description' => 'Text for the credit card surcharge invoice line.  If not set, it will default to Credit Card Surcharge.',
     'type'        => 'text',
     'per_agent'   => 1,

commit 8092cbafeef427df34beeea1342015c43b696f14
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 d2351c005..f916924af 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -895,6 +895,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'     => 'billing',
     '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 c503b45e6..611af5d08 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -1005,9 +1005,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(-)