From b57c35d5e18370219eda72af072383a06cca18d5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 28 Jul 2021 16:12:07 +1000
Subject: [PATCH] Fixes for locking

---
 app/Http/Controllers/PreviewController.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 0eaf8e64c738..d8c357cf8d58 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -189,10 +189,11 @@ class PreviewController extends BaseController
             $class = RecurringInvoice::class;
         }
             
-            DB::connection(config('database.default'))->beginTransaction();
 
         try {
-            
+
+            DB::connection(config('database.default'))->beginTransaction();
+
             if($request->has('entity_id')){
 
                 $entity_obj = $class::withTrashed()->whereId($this->decodePrimaryKey($request->input('entity_id')))->company()->first();
@@ -251,9 +252,13 @@ class PreviewController extends BaseController
                 ->design($template)
                 ->build();
 
+            DB::connection(config('database.default'))->rollBack();
+
             if (request()->query('html') == 'true') {
                 return $maker->getCompiledHTML;
             }
+
+
         }
         catch(\Exception $e){
 
@@ -261,7 +266,6 @@ class PreviewController extends BaseController
 
         }
 
-            DB::connection(config('database.default'))->rollBack();
 
             //if phantom js...... inject here..
             if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {