X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_refund.pm;h=e7c5a82154c7ccae6706a038d3fb59e2f8000e45;hp=8c672b8d741891e65ff7c234d426ca404e88fb70;hb=ad7f49821d40ffd099a45acc32ba91e0e211aede;hpb=f10cd68f08a6bfbd565a83b40bacc3f55a1265b3 diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm index 8c672b8d7..e7c5a8215 100644 --- a/FS/FS/cust_refund.pm +++ b/FS/FS/cust_refund.pm @@ -1,16 +1,18 @@ package FS::cust_refund; use strict; -use vars qw( @ISA ); +use base qw( FS::otaker_Mixin FS::payinfo_transaction_Mixin FS::cust_main_Mixin + FS::Record ); +use vars qw( @encrypted_fields ); use Business::CreditCard; -use FS::Record qw( qsearch qsearchs dbh ); use FS::UID qw(getotaker); +use FS::Record qw( qsearch qsearchs dbh ); use FS::cust_credit; use FS::cust_credit_refund; use FS::cust_pay_refund; use FS::cust_main; -@ISA = qw( FS::Record ); +@encrypted_fields = ('payinfo'); =head1 NAME @@ -39,28 +41,50 @@ inherits from FS::Record. The following fields are currently supported: =over 4 -=item refundnum - primary key (assigned automatically for new refunds) +=item refundnum + +primary key (assigned automatically for new refunds) + +=item custnum -=item custnum - customer (see L) +customer (see L) -=item refund - Amount of the refund +=item refund -=item reason - Reason for the refund +Amount of the refund -=item _date - specified as a UNIX timestamp; see L. Also see +=item reason + +Reason for the refund + +=item _date + +specified as a UNIX timestamp; see L. Also see L and L for conversion functions. -=item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH), -`LECB' (Phone bill billing), `BILL' (billing), `CASH' (cash), -`WEST' (Western Union), `MCRD' (Manual credit card), or `COMP' (free) +=item payby + +Payment Type (See L for valid payby values) -=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username) +=item payinfo -=item paybatch - text field for tracking card processing +Payment Information (See L for data format) -=item otaker - order taker (assigned automatically, see L) +=item paymask -=item closed - books closed flag, empty or `Y' +Masked payinfo (See L for how this works) + +=item paybatch + +text field for tracking card processing + +=item usernum + +order taker (see L + +=item closed + +books closed flag, empty or `Y' =back @@ -163,24 +187,63 @@ sub insert { =item delete -Currently unimplemented (accounting reasons). +Unless the closed flag is set, deletes this refund and all associated +applications (see L and L). =cut sub delete { my $self = shift; return "Can't delete closed refund" if $self->closed =~ /^Y/i; - $self->SUPER::delete(@_); + + 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; + + foreach my $cust_credit_refund ( $self->cust_credit_refund ) { + my $error = $cust_credit_refund->delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + + foreach my $cust_pay_refund ( $self->cust_pay_refund ) { + my $error = $cust_pay_refund->delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + + my $error = $self->SUPER::delete(@_); + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + + $dbh->commit or die $dbh->errstr if $oldAutoCommit; + + ''; + } =item replace OLD_RECORD -Currently unimplemented (accounting reasons). +Modifying a refund? Well, don't say I didn't warn you. =cut sub replace { - return "Can't (yet?) modify cust_refund records!"; + my $self = shift; + $self->SUPER::replace(@_); } =item check @@ -193,10 +256,13 @@ returns the error, otherwise returns false. Called by the insert method. sub check { my $self = shift; + $self->otaker(getotaker) unless $self->otaker; + my $error = $self->ut_numbern('refundnum') || $self->ut_numbern('custnum') || $self->ut_money('refund') + || $self->ut_alphan('otaker') || $self->ut_text('reason') || $self->ut_numbern('_date') || $self->ut_textn('paybatch') @@ -212,31 +278,8 @@ sub check { unless $self->crednum || qsearchs( 'cust_main', { 'custnum' => $self->custnum } ); - $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|CASH|WEST|MCRD)$/ - or return "Illegal payby"; - $self->payby($1); - - #false laziness with cust_pay::check - if ( $self->payby eq 'CARD' ) { - my $payinfo = $self->payinfo; - $payinfo =~ s/\D//g; - $self->payinfo($payinfo); - if ( $self->payinfo ) { - $self->payinfo =~ /^(\d{13,16})$/ - or return "Illegal (mistyped?) credit card number (payinfo)"; - $self->payinfo($1); - validate($self->payinfo) or return "Illegal credit card number"; - return "Unknown card type" if cardtype($self->payinfo) eq "Unknown"; - } else { - $self->payinfo('N/A'); - } - - } else { - $error = $self->ut_textn('payinfo'); - return $error if $error; - } - - $self->otaker(getotaker); + $error = $self->payinfo_check; + return $error if $error; $self->SUPER::check; } @@ -250,6 +293,7 @@ refund. sub cust_credit_refund { my $self = shift; + map { $_ } #return $self->num_cust_credit_refund unless wantarray; sort { $a->_date <=> $b->_date } qsearch( 'cust_credit_refund', { 'refundnum' => $self->refundnum } ) ; @@ -264,6 +308,7 @@ refund. sub cust_pay_refund { my $self = shift; + map { $_ } #return $self->num_cust_pay_refund unless wantarray; sort { $a->_date <=> $b->_date } qsearch( 'cust_pay_refund', { 'refundnum' => $self->refundnum } ) ; @@ -285,29 +330,47 @@ sub unapplied { sprintf("%.2f", $amount ); } +=back +=head1 CLASS METHODS -=item payinfo_masked +=over 4 -Returns a "masked" payinfo field with all but the last four characters replaced -by 'x'es. Useful for displaying credit cards. +=item unapplied_sql -=cut +Returns an SQL fragment to retreive the unapplied amount. +=cut + +sub unapplied_sql { + #my $class = shift; + + "refund + - COALESCE( + ( SELECT SUM(amount) FROM cust_credit_refund + WHERE cust_refund.refundnum = cust_credit_refund.refundnum ) + ,0 + ) + - COALESCE( + ( SELECT SUM(amount) FROM cust_pay_refund + WHERE cust_refund.refundnum = cust_pay_refund.refundnum ) + ,0 + ) + "; -sub payinfo_masked { - my $self = shift; - my $payinfo = $self->payinfo; - 'x'x(length($payinfo)-4). substr($payinfo,(length($payinfo)-4)); } +# Used by FS::Upgrade to migrate to a new database. +sub _upgrade_data { # class method + my ($class, %opts) = @_; + $class->_upgrade_otaker(%opts); +} =back =head1 BUGS -Delete and replace methods. payinfo_masked false laziness with cust_main.pm -and cust_pay.pm +Delete and replace methods. =head1 SEE ALSO