projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a1183aa
)
fix discounts vs. quantities for prorate packages, RT#23530
author
Ivan Kohler
<ivan@freeside.biz>
Wed, 3 Jul 2013 03:02:32 +0000
(20:02 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Wed, 3 Jul 2013 03:02:32 +0000
(20:02 -0700)
FS/FS/part_pkg/currency_fixed.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/currency_fixed.pm
b/FS/FS/part_pkg/currency_fixed.pm
index
ce71452
..
c64fb78
100644
(file)
--- 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;
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 ) = @_;
#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; }
}
sub is_free { 0; }