[freeside-commits] branch master updated. 43ae6a5c70c3efdf51cebb259e1c37c3111ff0c0

[Ivan]

The branch, master has been updated
       via  43ae6a5c70c3efdf51cebb259e1c37c3111ff0c0 (commit)
      from  e4ceced95d8b5906d1589ffe7b5f778b6477f31e (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 43ae6a5c70c3efdf51cebb259e1c37c3111ff0c0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue May 30 14:56:39 2017 -0700

    error on batch insert is returned to user, not fatal, RT#75998

diff --git a/FS/FS/cust_main/Billing_Batch.pm b/FS/FS/cust_main/Billing_Batch.pm
index d8ae3b4..38d100e 100644
--- a/FS/FS/cust_main/Billing_Batch.pm
+++ b/FS/FS/cust_main/Billing_Batch.pm
@@ -89,7 +89,7 @@ sub batch_card {
   #this needs to handle mysql as well as Pg, like svc_acct.pm
   #(make it into a common function if folks need to do batching with mysql)
   $dbh->do("LOCK TABLE pay_batch IN SHARE ROW EXCLUSIVE MODE")
-    or return "Cannot lock pay_batch: " . $dbh->errstr;
+    or die "Cannot lock pay_batch: " . $dbh->errstr;
 
   my %pay_batch = (
     'status' => 'O',
@@ -157,7 +157,8 @@ sub batch_card {
 
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
-    die $error;
+    #die $error;
+    return $error; # e.g. "Illegal zip" ala RT#75998
   }
 
   my $unapplied =   $self->total_unapplied_credits

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

Summary of changes:
 FS/FS/cust_main/Billing_Batch.pm |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)