[freeside-commits] branch FREESIDE_4_BRANCH updated. 67afbc5ac97546dc9ce9163a5ff6596a9a5213be

[Mitch Jackson]

The branch, FREESIDE_4_BRANCH has been updated
       via  67afbc5ac97546dc9ce9163a5ff6596a9a5213be (commit)
      from  ae27d43bf9b2bbd8126e4fe1f7c38bba2c4a0407 (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 67afbc5ac97546dc9ce9163a5ff6596a9a5213be
Author: Mitch Jackson <mitch at freeside.biz>
Date:   Thu Nov 8 14:12:13 2018 -0500

    RT# 81608 Improved error msg for Bill Now
    
    Update Bill Now to throw an appropriate error
    message to user if they try to use Bill Now
    on a customer with pending package expiration

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index ae1c46ad5..afc21a97f 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -5776,7 +5776,13 @@ sub process_bill_and_collect {
   $param->{'fatal'} = 1; # runs from job queue, will be caught
   $param->{'retry'} = 1;
 
-  $cust_main->bill_and_collect( %$param );
+  local $@;
+  eval { $cust_main->bill_and_collect( %$param) };
+  if ( $@ ) {
+    die $@ =~ /cancel_pkgs cannot be run inside a transaction/
+      ? "Bill Now unavailable for customer with pending package expiration\n"
+      : $@;
+  }
 }
 
 =item pending_invoice_count

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

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