X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg_discount.pm;h=a20794027c9dd0e516bc14ed02a7528b075a784c;hb=7f5e32275a5a2674fd1d220cd651b222b9831476;hp=1b97bba03b424dfd9e6a734b965c92a13abbc7d1;hpb=942c8b05b17b119a3dad84d7035c76b481dc5b99;p=freeside.git

diff --git a/FS/FS/cust_pkg_discount.pm b/FS/FS/cust_pkg_discount.pm
index 1b97bba03..a20794027 100644
--- a/FS/FS/cust_pkg_discount.pm
+++ b/FS/FS/cust_pkg_discount.pm
@@ -1,7 +1,7 @@
 package FS::cust_pkg_discount;
 
 use strict;
-use base qw( FS::cust_main_Mixin FS::Record );
+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::discount;
@@ -53,9 +53,9 @@ months_used
 
 end_date
 
-=item otaker
+=item usernum
 
-otaker
+order taker, see L<FS::access_user>
 
 
 =back
@@ -106,6 +106,7 @@ sub insert {
       'amount'   => $self->amount,
       'percent'  => $self->percent,
       'months'   => $self->months,
+      'setup'   => $self->setup,
       'disabled' => 'Y',
     };
     my $error = $discount->insert;
@@ -164,11 +165,17 @@ sub check {
     || $self->ut_foreign_key('discountnum', 'discount', 'discountnum' )
     || $self->ut_float('months_used') #actually decimal, but this will do
     || $self->ut_numbern('end_date')
-    || $self->ut_text('otaker')
+    || $self->ut_alphan('otaker')
+    || $self->ut_numbern('usernum')
     || $self->ut_enum('disabled', [ '', 'Y' ] )
   ;
   return $error if $error;
 
+  return "Discount does not apply to setup fees, and package has no recurring"
+    if ! $self->discount->setup && $self->cust_pkg->part_pkg->freq =~ /^0/;
+
+  $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
+
   $self->SUPER::check;
 }
 
@@ -226,6 +233,12 @@ sub status {
   }
 }
 
+# Used by FS::Upgrade to migrate to a new database.
+sub _upgrade_data {  # class method
+  my ($class, %opts) = @_;
+  $class->_upgrade_otaker(%opts);
+}
+
 =back
 
 =head1 BUGS