X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_refund.pm;h=0f87679a043f7dd5610a8ace8eeff073a56e836a;hb=f3d5a1bc3bf8ffe4b2fe6a0da3b201ba988b21a8;hp=89f8f68c53fa631df86f776b85fac839bcf792b3;hpb=f1ee95396defc991301ac758b71bdda9df82984e;p=freeside.git

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 89f8f68c5..0f87679a0 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -93,12 +93,27 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  if ( $self->crednum ) {
+    my $cust_credit = qsearchs('cust_bill', { 'invnum' => $self->invnum } )
+      or do {
+        $dbh->rollback if $oldAutoCommit;
+        return "Unknown cust_credit.crednum: ". $self->crednum;
+      };
+    $self->custnum($cust_credit->custnum);
+  }
+
   my $error = $self->check;
   return $error if $error;
 
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
   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,
@@ -108,10 +123,54 @@ sub insert {
       $dbh->rollback if $oldAutoCommit;
       return $error;
     }
-    $self->custnum($cust_credit_refund->cust_credit->custnum);
+    #$self->custnum($cust_credit_refund->cust_credit->custnum);
   }
 
-  $error = $self->SUPER::insert;
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+  '';
+
+}
+
+sub upgrade_replace { #1.3.x->1.4.x
+  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 {
+      '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;
+    }
+    $new->custnum($cust_credit_refund->cust_credit->custnum);
+  } else {
+    die;
+  }
+
+  $error = $new->SUPER::replace($self);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -155,18 +214,20 @@ sub check {
 
   my $error =
     $self->ut_number('refundnum')
-    || $self->ut_number('custnum')
+    || $self->ut_numbern('custnum')
     || $self->ut_money('amount')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
   ;
   return $error if $error;
 
+  return "amount must be > 0 " if $self->amount == 0;
+
   $self->_date(time) unless $self->_date;
 
   return "unknown cust_main.custnum: ". $self->custnum
-    unless $self->invnum 
-           ||  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+    unless $self->crednum 
+           || qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
 
   $self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
   $self->payby($1);
@@ -198,7 +259,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.7 2001-09-02 04:25:55 ivan Exp $
+$Id: cust_refund.pm,v 1.11 2002-01-24 06:46:29 ivan Exp $
 
 =head1 BUGS