projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
delete payments
[freeside.git]
/
FS
/
FS
/
cust_refund.pm
diff --git
a/FS/FS/cust_refund.pm
b/FS/FS/cust_refund.pm
index
6bf2da5
..
3dbd4ef
100644
(file)
--- a/
FS/FS/cust_refund.pm
+++ b/
FS/FS/cust_refund.pm
@@
-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
@@
-133,7
+135,7
@@
sub insert {
}
}
-sub upgrade_replace {
+sub upgrade_replace {
#1.3.x->1.4.x
my $self = shift;
local $SIG{HUP} = 'IGNORE';
my $self = shift;
local $SIG{HUP} = 'IGNORE';
@@
-170,7
+172,7
@@
sub upgrade_replace {
die;
}
die;
}
- $error = $new->SUPER::
insert
($self);
+ $error = $new->SUPER::
replace
($self);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return $error;
@@
-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
@@
-215,13
+219,14
@@
sub check {
my $error =
$self->ut_number('refundnum')
|| $self->ut_numbern('custnum')
my $error =
$self->ut_number('refundnum')
|| $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
0 2002-01-24 02:26:49
ivan Exp $
+$Id: cust_refund.pm,v 1.1
5 2002-01-28 06:57:23
ivan Exp $
=head1 BUGS
=head1 BUGS