diff options
author | Mark Wells <mark@freeside.biz> | 2015-02-12 11:02:04 -0800 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2015-02-12 11:02:04 -0800 |
commit | 9bac210768d909662b03bc2a6552b92b6651cddf (patch) | |
tree | b2770e09ce029f3c0135f5c5439676fb194cb6f0 /FS/FS/quotation_pkg.pm | |
parent | bd989c6f5d2270ac7f9f4e5be19adcb84d65c378 (diff) |
unbreak fixed-amount discounts on quotations, #33099
Diffstat (limited to 'FS/FS/quotation_pkg.pm')
-rw-r--r-- | FS/FS/quotation_pkg.pm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/FS/FS/quotation_pkg.pm b/FS/FS/quotation_pkg.pm index ea8f4e0c8..25edc9458 100644 --- a/FS/FS/quotation_pkg.pm +++ b/FS/FS/quotation_pkg.pm @@ -103,11 +103,8 @@ otherwise returns false. =cut -use Data::Dumper; #XXX DEBUG sub insert { my ($self, %options) = @_; - warn Dumper($self); - warn Dumper(\%options); my $dbh = dbh; my $oldAutoCommit = $FS::UID::AutoCommit; @@ -318,7 +315,7 @@ sub insert_discount { #my ($self, %options) = @_; my $self = shift; - my $cust_pkg_discount = FS::quotation_pkg_discount->new( { + my $quotation_pkg_discount = FS::quotation_pkg_discount->new( { 'quotationpkgnum' => $self->quotationpkgnum, 'discountnum' => $self->discountnum, #for the create a new discount case @@ -329,7 +326,7 @@ sub insert_discount { 'setup' => $self->discountnum_setup, } ); - $cust_pkg_discount->insert; + $quotation_pkg_discount->insert; } sub _item_discount { @@ -351,7 +348,7 @@ sub _item_discount { push @ext, $pkg_discount->description; $d->{setup_amount} -= $pkg_discount->setup_amount; $d->{recur_amount} -= $pkg_discount->recur_amount; - } + } $d->{setup_amount} *= $self->quantity || 1; $d->{recur_amount} *= $self->quantity || 1; $d->{amount} = $d->{setup_amount} + $d->{recur_amount}; |