From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 26 Jan 2017 01:31:46 +0000 (-0800)
Subject: fix upgrades, fix bogus "Tokenized" paycardtype, RT#71513
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=7fe97938da9c746887cc3d4aa62399bd589995b0

fix upgrades, fix bogus "Tokenized" paycardtype, RT#71513
---

diff --git a/FS/FS/cust_payby.pm b/FS/FS/cust_payby.pm
index 53608cf64..36f90dfb5 100644
--- a/FS/FS/cust_payby.pm
+++ b/FS/FS/cust_payby.pm
@@ -356,8 +356,7 @@ sub check {
     validate($payinfo)
       or return gettext('invalid_card'); # . ": ". $self->payinfo;
 
-    my $cardtype = cardtype($payinfo);
-    $cardtype = 'Tokenized' if $self->tokenized; #token
+    my $cardtype = $self->paycardtype || cardtype($payinfo);
     
     return gettext('unknown_card_type') if $cardtype eq "Unknown";
     
@@ -547,7 +546,6 @@ sub check_payinfo_cardtype {
   $payinfo =~ s/\D//g;
 
   if ( $self->tokenized($payinfo) ) {
-    $self->set('paycardtype', 'Tokenized');
     return '';
   }