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 #14394 from marcusmoore/fixes/check-endpoint-is-set-for-checkout-in-notifications

Browse source 
Ensure Chat and Teams endpoints are not blank before attempting to send webhook on checkout and check in
This commit is contained in:
snipe 2024-03-08 08:44:52 +00:00 committed by GitHub
parent e8be178ac7 4b0bfc52b4
commit 112ddaf55b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Notifications/CheckinAccessoryNotification.php
View file

@ -43,12 +43,12 @@ class CheckinAccessoryNotification extends Notification
public function via() public function via()
{ {
$notifyBy = []; $notifyBy = [];
if (Setting::getSettings()->webhook_selected == 'google'){ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class; $notifyBy[] = GoogleChatChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'microsoft'){ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }

4
app/Notifications/CheckinAssetNotification.php
View file

@ -51,12 +51,12 @@ class CheckinAssetNotification extends Notification
public function via() public function via()
{ {
$notifyBy = []; $notifyBy = [];
if (Setting::getSettings()->webhook_selected == 'google'){ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class; $notifyBy[] = GoogleChatChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'microsoft'){ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }

4
app/Notifications/CheckinLicenseSeatNotification.php
View file

@ -48,11 +48,11 @@ class CheckinLicenseSeatNotification extends Notification
{ {
$notifyBy = []; $notifyBy = [];
if (Setting::getSettings()->webhook_selected == 'google'){ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class; $notifyBy[] = GoogleChatChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'microsoft'){ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }

4
app/Notifications/CheckoutAccessoryNotification.php
View file

@ -42,12 +42,12 @@ class CheckoutAccessoryNotification extends Notification
public function via() public function via()
{ {
$notifyBy = []; $notifyBy = [];
if (Setting::getSettings()->webhook_selected == 'google'){ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class; $notifyBy[] = GoogleChatChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'microsoft'){ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }

4
app/Notifications/CheckoutAssetNotification.php
View file

@ -62,12 +62,12 @@ class CheckoutAssetNotification extends Notification
public function via() public function via()
{ {
$notifyBy = []; $notifyBy = [];
if (Setting::getSettings()->webhook_selected == 'google'){ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class; $notifyBy[] = GoogleChatChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'microsoft'){ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }

4
app/Notifications/CheckoutConsumableNotification.php
View file

@ -49,12 +49,12 @@ class CheckoutConsumableNotification extends Notification
public function via() public function via()
{ {
$notifyBy = []; $notifyBy = [];
if (Setting::getSettings()->webhook_selected == 'google'){ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class; $notifyBy[] = GoogleChatChannel::class;
} }
if (Setting::getSettings()->webhook_selected == 'microsoft'){ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class; $notifyBy[] = MicrosoftTeamsChannel::class;
} }