projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
never blank an existing paycardtype inadvertantly
[freeside.git]
/
FS
/
FS
/
cust_payby.pm
diff --git
a/FS/FS/cust_payby.pm
b/FS/FS/cust_payby.pm
index
e25d73e
..
136acf1
100644
(file)
--- a/
FS/FS/cust_payby.pm
+++ b/
FS/FS/cust_payby.pm
@@
-357,14
+357,14
@@
sub check {
or return gettext('invalid_card'); # . ": ". $self->payinfo;
# see parallel checks in check_payinfo_cardtype & payinfo_Mixin::payinfo_check
or return gettext('invalid_card'); # . ": ". $self->payinfo;
# see parallel checks in check_payinfo_cardtype & payinfo_Mixin::payinfo_check
- my $cardtype =
''
;
+ my $cardtype =
$self->paycardtype
;
if ( $self->tokenized ) {
if ( $self->paymask =~ /^\d+x/ ) {
$cardtype = cardtype($self->paymask);
} else {
if ( $self->tokenized ) {
if ( $self->paymask =~ /^\d+x/ ) {
$cardtype = cardtype($self->paymask);
} else {
- $cardtype = '';
#return "paycardtype required ".
#return "paycardtype required ".
- # "(can't derive from a token and no paymask w/prefix provided)";
+ # "(can't derive from a token and no paymask w/prefix provided)"
+ # unless $cardtype;
}
} else {
$cardtype = cardtype($self->payinfo);
}
} else {
$cardtype = cardtype($self->payinfo);