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

fix for general webhook not notifiying anymore

Browse source
This commit is contained in:
Godfrey M 2024-01-30 10:47:18 -08:00
parent 3da7876631
commit 22385a8e35
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Listeners/CheckoutableListener.php
View file

@ -60,7 +60,7 @@ class CheckoutableListener
if ($this->shouldSendWebhookNotification()) {
//slack doesn't include the url in its messaging format so this is needed to hit the endpoint
if(Setting::getSettings()->webhook_selected =='slack') {
if(Setting::getSettings()->webhook_selected !='microsoft') {
Notification::route('slack', Setting::getSettings()->webhook_endpoint)
->notify($this->getCheckoutNotification($event));

2
app/Notifications/CheckinAccessoryNotification.php
View file

@ -44,7 +44,7 @@ class CheckinAccessoryNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class;
}
if (Setting::getSettings()->webhook_selected == 'slack') {
if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack';
}

2
app/Notifications/CheckinAssetNotification.php
View file

@ -51,7 +51,7 @@ class CheckinAssetNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class;
}
if (Setting::getSettings()->webhook_selected == 'slack') {
if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
\Log::debug('use webhook');
$notifyBy[] = 'slack';
}

2
app/Notifications/CheckinLicenseSeatNotification.php
View file

@ -48,7 +48,7 @@ class CheckinLicenseSeatNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class;
}
if (Setting::getSettings()->webhook_selected == 'slack') {
if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack';
}

2
app/Notifications/CheckoutAccessoryNotification.php
View file

@ -43,7 +43,7 @@ class CheckoutAccessoryNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class;
}
if (Setting::getSettings()->webhook_selected == 'slack') {
if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack';
}

2
app/Notifications/CheckoutAssetNotification.php
View file

@ -60,7 +60,7 @@ class CheckoutAssetNotification extends Notification
}
$notifyBy = [];
if ((Setting::getSettings()) && (Setting::getSettings()->webhook_selected == 'slack')) {
if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
\Log::debug('use webhook');
$notifyBy[] = 'slack';
}

2
app/Notifications/CheckoutConsumableNotification.php
View file

@ -50,7 +50,7 @@ class CheckoutConsumableNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class;
}
if (Setting::getSettings()->webhook_selected == 'slack') {
if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack';
}

2
app/Notifications/CheckoutLicenseSeatNotification.php
View file

@ -51,7 +51,7 @@ class CheckoutLicenseSeatNotification extends Notification
$notifyBy[] = MicrosoftTeamsChannel::class;
}
if (Setting::getSettings()->webhook_selected == 'slack') {
if (Setting::getSettings()->webhook_selected == 'slack' || Setting::getSettings()->webhook_selected == 'general' ) {
$notifyBy[] = 'slack';
}