# see parallel checks in cust_payby::check & cust_payby::check_payinfo_cardtype
if ( $self->tokenized ) {
+ $self->set('is_tokenized', 'Y'); #so we don't try to do it again
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)";
}
$payinfo =~ s/\D//g;
$self->payinfo($payinfo);
if ( $self->payinfo ) {
- $self->payinfo =~ /^(\d{13,16}|\d{8,9})$/
+ $self->payinfo =~ /^(\d{13,19}|\d{8,9})$/
or return "Illegal (mistyped?) credit card number (payinfo)";
$self->payinfo($1);
validate($self->payinfo) or return "Illegal credit card number";
# 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)";
}