Merge remote-tracking branch 'origin/develop'

snipe · snipe · commit 0f63fa23e0c8 · 2024-03-08T09:08:29.000Z
Signed-off-by: snipe &lt;snipe@snipe.net&gt;

# Conflicts:
#	package-lock.json
diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php
@@ -43,12 +43,12 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedIn
     public function via()
     {
         $notifyBy = [];
-        if (Setting::getSettings()->webhook_selected == 'google'){
+        if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_selected == 'microsoft'){
+        if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
@@ -51,12 +51,12 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedInBy, $not
     public function via()
     {
         $notifyBy = [];
-        if (Setting::getSettings()->webhook_selected == 'google'){
+        if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_selected == 'microsoft'){
+        if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php
@@ -48,11 +48,11 @@ public function via()
     {
         $notifyBy = [];
 
-        if (Setting::getSettings()->webhook_selected == 'google'){
+        if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
         }
-        if (Setting::getSettings()->webhook_selected == 'microsoft'){
+        if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php
@@ -42,12 +42,12 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOu
     public function via()
     {
         $notifyBy = [];
-        if (Setting::getSettings()->webhook_selected == 'google'){
+        if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_selected == 'microsoft'){
+        if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
@@ -62,12 +62,12 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $ac
     public function via()
     {
         $notifyBy = [];
-        if (Setting::getSettings()->webhook_selected == 'google'){
+        if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_selected == 'microsoft'){
+        if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php
@@ -49,12 +49,12 @@ public function __construct(Consumable $consumable, $checkedOutTo, User $checked
     public function via()
     {
         $notifyBy = [];
-        if (Setting::getSettings()->webhook_selected == 'google'){
+        if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = GoogleChatChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_selected == 'microsoft'){
+        if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
 
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,12 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedIn`
`43`	`43`	`public function via()`
`44`	`44`	`{`
`45`	`45`	`$notifyBy = [];`
`46`		`- if (Setting::getSettings()->webhook_selected == 'google'){`
	`46`	`+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {`
`47`	`47`
`48`	`48`	`$notifyBy[] = GoogleChatChannel::class;`
`49`	`49`	`}`
`50`	`50`
`51`		`- if (Setting::getSettings()->webhook_selected == 'microsoft'){`
	`51`	`+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {`
`52`	`52`
`53`	`53`	`$notifyBy[] = MicrosoftTeamsChannel::class;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,12 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedInBy, $not`
`51`	`51`	`public function via()`
`52`	`52`	`{`
`53`	`53`	`$notifyBy = [];`
`54`		`- if (Setting::getSettings()->webhook_selected == 'google'){`
	`54`	`+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {`
`55`	`55`
`56`	`56`	`$notifyBy[] = GoogleChatChannel::class;`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (Setting::getSettings()->webhook_selected == 'microsoft'){`
	`59`	`+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {`
`60`	`60`
`61`	`61`	`$notifyBy[] = MicrosoftTeamsChannel::class;`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ public function via()`
`48`	`48`	`{`
`49`	`49`	`$notifyBy = [];`
`50`	`50`
`51`		`- if (Setting::getSettings()->webhook_selected == 'google'){`
	`51`	`+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {`
`52`	`52`
`53`	`53`	`$notifyBy[] = GoogleChatChannel::class;`
`54`	`54`	`}`
`55`		`- if (Setting::getSettings()->webhook_selected == 'microsoft'){`
	`55`	`+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {`
`56`	`56`
`57`	`57`	`$notifyBy[] = MicrosoftTeamsChannel::class;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@ public function __construct(Accessory $accessory, $checkedOutTo, User $checkedOu`
`42`	`42`	`public function via()`
`43`	`43`	`{`
`44`	`44`	`$notifyBy = [];`
`45`		`- if (Setting::getSettings()->webhook_selected == 'google'){`
	`45`	`+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {`
`46`	`46`
`47`	`47`	`$notifyBy[] = GoogleChatChannel::class;`
`48`	`48`	`}`
`49`	`49`
`50`		`- if (Setting::getSettings()->webhook_selected == 'microsoft'){`
	`50`	`+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {`
`51`	`51`
`52`	`52`	`$notifyBy[] = MicrosoftTeamsChannel::class;`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,12 @@ public function __construct(Asset $asset, $checkedOutTo, User $checkedOutBy, $ac`
`62`	`62`	`public function via()`
`63`	`63`	`{`
`64`	`64`	`$notifyBy = [];`
`65`		`- if (Setting::getSettings()->webhook_selected == 'google'){`
	`65`	`+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {`
`66`	`66`
`67`	`67`	`$notifyBy[] = GoogleChatChannel::class;`
`68`	`68`	`}`
`69`	`69`
`70`		`- if (Setting::getSettings()->webhook_selected == 'microsoft'){`
	`70`	`+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {`
`71`	`71`
`72`	`72`	`$notifyBy[] = MicrosoftTeamsChannel::class;`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,12 @@ public function __construct(Consumable $consumable, $checkedOutTo, User $checked`
`49`	`49`	`public function via()`
`50`	`50`	`{`
`51`	`51`	`$notifyBy = [];`
`52`		`- if (Setting::getSettings()->webhook_selected == 'google'){`
	`52`	`+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {`
`53`	`53`
`54`	`54`	`$notifyBy[] = GoogleChatChannel::class;`
`55`	`55`	`}`
`56`	`56`
`57`		`- if (Setting::getSettings()->webhook_selected == 'microsoft'){`
	`57`	`+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {`
`58`	`58`
`59`	`59`	`$notifyBy[] = MicrosoftTeamsChannel::class;`
`60`	`60`	`}`