Skip to content

Round CC surcharge immediately after calculating for event-based payments #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Round CC surcharge immediately after calculating for event-based payments #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions FS/FS/cust_main/Billing_Realtime.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,21 +476,25 @@ sub realtime_bop {
&& $options{method} eq 'CC';

# always add cc surcharge if called from event
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;
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;
$cc_surcharge = sprintf("%.2f", $cc_surcharge); # round surcharge
$options{'amount'} += $cc_surcharge;
$options{'amount'} = sprintf("%.2f", $options{'amount'}); # round (again)?
$options{'amount'} = sprintf("%.2f", $options{'amount'}); # round total
}
}
elsif($cc_surcharge_pct > 0 || $cc_surcharge_flat > 0) {
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-processing_fee
$cc_surcharge = $options{'amount'} - $options{'processing-fee'} - (($options{'amount'} - ($cc_surcharge_flat + $options{'processing-fee'})) / ( 1 + $cc_surcharge_pct/100 )) if $options{'amount'} > 0;
if ( $options{'amount'} > 0 ) {
$cc_surcharge = $options{'amount'} - $options{'processing-fee'} - (( $options{'amount'} - ( $cc_surcharge_flat + $options{'processing-fee'} )) / ( 1 + ( $cc_surcharge_pct / 100 ) ));
$cc_surcharge = sprintf("%.2f", $cc_surcharge); # round surcharge
$options{'amount'} = sprintf("%.2f", $options{'amount'}); # round total
}
}

$cc_surcharge = sprintf("%.2f",$cc_surcharge) if $cc_surcharge > 0;

$options{'cc_surcharge'} = $cc_surcharge;


Expand Down