[freeside-commits] branch master updated. 01c9143a54bf5e1513537547fd362822f58d1e2a
Christopher Burger
burgerc at freeside.biz
Fri May 11 08:30:00 PDT 2018
The branch, master has been updated
via 01c9143a54bf5e1513537547fd362822f58d1e2a (commit)
from d2cc614910c251801564615a268c7ca3bdb2c954 (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 01c9143a54bf5e1513537547fd362822f58d1e2a
Author: Christopher Burger <burgerc at freeside.biz>
Date: Fri May 11 11:29:36 2018 -0400
RT# 79737 - Added ability to us a cc surcharge of a flat fee.
diff --git a/FS/FS/ClientAPI/MasonComponent.pm b/FS/FS/ClientAPI/MasonComponent.pm
index 3a4bfe133..d615c271c 100644
--- a/FS/FS/ClientAPI/MasonComponent.pm
+++ b/FS/FS/ClientAPI/MasonComponent.pm
@@ -63,6 +63,7 @@ my %session_callbacks = (
'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', $cust_main->agentnum)),
+ 'surcharge_flatfee' => scalar($conf->config('credit-card-surcharge-flatfee', $cust_main->agentnum)),
);
@$argsref = ( %args );
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 66697efb5..e4fef9554 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -921,6 +921,7 @@ sub payment_info {
$return{paybatch} = $return{payunique}; #back compat
$return{credit_card_surcharge_percentage} = $conf->config('credit-card-surcharge-percentage', $cust_main->agentnum);
+ $return{credit_card_surcharge_flatfee} = $conf->config('credit-card-surcharge-flatfee', $cust_main->agentnum);
return { 'error' => '',
%return,
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 2f8ac243d..5c6c411b3 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -781,6 +781,14 @@ my $validate_email = sub { $_[0] =~
},
{
+ 'key' => 'credit-card-surcharge-flatfee',
+ 'section' => 'credit_cards',
+ 'description' => 'Add a credit card surcharge to invoices, as a flat fee.',
+ '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 f16752ba4..75c310e7a 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -421,6 +421,8 @@ sub realtime_bop {
$options{amount} = $amount;
}
+ return '' unless $options{amount} > 0;
+
# set fields from passed cust_payby
_bop_cust_payby_options(\%options);
@@ -454,16 +456,24 @@ sub realtime_bop {
if $conf->config('credit-card-surcharge-percentage', $self->agentnum)
&& $options{method} eq 'CC';
+ my $cc_surcharge_flat = 0;
+ $cc_surcharge_flat = $conf->config('credit-card-surcharge-flatfee', $self->agentnum)
+ if $conf->config('credit-card-surcharge-flatfee', $self->agentnum)
+ && $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;
+ if($options{'cc_surcharge_from_event'} && ($cc_surcharge_pct > 0 || $cc_surcharge_flat > 0)) {
+ if ($options{'amount'} > 0) {
+ $cc_surcharge = ($options{'amount'} * ($cc_surcharge_pct / 100)) + $cc_surcharge_flat;
$options{'amount'} += $cc_surcharge;
$options{'amount'} = sprintf("%.2f", $options{'amount'}); # round (again)?
+ }
}
- elsif($cc_surcharge_pct > 0) { # we're called not from event (i.e. from a
- # payment screen), so consider the given
- # amount as post-surcharge
- $cc_surcharge = $options{'amount'} - ($options{'amount'} / ( 1 + $cc_surcharge_pct/100 ));
+ elsif($cc_surcharge_pct > 0 || $cc_surcharge_flat > 0) {
+ # we're called not from event (i.e. from a
+ # payment screen), so consider the given
+ # amount as post-surcharge
+ $cc_surcharge = $options{'amount'} - (($options{'amount'} - $cc_surcharge_flat) / ( 1 + $cc_surcharge_pct/100 )) if $options{'amount'} > 0;
}
$cc_surcharge = sprintf("%.2f",$cc_surcharge) if $cc_surcharge > 0;
diff --git a/httemplate/elements/tr-amount_fee.html b/httemplate/elements/tr-amount_fee.html
index 9c13f5952..9e6d9e96d 100644
--- a/httemplate/elements/tr-amount_fee.html
+++ b/httemplate/elements/tr-amount_fee.html
@@ -94,6 +94,9 @@ if ( $amount > 0 ) {
$amount += $amount * $opt{'surcharge_percentage'}/100
if $opt{'surcharge_percentage'} > 0;
+ $amount += $opt{'surcharge_flatfee'}
+ if $opt{'surcharge_flatfee'} > 0;
+
$amount = sprintf("%.2f", $amount);
}
diff --git a/httemplate/elements/tr-select-payment_options.html b/httemplate/elements/tr-select-payment_options.html
index 2304c22d0..8859b9b36 100644
--- a/httemplate/elements/tr-select-payment_options.html
+++ b/httemplate/elements/tr-select-payment_options.html
@@ -17,6 +17,11 @@ Example:
? scalar($conf->config('credit-card-surcharge-percentage', $cust_main->agentnum))
: 0
),
+ 'surcharge_flatfee' =>
+ ( $payby eq 'CARD'
+ ? scalar($conf->config('credit-card-surcharge-flatfee', $cust_main->agentnum))
+ : 0
+ ),
)
</%doc>
diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 5bfa29d70..de060b010 100644
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -25,6 +25,11 @@
? scalar($conf->config('credit-card-surcharge-percentage', $cust_main->agentnum))
: 0
),
+ 'surcharge_flatfee:Q' =>
+ ( $payby eq 'CARD'
+ ? scalar($conf->config('credit-card-surcharge-flatfee', $cust_main->agentnum))
+ : 0
+ ),
&>
% if ( $conf->exists('part_pkg-term_discounts') ) {
-----------------------------------------------------------------------
Summary of changes:
FS/FS/ClientAPI/MasonComponent.pm | 1 +
FS/FS/ClientAPI/MyAccount.pm | 1 +
FS/FS/Conf.pm | 8 ++++++++
FS/FS/cust_main/Billing_Realtime.pm | 22 ++++++++++++++++------
httemplate/elements/tr-amount_fee.html | 3 +++
httemplate/elements/tr-select-payment_options.html | 5 +++++
httemplate/misc/payment.cgi | 5 +++++
7 files changed, 39 insertions(+), 6 deletions(-)
More information about the freeside-commits
mailing list