[freeside-commits] branch FREESIDE_3_BRANCH updated. 01c2f31cf80bc89cc28d0ac7b99e3ab731431ff2

Jonathan Prykop jonathan at 420.am
Mon Jan 30 14:45:02 PST 2017


The branch, FREESIDE_3_BRANCH has been updated
       via  01c2f31cf80bc89cc28d0ac7b99e3ab731431ff2 (commit)
       via  5a72115c1e8d32028cb4e611ecfbd4b2c05817d6 (commit)
      from  5b1a45b996760ef7ae328674f85dd00e3f0adb07 (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 01c2f31cf80bc89cc28d0ac7b99e3ab731431ff2
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Mon Jan 30 16:44:02 2017 -0600

    74355: freeside-upgrade error N/A (tokenized) [payinfo_check return bug fix, already on 71513 project branch]

diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index bca0878..b30ea35 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -238,6 +238,7 @@ sub payinfo_check {
     }
   }
 
+  return '';
 }
 
 =item payby_payinfo_pretty [ LOCALE ]

commit 5a72115c1e8d32028cb4e611ecfbd4b2c05817d6
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Mon Jan 30 16:31:46 2017 -0600

    74355: freeside-upgrade error N/A (tokenized) [better error handling for encryption upgrade failures]

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ddddb24..72bc10f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -5795,7 +5795,7 @@ sub queueable_upgrade {
         local($import) = 1;#prevent automatic geocoding (need its own variable?)
 
         my $error = $record->replace;
-        die $error if $error;
+        die "Error replacing $table ".$record->get($record->primary_key).": $error" if $error;
       }
     }
 

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

Summary of changes:
 FS/FS/cust_main.pm     |    2 +-
 FS/FS/payinfo_Mixin.pm |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)




More information about the freeside-commits mailing list