DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix checkouts for licenses

Browse source
This commit is contained in:
Marcus Moore 2023-03-23 17:03:48 -07:00
parent 25e859c866
commit fc043a35d9
No known key found for this signature in database
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Listeners/CheckoutableListener.php
View file

@ -38,13 +38,7 @@ class CheckoutableListener
// @todo: get sent for models that don't have email addresses associated... // @todo: get sent for models that don't have email addresses associated...
if (Setting::getSettings() && Setting::getSettings()->webhook_endpoint) { if (Setting::getSettings() && Setting::getSettings()->webhook_endpoint) {
Notification::route('slack', Setting::getSettings()->webhook_endpoint) Notification::route('slack', Setting::getSettings()->webhook_endpoint)
->notify(new CheckoutAssetNotification( ->notify($this->getCheckoutNotification($event));
$event->checkoutable,
$event->checkedOutTo,
$event->checkedOutBy,
null,
$event->note)
);
} }
/** /**
@ -53,6 +47,7 @@ class CheckoutableListener
$acceptance = $this->getCheckoutAcceptance($event); $acceptance = $this->getCheckoutAcceptance($event);
try { try {
// @todo: wrap notification above in this 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),
@ -193,7 +188,7 @@ class CheckoutableListener
* @param CheckoutAcceptance $acceptance * @param CheckoutAcceptance $acceptance
* @return Notification * @return Notification
*/ */
private function getCheckoutNotification($event, $acceptance) private function getCheckoutNotification($event, $acceptance = null)
{ {
$notificationClass = null; $notificationClass = null;