diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2018-05-01 10:07:54 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2018-05-04 12:45:28 -0400 |
| commit | 88dc1572bd268239a0ca0384a8f536df22f08c1a (patch) | |
| tree | e2129f5610dc7b67d1d38e2f5699844e9d47babb /FS/FS/part_pkg | |
| parent | b8aea2bf8dcebf7a6b9a217ee78114e42404fe68 (diff) | |
RT# 77964 - Placed waive setup fee check back to billing.pm, and added check for prorate package in billing.pm
Diffstat (limited to 'FS/FS/part_pkg')
| -rw-r--r-- | FS/FS/part_pkg/flat.pm | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm index 0bc3860..cfee584 100644 --- a/FS/FS/part_pkg/flat.pm +++ b/FS/FS/part_pkg/flat.pm @@ -118,26 +118,22 @@ sub calc_setup { return 0 if $self->prorate_setup($cust_pkg, $sdate); - if (!$cust_pkg->waive_setup) { - my $i = 0; - my $count = $self->option( 'additional_count', 'quiet' ) || 0; - while ($i < $count) { - push @$details, $self->option( 'additional_info' . $i++ ); - } + my $i = 0; + my $count = $self->option( 'additional_count', 'quiet' ) || 0; + while ($i < $count) { + push @$details, $self->option( 'additional_info' . $i++ ); + } - my $charge = $self->base_setup($cust_pkg, $sdate, $details); + my $charge = $self->base_setup($cust_pkg, $sdate, $details); - my $discount = 0; - if ( $charge > 0 ) { - $param->{'setup_charge'} = $charge; - $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param); - delete $param->{'setup_charge'}; - } - - return sprintf( '%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) ); + my $discount = 0; + if ( $charge > 0 ) { + $param->{'setup_charge'} = $charge; + $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param); + delete $param->{'setup_charge'}; } - return; + sprintf( '%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) ); } |