projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up payinfo_Mixin to use payby.pm for payby info and have card masking full...
[freeside.git]
/
FS
/
FS
/
cust_pay_batch.pm
diff --git
a/FS/FS/cust_pay_batch.pm
b/FS/FS/cust_pay_batch.pm
index
c9a5468
..
d263f21
100644
(file)
--- a/
FS/FS/cust_pay_batch.pm
+++ b/
FS/FS/cust_pay_batch.pm
@@
-3,10
+3,11
@@
package FS::cust_pay_batch;
use strict;
use vars qw( @ISA $DEBUG );
use FS::Record qw(dbh qsearch qsearchs);
use strict;
use vars qw( @ISA $DEBUG );
use FS::Record qw(dbh qsearch qsearchs);
+use FS::payinfo_Mixin;
use FS::part_bill_event qw(due_events);
use Business::CreditCard 0.28;
use FS::part_bill_event qw(due_events);
use Business::CreditCard 0.28;
-@ISA = qw( FS::Record );
+@ISA = qw( FS::Record
FS::payinfo_Mixin
);
# 1 is mostly method/subroutine entry and options
# 2 traces progress of some operations
# 1 is mostly method/subroutine entry and options
# 2 traces progress of some operations
@@
-124,7
+125,7
@@
sub check {
my $error =
$self->ut_numbern('paybatchnum')
my $error =
$self->ut_numbern('paybatchnum')
- || $self->ut_numbern('trancode') #depr
ici
ated
+ || $self->ut_numbern('trancode') #depr
ec
ated
|| $self->ut_money('amount')
|| $self->ut_number('invnum')
|| $self->ut_number('custnum')
|| $self->ut_money('amount')
|| $self->ut_number('invnum')
|| $self->ut_number('custnum')
@@
-142,11
+143,7
@@
sub check {
$self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
$self->first($1);
$self->first =~ /^([\w \,\.\-\']+)$/ or return "Illegal first name";
$self->first($1);
- $self->payby =~ /^(CARD|CHEK|LECB|BILL|COMP|PREP|CASH|WEST|MCRD)$/
- or return "Illegal payby";
- $self->payby($1);
-
- $error = FS::payby::payinfo_check($self->payby, \$self->payinfo);
+ $error = $self->payinfo_check();
return $error if $error;
if ( $self->exp eq '' ) {
return $error if $error;
if ( $self->exp eq '' ) {