X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_refund.pm;h=c216ec284ffca9b249a0c3557916f220b1285138;hp=742c9bb8d815537e4523c0eb152cfa7d8ec47f41;hb=8c1f9804d9a02c0c054eededeb500c72a640249a;hpb=13477c4eb15c3150938a2af8e90f01ad2d83b335

diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm
index 742c9bb8d..c216ec284 100644
--- a/FS/FS/cust_refund.pm
+++ b/FS/FS/cust_refund.pm
@@ -3,9 +3,11 @@ package FS::cust_refund;
 use strict;
 use vars qw( @ISA );
 use Business::CreditCard;
-use FS::Record qw( qsearchs );
+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 );
 
@@ -38,7 +40,7 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item refundnum - primary key (assigned automatically for new refunds)
 
-=item crednum - Credit (see L<FS::cust_credit>)
+=item custnum - customer (see L<FS::cust_main>)
 
 =item refund - Amount of the refund
 
@@ -49,6 +51,8 @@ L<Time::Local> and L<Date::Parse> for conversion functions.
 
 =item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
 
+=item paybatch - text field for tracking card processing
+
 =item otaker - order taker (assigned automatically, see L<FS::UID>)
 
 =back
@@ -67,26 +71,17 @@ sub table { 'cust_refund'; }
 
 =item insert
 
-Adds this refund to the database, and updates the credit (see
-L<FS::cust_credit>).
+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.  In this case, custnum is optional.
 
 =cut
 
 sub insert {
   my $self = shift;
 
-  my $error;
-
-  $error=$self->check;
-  return $error if $error;
-
-  my $old_cust_credit =
-    qsearchs( 'cust_credit', { 'crednum' => $self->crednum } );
-  return "Unknown crednum" unless $old_cust_credit;
-  my %hash = $old_cust_credit->hash;
-  $hash{credited} = sprintf("%.2f", $hash{credited} - $self->refund );
-  my($new_cust_credit) = new FS::cust_credit ( \%hash );
-
   local $SIG{HUP} = 'IGNORE';
   local $SIG{INT} = 'IGNORE';
   local $SIG{QUIT} = 'IGNORE';
@@ -94,10 +89,38 @@ sub insert {
   local $SIG{TSTP} = 'IGNORE';
   local $SIG{PIPE} = 'IGNORE';
 
-  $error = $new_cust_credit->replace($old_cust_credit);
-  return "Error modifying cust_credit: $error" if $error;
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->check;
+  return $error if $error;
+
+  if ( $self->crednum ) {
+    my $cust_credit_refund = new FS::cust_credit_refund {
+      'cred'      => $self->cred,
+      'refundnum' => $self->refundnum,
+      'amount'    => $self->refund,
+      '_date'     => $self->_date,
+    };
+    $error = $cust_bill_pay->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;
+
+  '';
 
-  $self->SUPER::insert;
 }
 
 =item delete
@@ -130,18 +153,21 @@ returns the error, otherwise returns false.  Called by the insert method.
 sub check {
   my $self = shift;
 
-  my $error;
-
-  $error =
+  my $error =
     $self->ut_number('refundnum')
-    || $self->ut_number('crednum')
+    || $self->ut_number('custnum')
     || $self->ut_money('amount')
     || $self->ut_numbern('_date')
+    || $self->ut_textn('paybatch')
   ;
   return $error if $error;
 
   $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);
 
@@ -172,7 +198,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_refund.pm,v 1.2 2001-02-11 17:17:39 ivan Exp $
+$Id: cust_refund.pm,v 1.6 2001-09-02 02:46:55 ivan Exp $
 
 =head1 BUGS