X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_refund.pm;h=8fe6876d3efeeba583307471ffa989b9b78dd258;hp=6bf2da595eb118f349b60051b56da84efa0b1fa6;hb=3ef62a0570055da710328937e7f65dbb2c027c62;hpb=579b08e47d45dec6ea0729164a6e24613c02be26

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 6bf2da595..8fe6876d3 100644
--- 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
@@ -94,7 +96,7 @@ sub insert {
   my $dbh = dbh;
 
   if ( $self->crednum ) {
-    my $cust_credit = qsearchs('cust_bill', { 'invnum' => $self->invnum } )
+    my $cust_credit = qsearchs('cust_credit', { 'crednum' => $self->crednum } )
       or do {
         $dbh->rollback if $oldAutoCommit;
         return "Unknown cust_credit.crednum: ". $self->crednum;
@@ -133,7 +135,7 @@ sub insert {
 
 }
 
-sub upgrade_replace {
+sub upgrade_replace { #1.3.x->1.4.x
   my $self = shift;
 
   local $SIG{HUP} = 'IGNORE';
@@ -170,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;
@@ -189,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
@@ -213,15 +217,16 @@ sub check {
   my $self = shift;
 
   my $error =
-    $self->ut_number('refundnum')
+    $self->ut_numbern('refundnum')
     || $self->ut_numbern('custnum')
-    || $self->ut_money('amount')
+    || $self->ut_money('refund')
     || $self->ut_numbern('_date')
     || $self->ut_textn('paybatch')
+    || $self->ut_enum('closed', [ '', 'Y' ])
   ;
   return $error if $error;
 
-  return "amount must be > 0 " if $self->amount == 0;
+  return "refund must be > 0 " if $self->refund <= 0;
 
   $self->_date(time) unless $self->_date;
 
@@ -232,9 +237,11 @@ sub check {
   $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)";
@@ -259,7 +266,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.10 2002-01-24 02:26:49 ivan Exp $
+$Id: cust_refund.pm,v 1.18 2002-02-19 03:22:39 jeff Exp $
 
 =head1 BUGS