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);
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)";
}
# 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)";
}