Refactor for settings appropriate user id on activities

app/Listeners/Activity/CreatedClientActivity.php

@@ -43,7 +43,7 @@ class CreatedClientActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->client->user_id;
 
         $fields->client_id = $event->client->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/CreatedCreditActivity.php

@@ -43,7 +43,7 @@ class CreatedCreditActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->credit_id = $event->credit->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/CreatedExpenseActivity.php

@@ -43,7 +43,7 @@ class CreatedExpenseActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields->expense_id = $event->expense->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/CreatedQuoteActivity.php

@@ -43,7 +43,7 @@ class CreatedQuoteActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->quote_id = $event->quote->id;
         $fields->client_id = $event->quote->client_id;

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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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/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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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/ExpenseArchivedActivity.php

@@ -45,7 +45,7 @@ class ExpenseArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields->expense_id = $expense->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/ExpenseDeletedActivity.php

@@ -43,7 +43,7 @@ class ExpenseDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields->expense_id = $event->expense->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/ExpenseRestoredActivity.php

@@ -43,7 +43,7 @@ class ExpenseRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields->expense_id = $event->expense->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/ExpenseUpdatedActivity.php

@@ -43,7 +43,7 @@ class ExpenseUpdatedActivity implements ShouldQueue
 
         $expense = $event->expense;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields = new stdClass;
 

app/Listeners/Activity/PaymentArchivedActivity.php

@@ -48,7 +48,7 @@ class PaymentArchivedActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->payment_id = $payment->id;
         $fields->client_id = $payment->client_id;

app/Listeners/Activity/PaymentCreatedActivity.php

@@ -50,7 +50,7 @@ class PaymentCreatedActivity implements ShouldQueue
             $invoice_id = $payment->invoices()->first()->id;
         }
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields = new stdClass;
 
@@ -60,7 +60,8 @@ class PaymentCreatedActivity implements ShouldQueue
         $fields->user_id = $user_id;
         $fields->company_id = $payment->company_id;
         $fields->activity_type_id = Activity::CREATE_PAYMENT;
-
+        $fields->client_contact_id = $payment->client_contact_id ?? null;
+        
         $this->activity_repo->save($fields, $payment, $event->event_vars);
 
     }

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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->client_id = $event->payment->client_id;
         $fields->user_id = $user_id;

app/Listeners/Activity/PaymentUpdatedActivity.php

@@ -48,7 +48,7 @@ class PaymentUpdatedActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->payment_id = $payment->id;
         $fields->client_id = $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->quote_id = $quote->id;
         $fields->client_id = $quote->client_id;

app/Listeners/Activity/RestoreClientActivity.php

@@ -43,7 +43,7 @@ class RestoreClientActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->client->user_id;
 
         $fields->client_id = $event->client->id;
         $fields->user_id = $user_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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $task->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/TaskDeletedActivity.php

@@ -43,7 +43,7 @@ class TaskDeletedActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->task->user_id;
 
         $fields->task_id = $event->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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $event->vendor->id;
         $fields->user_id = $user_id;

app/Listeners/Activity/VendorUpdatedActivity.php

@@ -45,7 +45,7 @@ class VendorUpdatedActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->vendor->user_id;
 
         $fields->vendor_id = $vendor->id;
         $fields->user_id = $user_id;

app/Listeners/Credit/CreditRestoredActivity.php

@@ -43,7 +43,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->credit->user_id;
 
         $fields->credit_id = $event->credit->id;
         $fields->client_id = $event->credit->client_id;

app/Listeners/Credit/CreditViewedActivity.php

@@ -45,7 +45,7 @@ class CreditViewedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->user_id;
 
         $fields->user_id = $user_id;
         $fields->company_id = $event->invitation->company_id;

app/Listeners/Invoice/CreateInvoiceActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;

app/Listeners/Invoice/InvoiceArchivedActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
 

app/Listeners/Invoice/InvoiceCancelledActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;

app/Listeners/Invoice/InvoiceDeletedActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;

app/Listeners/Invoice/InvoiceEmailActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invitation->invoice->id;

app/Listeners/Invoice/InvoiceEmailFailedActivity.php

@@ -49,7 +49,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $fields->user_id = $user_id;
 

app/Listeners/Invoice/InvoicePaidActivity.php

@@ -45,11 +45,12 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;
         $fields->client_id = $event->payment->client_id;
+        $fields->client_contact_id = $event->payment->client_contact_id ?? null;
         $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

