From 8577566393ef55f8a73b52a0ac86dc6855766a1b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 31 Mar 2023 10:01:25 +1100 Subject: [PATCH] Updates for activities --- app/Listeners/Invoice/InvoiceEmailActivity.php | 4 ++-- app/Listeners/Invoice/InvoiceReminderEmailActivity.php | 7 ++++--- app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php | 6 +++--- app/Listeners/Quote/QuoteEmailActivity.php | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Listeners/Invoice/InvoiceEmailActivity.php b/app/Listeners/Invoice/InvoiceEmailActivity.php index 4d3df882c0fc..5969ef97877b 100644 --- a/app/Listeners/Invoice/InvoiceEmailActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailActivity.php @@ -50,10 +50,10 @@ class InvoiceEmailActivity implements ShouldQueue $fields->user_id = $user_id; $fields->invoice_id = $event->invitation->invoice->id; $fields->company_id = $event->invitation->invoice->company_id; - $fields->client_contact_id = $event->invitation->invoice->client_contact_id; + $fields->client_contact_id = $event->invitation->client_contact_id; $fields->client_id = $event->invitation->invoice->client_id; $fields->activity_type_id = Activity::EMAIL_INVOICE; - $this->activity_repo->save($fields, $event->invitation->invoice, $event->event_vars); + $this->activity_repo->save($fields, $event->invitation, $event->event_vars); } } diff --git a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php index 85a235db3470..1cf801afec62 100644 --- a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php +++ b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php @@ -47,11 +47,12 @@ class InvoiceReminderEmailActivity implements ShouldQueue $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id; $fields->user_id = $user_id; - $fields->invoice_id = $event->invitation->invoice->id; - $fields->company_id = $event->invitation->invoice->company_id; + $fields->invoice_id = $event->invitation->invoice_id; + $fields->company_id = $event->invitation->company_id; $fields->client_contact_id = $event->invitation->client_contact_id; + $fields->client_id = $event->invitation->invoice->client_id; $fields->activity_type_id = $event->reminder; - $this->activity_repo->save($fields, $event->invitation->invoice, $event->event_vars); + $this->activity_repo->save($fields, $event->invitation, $event->event_vars); } } diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php index 099ec3bad33e..e10dd2240305 100644 --- a/app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php +++ b/app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php @@ -49,11 +49,11 @@ class PurchaseOrderEmailActivity implements ShouldQueue $fields->user_id = $user_id; $fields->purchase_order_id = $event->invitation->purchase_order->id; - $fields->company_id = $event->invitation->purchase_order->company_id; - $fields->vendor_contact_id = $event->invitation->purchase_order->vendor_contact_id; + $fields->company_id = $event->invitation->company_id; + $fields->vendor_contact_id = $event->invitation->vendor_contact_id; $fields->vendor_id = $event->invitation->purchase_order->vendor_id; $fields->activity_type_id = Activity::EMAIL_PURCHASE_ORDER; - $this->activity_repo->save($fields, $event->invitation->purchase_order, $event->event_vars); + $this->activity_repo->save($fields, $event->invitation, $event->event_vars); } } diff --git a/app/Listeners/Quote/QuoteEmailActivity.php b/app/Listeners/Quote/QuoteEmailActivity.php index cf543697cfe8..7ef8354553a4 100644 --- a/app/Listeners/Quote/QuoteEmailActivity.php +++ b/app/Listeners/Quote/QuoteEmailActivity.php @@ -56,6 +56,6 @@ class QuoteEmailActivity implements ShouldQueue $fields->client_id = $event->invitation->quote->client_id; $fields->activity_type_id = Activity::EMAIL_QUOTE; - $this->activity_repo->save($fields, $event->invitation->quote, $event->event_vars); + $this->activity_repo->save($fields, $event->invitation, $event->event_vars); } }