diff options
author | Ivan Kohler <ivan@freeside.biz> | 2017-01-25 17:30:59 -0800 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2017-01-25 17:30:59 -0800 |
commit | e00bf149d4f7335832b0316854ccc94e171af134 (patch) | |
tree | 63f8699b774550ada7b0d6910734e99db589a0cc /FS/FS/payinfo_Mixin.pm | |
parent | bc553832d03115c8794d0d248f9db1ebe0893ab0 (diff) |
fix upgrades, fix bogus "Tokenized" paycardtype, RT#71513
Diffstat (limited to 'FS/FS/payinfo_Mixin.pm')
-rw-r--r-- | FS/FS/payinfo_Mixin.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm index 1c45720..ac92623 100644 --- a/FS/FS/payinfo_Mixin.pm +++ b/FS/FS/payinfo_Mixin.pm @@ -197,14 +197,16 @@ sub payinfo_check { if ( $self->payby eq 'CARD' && ! $self->is_encrypted($self->payinfo) ) { - my $payinfo = $self->payinfo; - my $cardtype = cardtype($payinfo); - $cardtype = 'Tokenized' if $self->tokenized; - $self->set('paycardtype', $cardtype); + if ( $self->tokenized && ! $self->paycardtype ) { + return "paycardtype required (cannot be derived from a token)"; + } else { + $self->set('paycardtype', cardtype($self->payinfo)); + } if ( $ignore_masked_payinfo and $self->mask_payinfo eq $self->payinfo ) { # allow it } else { + my $payinfo = $self->payinfo; $payinfo =~ s/\D//g; $self->payinfo($payinfo); if ( $self->payinfo ) { @@ -212,7 +214,7 @@ sub payinfo_check { or return "Illegal (mistyped?) credit card number (payinfo)"; $self->payinfo($1); validate($self->payinfo) or return "Illegal credit card number"; - return "Unknown card type" if $cardtype eq "Unknown"; + return "Unknown card type" if $self->paycardtype eq "Unknown"; } else { $self->payinfo('N/A'); #??? re-masks card } |