[freeside-commits] branch master updated. 904f7bbe9bebcaeb194a276eab8d8579fbd91b4a

[Ivan]

The branch, master has been updated
       via  904f7bbe9bebcaeb194a276eab8d8579fbd91b4a (commit)
      from  96a13f50757181b21c66e6bd15840d7072f254da (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 904f7bbe9bebcaeb194a276eab8d8579fbd91b4a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu May 21 10:07:47 2015 -0700

    don't credit-card-surcharge-percentage to ACH, RT#34815

diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index 1f6a9e9..d973896 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -374,8 +374,9 @@ sub realtime_bop {
   my $cc_surcharge = 0;
   my $cc_surcharge_pct = 0;
   $cc_surcharge_pct = $conf->config('credit-card-surcharge-percentage') 
-    if $conf->config('credit-card-surcharge-percentage');
-  
+    if $conf->config('credit-card-surcharge-percentage')
+    && $options{method} eq 'CC';
+
   # always add cc surcharge if called from event 
   if($options{'cc_surcharge_from_event'} && $cc_surcharge_pct > 0) {
       $cc_surcharge = $options{'amount'} * $cc_surcharge_pct / 100;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main/Billing_Realtime.pm |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)