my($self, $cust_pkg, $sdate, $details, $param ) = @_;
my $conf = new FS::Conf;
- my $br = $self->base_recur_permonth($cust_pkg, $sdate);
- $br += $param->{'override_charges'} if $param->{'override_charges'};
-
+ my $br_permonth = $self->base_recur_permonth($cust_pkg, $sdate);
+ $br_permonth += $param->{'override_charges'} if $param->{'override_charges'};
+
+ my $br = $self->base_recur($cust_pkg, $sdate);
+ $br += $param->{'override_charges'} * ($cust_pkg->part_pkg->freq || 0) if $param->{'override_charges'};
+
my $tot_discount = 0;
#UI enforces just 1 for now, will need ordering when they can be stacked
my $amount = 0;
$amount += $discount->amount
if $cust_pkg->pkgpart == $param->{'real_pkgpart'};
- $amount += sprintf('%.2f', $discount->percent * $br / 100 );
+ $amount += sprintf('%.2f', $discount->percent * $br_permonth / 100 ); # FIXME: should this use $br / $freq to avoid rounding errors?
my $chg_months = defined($param->{'months'}) ?
$param->{'months'} :
$cust_pkg->part_pkg->freq;
};
}
- $amount = min($amount, $br);
- $amount *= $months;
+ $amount = min($amount * $months, $br);
}
$amount = sprintf('%.2f', $amount + 0.00000001 ); #so 1.005 rounds to 1.01
&& !defined $param->{'setup_charge'}
)
{
- $discount_left = $br - $amount;
+ $discount_left = $br_permonth - $amount; # FIXME: $amount is no longer permonth at this point!
if ( $discount_left < 0 ) {
- $amount = $br;
+ $amount = $br_permonth; # FIXME: seems like this should *= $months
$param->{'discount_left_setup'}{$discount->discountnum} =
0 - $discount_left;
}
#}
#push @$details, $d;
- #push @$details, sprintf( $format, $money_char, $br );
+ #push @$details, sprintf( $format, $money_char, $br_permonth );
}