From 815c4a9660d14d5da2af0687b0f5c3035c683291 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 28 Jul 2021 12:16:54 +1000 Subject: [PATCH] Fixes for actioning user in activity logs" --- app/Listeners/Activity/CreatedSubscriptionActivity.php | 2 +- app/Listeners/Activity/CreatedTaskActivity.php | 2 +- app/Listeners/Activity/CreatedVendorActivity.php | 2 +- app/Listeners/Activity/CreditArchivedActivity.php | 2 +- app/Listeners/Activity/DeleteClientActivity.php | 2 +- app/Listeners/Activity/DeleteCreditActivity.php | 2 +- app/Listeners/Activity/PaymentDeletedActivity.php | 2 +- app/Listeners/Activity/PaymentRefundedActivity.php | 2 +- app/Listeners/Activity/PaymentVoidedActivity.php | 2 +- app/Listeners/Activity/QuoteUpdatedActivity.php | 2 +- app/Listeners/Activity/SubscriptionArchivedActivity.php | 2 +- app/Listeners/Activity/SubscriptionDeletedActivity.php | 2 +- app/Listeners/Activity/SubscriptionRestoredActivity.php | 2 +- app/Listeners/Activity/SubscriptionUpdatedActivity.php | 2 +- app/Listeners/Activity/TaskArchivedActivity.php | 2 +- app/Listeners/Activity/TaskRestoredActivity.php | 2 +- app/Listeners/Activity/TaskUpdatedActivity.php | 2 +- app/Listeners/Activity/UpdatedCreditActivity.php | 2 +- app/Listeners/Activity/VendorArchivedActivity.php | 2 +- app/Listeners/Activity/VendorDeletedActivity.php | 2 +- app/Listeners/Activity/VendorRestoredActivity.php | 2 +- app/Listeners/Credit/CreditRestoredActivity.php | 4 +++- app/Listeners/Credit/CreditViewedActivity.php | 4 +++- app/Listeners/Invoice/CreateInvoiceActivity.php | 4 +++- app/Listeners/Invoice/InvoiceArchivedActivity.php | 5 ++++- app/Listeners/Invoice/InvoiceCancelledActivity.php | 4 +++- app/Listeners/Invoice/InvoiceDeletedActivity.php | 4 +++- app/Listeners/Invoice/InvoiceEmailActivity.php | 4 +++- app/Listeners/Invoice/InvoiceEmailFailedActivity.php | 5 ++++- app/Listeners/Invoice/InvoicePaidActivity.php | 4 +++- app/Listeners/Invoice/InvoiceReminderEmailActivity.php | 4 +++- app/Listeners/Invoice/InvoiceRestoredActivity.php | 4 +++- app/Listeners/Invoice/InvoiceReversedActivity.php | 4 +++- app/Listeners/Invoice/InvoiceViewedActivity.php | 5 ++++- app/Listeners/Invoice/UpdateInvoiceActivity.php | 4 +++- app/Listeners/Payment/PaymentRestoredActivity.php | 4 +++- app/Listeners/Quote/QuoteApprovedActivity.php | 4 +++- app/Listeners/Quote/QuoteArchivedActivity.php | 4 +++- app/Listeners/Quote/QuoteDeletedActivity.php | 4 +++- app/Listeners/Quote/QuoteEmailActivity.php | 6 +++++- app/Listeners/Quote/QuoteRestoredActivity.php | 5 ++++- .../RecurringInvoice/CreateRecurringInvoiceActivity.php | 4 +++- .../RecurringInvoice/RecurringInvoiceArchivedActivity.php | 3 ++- .../RecurringInvoice/RecurringInvoiceDeletedActivity.php | 3 ++- .../RecurringInvoice/RecurringInvoiceRestoredActivity.php | 3 ++- .../RecurringInvoice/UpdateRecurringInvoiceActivity.php | 3 ++- app/Listeners/User/ArchivedUserActivity.php | 4 +++- app/Listeners/User/CreatedUserActivity.php | 4 +++- app/Listeners/User/DeletedUserActivity.php | 5 ++++- app/Listeners/User/RestoredUserActivity.php | 3 ++- app/Listeners/User/UpdatedUserActivity.php | 4 +++- 51 files changed, 113 insertions(+), 51 deletions(-) diff --git a/app/Listeners/Activity/CreatedSubscriptionActivity.php b/app/Listeners/Activity/CreatedSubscriptionActivity.php index ccf130e07607..4f27b49cd2b3 100644 --- a/app/Listeners/Activity/CreatedSubscriptionActivity.php +++ b/app/Listeners/Activity/CreatedSubscriptionActivity.php @@ -43,7 +43,7 @@ class CreatedSubscriptionActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; $fields->subscription_id = $event->subscription->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/CreatedTaskActivity.php b/app/Listeners/Activity/CreatedTaskActivity.php index bc16d11464f4..efb218771bb5 100644 --- a/app/Listeners/Activity/CreatedTaskActivity.php +++ b/app/Listeners/Activity/CreatedTaskActivity.php @@ -43,7 +43,7 @@ class CreatedTaskActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id; $fields->task_id = $event->task->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/CreatedVendorActivity.php b/app/Listeners/Activity/CreatedVendorActivity.php index fc3aae6f7128..6fe33261b60c 100644 --- a/app/Listeners/Activity/CreatedVendorActivity.php +++ b/app/Listeners/Activity/CreatedVendorActivity.php @@ -43,7 +43,7 @@ class CreatedVendorActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id; $fields->vendor_id = $event->vendor->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/CreditArchivedActivity.php b/app/Listeners/Activity/CreditArchivedActivity.php index 55d3f0734990..23f1706e84a5 100644 --- a/app/Listeners/Activity/CreditArchivedActivity.php +++ b/app/Listeners/Activity/CreditArchivedActivity.php @@ -43,7 +43,7 @@ class CreditArchivedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id; $fields->payment_id = $event->credit->id; $fields->client_id = $event->credit->client_id; diff --git a/app/Listeners/Activity/DeleteClientActivity.php b/app/Listeners/Activity/DeleteClientActivity.php index 1762fc443c45..ff61a7f7e691 100644 --- a/app/Listeners/Activity/DeleteClientActivity.php +++ b/app/Listeners/Activity/DeleteClientActivity.php @@ -43,7 +43,7 @@ class DeleteClientActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->client->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->client->user_id; $fields->client_id = $event->client->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/DeleteCreditActivity.php b/app/Listeners/Activity/DeleteCreditActivity.php index 3ba0a6da33d9..cafec4816931 100644 --- a/app/Listeners/Activity/DeleteCreditActivity.php +++ b/app/Listeners/Activity/DeleteCreditActivity.php @@ -43,7 +43,7 @@ class DeleteCreditActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id; $fields->client_id = $event->credit->client_id; $fields->credit_id = $event->credit->id; diff --git a/app/Listeners/Activity/PaymentDeletedActivity.php b/app/Listeners/Activity/PaymentDeletedActivity.php index 07212581a90c..f1bfb415f40f 100644 --- a/app/Listeners/Activity/PaymentDeletedActivity.php +++ b/app/Listeners/Activity/PaymentDeletedActivity.php @@ -43,7 +43,7 @@ class PaymentDeletedActivity implements ShouldQueue $payment = $event->payment; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id; $invoices = $payment->invoices; diff --git a/app/Listeners/Activity/PaymentRefundedActivity.php b/app/Listeners/Activity/PaymentRefundedActivity.php index 18c7013f2060..118ab8f82fef 100644 --- a/app/Listeners/Activity/PaymentRefundedActivity.php +++ b/app/Listeners/Activity/PaymentRefundedActivity.php @@ -43,7 +43,7 @@ class PaymentRefundedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id; $fields->client_id = $event->payment->id; $fields->client_id = $event->payment->client_id; diff --git a/app/Listeners/Activity/PaymentVoidedActivity.php b/app/Listeners/Activity/PaymentVoidedActivity.php index 852206dc5f28..061350dc0a05 100644 --- a/app/Listeners/Activity/PaymentVoidedActivity.php +++ b/app/Listeners/Activity/PaymentVoidedActivity.php @@ -43,7 +43,7 @@ class PaymentVoidedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id; $fields->client_id = $event->payment->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/QuoteUpdatedActivity.php b/app/Listeners/Activity/QuoteUpdatedActivity.php index e20e07b73ee7..3b3ea8e3f5aa 100644 --- a/app/Listeners/Activity/QuoteUpdatedActivity.php +++ b/app/Listeners/Activity/QuoteUpdatedActivity.php @@ -45,7 +45,7 @@ class QuoteUpdatedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id; $fields->quote_id = $quote->id; $fields->client_id = $quote->client_id; diff --git a/app/Listeners/Activity/SubscriptionArchivedActivity.php b/app/Listeners/Activity/SubscriptionArchivedActivity.php index 0412cecc16fd..c8180ed522b8 100644 --- a/app/Listeners/Activity/SubscriptionArchivedActivity.php +++ b/app/Listeners/Activity/SubscriptionArchivedActivity.php @@ -45,7 +45,7 @@ class SubscriptionArchivedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; $fields->subscription_id = $subscription->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/SubscriptionDeletedActivity.php b/app/Listeners/Activity/SubscriptionDeletedActivity.php index 93e66265b78a..d9c4f7531b8e 100644 --- a/app/Listeners/Activity/SubscriptionDeletedActivity.php +++ b/app/Listeners/Activity/SubscriptionDeletedActivity.php @@ -43,7 +43,7 @@ class SubscriptionDeletedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; $fields->subscription_id = $event->subscription->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/SubscriptionRestoredActivity.php b/app/Listeners/Activity/SubscriptionRestoredActivity.php index baea7d77f990..b6cafe96413a 100644 --- a/app/Listeners/Activity/SubscriptionRestoredActivity.php +++ b/app/Listeners/Activity/SubscriptionRestoredActivity.php @@ -43,7 +43,7 @@ class SubscriptionRestoredActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; $fields->subscription_id = $event->subscription->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/SubscriptionUpdatedActivity.php b/app/Listeners/Activity/SubscriptionUpdatedActivity.php index e7999604898c..b24e7e3b2a34 100644 --- a/app/Listeners/Activity/SubscriptionUpdatedActivity.php +++ b/app/Listeners/Activity/SubscriptionUpdatedActivity.php @@ -45,7 +45,7 @@ class SubscriptionUpdatedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->subscription->user_id; $fields->subscription_id = $subscription->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/TaskArchivedActivity.php b/app/Listeners/Activity/TaskArchivedActivity.php index 7cdda3c773fc..da544e1ed9ab 100644 --- a/app/Listeners/Activity/TaskArchivedActivity.php +++ b/app/Listeners/Activity/TaskArchivedActivity.php @@ -45,7 +45,7 @@ class TaskArchivedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id; $fields->task_id = $task->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/TaskRestoredActivity.php b/app/Listeners/Activity/TaskRestoredActivity.php index c3b4aa12cb7c..317203ecaf55 100644 --- a/app/Listeners/Activity/TaskRestoredActivity.php +++ b/app/Listeners/Activity/TaskRestoredActivity.php @@ -43,7 +43,7 @@ class TaskRestoredActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id; $fields->task_id = $event->task->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/TaskUpdatedActivity.php b/app/Listeners/Activity/TaskUpdatedActivity.php index 7ec307f0bc2c..e125a65272f4 100644 --- a/app/Listeners/Activity/TaskUpdatedActivity.php +++ b/app/Listeners/Activity/TaskUpdatedActivity.php @@ -45,7 +45,7 @@ class TaskUpdatedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->task->user_id; $fields->task_id = $task->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/UpdatedCreditActivity.php b/app/Listeners/Activity/UpdatedCreditActivity.php index 5592f01498d9..494017e59dd6 100644 --- a/app/Listeners/Activity/UpdatedCreditActivity.php +++ b/app/Listeners/Activity/UpdatedCreditActivity.php @@ -43,7 +43,7 @@ class UpdatedCreditActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id; $fields->credit_id = $event->credit->id; $fields->client_id = $event->credit->client_id; diff --git a/app/Listeners/Activity/VendorArchivedActivity.php b/app/Listeners/Activity/VendorArchivedActivity.php index 8ce74353af9c..e6e09613f7b8 100644 --- a/app/Listeners/Activity/VendorArchivedActivity.php +++ b/app/Listeners/Activity/VendorArchivedActivity.php @@ -45,7 +45,7 @@ class VendorArchivedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id; $fields->vendor_id = $vendor->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/VendorDeletedActivity.php b/app/Listeners/Activity/VendorDeletedActivity.php index 5f64403a38ec..b9c8c97236b8 100644 --- a/app/Listeners/Activity/VendorDeletedActivity.php +++ b/app/Listeners/Activity/VendorDeletedActivity.php @@ -43,7 +43,7 @@ class VendorDeletedActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id; $fields->vendor_id = $event->vendor->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/VendorRestoredActivity.php b/app/Listeners/Activity/VendorRestoredActivity.php index 742ae9ed4b5c..796ea21fb2e4 100644 --- a/app/Listeners/Activity/VendorRestoredActivity.php +++ b/app/Listeners/Activity/VendorRestoredActivity.php @@ -43,7 +43,7 @@ class VendorRestoredActivity implements ShouldQueue $fields = new stdClass; -$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->vendor->user_id; $fields->vendor_id = $event->vendor->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Credit/CreditRestoredActivity.php b/app/Listeners/Credit/CreditRestoredActivity.php index 45a08aa8b181..ab2d6b0c19ee 100644 --- a/app/Listeners/Credit/CreditRestoredActivity.php +++ b/app/Listeners/Credit/CreditRestoredActivity.php @@ -43,9 +43,11 @@ class CreditRestoredActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->credit->user_id; + $fields->credit_id = $event->credit->id; $fields->client_id = $event->credit->client_id; - $fields->user_id = $event->credit->user_id; + $fields->user_id = $user_id; $fields->company_id = $event->credit->company_id; $fields->activity_type_id = Activity::RESTORE_CREDIT; diff --git a/app/Listeners/Credit/CreditViewedActivity.php b/app/Listeners/Credit/CreditViewedActivity.php index bf62679aa471..76bb71915d51 100644 --- a/app/Listeners/Credit/CreditViewedActivity.php +++ b/app/Listeners/Credit/CreditViewedActivity.php @@ -43,7 +43,9 @@ class CreditViewedActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $event->invitation->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->user_id; + + $fields->user_id = $user_id; $fields->company_id = $event->invitation->company_id; $fields->activity_type_id = Activity::VIEW_CREDIT; $fields->client_id = $event->invitation->credit->client_id; diff --git a/app/Listeners/Invoice/CreateInvoiceActivity.php b/app/Listeners/Invoice/CreateInvoiceActivity.php index 8bab3659cbfd..991a095f3118 100644 --- a/app/Listeners/Invoice/CreateInvoiceActivity.php +++ b/app/Listeners/Invoice/CreateInvoiceActivity.php @@ -43,9 +43,11 @@ class CreateInvoiceActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id; + + $fields->user_id = $user_id; $fields->invoice_id = $event->invoice->id; $fields->client_id = $event->invoice->client_id; - $fields->user_id = $event->invoice->user_id; $fields->company_id = $event->invoice->company_id; $fields->activity_type_id = Activity::CREATE_INVOICE; diff --git a/app/Listeners/Invoice/InvoiceArchivedActivity.php b/app/Listeners/Invoice/InvoiceArchivedActivity.php index 645dccad312e..ff4800f41c4e 100644 --- a/app/Listeners/Invoice/InvoiceArchivedActivity.php +++ b/app/Listeners/Invoice/InvoiceArchivedActivity.php @@ -45,9 +45,12 @@ class InvoiceArchivedActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id; + + $fields->user_id = $user_id; + $fields->invoice_id = $event->invoice->id; $fields->client_id = $event->invoice->client_id; - $fields->user_id = $event->invoice->user_id; $fields->company_id = $event->invoice->company_id; $fields->activity_type_id = Activity::ARCHIVE_INVOICE; diff --git a/app/Listeners/Invoice/InvoiceCancelledActivity.php b/app/Listeners/Invoice/InvoiceCancelledActivity.php index 3f9ec908e5a2..80f1f55c7a11 100644 --- a/app/Listeners/Invoice/InvoiceCancelledActivity.php +++ b/app/Listeners/Invoice/InvoiceCancelledActivity.php @@ -43,9 +43,11 @@ class InvoiceCancelledActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id; + + $fields->user_id = $user_id; $fields->invoice_id = $event->invoice->id; $fields->client_id = $event->invoice->client_id; - $fields->user_id = $event->invoice->user_id; $fields->company_id = $event->invoice->company_id; $fields->activity_type_id = Activity::CANCELLED_INVOICE; diff --git a/app/Listeners/Invoice/InvoiceDeletedActivity.php b/app/Listeners/Invoice/InvoiceDeletedActivity.php index 5b027021d01c..f7bed8b89232 100644 --- a/app/Listeners/Invoice/InvoiceDeletedActivity.php +++ b/app/Listeners/Invoice/InvoiceDeletedActivity.php @@ -43,9 +43,11 @@ class InvoiceDeletedActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id; + + $fields->user_id = $user_id; $fields->invoice_id = $event->invoice->id; $fields->client_id = $event->invoice->client_id; - $fields->user_id = $event->invoice->user_id; $fields->company_id = $event->invoice->company_id; $fields->activity_type_id = Activity::DELETE_INVOICE; diff --git a/app/Listeners/Invoice/InvoiceEmailActivity.php b/app/Listeners/Invoice/InvoiceEmailActivity.php index dde433364c0e..7515709a2e1d 100644 --- a/app/Listeners/Invoice/InvoiceEmailActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailActivity.php @@ -43,8 +43,10 @@ class InvoiceEmailActivity implements ShouldQueue $fields = new stdClass; + $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->user_id = $event->invitation->invoice->user_id; $fields->company_id = $event->invitation->invoice->company_id; $fields->client_contact_id = $event->invitation->invoice->client_contact_id; $fields->client_id = $event->invitation->invoice->client_id; diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php index 653b66f79402..530c4929e146 100644 --- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php @@ -48,9 +48,12 @@ class InvoiceEmailFailedActivity implements ShouldQueue $fields = new stdClass; + $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->client_id = $event->invitation->invoice->client_id; - $fields->user_id = $event->invitation->invoice->user_id; $fields->company_id = $event->invitation->invoice->company_id; $fields->activity_type_id = Activity::EMAIL_INVOICE_FAILED; $fields->notes = $event->message; diff --git a/app/Listeners/Invoice/InvoicePaidActivity.php b/app/Listeners/Invoice/InvoicePaidActivity.php index 65351ff34c6b..c1b9e6878476 100644 --- a/app/Listeners/Invoice/InvoicePaidActivity.php +++ b/app/Listeners/Invoice/InvoicePaidActivity.php @@ -44,8 +44,10 @@ class InvoicePaidActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id; + + $fields->user_id = $user_id; $fields->invoice_id = $event->invoice->id; - $fields->user_id = $event->invoice->user_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/Listeners/Invoice/InvoiceReminderEmailActivity.php b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php index 3da40c0970df..aba48ce03c19 100644 --- a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php +++ b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php @@ -42,8 +42,10 @@ class InvoiceReminderEmailActivity implements ShouldQueue $fields = new stdClass; + $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->user_id = $event->invitation->invoice->user_id; $fields->company_id = $event->invitation->invoice->company_id; $fields->client_contact_id = $event->invitation->invoice->client_contact_id; $fields->activity_type_id = $event->reminder; diff --git a/app/Listeners/Invoice/InvoiceRestoredActivity.php b/app/Listeners/Invoice/InvoiceRestoredActivity.php index d6c85ad4e14e..b0671f45f06d 100644 --- a/app/Listeners/Invoice/InvoiceRestoredActivity.php +++ b/app/Listeners/Invoice/InvoiceRestoredActivity.php @@ -43,9 +43,11 @@ class InvoiceRestoredActivity implements ShouldQueue $fields = new stdClass; + $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->invoice->id; $fields->client_id = $event->invoice->client_id; - $fields->user_id = $event->invoice->user_id; $fields->company_id = $event->invoice->company_id; $fields->activity_type_id = Activity::RESTORE_INVOICE; diff --git a/app/Listeners/Invoice/InvoiceReversedActivity.php b/app/Listeners/Invoice/InvoiceReversedActivity.php index 4f4f4433bd13..b7b26ba33e17 100644 --- a/app/Listeners/Invoice/InvoiceReversedActivity.php +++ b/app/Listeners/Invoice/InvoiceReversedActivity.php @@ -43,9 +43,11 @@ class InvoiceReversedActivity implements ShouldQueue $fields = new stdClass; + $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->invoice->id; $fields->client_id = $event->invoice->client_id; - $fields->user_id = $event->invoice->user_id; $fields->company_id = $event->invoice->company_id; $fields->activity_type_id = Activity::REVERSED_INVOICE; diff --git a/app/Listeners/Invoice/InvoiceViewedActivity.php b/app/Listeners/Invoice/InvoiceViewedActivity.php index c0fd2cc7f1c9..40b6c3ecb335 100644 --- a/app/Listeners/Invoice/InvoiceViewedActivity.php +++ b/app/Listeners/Invoice/InvoiceViewedActivity.php @@ -43,7 +43,10 @@ class InvoiceViewedActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $event->invitation->user_id; + + $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->company_id = $event->invitation->company_id; $fields->activity_type_id = Activity::VIEW_INVOICE; $fields->client_id = $event->invitation->invoice->client_id; diff --git a/app/Listeners/Invoice/UpdateInvoiceActivity.php b/app/Listeners/Invoice/UpdateInvoiceActivity.php index 3cd5b2bdef0f..232dc69b0fd3 100644 --- a/app/Listeners/Invoice/UpdateInvoiceActivity.php +++ b/app/Listeners/Invoice/UpdateInvoiceActivity.php @@ -43,8 +43,10 @@ class UpdateInvoiceActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invoice->user_id; + + $fields->user_id = $user_id; $fields->client_id = $event->invoice->client_id; - $fields->user_id = $event->invoice->user_id; $fields->company_id = $event->invoice->company_id; $fields->activity_type_id = Activity::UPDATE_INVOICE; $fields->invoice_id = $event->invoice->id; diff --git a/app/Listeners/Payment/PaymentRestoredActivity.php b/app/Listeners/Payment/PaymentRestoredActivity.php index 0747c0e9fa68..5d89d7a8b74b 100644 --- a/app/Listeners/Payment/PaymentRestoredActivity.php +++ b/app/Listeners/Payment/PaymentRestoredActivity.php @@ -43,9 +43,11 @@ class PaymentRestoredActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id; + + $fields->user_id = $user_id; $fields->payment_id = $event->payment->id; $fields->client_id = $event->payment->client_id; - $fields->user_id = $event->payment->user_id; $fields->company_id = $event->payment->company_id; $fields->activity_type_id = Activity::RESTORE_PAYMENT; diff --git a/app/Listeners/Quote/QuoteApprovedActivity.php b/app/Listeners/Quote/QuoteApprovedActivity.php index 2c84b50e2805..2e0c7c79f5a9 100644 --- a/app/Listeners/Quote/QuoteApprovedActivity.php +++ b/app/Listeners/Quote/QuoteApprovedActivity.php @@ -43,9 +43,11 @@ class QuoteApprovedActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id; + + $fields->user_id = $user_id; $fields->quote_id = $event->quote->id; $fields->client_id = $event->quote->client_id; - $fields->user_id = $event->quote->user_id; $fields->client_contact_id = $event->contact->id; $fields->company_id = $event->quote->company_id; $fields->activity_type_id = Activity::APPROVE_QUOTE; diff --git a/app/Listeners/Quote/QuoteArchivedActivity.php b/app/Listeners/Quote/QuoteArchivedActivity.php index 55e211bd903b..27add2bbad15 100644 --- a/app/Listeners/Quote/QuoteArchivedActivity.php +++ b/app/Listeners/Quote/QuoteArchivedActivity.php @@ -43,9 +43,11 @@ class QuoteArchivedActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id; + + $fields->user_id = $user_id; $fields->quote_id = $event->quote->id; $fields->client_id = $event->quote->client_id; - $fields->user_id = $event->quote->user_id; $fields->company_id = $event->quote->company_id; $fields->activity_type_id = Activity::ARCHIVE_QUOTE; diff --git a/app/Listeners/Quote/QuoteDeletedActivity.php b/app/Listeners/Quote/QuoteDeletedActivity.php index 6e8534d36404..a3b4d51f80ff 100644 --- a/app/Listeners/Quote/QuoteDeletedActivity.php +++ b/app/Listeners/Quote/QuoteDeletedActivity.php @@ -43,9 +43,11 @@ class QuoteDeletedActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id; + + $fields->user_id = $user_id; $fields->quote_id = $event->quote->id; $fields->client_id = $event->quote->client_id; - $fields->user_id = $event->quote->user_id; $fields->company_id = $event->quote->company_id; $fields->activity_type_id = Activity::DELETE_QUOTE; diff --git a/app/Listeners/Quote/QuoteEmailActivity.php b/app/Listeners/Quote/QuoteEmailActivity.php index 78340d4e35a9..4dcf747e595c 100644 --- a/app/Listeners/Quote/QuoteEmailActivity.php +++ b/app/Listeners/Quote/QuoteEmailActivity.php @@ -43,9 +43,13 @@ class QuoteEmailActivity implements ShouldQueue $fields = new stdClass; + + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->quote->user_id; + + $fields->user_id = $user_id; + $fields->quote_id = $event->invitation->quote->id; $fields->client_id = $event->invitation->quote->client_id; - $fields->user_id = $event->invitation->quote->user_id; $fields->company_id = $event->invitation->quote->company_id; $fields->client_contact_id = $event->invitation->quote->client_contact_id; $fields->client_id = $event->invitation->quote->client_id; diff --git a/app/Listeners/Quote/QuoteRestoredActivity.php b/app/Listeners/Quote/QuoteRestoredActivity.php index 297d74a0b4ef..11dc0152a8d0 100644 --- a/app/Listeners/Quote/QuoteRestoredActivity.php +++ b/app/Listeners/Quote/QuoteRestoredActivity.php @@ -43,7 +43,10 @@ class QuoteRestoredActivity implements ShouldQueue $fields = new stdClass; - $fields->quote_id = $event->quote->id; + + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id; + + $fields->user_id = $user_id; $fields->client_id = $event->quote->client_id; $fields->user_id = $event->quote->user_id; $fields->company_id = $event->quote->company_id; diff --git a/app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php b/app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php index 4ac8f4566ad5..998386a059eb 100644 --- a/app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php +++ b/app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php @@ -43,9 +43,11 @@ class CreateRecurringInvoiceActivity implements ShouldQueue $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id; + + $fields->user_id = $user_id; $fields->recurring_invoice_id = $event->recurring_invoice->id; $fields->client_id = $event->recurring_invoice->client_id; - $fields->user_id = $event->recurring_invoice->user_id; $fields->company_id = $event->recurring_invoice->company_id; $fields->activity_type_id = Activity::CREATE_RECURRING_INVOICE; diff --git a/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php b/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php index d8c26535ae27..04e23d08847c 100644 --- a/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php +++ b/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php @@ -44,10 +44,11 @@ class RecurringInvoiceArchivedActivity implements ShouldQueue $event->recurring_invoice->service()->deletePdf(); $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id; + $fields->user_id = $user_id; $fields->recurring_invoice_id = $event->recurring_invoice->id; $fields->client_id = $event->recurring_invoice->client_id; - $fields->user_id = $event->recurring_invoice->user_id; $fields->company_id = $event->recurring_invoice->company_id; $fields->activity_type_id = Activity::ARCHIVE_RECURRING_INVOICE; diff --git a/app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php b/app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php index ba3ff78fcbe5..443a515a7095 100644 --- a/app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php +++ b/app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php @@ -42,10 +42,11 @@ class RecurringInvoiceDeletedActivity implements ShouldQueue MultiDB::setDb($event->company->db); $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id; + $fields->user_id = $user_id; $fields->recurring_invoice_id = $event->recurring_invoice->id; $fields->client_id = $event->recurring_invoice->client_id; - $fields->user_id = $event->recurring_invoice->user_id; $fields->company_id = $event->recurring_invoice->company_id; $fields->activity_type_id = Activity::DELETE_RECURRING_INVOICE; diff --git a/app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php b/app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php index 73c8120724c9..5bb75d54e5ad 100644 --- a/app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php +++ b/app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php @@ -42,10 +42,11 @@ class RecurringInvoiceRestoredActivity implements ShouldQueue MultiDB::setDb($event->company->db); $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id; + $fields->user_id = $user_id; $fields->recurring_invoice_id = $event->recurring_invoice->id; $fields->client_id = $event->recurring_invoice->client_id; - $fields->user_id = $event->recurring_invoice->user_id; $fields->company_id = $event->recurring_invoice->company_id; $fields->activity_type_id = Activity::RESTORE_RECURRING_INVOICE; diff --git a/app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php b/app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php index 268ded44f28a..90e7810b68f8 100644 --- a/app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php +++ b/app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php @@ -42,9 +42,10 @@ class UpdateRecurringInvoiceActivity implements ShouldQueue MultiDB::setDB($event->company->db); $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id; + $fields->user_id = $user_id; $fields->client_id = $event->recurring_invoice->client_id; - $fields->user_id = $event->recurring_invoice->user_id; $fields->company_id = $event->recurring_invoice->company_id; $fields->activity_type_id = Activity::UPDATE_RECURRING_INVOICE; $fields->recurring_invoice_id = $event->recurring_invoice->id; diff --git a/app/Listeners/User/ArchivedUserActivity.php b/app/Listeners/User/ArchivedUserActivity.php index e1229cddffaa..3f548d038d6f 100644 --- a/app/Listeners/User/ArchivedUserActivity.php +++ b/app/Listeners/User/ArchivedUserActivity.php @@ -43,7 +43,9 @@ class ArchivedUserActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $event->creating_user->id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id; + + $fields->user_id = $user_id; $fields->notes = $event->creating_user->present()->name . " Archived User " . $event->user->present()->name(); $fields->company_id = $event->company->id; diff --git a/app/Listeners/User/CreatedUserActivity.php b/app/Listeners/User/CreatedUserActivity.php index 9efc58ff5b14..48e1e2b2a4cc 100644 --- a/app/Listeners/User/CreatedUserActivity.php +++ b/app/Listeners/User/CreatedUserActivity.php @@ -43,7 +43,9 @@ class CreatedUserActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $event->creating_user->id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id; + + $fields->user_id = $user_id; $fields->notes = $event->creating_user->present()->name() . " Created the user " . $event->user->present()->name(); $fields->company_id = $event->company->id; $fields->activity_type_id = Activity::CREATE_USER; diff --git a/app/Listeners/User/DeletedUserActivity.php b/app/Listeners/User/DeletedUserActivity.php index c34d35d893b2..a15a0383e419 100644 --- a/app/Listeners/User/DeletedUserActivity.php +++ b/app/Listeners/User/DeletedUserActivity.php @@ -48,7 +48,10 @@ class DeletedUserActivity implements ShouldQueue $fields = new stdClass; - $fields->user_id = $event->creating_user->id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id; + + $fields->user_id = $user_id; + $fields->notes = $event->creating_user->present()->name() . " Deleted the user " . $event->user->present()->name(); $fields->company_id = $event->company->id; $fields->activity_type_id = Activity::DELETE_USER; diff --git a/app/Listeners/User/RestoredUserActivity.php b/app/Listeners/User/RestoredUserActivity.php index c02f8169b05b..b010622da78a 100644 --- a/app/Listeners/User/RestoredUserActivity.php +++ b/app/Listeners/User/RestoredUserActivity.php @@ -42,8 +42,9 @@ class RestoredUserActivity implements ShouldQueue MultiDB::setDb($event->company->db); $fields = new stdClass; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id; - $fields->user_id = $event->user->id; + $fields->user_id = $user_id; $fields->notes = $event->creating_user->present()->name() . " Restored user " . $event->user->present()->name(); $fields->company_id = $event->company->id; diff --git a/app/Listeners/User/UpdatedUserActivity.php b/app/Listeners/User/UpdatedUserActivity.php index 0c6a49a119e4..14d12c68e416 100644 --- a/app/Listeners/User/UpdatedUserActivity.php +++ b/app/Listeners/User/UpdatedUserActivity.php @@ -42,7 +42,9 @@ class UpdatedUserActivity implements ShouldQueue MultiDB::setDb($event->company->db); $fields = new stdClass; - $fields->user_id = $event->creating_user->id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id; + + $fields->user_id = $user_id; $fields->notes = $event->creating_user->present()->name() . " Updated user " . $event->user->present()->name(); $fields->company_id = $event->company->id;