Fixes for actioning user in activity logs"

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;
 

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;

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;
 

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;
 

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;

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;

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;
 

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;

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;