diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index 6cb3123fc20e..e3e7a65b3040 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -52,8 +52,7 @@ class QueryLogging $timeEnd = microtime(true); $time = $timeEnd - $timeStart; - nlog($request->method().' - '.urldecode($request->url()).": $count queries - ".$time); - + //nlog($request->method().' - '.urldecode($request->url()).": $count queries - ".$time); // if($count > 50) //nlog($queries); diff --git a/app/Listeners/Activity/ArchivedClientActivity.php b/app/Listeners/Activity/ArchivedClientActivity.php index 3823c6ac4125..e4f31211de06 100644 --- a/app/Listeners/Activity/ArchivedClientActivity.php +++ b/app/Listeners/Activity/ArchivedClientActivity.php @@ -43,7 +43,7 @@ class ArchivedClientActivity implements ShouldQueue $fields = new stdClass; - $user_id = $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/ClientUpdatedActivity.php b/app/Listeners/Activity/ClientUpdatedActivity.php index 7013d020209a..c1419f463675 100644 --- a/app/Listeners/Activity/ClientUpdatedActivity.php +++ b/app/Listeners/Activity/ClientUpdatedActivity.php @@ -45,7 +45,7 @@ class ClientUpdatedActivity implements ShouldQueue $fields = new stdClass; - $user_id = $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 = $client->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/CreatedClientActivity.php b/app/Listeners/Activity/CreatedClientActivity.php index c3c13bf26b7e..c0d7bb6072c1 100644 --- a/app/Listeners/Activity/CreatedClientActivity.php +++ b/app/Listeners/Activity/CreatedClientActivity.php @@ -43,7 +43,7 @@ class CreatedClientActivity implements ShouldQueue $fields = new stdClass; - $user_id = $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/CreatedCreditActivity.php b/app/Listeners/Activity/CreatedCreditActivity.php index e190d9eff8b4..a3f3b29d91c4 100644 --- a/app/Listeners/Activity/CreatedCreditActivity.php +++ b/app/Listeners/Activity/CreatedCreditActivity.php @@ -43,7 +43,7 @@ class CreatedCreditActivity implements ShouldQueue $fields = new stdClass; - $user_id = $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->user_id = $user_id; diff --git a/app/Listeners/Activity/CreatedExpenseActivity.php b/app/Listeners/Activity/CreatedExpenseActivity.php index f78e6a86e33a..64edafbd776a 100644 --- a/app/Listeners/Activity/CreatedExpenseActivity.php +++ b/app/Listeners/Activity/CreatedExpenseActivity.php @@ -44,7 +44,7 @@ class CreatedExpenseActivity implements ShouldQueue $fields = new stdClass; - $user_id = $event->event_vars['user_id'] ?: $event->expense->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id; $fields->expense_id = $event->expense->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/CreatedQuoteActivity.php b/app/Listeners/Activity/CreatedQuoteActivity.php index f647c0d8ea71..6ccb12ed1978 100644 --- a/app/Listeners/Activity/CreatedQuoteActivity.php +++ b/app/Listeners/Activity/CreatedQuoteActivity.php @@ -43,7 +43,7 @@ class CreatedQuoteActivity implements ShouldQueue $fields = new stdClass; - $user_id = $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 = $event->quote->id; $fields->client_id = $event->quote->client_id; diff --git a/app/Listeners/Activity/CreatedSubscriptionActivity.php b/app/Listeners/Activity/CreatedSubscriptionActivity.php index 83df729fc64c..82b9ea021469 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 = $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 2250c9e2f63f..17b972be0f0d 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 = $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 0b732ef00703..6a488024c7d4 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 = $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 de26e7441d90..51fc8f884fe6 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 = $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 410651fa095c..38aabbfd6a71 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 = $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 9d6d3faea98e..30b81f40286e 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 = $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/ExpenseArchivedActivity.php b/app/Listeners/Activity/ExpenseArchivedActivity.php index 4cbefebf4c50..2718abc07043 100644 --- a/app/Listeners/Activity/ExpenseArchivedActivity.php +++ b/app/Listeners/Activity/ExpenseArchivedActivity.php @@ -45,7 +45,7 @@ class ExpenseArchivedActivity implements ShouldQueue $fields = new stdClass; - $user_id = $event->event_vars['user_id'] ?: $event->expense->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id; $fields->expense_id = $expense->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/ExpenseDeletedActivity.php b/app/Listeners/Activity/ExpenseDeletedActivity.php index 6abbf97e2526..c9318d3559e7 100644 --- a/app/Listeners/Activity/ExpenseDeletedActivity.php +++ b/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['user_id']) ? $event->event_vars['user_id'] : $event->expense->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id; $fields->expense_id = $event->expense->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/ExpenseRestoredActivity.php b/app/Listeners/Activity/ExpenseRestoredActivity.php index d20b13bf60c6..6999caf5ab6f 100644 --- a/app/Listeners/Activity/ExpenseRestoredActivity.php +++ b/app/Listeners/Activity/ExpenseRestoredActivity.php @@ -43,7 +43,7 @@ class ExpenseRestoredActivity implements ShouldQueue $fields = new stdClass; - $user_id = $event->event_vars['user_id'] ?: $event->expense->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id; $fields->expense_id = $event->expense->id; $fields->user_id = $user_id; diff --git a/app/Listeners/Activity/ExpenseUpdatedActivity.php b/app/Listeners/Activity/ExpenseUpdatedActivity.php index 69d3390e44b2..2f72f5d03138 100644 --- a/app/Listeners/Activity/ExpenseUpdatedActivity.php +++ b/app/Listeners/Activity/ExpenseUpdatedActivity.php @@ -43,7 +43,7 @@ class ExpenseUpdatedActivity implements ShouldQueue $expense = $event->expense; - $user_id = $event->event_vars['user_id'] ?: $event->expense->user_id; + $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id; $fields = new stdClass; diff --git a/app/Listeners/Activity/PaymentArchivedActivity.php b/app/Listeners/Activity/PaymentArchivedActivity.php index aa7f4f3d680b..964dfeb20733 100644 --- a/app/Listeners/Activity/PaymentArchivedActivity.php +++ b/app/Listeners/Activity/PaymentArchivedActivity.php @@ -48,7 +48,7 @@ class PaymentArchivedActivity implements ShouldQueue $fields = new stdClass; - $user_id = $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->payment_id = $payment->id; $fields->client_id = $payment->client_id; diff --git a/app/Listeners/Activity/PaymentCreatedActivity.php b/app/Listeners/Activity/PaymentCreatedActivity.php index c21dc7ce1d7f..390d4fc1c198 100644 --- a/app/Listeners/Activity/PaymentCreatedActivity.php +++ b/app/Listeners/Activity/PaymentCreatedActivity.php @@ -43,7 +43,7 @@ class PaymentCreatedActivity implements ShouldQueue $payment = $event->payment; - $user_id = $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/PaymentDeletedActivity.php b/app/Listeners/Activity/PaymentDeletedActivity.php index 38a27181eab3..88821c619a51 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 = $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 095fe8391965..ba06e63dd52e 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 = $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/PaymentUpdatedActivity.php b/app/Listeners/Activity/PaymentUpdatedActivity.php index 2802c74a7ce0..d1a7fd5fa53c 100644 --- a/app/Listeners/Activity/PaymentUpdatedActivity.php +++ b/app/Listeners/Activity/PaymentUpdatedActivity.php @@ -48,7 +48,7 @@ class PaymentUpdatedActivity implements ShouldQueue $fields = new stdClass; - $user_id = $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->payment_id = $payment->id; $fields->client_id = $payment->client_id; diff --git a/app/Listeners/Activity/PaymentVoidedActivity.php b/app/Listeners/Activity/PaymentVoidedActivity.php index f10d4ac01c46..64a106bc811b 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 = $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 9506c8ae2291..8e5186ae34e7 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 = $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/RestoreClientActivity.php b/app/Listeners/Activity/RestoreClientActivity.php index 93b1b83ba4d5..614dc9d1a2bc 100644 --- a/app/Listeners/Activity/RestoreClientActivity.php +++ b/app/Listeners/Activity/RestoreClientActivity.php @@ -43,7 +43,7 @@ class RestoreClientActivity implements ShouldQueue $fields = new stdClass; - $user_id = $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/SubscriptionArchivedActivity.php b/app/Listeners/Activity/SubscriptionArchivedActivity.php index ec793416ca2b..60771930e457 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 = $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 73a9e749f916..4a7f2fec8e98 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 = $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 09b6b860cb62..d1d53cc185ca 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 = $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 a07f4a78ff4c..2f463faacaf4 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 = $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 83cf0d6bd62f..9b8f3aededa9 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 = $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 19d0a4cf39da..e5bcebb9f0ca 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 = $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 11a5ace8ca2f..608723ee53b7 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 = $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 9974fbd5fef1..f9382e311a6d 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 = $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 262de59ce29b..621dd4c9f0f6 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 = $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 b63f76d0f2ef..9bb9f1457cb7 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 = $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 a6927cddfdfb..6f881125a4ad 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 = $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/VendorUpdatedActivity.php b/app/Listeners/Activity/VendorUpdatedActivity.php index 2b1d7bab0262..6f45b9bba682 100644 --- a/app/Listeners/Activity/VendorUpdatedActivity.php +++ b/app/Listeners/Activity/VendorUpdatedActivity.php @@ -45,7 +45,7 @@ class VendorUpdatedActivity implements ShouldQueue $fields = new stdClass; - $user_id = $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;