diff options
| -rw-r--r-- | FS/FS/cust_payby.pm | 6 | ||||
| -rw-r--r-- | FS/FS/payinfo_Mixin.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/FS/FS/cust_payby.pm b/FS/FS/cust_payby.pm index e25d73ecd..136acf1b6 100644 --- 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 - my $cardtype = ''; + my $cardtype = $self->paycardtype; if ( $self->tokenized ) { if ( $self->paymask =~ /^\d+x/ ) { $cardtype = cardtype($self->paymask); } else { - $cardtype = ''; #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); diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm index cb9b72318..84759cc11 100644 --- a/FS/FS/payinfo_Mixin.pm +++ b/FS/FS/payinfo_Mixin.pm @@ -202,7 +202,7 @@ sub payinfo_check { if ( $self->paymask =~ /^\d+x/ ) { $self->set('paycardtype', cardtype($self->paymask)); } else { - $self->set('paycardtype', ''); + $self->set('paycardtype', '') unless $self->paycardtype; #return "paycardtype required ". # "(can't derive from a token and no paymask w/prefix provided)"; } @@ -233,7 +233,7 @@ sub payinfo_check { # if we can't decrypt the card, at least detect the cardtype $self->set('paycardtype', cardtype($self->paymask)); } else { - $self->set('paycardtype', ''); + $self->set('paycardtype', '') unless $self->paycardtype; # return "paycardtype required ". # "(can't derive from a token and no paymask w/prefix provided)"; } |