diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-10-16 15:11:35 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-10-16 15:11:35 -0700 |
| commit | e3414e8ef2f07df0412b5cd645213b34393078ec (patch) | |
| tree | 44dde6c5a6534184a5ff02063fa73dc838adc389 | |
| parent | c7c021dcf27486b808c0aed629a28ced42bc3d03 (diff) | |
agent-virtualize credit card surcharge percentage, RT#72961
| -rw-r--r-- | FS/FS/ClientAPI/MasonComponent.pm | 2 | ||||
| -rw-r--r-- | FS/FS/ClientAPI/MyAccount.pm | 3 | ||||
| -rw-r--r-- | FS/FS/cust_main/Billing_Realtime.pm | 4 | ||||
| -rw-r--r-- | httemplate/misc/payment.cgi | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/FS/FS/ClientAPI/MasonComponent.pm b/FS/FS/ClientAPI/MasonComponent.pm index 493e0c0c2..3a4bfe133 100644 --- a/FS/FS/ClientAPI/MasonComponent.pm +++ b/FS/FS/ClientAPI/MasonComponent.pm @@ -62,7 +62,7 @@ my %session_callbacks = ( 'process-display' => scalar($conf->config('selfservice_process-display')), 'process-skip_first' => $conf->exists('selfservice_process-skip_first'), 'num_payments' => scalar($cust_main->cust_pay), - 'surcharge_percentage' => scalar($conf->config('credit-card-surcharge-percentage')), + 'surcharge_percentage' => scalar($conf->config('credit-card-surcharge-percentage', $cust_main->agentnum)), ); @$argsref = ( %args ); diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm index 23fbf6cf6..3d01c0d77 100644 --- a/FS/FS/ClientAPI/MyAccount.pm +++ b/FS/FS/ClientAPI/MyAccount.pm @@ -868,7 +868,6 @@ sub payment_info { 'save_unchecked' => $conf->exists('selfservice-save_unchecked'), - 'credit_card_surcharge_percentage' => scalar($conf->config('credit-card-surcharge-percentage')), }; } @@ -929,6 +928,8 @@ sub payment_info { $return{payunique} = "webui-MyAccount-$_date-$$-". rand() * 2**32; #new $return{paybatch} = $return{payunique}; #back compat + $return{credit_card_surcharge_percentage} = $conf->config('credit-card-surcharge-percentage', $cust_main->agentnum); + return { 'error' => '', %return, }; diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm index 5d35fc2c4..bc98b8873 100644 --- a/FS/FS/cust_main/Billing_Realtime.pm +++ b/FS/FS/cust_main/Billing_Realtime.pm @@ -353,8 +353,8 @@ 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') + $cc_surcharge_pct = $conf->config('credit-card-surcharge-percentage', $self->agentnum) + if $conf->config('credit-card-surcharge-percentage', $self->agentnum) && $options{method} eq 'CC'; # always add cc surcharge if called from event diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi index 64fbe8a1c..4fa3df773 100644 --- a/httemplate/misc/payment.cgi +++ b/httemplate/misc/payment.cgi @@ -19,7 +19,7 @@ 'num_payments' => scalar($cust_main->cust_pay), 'surcharge_percentage' => ( $payby eq 'CARD' - ? scalar($conf->config('credit-card-surcharge-percentage')) + ? scalar($conf->config('credit-card-surcharge-percentage', $cust_main->agentnum)) : 0 ), &> |