Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
Signed-off-by: snipe <[email protected]>

# Conflicts:
#	package-lock.json
  • Loading branch information
snipe committed Mar 8, 2024
2 parents bda6fdf + 22ef569 commit 0f63fa2
Show file tree
Hide file tree
Showing 7 changed files with 9,758 additions and 288 deletions.
4 changes: 2 additions & 2 deletions app/Notifications/CheckinAccessoryNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions app/Notifications/CheckinAssetNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions app/Notifications/CheckinLicenseSeatNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions app/Notifications/CheckoutAccessoryNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions app/Notifications/CheckoutAssetNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions app/Notifications/CheckoutConsumableNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Loading

0 comments on commit 0f63fa2

Please sign in to comment.