projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mark@pc-intouch.com: exporttype2svcdb removal
[freeside.git]
/
FS
/
FS
/
cust_refund.pm
diff --git
a/FS/FS/cust_refund.pm
b/FS/FS/cust_refund.pm
index
0f87679
..
8fe6876
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;
@@
-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 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
+96,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
+191,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
+217,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_numbern('custnum')
- || $self->ut_money('
amount
')
+ || $self->ut_money('
refund
')
|| $self->ut_numbern('_date')
|| $self->ut_textn('paybatch')
|| $self->ut_numbern('_date')
|| $self->ut_textn('paybatch')
+ || $self->ut_enum('closed', [ '', 'Y' ])
;
return $error if $error;
;
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;
$self->_date(time) unless $self->_date;
@@
-232,9
+237,11
@@
sub check {
$self->payby =~ /^(CARD|BILL|COMP)$/ or return "Illegal payby";
$self->payby($1);
$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;
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)";
@@
-259,7
+266,7
@@
sub check {
=head1 VERSION
=head1 VERSION
-$Id: cust_refund.pm,v 1.1
1 2002-01-24 06:46:29 ivan
Exp $
+$Id: cust_refund.pm,v 1.1
8 2002-02-19 03:22:39 jeff
Exp $
=head1 BUGS
=head1 BUGS