From da7eb3b4c2326e07626e73166cbd221b2cd2f485 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 8 Jan 2021 12:44:31 +1100
Subject: [PATCH] Fixes for invoice creation from recurring where balance
 doubles

---
 app/Factory/RecurringInvoiceToInvoiceFactory.php | 2 +-
 app/Jobs/Entity/CreateEntityPdf.php              | 8 ++++++--
 app/Jobs/RecurringInvoice/SendRecurring.php      | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Factory/RecurringInvoiceToInvoiceFactory.php b/app/Factory/RecurringInvoiceToInvoiceFactory.php
index 8e9057ddee82..6bcc52add5b8 100644
--- a/app/Factory/RecurringInvoiceToInvoiceFactory.php
+++ b/app/Factory/RecurringInvoiceToInvoiceFactory.php
@@ -43,7 +43,7 @@ class RecurringInvoiceToInvoiceFactory
         $invoice->custom_value3 = $recurring_invoice->custom_value3;
         $invoice->custom_value4 = $recurring_invoice->custom_value4;
         $invoice->amount = $recurring_invoice->amount;
-        $invoice->balance = $recurring_invoice->balance;
+        // $invoice->balance = $recurring_invoice->balance;
         $invoice->user_id = $recurring_invoice->user_id;
         $invoice->assigned_user_id = $recurring_invoice->assigned_user_id;
         $invoice->company_id = $recurring_invoice->company_id;
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index f7d8cc7cce2a..a21fc5d63c4f 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -168,8 +168,12 @@ class CreateEntityPdf implements ShouldQueue
         return $file_path;
     }
 
-    public function failed(\Exception $exception)
+    public function failed($e)
     {
-        nlog("help!");
+
     }
+    // public function failed(\Exception $exception)
+    // {
+    //     nlog("help!");
+    // }
 }
diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php
index 2418bf41296e..ea75bd00d5a9 100644
--- a/app/Jobs/RecurringInvoice/SendRecurring.php
+++ b/app/Jobs/RecurringInvoice/SendRecurring.php
@@ -58,7 +58,7 @@ class SendRecurring implements ShouldQueue
         $invoice = RecurringInvoiceToInvoiceFactory::create($this->recurring_invoice, $this->recurring_invoice->client);
 
         $invoice->date = now()->format('Y-m-d');
-
+        
         $invoice = $invoice->service()
                            ->markSent()
                            ->applyNumber()