Takes all the arguments of calc_recur. Calculates and returns the amount
by which to reduce the recurring fee; also increments months used on the
-discount and generates an invoice detail describing it.
+discount.
=cut
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
#UI enforces one or the other (for now? probably for good)
my $amount = 0;
$amount += $discount->amount
- if defined $param->{'real_pkgpart'} && $cust_pkg->pkgpart == $param->{'real_pkgpart'};
- $amount += sprintf('%.2f', $discount->percent * $br / 100 );
- my $chg_months = $param->{'months'} || $cust_pkg->part_pkg->freq;
+ if $cust_pkg->pkgpart == $param->{'real_pkgpart'};
+ $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;
my $months = $discount->months
? min( $chg_months,
}
if ( ! defined $param->{'setup_charge'} ) {
- my $error = $cust_pkg_discount->increment_months_used($months)
- if defined $param->{'real_pkgpart'}
- && $cust_pkg->pkgpart == $param->{'real_pkgpart'};
- die "error discounting: $error" if $error;
+ if ( $cust_pkg->pkgpart == $param->{'real_pkgpart'} ) {
+ push @{ $param->{precommit_hooks} }, sub {
+ my $error = $cust_pkg_discount->increment_months_used($months);
+ die "error discounting: $error" if $error;
+ };
+ }
- $amount = min($amount, $br);
- $amount *= $months;
+ $amount = min($amount * $months, $br);
}
- $amount = sprintf('%.2f', $amount);
+ $amount = sprintf('%.2f', $amount + 0.00000001 ); #so 1.005 rounds to 1.01
next unless $amount > 0;
&& !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;
}
'months' => $months,
};
push @{ $param->{'discounts'} }, $cust_bill_pkg_discount;
+ $tot_discount += $amount;
#add details on discount to invoice
- my $money_char = $conf->config('money_char') || '$';
- $months = sprintf('%.2f', $months) if $months =~ /\./;
-
- my $d = 'Includes ';
- $d .= 'setup ' if defined $param->{'setup_charge'};
- $d .= 'discount of '. $discount->description_short;
- $d .= " for $months month". ( $months!=1 ? 's' : '' ) unless defined $param->{'setup_charge'};
- $d .= ": $money_char$amount" if $months != 1 || $discount->percent;
- push @$details, $d;
+ # no longer! this is now done during rendering based on the existence
+ # of the cust_bill_pkg_discount record
+ #
+ #my $money_char = $conf->config('money_char') || '$';
+ #$months = sprintf('%.2f', $months) if $months =~ /\./;
+
+ #my $d = 'Includes ';
+ #my $format;
+
+ #if ( $months eq '1' ) {
+ # $d .= "discount of $money_char$amount";
+ # $d .= " each" if $cust_pkg->quantity > 1;
+ # $format = 'Undiscounted amount: %s%.2f';
+ #} else {
+ # $d .= 'setup ' if defined $param->{'setup_charge'};
+ # $d .= 'discount of '. $discount->description_short;
+ # $d .= " for $months months"
+ # unless defined $param->{'setup_charge'};
+ # $d .= ": $money_char$amount" if $discount->percent;
+ # $format = 'Undiscounted monthly amount: %s%.2f';
+ #}
+
+ #push @$details, $d;
+ #push @$details, sprintf( $format, $money_char, $br_permonth );
- $tot_discount += $amount;
}
sprintf('%.2f', $tot_discount);