diff options
author | Mark Wells <mark@freeside.biz> | 2016-07-15 15:50:27 -0700 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2016-07-15 16:59:18 -0700 |
commit | 17f3394d929e83ed3b58916dcc40eac5c87bb5b4 (patch) | |
tree | 18d40f7d980f451d938b5dbb11e4da446c7c5703 /FS/FS/payinfo_Mixin.pm | |
parent | 666c35e4745dc6b5518f53267aadb3233f7cddb8 (diff) |
rename cardtype to paycardtype
Diffstat (limited to 'FS/FS/payinfo_Mixin.pm')
-rw-r--r-- | FS/FS/payinfo_Mixin.pm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm index b32f13b8d..a61125e54 100644 --- a/FS/FS/payinfo_Mixin.pm +++ b/FS/FS/payinfo_Mixin.pm @@ -194,9 +194,12 @@ sub payinfo_check { or return "Illegal payby: ". $self->payby; if ( $self->payby eq 'CARD' && ! $self->is_encrypted($self->payinfo) ) { + my $payinfo = $self->payinfo; my $cardtype = cardtype($payinfo); - $self->set('cardtype', $cardtype); + $cardtype = 'Tokenized' if $payinfo !~ /^99\d{14}$/; + $self->set('paycardtype', $cardtype); + if ( $ignore_masked_payinfo and $self->mask_payinfo eq $self->payinfo ) { # allow it } else { @@ -207,8 +210,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 $self->payinfo !~ /^99\d{14}$/ #token - && $cardtype eq "Unknown"; + return "Unknown card type" if $cardtype eq "Unknown"; } else { $self->payinfo('N/A'); #??? } @@ -216,9 +218,9 @@ sub payinfo_check { } else { if ( $self->payby eq 'CARD' and $self->paymask ) { # if we can't decrypt the card, at least detect the cardtype - $self->set('cardtype', cardtype($self->paymask)); + $self->set('paycardtype', cardtype($self->paymask)); } else { - $self->set('cardtype', ''); + $self->set('paycardtype', ''); } if ( $self->is_encrypted($self->payinfo) ) { #something better? all it would cause is a decryption error anyway? @@ -415,8 +417,8 @@ sub paydate_epoch_sql { =item upgrade_set_cardtype -Find all records with a credit card payment type and no cardtype, and -replace them in order to set their cardtype. +Find all records with a credit card payment type and no paycardtype, and +replace them in order to set their paycardtype. =cut @@ -427,7 +429,7 @@ sub upgrade_set_cardtype { local $ignore_masked_payinfo = 1; my $search = FS::Cursor->new({ table => $class->table, - extra_sql => q[ WHERE payby IN('CARD','DCRD') AND cardtype IS NULL ], + extra_sql => q[ WHERE payby IN('CARD','DCRD') AND paycardtype IS NULL ], }); while (my $record = $search->fetch) { my $error = $record->replace; |