[freeside-commits] branch FREESIDE_4_BRANCH updated. 1bc45dbbd8782d13739c31844606a4ea9ffa94a7

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  1bc45dbbd8782d13739c31844606a4ea9ffa94a7 (commit)
      from  e5ae481b8630b1c2a39666db20dd3088b276435c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1bc45dbbd8782d13739c31844606a4ea9ffa94a7
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 25 17:31:47 2017 -0800

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

diff --git a/FS/FS/cust_payby.pm b/FS/FS/cust_payby.pm
index 53608cf..36f90df 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 '';
   }
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_payby.pm |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)