From 5033f746397c0ee7f5a8792f03bd2f766514fa54 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 15 Nov 2023 13:25:34 +1100
Subject: [PATCH] Fixes for activity insertions

---
 app/Listeners/Invoice/InvoicePaidActivity.php |  2 +-
 app/Services/Client/Statement.php             | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Listeners/Invoice/InvoicePaidActivity.php b/app/Listeners/Invoice/InvoicePaidActivity.php
index 836136aad0e0..f942b867a3ee 100644
--- a/app/Listeners/Invoice/InvoicePaidActivity.php
+++ b/app/Listeners/Invoice/InvoicePaidActivity.php
@@ -49,7 +49,7 @@ class InvoicePaidActivity implements ShouldQueue
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
-        $fields->client_id = $event->invoice->client_id;
+        $fields->client_id = $event->payment->client_id;
         $fields->company_id = $event->invoice->company_id;
         $fields->activity_type_id = Activity::PAID_INVOICE;
         $fields->payment_id = $event->payment->id;
diff --git a/app/Services/Client/Statement.php b/app/Services/Client/Statement.php
index 556baf76f84f..41a2f7127ca6 100644
--- a/app/Services/Client/Statement.php
+++ b/app/Services/Client/Statement.php
@@ -62,6 +62,7 @@ class Statement
         $html = new HtmlEngine($this->getInvitation());
 
         $variables = [];
+        $variables = $html->generateLabelsAndValues();
 
         if($this->client->getSetting('statement_design_id') != '') {
 
@@ -72,9 +73,7 @@ class Statement
 
             return $this->templateStatement($variables);
         }
-
-        $variables = $html->generateLabelsAndValues();
-
+        
         if ($this->getDesign()->is_custom) {
             $this->options['custom_partials'] = \json_decode(\json_encode($this->getDesign()->design), true);
 
@@ -154,11 +153,13 @@ class Statement
             $statement_design_id = $this->client->getSetting('statement_design_id');
         }
 
-        $template = Design::where('id', $this->decodePrimaryKey($statement_design_id))
+        $template = Design::query()
+                            ->where('id', $this->decodePrimaryKey($statement_design_id))
                             ->where('company_id', $this->client->company_id)
                             ->first();
-
-        $ts = $template->service()->build([
+        
+        $ts = $template->service();
+        $ts->build([
             'variables' => collect([$variables]),
             'invoices' => $this->getInvoices()->get(),
             'payments' => $this->options['show_payments_table'] ? $this->getPayments()->get() : collect([]),
@@ -166,6 +167,7 @@ class Statement
             'aging' => $this->options['show_aging_table'] ? $this->getAging() : collect([]),
         ]);
 
+        // $ts->overrideVariables([$variables]);
         $html = $ts->getHtml();
         
         return $this->convertToPdf($html);