[freeside-commits] branch master updated. 5f2456557fee6e8d09733aad18200e4b2bbc2d93

[Mark Wells]

The branch, master has been updated
       via  5f2456557fee6e8d09733aad18200e4b2bbc2d93 (commit)
       via  8c72aca69588468b2e5b35397e4d6fb3d543155e (commit)
      from  a2c196921e984b7f1784fbb41c96a053ef68c9ee (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 5f2456557fee6e8d09733aad18200e4b2bbc2d93
Merge: 8c72aca a2c1969
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jul 19 12:56:35 2016 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 8c72aca69588468b2e5b35397e4d6fb3d543155e
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jul 19 12:56:06 2016 -0700

    unreverse the check for tokenized payinfo, #71291

diff --git a/FS/FS/cust_payby.pm b/FS/FS/cust_payby.pm
index facb9c8..e4a1d19 100644
--- a/FS/FS/cust_payby.pm
+++ b/FS/FS/cust_payby.pm
@@ -354,7 +354,7 @@ sub check {
       or return gettext('invalid_card'); # . ": ". $self->payinfo;
 
     my $cardtype = cardtype($payinfo);
-    $cardtype = 'Tokenized' if $self->payinfo !~ /^99\d{14}$/; #token
+    $cardtype = 'Tokenized' if $self->payinfo =~ /^99\d{14}$/; #token
     
     return gettext('unknown_card_type') if $cardtype eq "Unknown";
     
diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index a61125e..4f26e8c 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -197,7 +197,7 @@ sub payinfo_check {
 
     my $payinfo = $self->payinfo;
     my $cardtype = cardtype($payinfo);
-    $cardtype = 'Tokenized' if $payinfo !~ /^99\d{14}$/;
+    $cardtype = 'Tokenized' if $payinfo =~ /^99\d{14}$/;
     $self->set('paycardtype', $cardtype);
 
     if ( $ignore_masked_payinfo and $self->mask_payinfo eq $self->payinfo ) {

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

Summary of changes:
 FS/FS/cust_payby.pm    |    2 +-
 FS/FS/payinfo_Mixin.pm |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)