From ed0ad0478f55b4adfd1bfd22445dbc02807a5c8a Mon Sep 17 00:00:00 2001
From: Mitch Jackson <mitch@freeside.biz>
Date: Thu, 8 Nov 2018 14:12:13 -0500
Subject: [PATCH] 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
---
 FS/FS/cust_main.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index fb4b153b2..cc0e83f23 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -5429,7 +5429,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
-- 
2.11.0