projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added -y switch to freeside-daily to specify an offset in days
[freeside.git]
/
FS
/
FS
/
cust_refund.pm
diff --git
a/FS/FS/cust_refund.pm
b/FS/FS/cust_refund.pm
index
c7d8a6d
..
250bd20
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 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;
use FS::UID qw(getotaker);
use FS::cust_credit;
use FS::cust_credit_refund;
@@
-47,7
+47,8
@@
inherits from FS::Record. The following fields are currently supported:
=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">. Also see
L<Time::Local> and L<Date::Parse> for conversion functions.
=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">. Also see
L<Time::Local> and L<Date::Parse> for conversion functions.
-=item payby - `CARD' (credit cards), `BILL' (billing), or `COMP' (free)
+=item payby - `CARD' (credit cards), `CHEK' (electronic check/ACH),
+`LECB' (Phone bill billing), `BILL' (billing), or `COMP' (free)
=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
=item payinfo - card number, P.O.#, or comp issuer (4-8 lowercase alphanumerics; think username)
@@
-55,6
+56,8
@@
L<Time::Local> and L<Date::Parse> for conversion functions.
=item otaker - order taker (assigned automatically, see L<FS::UID>)
=item otaker - order taker (assigned automatically, see L<FS::UID>)
+=item closed - books closed flag, empty or `Y'
+
=back
=head1 METHODS
=back
=head1 METHODS
@@
-94,7
+97,7
@@
sub insert {
my $dbh = dbh;
if ( $self->crednum ) {
my $dbh = dbh;
if ( $self->crednum ) {
- my $cust_credit = qsearchs('cust_
bill', { 'invnum' => $self->inv
num } )
+ my $cust_credit = qsearchs('cust_
credit', { 'crednum' => $self->cred
num } )
or do {
$dbh->rollback if $oldAutoCommit;
return "Unknown cust_credit.crednum: ". $self->crednum;
or do {
$dbh->rollback if $oldAutoCommit;
return "Unknown cust_credit.crednum: ". $self->crednum;
@@
-189,7
+192,9
@@
Currently unimplemented (accounting reasons).
=cut
sub delete {
=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
}
=item replace OLD_RECORD
@@
-213,15
+218,16
@@
sub check {
my $self = shift;
my $error =
my $self = shift;
my $error =
- $self->ut_number('refundnum')
+ $self->ut_number
n
('refundnum')
|| $self->ut_numbern('custnum')
|| $self->ut_money('refund')
|| $self->ut_numbern('_date')
|| $self->ut_textn('paybatch')
|| $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 $error if $error;
- return "refund must be > 0 " if $self->refund
=
= 0;
+ return "refund must be > 0 " if $self->refund
<
= 0;
$self->_date(time) unless $self->_date;
$self->_date(time) unless $self->_date;
@@
-229,12
+235,14
@@
sub check {
unless $self->crednum
|| 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 =~ /^(CARD|
CHEK|LECB|
BILL|COMP)$/ or return "Illegal payby";
$self->payby($1);
$self->payby($1);
+ #false laziness with cust_pay::check
if ( $self->payby eq 'CARD' ) {
my $payinfo = $self->payinfo;
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)";
if ( $self->payinfo ) {
$self->payinfo =~ /^(\d{13,16})$/
or return "Illegal (mistyped?) credit card number (payinfo)";
@@
-252,14
+260,14
@@
sub check {
$self->otaker(getotaker);
$self->otaker(getotaker);
- ''; #no error
+ $self->SUPER::check;
}
=back
=head1 VERSION
}
=back
=head1 VERSION
-$Id: cust_refund.pm,v 1.
12 2002-01-24 06:52:44 ivan
Exp $
+$Id: cust_refund.pm,v 1.
21 2003-08-05 00:20:42 khoff
Exp $
=head1 BUGS
=head1 BUGS