X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_refund.pm;h=8fe6876d3efeeba583307471ffa989b9b78dd258;hp=742c9bb8d815537e4523c0eb152cfa7d8ec47f41;hb=3ef62a0570055da710328937e7f65dbb2c027c62;hpb=13477c4eb15c3150938a2af8e90f01ad2d83b335 diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm index 742c9bb8d..8fe6876d3 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( qsearchs 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) +=item custnum - customer (see L) =item refund - Amount of the refund @@ -49,8 +51,12 @@ L and L 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) +=item closed - books closed flag, empty or `Y' + =back =head1 METHODS @@ -67,25 +73,70 @@ sub table { 'cust_refund'; } =item insert -Adds this refund to the database, and updates the credit (see -L). +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; + 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; + + 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); + } - $error=$self->check; + my $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 ); + $error = $self->SUPER::insert; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + + 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); + } + + + $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'; @@ -94,10 +145,43 @@ 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; + + 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; + } + + $dbh->commit or die $dbh->errstr if $oldAutoCommit; + + ''; - $self->SUPER::insert; } =item delete @@ -107,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 @@ -130,24 +216,32 @@ returns the error, otherwise returns false. Called by the insert method. sub check { my $self = shift; - my $error; - - $error = - $self->ut_number('refundnum') - || $self->ut_number('crednum') - || $self->ut_money('amount') + my $error = + $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->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)"; @@ -172,7 +266,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.18 2002-02-19 03:22:39 jeff Exp $ =head1 BUGS