From 3351998efd880937db026a7aa1f613cf5ad9441e Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 22 Feb 2024 12:03:07 +0000 Subject: [PATCH] Only send notification if the item is assigned to a person Signed-off-by: snipe --- app/Http/Controllers/ReportsController.php | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index d03261bc29..2d5cbaaf9c 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -1156,16 +1156,20 @@ class ReportsController extends Controller $logItem = $logItem_res[0]; } - if (!$assetItem->assignedTo->locale){ - Notification::locale(Setting::getSettings()->locale)->send( - $assetItem->assignedTo, - new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note) - ); - } else { - Notification::send( - $assetItem->assignedTo, - new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note) - ); + // Only send notification if assigned + if ($assetItem->assignedTo) { + + if (!$assetItem->assignedTo->locale) { + Notification::locale(Setting::getSettings()->locale)->send( + $assetItem->assignedTo, + new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note) + ); + } else { + Notification::send( + $assetItem->assignedTo, + new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note) + ); + } } return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));