From 55839d66ed9b370e5f016b230e003aee84266f8d Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 5 Feb 2021 16:02:38 +1100
Subject: [PATCH] Auto archive invoice - Mark Paid

---
 app/Jobs/Invoice/InvoiceWorkflowSettings.php | 5 +++--
 app/Services/Invoice/MarkPaid.php            | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/Invoice/InvoiceWorkflowSettings.php b/app/Jobs/Invoice/InvoiceWorkflowSettings.php
index 579a7620f3..593ffbb378 100644
--- a/app/Jobs/Invoice/InvoiceWorkflowSettings.php
+++ b/app/Jobs/Invoice/InvoiceWorkflowSettings.php
@@ -35,10 +35,9 @@ class InvoiceWorkflowSettings implements ShouldQueue
      * @param Invoice $invoice
      * @param Client|null $client
      */
-    public function __construct(Invoice $invoice, Client $client = null)
+    public function __construct(Invoice $invoice)
     {
         $this->invoice = $invoice;
-        $this->client = $client ?? $invoice->client;
         $this->base_repository = new BaseRepository();
     }
 
@@ -49,6 +48,8 @@ class InvoiceWorkflowSettings implements ShouldQueue
      */
     public function handle()
     {
+        $this->client = $this->invoice->client;
+
         if ($this->client->getSetting('auto_archive_invoice')) {
             /* Throws: Payment amount xxx does not match invoice totals. */
             $this->base_repository->archive($this->invoice);
diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php
index 55c7e18016..e3f2c1c5bb 100644
--- a/app/Services/Invoice/MarkPaid.php
+++ b/app/Services/Invoice/MarkPaid.php
@@ -14,6 +14,7 @@ namespace App\Services\Invoice;
 use App\Events\Invoice\InvoiceWasPaid;
 use App\Events\Payment\PaymentWasCreated;
 use App\Factory\PaymentFactory;
+use App\Jobs\Invoice\InvoiceWorkflowSettings;
 use App\Jobs\Payment\EmailPayment;
 use App\Models\Invoice;
 use App\Models\Payment;
@@ -90,6 +91,8 @@ class MarkPaid extends AbstractService
             ->updatePaidToDate($payment->amount)
             ->save();
 
+        InvoiceWorkflowSettings::dispatchNow($this->invoice);
+
         return $this->invoice;
     }
 }