@@ -44,7 +44,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $reminder = match($event->template) {
             'reminder1' => 63,

app/Listeners/Invoice/InvoiceRestoredActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;

app/Listeners/Invoice/InvoiceReversedActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invoice->id;

app/Listeners/Invoice/InvoiceViewedActivity.php

@@ -45,7 +45,7 @@ class InvoiceViewedActivity 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $event->invitation->invoice->service()->markSent()->save();
 

app/Listeners/Invoice/UpdateInvoiceActivity.php

@@ -43,7 +43,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->invoice->client_id;

app/Listeners/Payment/PaymentEmailedActivity.php

@@ -41,7 +41,7 @@ class PaymentEmailedActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->payment->client_id;

app/Listeners/Payment/PaymentRestoredActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->payment->user_id;
 
         $fields->user_id = $user_id;
         $fields->payment_id = $event->payment->id;

app/Listeners/PurchaseOrder/CreatePurchaseOrderActivity.php

@@ -45,7 +45,7 @@ class CreatePurchaseOrderActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->purchase_order_id = $event->purchase_order->id;

app/Listeners/PurchaseOrder/PurchaseOrderAcceptedActivity.php

@@ -45,7 +45,7 @@ class PurchaseOrderAcceptedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $event->purchase_order->service()->markSent()->save();
 

app/Listeners/PurchaseOrder/PurchaseOrderArchivedActivity.php

@@ -45,7 +45,7 @@ class PurchaseOrderArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
 

app/Listeners/PurchaseOrder/PurchaseOrderDeletedActivity.php

@@ -45,7 +45,7 @@ class PurchaseOrderDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->purchase_order_id = $event->purchase_order->id;

app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php

@@ -45,7 +45,7 @@ class PurchaseOrderEmailActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->purchase_order_id = $event->invitation->purchase_order->id;

app/Listeners/PurchaseOrder/PurchaseOrderRestoredActivity.php

@@ -45,7 +45,7 @@ class PurchaseOrderRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->purchase_order_id = $event->purchase_order->id;

app/Listeners/PurchaseOrder/PurchaseOrderViewedActivity.php

@@ -45,7 +45,7 @@ class PurchaseOrderViewedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->purchase_order->user_id;
 
         $event->invitation->purchase_order->service()->markSent()->save();
 

app/Listeners/PurchaseOrder/UpdatePurchaseOrderActivity.php

@@ -45,7 +45,7 @@ class UpdatePurchaseOrderActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
 
         $fields->user_id = $user_id;
         $fields->vendor_id = $event->purchase_order->vendor_id;

app/Listeners/Quote/QuoteApprovedActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->quote_id = $event->quote->id;

app/Listeners/Quote/QuoteArchivedActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->quote_id = $event->quote->id;

app/Listeners/Quote/QuoteDeletedActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->quote_id = $event->quote->id;

app/Listeners/Quote/QuoteEmailActivity.php

@@ -45,7 +45,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->invitation->quote->user_id;
 
         $fields->user_id = $user_id;
 

app/Listeners/Quote/QuoteRestoredActivity.php

@@ -45,7 +45,7 @@ class QuoteRestoredActivity 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 = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->quote->client_id;

app/Listeners/RecurringExpense/CreatedRecurringExpenseActivity.php

@@ -45,7 +45,7 @@ class CreatedRecurringExpenseActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields->recurring_expense_id = $recurring_expense->id;
         $fields->user_id = $user_id;

app/Listeners/RecurringExpense/RecurringExpenseArchivedActivity.php

@@ -45,7 +45,7 @@ class RecurringExpenseArchivedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields->recurring_expense_id = $recurring_expense->id;
         $fields->user_id = $user_id;

app/Listeners/RecurringExpense/RecurringExpenseDeletedActivity.php

@@ -43,7 +43,7 @@ class RecurringExpenseDeletedActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields->recurring_expense_id = $event->recurring_expense->id;
         $fields->user_id = $user_id;

app/Listeners/RecurringExpense/RecurringExpenseRestoredActivity.php

@@ -43,7 +43,7 @@ class RecurringExpenseRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields->recurring_expense_id = $event->recurring_expense->id;
         $fields->user_id = $user_id;

app/Listeners/RecurringExpense/RecurringExpenseUpdatedActivity.php

@@ -43,7 +43,7 @@ class RecurringExpenseUpdatedActivity implements ShouldQueue
 
         $recurring_expense = $event->recurring_expense;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_expense->user_id;
 
         $fields = new stdClass;
 

app/Listeners/RecurringInvoice/CreateRecurringInvoiceActivity.php

@@ -43,7 +43,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;

app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php

@@ -44,7 +44,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;

app/Listeners/RecurringInvoice/RecurringInvoiceDeletedActivity.php

@@ -42,7 +42,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;

app/Listeners/RecurringInvoice/RecurringInvoiceRestoredActivity.php

@@ -42,7 +42,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_invoice_id = $event->recurring_invoice->id;

app/Listeners/RecurringInvoice/UpdateRecurringInvoiceActivity.php

@@ -42,7 +42,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->recurring_invoice->client_id;

app/Listeners/RecurringQuote/CreateRecurringQuoteActivity.php

@@ -43,7 +43,7 @@ class CreateRecurringQuoteActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_quote_id = $event->recurring_quote->id;

app/Listeners/RecurringQuote/RecurringQuoteArchivedActivity.php

@@ -44,7 +44,7 @@ class RecurringQuoteArchivedActivity implements ShouldQueue
         $event->recurring_quote->service()->deletePdf();
 
         $fields = new stdClass;
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_quote_id = $event->recurring_quote->id;

app/Listeners/RecurringQuote/RecurringQuoteDeletedActivity.php

@@ -42,7 +42,7 @@ class RecurringQuoteDeletedActivity 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_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_quote_id = $event->recurring_quote->id;

app/Listeners/RecurringQuote/RecurringQuoteRestoredActivity.php

@@ -42,7 +42,7 @@ class RecurringQuoteRestoredActivity 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_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->recurring_quote_id = $event->recurring_quote->id;

app/Listeners/RecurringQuote/UpdateRecurringQuoteActivity.php

@@ -42,7 +42,7 @@ class UpdateRecurringQuoteActivity 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_quote->user_id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
         $fields->user_id = $user_id;
         $fields->client_id = $event->recurring_quote->client_id;

app/Listeners/User/ArchivedUserActivity.php

@@ -43,7 +43,7 @@ class ArchivedUserActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
 

app/Listeners/User/CreatedUserActivity.php

@@ -43,7 +43,7 @@ class CreatedUserActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
         $fields->company_id = $event->company->id;

app/Listeners/User/DeletedUserActivity.php

@@ -48,7 +48,7 @@ class DeletedUserActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-        $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
         $fields->company_id = $event->company->id;

app/Listeners/User/RestoredUserActivity.php

@@ -42,7 +42,7 @@ 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
 

app/Listeners/User/UpdatedUserActivity.php

@@ -42,7 +42,7 @@ class UpdatedUserActivity 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;
+        $user_id = isset($event->event_vars['user_id']) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
 

app/Models/Activity.php

@@ -410,6 +410,12 @@ class Activity extends StaticModel
 
         $found_variables = array_intersect(explode(" ", trans("texts.activity_{$this->activity_type_id}")), $intersect);
 
+        if($this->activity_type_id == 10 && $this->client_contact_id && !$this->token_id)
+            $found_variables = array_intersect(explode(" ", trans("texts.activity_10_online")), $intersect);
+
+        if($this->activity_type_id == 54 && !$this->token_id)
+            array_push($found_variables, ':contact');
+
         $replacements = [];
 
         foreach($found_variables as $var) {
@@ -475,6 +481,10 @@ class Activity extends StaticModel
 
         $contact_entity = $this->contact ? 'clients' : 'vendors';
 
+        if(!$contact) {
+            return [];
+        }
+        
         return ['contact' => [ 'label' => $contact?->present()->name() ?? '', 'hashed_id' => $entity->hashed_id ?? '', 'contact_entity' => $contact_entity]];
     }
 }

app/Utils/Ninja.php

@@ -132,7 +132,7 @@ class Ninja
             'ip' => $ip,
             'token' => request()->header('X-API-TOKEN'),
             'is_system' => app()->runningInConsole(),
-            'user_id' => ($ip == '127.0.0.1') ? null : $user_id,
+            'user_id' => (app()->runningInConsole() && $ip == '127.0.0.1') ? null : $user_id,
         ];
     }
 

lang/en/texts.php

@@ -5134,7 +5134,7 @@ $lang = array(
     'region' => 'Region',
     'county' => 'County',
     'tax_details' => 'Tax Details',
-    'activity_10_online' => ':contact entered payment :payment for invoice :invoice for :client',
+    'activity_10_online' => ':contact made payment :payment for invoice :invoice for :client',
     'activity_10_manual' => ':user entered payment :payment for invoice :invoice for :client',
     'default_payment_type' => 'Default Payment Type',
     'number_precision' => 'Number precision',