summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Burger <burgerc@freeside.biz>2018-05-15 08:17:31 -0400
committerChristopher Burger <burgerc@freeside.biz>2018-05-15 08:17:31 -0400
commit7eff77c9579ff987439e1e6a82aa79cf147478a4 (patch)
tree2369f116225453b60a3dc1c082b4af0fd934cb1d
parentb53391a3517cfc6f492ad830ba92eaf1eb21bfad (diff)
Revert "RT# 77964 - Placed waive setup fee check back to billing.pm, and added check for prorate package in billing.pm"
This reverts commit 88dc1572bd268239a0ca0384a8f536df22f08c1a.
-rw-r--r--FS/FS/cust_main/Billing.pm9
-rw-r--r--FS/FS/part_pkg/flat.pm28
2 files changed, 17 insertions, 20 deletions
diff --git a/FS/FS/cust_main/Billing.pm b/FS/FS/cust_main/Billing.pm
index a5a38fd..44a4dbb 100644
--- a/FS/FS/cust_main/Billing.pm
+++ b/FS/FS/cust_main/Billing.pm
@@ -1027,10 +1027,9 @@ 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 ) };
@@ -1050,12 +1049,6 @@ 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
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index cfee584..0bc3860 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -118,22 +118,26 @@ sub calc_setup {
return 0 if $self->prorate_setup($cust_pkg, $sdate);
- my $i = 0;
- my $count = $self->option( 'additional_count', 'quiet' ) || 0;
- while ($i < $count) {
- push @$details, $self->option( 'additional_info' . $i++ );
- }
+ 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 $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'};
+ 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) );
}
- sprintf( '%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) );
+ return;
}