DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

try/catch wrap notifications on checkin/checkout

Browse source
This commit is contained in:
Brady Wetherington 2022-09-15 13:18:42 -07:00
parent 51d7f2b97b
commit 1899e4d1e8
1 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
app/Listeners/CheckoutableListener.php
View file

@ -20,6 +20,8 @@ use App\Notifications\CheckoutConsumableNotification;
use App\Notifications\CheckoutLicenseNotification; use App\Notifications\CheckoutLicenseNotification;
use App\Notifications\CheckoutLicenseSeatNotification; use App\Notifications\CheckoutLicenseSeatNotification;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
use Exception;
use Log;
class CheckoutableListener class CheckoutableListener
{ {
@ -43,16 +45,20 @@ class CheckoutableListener
*/ */
$acceptance = $this->getCheckoutAcceptance($event); $acceptance = $this->getCheckoutAcceptance($event);
if (! $event->checkedOutTo->locale) { try {
Notification::locale(Setting::getSettings()->locale)->send( if (! $event->checkedOutTo->locale) {
$this->getNotifiables($event), Notification::locale(Setting::getSettings()->locale)->send(
$this->getCheckoutNotification($event, $acceptance) $this->getNotifiables($event),
); $this->getCheckoutNotification($event, $acceptance)
} else { );
Notification::send( } else {
$this->getNotifiables($event), Notification::send(
$this->getCheckoutNotification($event, $acceptance) $this->getNotifiables($event),
); $this->getCheckoutNotification($event, $acceptance)
);
}
} catch (Exception $e) {
Log::error("Exception caught during checkout notification: ".$e->getMessage());
} }
} }
@ -83,17 +89,21 @@ class CheckoutableListener
} }
} }
// Use default locale try {
if (! $event->checkedOutTo->locale) { // Use default locale
Notification::locale(Setting::getSettings()->locale)->send( if (! $event->checkedOutTo->locale) {
$this->getNotifiables($event), Notification::locale(Setting::getSettings()->locale)->send(
$this->getCheckinNotification($event) $this->getNotifiables($event),
); $this->getCheckinNotification($event)
} else { );
Notification::send( } else {
$this->getNotifiables($event), Notification::send(
$this->getCheckinNotification($event) $this->getNotifiables($event),
); $this->getCheckinNotification($event)
);
}
} catch (Exception $e) {
Log::error("Exception caught during checkin notification: ".$e->getMessage());
} }
} }