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

Merge pull request #11834 from uberbrady/try_catch_notifications

Browse source 
try/catch wrap notifications on checkin/checkout
This commit is contained in:
snipe 2022-10-13 14:20:22 -07:00 committed by GitHub
parent 0303df4b25 1899e4d1e8
commit b7bcfaccc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
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,6 +45,7 @@ class CheckoutableListener
*/ */
$acceptance = $this->getCheckoutAcceptance($event); $acceptance = $this->getCheckoutAcceptance($event);
try {
if (! $event->checkedOutTo->locale) { if (! $event->checkedOutTo->locale) {
Notification::locale(Setting::getSettings()->locale)->send( Notification::locale(Setting::getSettings()->locale)->send(
$this->getNotifiables($event), $this->getNotifiables($event),
@ -54,6 +57,9 @@ class CheckoutableListener
$this->getCheckoutNotification($event, $acceptance) $this->getCheckoutNotification($event, $acceptance)
); );
} }
} catch (Exception $e) {
Log::error("Exception caught during checkout notification: ".$e->getMessage());
}
} }
/** /**
@ -83,6 +89,7 @@ class CheckoutableListener
} }
} }
try {
// Use default locale // Use default locale
if (! $event->checkedOutTo->locale) { if (! $event->checkedOutTo->locale) {
Notification::locale(Setting::getSettings()->locale)->send( Notification::locale(Setting::getSettings()->locale)->send(
@ -95,6 +102,9 @@ class CheckoutableListener
$this->getCheckinNotification($event) $this->getCheckinNotification($event)
); );
} }
} catch (Exception $e) {
Log::error("Exception caught during checkin notification: ".$e->getMessage());
}
} }
/** /**