From 77e088ce10a52b40743ff9ae7e82336f167db2f8 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Fri, 15 Jul 2016 15:50:27 -0700 Subject: [PATCH] rename cardtype to paycardtype --- FS/FS/Schema.pm | 6 +++--- FS/FS/Upgrade.pm | 2 +- FS/FS/cust_pay.pm | 4 ++-- FS/FS/cust_refund.pm | 2 +- FS/FS/payinfo_Mixin.pm | 18 ++++++++++-------- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index f3fca2ea9..63c113c66 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -1755,7 +1755,7 @@ sub tables_hashref { # index into payby table # eventually 'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above - 'cardtype', 'varchar', 'NULL', $char_d, '', '', + 'paycardtype', 'varchar', 'NULL', $char_d, '', '', 'paymask', 'varchar', 'NULL', $char_d, '', '', 'paydate', 'varchar', 'NULL', 10, '', '', 'paybatch', 'varchar', 'NULL', $char_d, '', '', #for auditing purposes. @@ -1794,7 +1794,7 @@ sub tables_hashref { # index into payby table # eventually 'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above - 'cardtype', 'varchar', 'NULL', $char_d, '', '', + 'paycardtype', 'varchar', 'NULL', $char_d, '', '', 'paymask', 'varchar', 'NULL', $char_d, '', '', #'paydate' ? 'paybatch', 'varchar', 'NULL', $char_d, '', '', #for auditing purposes. @@ -2146,7 +2146,7 @@ sub tables_hashref { # be index into payby # table eventually 'payinfo', 'varchar', 'NULL', 512, '', '', #see cust_main above - 'cardtype', 'varchar', 'NULL', $char_d, '', '', + 'paycardtype', 'varchar', 'NULL', $char_d, '', '', 'paymask', 'varchar', 'NULL', $char_d, '', '', 'paybatch', 'varchar', 'NULL', $char_d, '', '', 'closed', 'char', 'NULL', 1, '', '', diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm index 26cd42a10..481646d58 100644 --- a/FS/FS/Upgrade.pm +++ b/FS/FS/Upgrade.pm @@ -391,7 +391,7 @@ sub upgrade_data { 'cust_refund' => [], 'banned_pay' => [], - #cardtype + #paycardtype 'cust_payby' => [], #default namespace diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm index 6676317a8..04aac4e7d 100644 --- a/FS/FS/cust_pay.pm +++ b/FS/FS/cust_pay.pm @@ -96,7 +96,7 @@ Payment Type (See L for valid values) Payment Information (See L for data format) -=item cardtype +=item paycardtype Credit card type, if appropriate; autodetected. @@ -1248,7 +1248,7 @@ sub _upgrade_data { #class method } ### - # set cardtype + # set paycardtype ### $class->upgrade_set_cardtype; diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm index 17bd13d10..e26121b77 100644 --- a/FS/FS/cust_refund.pm +++ b/FS/FS/cust_refund.pm @@ -83,7 +83,7 @@ Payment Type (See L for valid payby values) Payment Information (See L for data format) -=item cardtype +=item paycardtype Detected credit card type, if appropriate; autodetected. diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm index 81e04a429..b02e98eb2 100644 --- a/FS/FS/payinfo_Mixin.pm +++ b/FS/FS/payinfo_Mixin.pm @@ -198,9 +198,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 { @@ -211,8 +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 $self->payinfo !~ /^99\d{14}$/ #token - && $cardtype eq "Unknown"; + return "Unknown card type" if $cardtype eq "Unknown"; } else { $self->payinfo('N/A'); #??? } @@ -220,9 +222,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? @@ -320,8 +322,8 @@ sub payinfo_used { =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 @@ -332,7 +334,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; -- 2.11.0