X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_refund.pm;h=77bacdffb92cbda3d0d74fff97e86514adbec850;hb=60c837e0aaf454dfa0b0c0283dc36928782d1b6c;hp=8e4ef0d4e4104f2e892e4284783861c97a9aec32;hpb=cdd5aa1d86cd5b266e02bed58570c97c2d7698ba;p=freeside.git

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 8e4ef0d4e..77bacdffb 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -3,10 +3,11 @@ package FS::cust_refund;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw( qsearchs dbh );
+use FS::Record qw( dbh );
 use FS::UID qw(getotaker);
 use FS::cust_credit;
 use FS::cust_credit_refund;
+use FS::cust_main;
 
 @ISA = qw( FS::Record );
 
@@ -39,6 +40,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item refundnum - primary key (assigned automatically for new refunds)
 
+=item custnum - customer (see L<FS::cust_main>)
+
 =item refund - Amount of the refund
 
 =item _date - specified as a UNIX timestamp; see L<perlfunc/"time">.  Also see
@@ -72,7 +75,7 @@ Adds this refund to the database.
 
 For backwards-compatibility and convenience, if the additional field crednum is
 defined, an FS::cust_credit_refund record for the full amount of the refund
-will be created.
+will be created.  In this case, custnum is optional.
 
 =cut
 
@@ -93,24 +96,76 @@ sub insert {
   my $error = $self->check;
   return $error if $error;
 
+  die;
+
+  if ( $self->crednum ) {
+    my $cust_credit_refund = new FS::cust_credit_refund {
+      'crednum'   => $self->crednum,
+      'refundnum' => $self->refundnum,
+      'amount'    => $self->refund,
+      '_date'     => $self->_date,
+    };
+    $error = $cust_credit_refund->insert;
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
+    }
+    $self->custnum($cust_credit_refund->cust_credit->custnum);
+  }
+
   $error = $self->SUPER::insert;
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
   }
 
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+}
+
+sub upgrade_replace {
+  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;
+
+  my $error = $self->check;
+  return $error if $error;
+
+  my %new = $self->hash;
+  my $new = FS::cust_refund->new(\%new);
+
   if ( $self->crednum ) {
     my $cust_credit_refund = new FS::cust_credit_refund {
-      'cred' => $self->cred,
+      'crednum'   => $self->crednum,
       'refundnum' => $self->refundnum,
-      'amount' => $self->refund,
-      '_date' => $self->_date,
+      'amount'    => $self->refund,
+      '_date'     => $self->_date,
     };
-    $error = $cust_bill_pay->insert;
+    $error = $cust_credit_refund->insert;
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return $error;
     }
+    $new->custnum($cust_credit_refund->cust_credit->custnum);
+  } else {
+    die;
+  }
+
+  $error = $new->SUPER::insert($self);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
   }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
@@ -151,6 +206,7 @@ sub check {
 
   my $error =
     $self->ut_number('refundnum')
+    || $self->ut_number('custnum')
     || $self->ut_money('amount')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
@@ -159,6 +215,10 @@ sub check {
 
   $self->_date(time) unless $self->_date;
 
+  return "unknown cust_main.custnum: ". $self->custnum
+    unless $self->invnum 
+           ||  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
 
@@ -189,7 +249,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.4 2001-09-01 20:11:07 ivan Exp $
+$Id: cust_refund.pm,v 1.8 2001-09-02 05:38:13 ivan Exp $
 
 =head1 BUGS