diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2017-02-01 14:00:53 -0600 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2017-02-01 14:00:53 -0600 |
| commit | 57ac39c47a28bcf9dc1f689e6bd6234f0218d0ad (patch) | |
| tree | e1cc68d1b695640f42d677258e9cd260bce4f595 /FS/FS/payinfo_Mixin.pm | |
| parent | 87d108d379a5c077370afc04728d1c28e9edef30 (diff) | |
71513: Card tokenization [tweaks to paycardtype checks]
Diffstat (limited to 'FS/FS/payinfo_Mixin.pm')
| -rw-r--r-- | FS/FS/payinfo_Mixin.pm | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm index 7401eb9..cb9b723 100644 --- a/FS/FS/payinfo_Mixin.pm +++ b/FS/FS/payinfo_Mixin.pm @@ -197,20 +197,17 @@ sub payinfo_check { if ( $self->payby eq 'CARD' && ! $self->is_encrypted($self->payinfo) ) { - unless ( $self->paycardtype ) { - - if ( $self->tokenized ) { - if ( $self->paymask =~ /^\d+x/ ) { - $self->set('paycardtype', cardtype($self->paymask)); - } else { - $self->set('paycardtype', ''); - # return "paycardtype required ". - # "(can't derive from a token and no paymask w/prefix provided)"; - } + # see parallel checks in cust_payby::check & cust_payby::check_payinfo_cardtype + if ( $self->tokenized ) { + if ( $self->paymask =~ /^\d+x/ ) { + $self->set('paycardtype', cardtype($self->paymask)); } else { - $self->set('paycardtype', cardtype($self->payinfo)); + $self->set('paycardtype', ''); + #return "paycardtype required ". + # "(can't derive from a token and no paymask w/prefix provided)"; } - + } else { + $self->set('paycardtype', cardtype($self->payinfo)); } if ( $ignore_masked_payinfo and $self->mask_payinfo eq $self->payinfo ) { @@ -232,17 +229,13 @@ sub payinfo_check { } else { - unless ( $self->paycardtype ) { - - if ( $self->payby eq 'CARD' && $self->paymask =~ /^\d+x/ ) { - # if we can't decrypt the card, at least detect the cardtype - $self->set('paycardtype', cardtype($self->paymask)); - } else { - $self->set('paycardtype', ''); - # return "paycardtype required ". - # "(can't derive from a token and no paymask w/prefix provided)"; - } - + if ( $self->payby eq 'CARD' && $self->paymask =~ /^\d+x/ ) { + # if we can't decrypt the card, at least detect the cardtype + $self->set('paycardtype', cardtype($self->paymask)); + } else { + $self->set('paycardtype', ''); + # return "paycardtype required ". + # "(can't derive from a token and no paymask w/prefix provided)"; } if ( $self->is_encrypted($self->payinfo) ) { |