X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_pay_void.pm;h=fa851e19da4475b6a76d475c15ccaef298503384;hp=86fbbe5abbe50dd3c8ab152318f9989e34a407c3;hb=b516a7cb6c072871568bb0f217cc2bab6ebddd4a;hpb=cc9855d8e52fe35a362f7bda01616d53f04a7aab

diff --git a/FS/FS/cust_pay_void.pm b/FS/FS/cust_pay_void.pm
index 86fbbe5ab..fa851e19d 100644
--- a/FS/FS/cust_pay_void.pm
+++ b/FS/FS/cust_pay_void.pm
@@ -1,6 +1,8 @@
 package FS::cust_pay_void; 
+
 use strict;
-use vars qw( @ISA @encrypted_fields );
+use base qw( FS::otaker_Mixin FS::payinfo_Mixin FS::Record );
+use vars qw( @encrypted_fields );
 use Business::CreditCard;
 use FS::UID qw(getotaker);
 use FS::Record qw(qsearchs dbh fields); # qsearch );
@@ -11,8 +13,6 @@ use FS::cust_pay;
 #use FS::cust_main;
 use FS::cust_pkg;
 
-@ISA = qw( FS::Record FS::payinfo_Mixin );
-
 @encrypted_fields = ('payinfo');
 
 =head1 NAME
@@ -58,6 +58,10 @@ Amount of this payment
 specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
 L<Time::Local> and L<Date::Parse> for conversion functions.
 
+=item otaker
+
+order taker (see L<FS::access_user>)
+
 =item payby
 
 `CARD' (credit cards), `CHEK' (electronic check/ACH),
@@ -215,7 +219,7 @@ sub check {
     return $error if $error;
   }
 
-  $self->otaker(getotaker);
+  $self->otaker(getotaker) unless $self->otaker;
 
   $self->SUPER::check;
 }
@@ -231,6 +235,12 @@ sub cust_main {
   qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 }
 
+# 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