import rt 2.0.14

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

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 77bacdf..8fe6876 100644 (file)
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -3,7 +3,7 @@ package FS::cust_refund;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw( dbh );
+use FS::Record qw( qsearchs dbh );
 use FS::UID qw(getotaker);
 use FS::cust_credit;
 use FS::cust_credit_refund;
@@ -55,6 +55,8 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item otaker - order taker (assigned automatically, see L<FS::UID>)
 
+=item closed - books closed flag, empty or `Y'
+
 =back
 
 =head1 METHODS
@@ -93,10 +95,23 @@ sub insert {
   local $FS::UID::AutoCommit = 0;
   my $dbh = dbh;
 
+  if ( $self->crednum ) {
+    my $cust_credit = qsearchs('cust_credit', { 'crednum' => $self->crednum } )
+      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;
 
-  die;
+  $error = $self->SUPER::insert;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
 
   if ( $self->crednum ) {
     my $cust_credit_refund = new FS::cust_credit_refund {
@@ -110,14 +125,9 @@ 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;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
 
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
@@ -125,7 +135,7 @@ sub insert {
 
 }
 
-sub upgrade_replace {
+sub upgrade_replace { #1.3.x->1.4.x
   my $self = shift;
 
   local $SIG{HUP} = 'IGNORE';
@@ -162,7 +172,7 @@ sub upgrade_replace {
     die;
   }
 
-  $error = $new->SUPER::insert($self);
+  $error = $new->SUPER::replace($self);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return $error;
@@ -181,7 +191,9 @@ Currently unimplemented (accounting reasons).
 =cut
 
 sub delete {
-  return "Can't (yet?) delete cust_refund records!";
+  my $self = shift;
+  return "Can't delete closed refund" if $self->closed =~ /^Y/i;
+  $self->SUPER::delete(@_);
 }
 
 =item replace OLD_RECORD
@@ -205,26 +217,31 @@ sub check {
   my $self = shift;
 
   my $error =
-    $self->ut_number('refundnum')
-    || $self->ut_number('custnum')
-    || $self->ut_money('amount')
+    $self->ut_numbern('refundnum')
+    || $self->ut_numbern('custnum')
+    || $self->ut_money('refund')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
+    || $self->ut_enum('closed', [ '', 'Y' ])
   ;
   return $error if $error;
 
+  return "refund must be > 0 " if $self->refund <= 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);
 
+  #false laziness with cust_pay::check
   if ( $self->payby eq 'CARD' ) {
     my $payinfo = $self->payinfo;
-    $self->payinfo($payinfo =~ s/\D//g);
+    $payinfo =~ s/\D//g;
+    $self->payinfo($payinfo);
     if ( $self->payinfo ) {
       $self->payinfo =~ /^(\d{13,16})$/
         or return "Illegal (mistyped?) credit card number (payinfo)";
@@ -249,7 +266,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.8 2001-09-02 05:38:13 ivan Exp $
+$Id: cust_refund.pm,v 1.18 2002-02-19 03:22:39 jeff Exp $
 
 =head1 BUGS