diff options
| -rw-r--r-- | FS/FS/Conf.pm | 1 | ||||
| -rw-r--r-- | FS/FS/part_pkg/currency_fixed.pm | 7 | ||||
| -rw-r--r-- | FS/FS/part_pkg/incomplete/rt_time.pm (renamed from FS/FS/part_pkg/rt_time.pm) | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 42fe9ec4c..f76c72ff4 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2275,6 +2275,7 @@ and customer address. Include units.', 'key' => 'selfservice-timeout', 'section' => 'self-service', 'description' => 'Timeout for the self-service login cookie, in seconds. Defaults to 1 hour.', + 'type' => 'text', }, { 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; } diff --git a/FS/FS/part_pkg/rt_time.pm b/FS/FS/part_pkg/incomplete/rt_time.pm index 11b7ee85c..f96eba628 100644 --- a/FS/FS/part_pkg/rt_time.pm +++ b/FS/FS/part_pkg/incomplete/rt_time.pm @@ -44,7 +44,7 @@ sub calc_recur { my $charges = 0; $charges += $self->calc_usage(@_); - $charges += $self->calc_recur_Common(@_); + $charges += ($cust_pkg->quantity || 1) * $self->calc_recur_Common(@_); $charges; |