add E911 address to self-service provision_phone, document it, RT#34069

[freeside.git] / FS / FS / cust_pkg_discount.pm

diff --git a/FS/FS/cust_pkg_discount.pm b/FS/FS/cust_pkg_discount.pm
index d82d949..5d0f85b 100644 (file)
--- a/FS/FS/cust_pkg_discount.pm
+++ b/FS/FS/cust_pkg_discount.pm
@@ -1,9 +1,11 @@
 package FS::cust_pkg_discount;
 package FS::cust_pkg_discount;

+use base qw( FS::otaker_Mixin
+             FS::cust_main_Mixin
+             FS::pkg_discount_Mixin
+             FS::Record );

 
 use strict;
 
 use strict;

-use base qw( FS::otaker_Mixin FS::cust_main_Mixin FS::Record );
-use FS::Record qw( dbh qsearchs ); # qsearch );
-use FS::cust_pkg;
+use FS::Record qw( dbh ); # qsearch qsearchs dbh );

 use FS::discount;
 
 =head1 NAME
 use FS::discount;
 
 =head1 NAME


@@ -83,52 +85,6 @@ sub table { 'cust_pkg_discount'; }
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 
 Adds this record to the database.  If there is an error, returns the error,
 otherwise returns false.
 

-=cut
-
-sub insert {
-  #my( $self, %options ) = @_;
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  if ( $self->discountnum == -1 ) {
-    my $discount = new FS::discount {
-      '_type'    => $self->_type,
-      'amount'   => $self->amount,
-      'percent'  => $self->percent,
-      'months'   => $self->months,
-      'setup'    => $self->setup,
-      #'linked'   => $self->linked,
-      'disabled' => 'Y',
-    };
-    my $error = $discount->insert;
-    if ( $error ) {
-      $dbh->rollback if $oldAutoCommit;
-      return $error;
-    }
-    $self->discountnum($discount->discountnum);
-  }
-
-  my $error = $self->SUPER::insert; #(@_); #(%options);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-

 =item delete
 
 Delete this record from the database.
 =item delete
 
 Delete this record from the database.


@@ -184,24 +140,10 @@ sub check {
 
 Returns the customer package (see L<FS::cust_pkg>).
 
 
 Returns the customer package (see L<FS::cust_pkg>).
 

-=cut
-
-sub cust_pkg {
-  my $self = shift;
-  qsearchs('cust_pkg', { 'pkgnum' => $self->pkgnum } );
-}
-

 =item discount
 
 Returns the discount (see L<FS::discount>).
 
 =item discount
 
 Returns the discount (see L<FS::discount>).
 

-=cut
-
-sub discount {
-  my $self = shift;
-  qsearchs('discount', { 'discountnum' => $self->discountnum } );
-}
-

 =item increment_months_used MONTHS
 
 Increments months_used by the given parameter
 =item increment_months_used MONTHS
 
 Increments months_used by the given parameter