[freeside-commits] branch master updated. e6163f4fbcde29824afc6166ca63b1d946d2a0df

[Ivan]

The branch, master has been updated
       via  e6163f4fbcde29824afc6166ca63b1d946d2a0df (commit)
      from  561acfcfe03d8e7057f5995c86e6d33f94679d42 (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 e6163f4fbcde29824afc6166ca63b1d946d2a0df
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Jan 10 16:12:40 2017 -0800

    style pedantry

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 5ffc84a..9a300cd 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -5372,11 +5372,14 @@ sub queueable_upgrade {
   eval "use FS::upgrade_journal";
   die $@ if $@;
 
-  # prior to 2013 (commit f16665c9) payinfo was stored in history if not encrypted,
-  # clear that out before encrypting/tokenizing anything else
+  # prior to 2013 (commit f16665c9) payinfo was stored in history if not
+  # encrypted, clear that out before encrypting/tokenizing anything else
   if (!FS::upgrade_journal->is_done('clear_payinfo_history')) {
-    foreach my $table ('cust_payby','cust_pay_pending','cust_pay','cust_pay_void','cust_refund') {
-      my $sql = 'UPDATE h_'.$table.' SET payinfo = NULL WHERE payinfo IS NOT NULL';
+    foreach my $table (qw(
+      cust_payby cust_pay_pending cust_pay cust_pay_void cust_refund
+    )) {
+      my $sql =
+        'UPDATE h_'.$table.' SET payinfo = NULL WHERE payinfo IS NOT NULL';
       my $sth = dbh->prepare($sql) or die dbh->errstr;
       $sth->execute or die $sth->errstr;
     }
@@ -5384,7 +5387,9 @@ sub queueable_upgrade {
   }
 
   # encrypt old records
-  if ($conf->exists('encryption') && !FS::upgrade_journal->is_done('encryption_check')) {
+  if ( $conf->exists('encryption')
+         && ! FS::upgrade_journal->is_done('encryption_check')
+  ) {
 
     # allow replacement of closed cust_pay/cust_refund records
     local $FS::payinfo_Mixin::allow_closed_replace = 1;
@@ -5396,11 +5401,15 @@ sub queueable_upgrade {
     local $FS::UID::AutoCommit = 1;
 
     # encrypt what's there
-    foreach my $table ('cust_payby','cust_pay_pending','cust_pay','cust_pay_void','cust_refund') {
+    foreach my $table (qw(
+      cust_payby cust_pay_pending cust_pay cust_pay_void cust_refund
+    )) {
       my $tclass = 'FS::'.$table;
       my $lastrecnum = 0;
       my @recnums = ();
-      while (my $recnum = _upgrade_next_recnum(dbh,$table,\$lastrecnum,\@recnums)) {
+      while (
+        my $recnum = _upgrade_next_recnum(dbh,$table,\$lastrecnum,\@recnums)
+      ) {
         my $record = $tclass->by_key($recnum);
         next unless $record; # small chance it's been deleted, that's ok
         next unless grep { $record->payby eq $_ } @FS::Record::encrypt_payby;

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

Summary of changes:
 FS/FS/cust_main.pm |   23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)