diff options
| author | ivan <ivan> | 2011-10-24 22:48:29 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-10-24 22:48:29 +0000 |
| commit | fa4f0bee732a9a8f1444e1766c6239c871761a39 (patch) | |
| tree | 52c9d6c2f3209f67fed52e8bc8b77fc45f1cc027 /FS | |
| parent | 0e21e4eeb99d5de0bafd8036d92d72a71cd0577c (diff) | |
fix recur_Common packages with setup discounts
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/part_pkg/recur_Common.pm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm index 07ade81dc..7197eaeee 100644 --- a/FS/FS/part_pkg/recur_Common.pm +++ b/FS/FS/part_pkg/recur_Common.pm @@ -22,8 +22,19 @@ sub base_recur { sub calc_setup { # moved from all descendant packages which just had $self->option('setup_fee') my($self, $cust_pkg, $sdate, $details, $param) = @_; + return 0 if $self->prorate_setup($cust_pkg, $sdate); - $self->option('setup_fee'); + + my $charge = $self->option('setup_fee'); + + my $discount = 0; + if ( $charge > 0 ) { + $param->{'setup_charge'} = $charge; + $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param); + delete $param->{'setup_charge'}; + } + + sprintf('%.2f', $charge - $discount); } sub cutoff_day { |