[freeside-commits] branch master updated. 375b84b1dcca3fb2f71aa3ac63281164501acc1e

[Ivan]

The branch, master has been updated
       via  375b84b1dcca3fb2f71aa3ac63281164501acc1e (commit)
       via  2ebfd5c5a550befcd4546edeed8de8300e0c59d2 (commit)
      from  57ac39c47a28bcf9dc1f689e6bd6234f0218d0ad (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 375b84b1dcca3fb2f71aa3ac63281164501acc1e
Merge: 2ebfd5c 57ac39c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Feb 1 12:16:26 2017 -0800

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


commit 2ebfd5c5a550befcd4546edeed8de8300e0c59d2
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Feb 1 12:16:21 2017 -0800

    only tokenize cards

diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index d96b8ba..f089059 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -2463,7 +2463,7 @@ CUSTLOOP:
       }
 
       if ($require_tokenized && $opt{'daily'}) {
-        $log->critical("Untokenized card number detected in cust_payby ".$cust_payby->custpaybynum);
+        $log->info("Untokenized card number detected in cust_payby ".$cust_payby->custpaybynum. '; tokenizing');
         $dbh->commit or die $dbh->errstr; # commit log message
       }
 
@@ -2564,7 +2564,7 @@ CUSTLOOP:
       }
 
       if ($require_tokenized && $opt{'daily'}) {
-        $log->critical("Untokenized card number detected in $table ".$record->get($record->primary_key));
+        $log->info("Untokenized card number detected in $table ".$record->get($record->primary_key). ';tokenizing');
         $dbh->commit or die $dbh->errstr; # commit log message
       }
 
@@ -2706,7 +2706,15 @@ sub _token_check_next_recnum {
   my $recnum = shift @$recnums;
   return $recnum if $recnum;
   my $tclass = 'FS::'.$table;
-  my $sth = $dbh->prepare('SELECT '.$tclass->primary_key.' FROM '.$table.' ORDER BY '.$tclass->primary_key.' LIMIT '.$step.' OFFSET '.$$offset) or die $dbh->errstr;
+  my $sth = $dbh->prepare(
+    'SELECT '.$tclass->primary_key.
+    ' FROM '.$table.
+    " WHERE payby IN ( 'CARD', 'DCRD' ) ".
+    "   AND ( length(payinfo) > 80 OR payinfo NOT LIKE '99%' )".
+    ' ORDER BY '.$tclass->primary_key.
+    ' LIMIT '.$step.
+    ' OFFSET '.$$offset
+  ) or die $dbh->errstr;
   $sth->execute() or die $sth->errstr;
   my @recnums;
   while (my $rec = $sth->fetchrow_hashref) {

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

Summary of changes:
 FS/FS/cust_main/Billing_Realtime.pm |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)