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/cust_main | |
| 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/cust_main')
| -rw-r--r-- | FS/FS/cust_main/Billing.pm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm index 44a4dbb..a5a38fd 100644 --- a/FS/FS/cust_main/Billing.pm +++ b/FS/FS/cust_main/Billing.pm @@ -1027,9 +1027,10 @@ sub _make_lines { || $cust_pkg->expire > $cmp_time ) ) { - + warn " bill setup\n" if $DEBUG > 1; + unless ($cust_pkg->waive_setup) { $lineitems++; $setup = eval { $cust_pkg->calc_setup( $time, \@details, \%setup_param ) }; @@ -1049,6 +1050,12 @@ sub _make_lines { $setup_billed_currency = delete $setup_param{'billed_currency'}; $setup_billed_amount = delete $setup_param{'billed_amount'}; } + } + + if ($cust_pkg->waive_setup && $part_pkg->plan eq "prorate") { + $lineitems++; + $setup = 0 if $part_pkg->prorate_setup($cust_pkg, $time); + } if ( $cust_pkg->get('setup') ) { # don't change it |