X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fquotation_pkg_discount.pm;h=87ac6bd04320876dcc026930d2b2da6ed66594e1;hb=2b8cc0f23f764bd53994ca3763b9c61756c96766;hp=15b1bfeb8607ca490423de35c02ca52254c1cdf3;hpb=d46254f9b36873e457424eefdcf3610b71ef889d;p=freeside.git

diff --git a/FS/FS/quotation_pkg_discount.pm b/FS/FS/quotation_pkg_discount.pm
index 15b1bfeb8..87ac6bd04 100644
--- a/FS/FS/quotation_pkg_discount.pm
+++ b/FS/FS/quotation_pkg_discount.pm
@@ -1,8 +1,10 @@
 package FS::quotation_pkg_discount;
 
 use strict;
-use base qw( FS::Record );
+use base qw( FS::pkg_discount_Mixin FS::Record );
 use FS::Record qw( qsearch qsearchs );
+use FS::quotation_pkg;
+use FS::discount;
 use FS::Maketext 'mt';
 
 =head1 NAME
@@ -79,27 +81,15 @@ sub table { 'quotation_pkg_discount'; }
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
-=cut
-
-# the insert method can be inherited from FS::Record
-
 =item delete
 
 Delete this record from the database.
 
-=cut
-
-# the delete method can be inherited from FS::Record
-
 =item replace OLD_RECORD
 
 Replaces the OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
 
-=cut
-
-# the replace method can be inherited from FS::Record
-
 =item check
 
 Checks all fields to make sure this is a valid quotation package discount.
@@ -128,18 +118,6 @@ sub check {
 
 =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).
@@ -161,6 +139,17 @@ sub description {
   return $desc;
 }
 
+#stub for 3.x
+sub quotation_pkg {
+  my $self = shift;
+  FS::quotation_pkg->by_key($self->quotationpkgnum);
+}
+
+sub discount {
+  my $self = shift;
+  FS::discount->by_key($self->discountnum);
+}
+
 =head1 BUGS
 
 =head1 SEE ALSO