unbreak fixed-amount discounts on quotations, #33099

diff --git a/FS/FS/quotation_pkg.pm b/FS/FS/quotation_pkg.pm
index ea8f4e0..25edc94 100644 (file)
--- a/FS/FS/quotation_pkg.pm
+++ b/FS/FS/quotation_pkg.pm
@@ -103,11 +103,8 @@ otherwise returns false.
 
 =cut
 
 
 =cut
 

-use Data::Dumper; #XXX DEBUG

 sub insert {
   my ($self, %options) = @_;
 sub insert {
   my ($self, %options) = @_;

-  warn Dumper($self);
-  warn Dumper(\%options);

 
   my $dbh = dbh;
   my $oldAutoCommit = $FS::UID::AutoCommit;
 
   my $dbh = dbh;
   my $oldAutoCommit = $FS::UID::AutoCommit;


@@ -318,7 +315,7 @@ sub insert_discount {
   #my ($self, %options) = @_;
   my $self = shift;
 
   #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
     'quotationpkgnum' => $self->quotationpkgnum,
     'discountnum'     => $self->discountnum,
     #for the create a new discount case


@@ -329,7 +326,7 @@ sub insert_discount {
     'setup'       => $self->discountnum_setup,
   } );
 
     'setup'       => $self->discountnum_setup,
   } );
 

-  $cust_pkg_discount->insert;
+  $quotation_pkg_discount->insert;

 }
 
 sub _item_discount {
 }
 
 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;
     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};
   $d->{setup_amount} *= $self->quantity || 1;
   $d->{recur_amount} *= $self->quantity || 1;
   $d->{amount} = $d->{setup_amount} + $d->{recur_amount};

diff --git a/FS/FS/quotation_pkg_discount.pm b/FS/FS/quotation_pkg_discount.pm
index 9fdae3e..4389db2 100644 (file)
--- a/FS/FS/quotation_pkg_discount.pm
+++ b/FS/FS/quotation_pkg_discount.pm
@@ -116,18 +116,6 @@ sub check {
 
 =back
 
 
 =back
 

-=item amount
-
-Returns the total amount of this discount (setup + recur), for compatibility
-with L<FS::cust_bill_pkg_discount>.
-
-=cut
-
-sub amount {
-  my $self = shift;
-  return $self->get('setup_amount') + $self->get('recur_amount');
-}
-

 =item description
 
 Returns a string describing the discount (for use on the quotation).
 =item description
 
 Returns a string describing the discount (for use on the quotation).