DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14315 from snipe/fixes/rb-3565

Browse source 
Only send notification if the item is assigned to a person
This commit is contained in:
snipe 2024-02-22 12:05:59 +00:00 committed by GitHub
parent 54552fc95c 3351998efd
commit eb61f5aa9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/Http/Controllers/ReportsController.php
View file

@ -1156,16 +1156,20 @@ class ReportsController extends Controller
$logItem = $logItem_res[0]; $logItem = $logItem_res[0];
} }
if (!$assetItem->assignedTo->locale){ // Only send notification if assigned
Notification::locale(Setting::getSettings()->locale)->send( if ($assetItem->assignedTo) {
$assetItem->assignedTo,
new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note) if (!$assetItem->assignedTo->locale) {
); Notification::locale(Setting::getSettings()->locale)->send(
} else { $assetItem->assignedTo,
Notification::send( new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note)
$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')); return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));