diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 20:02:32 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-07-02 20:02:32 -0700 |
| commit | 050f1d1afbb08680769f1e643118e729dd90c4a8 (patch) | |
| tree | 7f458f3f5a70c2551a49f671067c318ea4443438 | |
| parent | a1183aad7a409d1212c7e3cdb4a9f02e93578d31 (diff) | |
fix discounts vs. quantities for prorate packages, RT#23530
| -rw-r--r-- | FS/FS/part_pkg/currency_fixed.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/FS/FS/part_pkg/currency_fixed.pm b/FS/FS/part_pkg/currency_fixed.pm index ce7145278..c64fb7872 100644 --- a/FS/FS/part_pkg/currency_fixed.pm +++ b/FS/FS/part_pkg/currency_fixed.pm @@ -81,9 +81,12 @@ sub base_recur { sub can_discount { 0; } #can't discount yet (percentage would work, but amount?) sub calc_recur { my $self = shift; + #my($cust_pkg, $sdate, $details, $param ) = @_; - #$self->calc_recur_Common($cust_pkg,$sdate,$details,$param); - $self->calc_recur_Common(@_); + my $cust_pkg = $_[0]; + + ($cust_pkg->quantity || 1) * $self->calc_recur_Common(@_); #($cust_pkg,$sdate,$details,$param); + } sub is_free { 0; } |