diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 6c43fec05a..95a344dce9 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Crypt;
use Illuminate\Contracts\Encryption\DecryptException;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
use Intervention\Image\ImageManagerStatic as Image;
use Illuminate\Support\Facades\Session;
@@ -708,6 +709,28 @@ class Helper
return $randomString;
}
+ /**
+ * A method to be used to handle deprecations notifications, currently handling MS Teams. more can be added when needed.
+ *
+ *
+ * @author [Godfrey Martinez]
+ * @since [v7.0.14]
+ * @return array
+ */
+ public static function deprecationCheck() : array {
+ // The check and message that the user is still using the deprecated version
+ $deprecations = [
+ 'ms_teams_deprecated' => array(
+ 'check' => !Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows'),
+ 'message' => 'The Microsoft Teams webhook URL being used will be deprecated Jan 31st, 2025. Change webhook endpoint'),
+ ];
+
+ // if item of concern is being used and its being used with the deprecated values return the notification array.
+ if(Setting::getSettings()->webhook_selected === 'microsoft' && $deprecations['ms_teams_deprecated']['check']) {
+ return $deprecations;
+ }
+ return [];
+ }
/**
* This nasty little method gets the low inventory info for the
diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php
index 58ee68ea00..f8c6c8baa9 100644
--- a/app/Listeners/CheckoutableListener.php
+++ b/app/Listeners/CheckoutableListener.php
@@ -30,6 +30,7 @@ use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Notification;
use Exception;
use Illuminate\Support\Facades\Log;
+use Osama\LaravelTeamsNotification\TeamsNotification;
class CheckoutableListener
{
@@ -86,8 +87,14 @@ class CheckoutableListener
// Send Webhook notification
if ($this->shouldSendWebhookNotification()) {
- Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)
- ->notify($this->getCheckoutNotification($event, $acceptance));
+ if (Setting::getSettings()->webhook_selected === 'microsoft') {
+ $message = $this->getCheckoutNotification($event)->toMicrosoftTeams();
+ $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
+ $notification->success()->sendMessage($message[0], $message[1]); // Send the message to Microsoft Teams
+ } else {
+ Notification::route(Setting::getSettings()->webhook_selected, Setting::getSettings()->webhook_endpoint)
+ ->notify($this->getCheckoutNotification($event, $acceptance));
+ }
}
} catch (ClientException $e) {
Log::debug("Exception caught during checkout notification: " . $e->getMessage());
diff --git a/app/Livewire/SlackSettingsForm.php b/app/Livewire/SlackSettingsForm.php
index 45b8b7b41e..64196b5dd9 100644
--- a/app/Livewire/SlackSettingsForm.php
+++ b/app/Livewire/SlackSettingsForm.php
@@ -4,10 +4,11 @@ namespace App\Livewire;
use GuzzleHttp\Client;
use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Str;
use Livewire\Component;
use App\Models\Setting;
use App\Helpers\Helper;
-
+use Osama\LaravelTeamsNotification\TeamsNotification;
class SlackSettingsForm extends Component
{
public $webhook_endpoint;
@@ -19,6 +20,7 @@ class SlackSettingsForm extends Component
public $webhook_placeholder;
public $webhook_icon;
public $webhook_selected;
+ public $teams_webhook_deprecated;
public array $webhook_text;
public Setting $setting;
@@ -62,7 +64,7 @@ class SlackSettingsForm extends Component
"name" => trans('admin/settings/general.ms_teams'),
"icon" => "fa-brands fa-microsoft",
"placeholder" => "https://abcd.webhook.office.com/webhookb2/XXXXXXX",
- "link" => "https://learn.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook?tabs=dotnet#create-incoming-webhooks-1",
+ "link" => "https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498",
"test" => "msTeamTestWebhook"
),
];
@@ -79,15 +81,17 @@ class SlackSettingsForm extends Component
$this->webhook_channel = $this->setting->webhook_channel;
$this->webhook_botname = $this->setting->webhook_botname;
$this->webhook_options = $this->setting->webhook_selected;
- if($this->webhook_selected == 'microsoft' || $this->webhook_selected == 'google'){
+ $this->teams_webhook_deprecated = !Str::contains($this->webhook_endpoint, 'workflows');
+ if($this->webhook_selected === 'microsoft' || $this->webhook_selected === 'google'){
$this->webhook_channel = '#NA';
}
-
if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
$this->isDisabled= '';
}
-
+ if($this->webhook_selected === 'microsoft' && $this->teams_webhook_deprecated) {
+ session()->flash('warning', 'The selected Microsoft Teams webhook URL will be deprecated Jan 31st, 2025. Please use a workflow URL. Microsofts Documentation on creating a workflow can be found here.');
+ }
}
public function updated($field) {
@@ -109,7 +113,6 @@ class SlackSettingsForm extends Component
if($this->webhook_selected == 'microsoft' || $this->webhook_selected == 'google'){
$this->webhook_channel = '#NA';
}
-
}
private function isButtonDisabled() {
@@ -126,7 +129,9 @@ class SlackSettingsForm extends Component
public function render()
{
$this->isButtonDisabled();
+
return view('livewire.slack-settings-form');
+
}
public function testWebhook(){
@@ -236,20 +241,32 @@ class SlackSettingsForm extends Component
}
public function msTeamTestWebhook(){
- $payload =
- [
- "@type" => "MessageCard",
- "@context" => "http://schema.org/extensions",
- "summary" => trans('mail.snipe_webhook_summary'),
- "title" => trans('mail.snipe_webhook_test'),
- "text" => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
- ];
+ try {
- try {
- $response = Http::withHeaders([
- 'content-type' => 'applications/json',
- ])->post($this->webhook_endpoint,
- $payload)->throw();
+ if($this->teams_webhook_deprecated){
+ //will use the deprecated webhook format
+ $payload =
+ [
+ "@type" => "MessageCard",
+ "@context" => "http://schema.org/extensions",
+ "summary" => trans('mail.snipe_webhook_summary'),
+ "title" => trans('mail.snipe_webhook_test'),
+ "text" => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
+ ];
+ $response = Http::withHeaders([
+ 'content-type' => 'applications/json',
+ ])->post($this->webhook_endpoint,
+ $payload)->throw();
+ }
+ else {
+ $notification = new TeamsNotification($this->webhook_endpoint);
+ $message = trans('general.webhook_test_msg', ['app' => $this->webhook_name]);
+ $notification->success()->sendMessage($message);
+
+ $response = Http::withHeaders([
+ 'content-type' => 'applications/json',
+ ])->post($this->webhook_endpoint);
+ }
if(($response->getStatusCode() == 302)||($response->getStatusCode() == 301)){
return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));
diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php
index d295515121..28e6c054f7 100644
--- a/app/Notifications/CheckinAccessoryNotification.php
+++ b/app/Notifications/CheckinAccessoryNotification.php
@@ -10,6 +10,7 @@ use Illuminate\Notifications\Channels\SlackWebhookChannel;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
use NotificationChannels\GoogleChat\Card;
use NotificationChannels\GoogleChat\GoogleChatChannel;
use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -91,18 +92,29 @@ class CheckinAccessoryNotification extends Notification
$admin = $this->admin;
$item = $this->item;
$note = $this->note;
+ if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+ return MicrosoftTeamsMessage::create()
+ ->to($this->settings->webhook_endpoint)
+ ->type('success')
+ ->addStartGroupToSection('activityTitle')
+ ->title(trans('Accessory_Checkin_Notification'))
+ ->addStartGroupToSection('activityText')
+ ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+ ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+ ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->present()->fullName())
+ ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
+ ->fact(trans('mail.notes'), $note ?: '');
+ }
- return MicrosoftTeamsMessage::create()
- ->to($this->settings->webhook_endpoint)
- ->type('success')
- ->addStartGroupToSection('activityTitle')
- ->title(trans('Accessory_Checkin_Notification'))
- ->addStartGroupToSection('activityText')
- ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
- ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
- ->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->present()->fullName())
- ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
- ->fact(trans('mail.notes'), $note ?: '');
+ $message = trans('mail.Accessory_Checkin_Notification');
+ $details = [
+ trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name),
+ trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
+ trans('mail.Accessory_Checkin_Notification'). ' by' => $admin->present()->fullName(),
+ trans('admin/consumables/general.remaining')=> $item->numRemaining(),
+ trans('mail.notes') => $note ?: '',
+ ];
+ return array($message, $details);
}
public function toGoogleChat()
{
diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index 6f95437334..75077aeb46 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -10,6 +10,7 @@ use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
use NotificationChannels\GoogleChat\Card;
use NotificationChannels\GoogleChat\GoogleChatChannel;
use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -97,16 +98,30 @@ class CheckinAssetNotification extends Notification
$item = $this->item;
$note = $this->note;
- return MicrosoftTeamsMessage::create()
- ->to($this->settings->webhook_endpoint)
- ->type('success')
- ->title(trans('mail.Asset_Checkin_Notification'))
- ->addStartGroupToSection('activityText')
- ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
- ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
- ->fact(trans('mail.Asset_Checkin_Notification')." by ", $admin->present()->fullName())
- ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
- ->fact(trans('mail.notes'), $note ?: '');
+ if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+ return MicrosoftTeamsMessage::create()
+ ->to($this->settings->webhook_endpoint)
+ ->type('success')
+ ->title(trans('mail.Asset_Checkin_Notification'))
+ ->addStartGroupToSection('activityText')
+ ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
+ ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+ ->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->present()->fullName())
+ ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
+ ->fact(trans('mail.notes'), $note ?: '');
+ }
+
+
+ $message = trans('mail.Asset_Checkin_Notification');
+ $details = [
+ trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
+ trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
+ trans('mail.Asset_Checkin_Notification')." by " => $admin->present()->fullName(),
+ trans('admin/hardware/form.status') => $item->assetstatus->name,
+ trans('mail.notes') => $note ?: '',
+ ];
+
+ return array($message, $details);
}
public function toGoogleChat()
{
diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php
index 74018af7c9..1cb8706e67 100644
--- a/app/Notifications/CheckinLicenseSeatNotification.php
+++ b/app/Notifications/CheckinLicenseSeatNotification.php
@@ -10,6 +10,7 @@ use Illuminate\Notifications\Channels\SlackWebhookChannel;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
use NotificationChannels\GoogleChat\Card;
use NotificationChannels\GoogleChat\GoogleChatChannel;
use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -102,18 +103,30 @@ class CheckinLicenseSeatNotification extends Notification
$admin = $this->admin;
$item = $this->item;
$note = $this->note;
+ if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+ return MicrosoftTeamsMessage::create()
+ ->to($this->settings->webhook_endpoint)
+ ->type('success')
+ ->addStartGroupToSection('activityTitle')
+ ->title(trans('mail.License_Checkin_Notification'))
+ ->addStartGroupToSection('activityText')
+ ->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
+ ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->present()->fullName() ?: 'CLI tool')
+ ->fact(trans('mail.checkedin_from'), $target->present()->fullName())
+ ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
+ ->fact(trans('mail.notes'), $note ?: '');
+ }
- return MicrosoftTeamsMessage::create()
- ->to($this->settings->webhook_endpoint)
- ->type('success')
- ->addStartGroupToSection('activityTitle')
- ->title(trans('mail.License_Checkin_Notification'))
- ->addStartGroupToSection('activityText')
- ->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
- ->fact(trans('mail.License_Checkin_Notification')." by ", $admin->present()->fullName() ?: 'CLI tool')
- ->fact(trans('mail.checkedin_from'), $target->present()->fullName())
- ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
- ->fact(trans('mail.notes'), $note ?: '');
+ $message = trans('mail.License_Checkin_Notification');
+ $details = [
+ trans('mail.checkedin_from')=> $target->present()->fullName(),
+ trans('mail.license_for') => htmlspecialchars_decode($item->present()->name),
+ trans('mail.License_Checkin_Notification')." by " => $admin->present()->fullName() ?: 'CLI tool',
+ trans('admin/consumables/general.remaining') => $item->availCount()->count(),
+ trans('mail.notes') => $note ?: '',
+ ];
+
+ return array($message, $details);
}
public function toGoogleChat()
{
diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php
index 721ba7f6a4..116a5ac29f 100644
--- a/app/Notifications/CheckoutAccessoryNotification.php
+++ b/app/Notifications/CheckoutAccessoryNotification.php
@@ -9,6 +9,7 @@ use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
use NotificationChannels\GoogleChat\Card;
use NotificationChannels\GoogleChat\GoogleChatChannel;
use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -120,6 +121,7 @@ class CheckoutAccessoryNotification extends Notification
$item = $this->item;
$note = $this->note;
+ if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
return MicrosoftTeamsMessage::create()
->to($this->settings->webhook_endpoint)
->type('success')
@@ -133,7 +135,19 @@ class CheckoutAccessoryNotification extends Notification
->fact(trans('mail.Accessory_Checkout_Notification') . " by ", $admin->present()->fullName())
->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
->fact(trans('mail.notes'), $note ?: '');
+ }
+ $message = trans('mail.Accessory_Checkout_Notification');
+ $details = [
+ trans('mail.assigned_to') => $target->present()->name,
+ trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name),
+ trans('general.qty') => $this->checkout_qty,
+ trans('mail.checkedout_from') => $item->location->name ? $item->location->name : '',
+ trans('mail.Accessory_Checkout_Notification'). ' by' => $admin->present()->fullName(),
+ trans('admin/consumables/general.remaining')=> $item->numRemaining(),
+ trans('mail.notes') => $note ?: '',
+ ];
+ return array($message, $details);
}
public function toGoogleChat()
{
diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
index 97706cec94..83011e5c8e 100644
--- a/app/Notifications/CheckoutAssetNotification.php
+++ b/app/Notifications/CheckoutAssetNotification.php
@@ -11,6 +11,7 @@ use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Channels\SlackWebhookChannel;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
use NotificationChannels\GoogleChat\Card;
use NotificationChannels\GoogleChat\Enums\Icon;
use NotificationChannels\GoogleChat\Enums\ImageStyle;
@@ -21,6 +22,9 @@ use NotificationChannels\GoogleChat\Widgets\KeyValue;
use NotificationChannels\MicrosoftTeams\MicrosoftTeamsChannel;
use NotificationChannels\MicrosoftTeams\MicrosoftTeamsMessage;
use Illuminate\Support\Facades\Log;
+use Osama\LaravelTeamsNotification\Logging\TeamsLoggingChannel;
+use Osama\LaravelTeamsNotification\TeamsNotification;
+
class CheckoutAssetNotification extends Notification
{
use Queueable;
@@ -66,7 +70,7 @@ class CheckoutAssetNotification extends Notification
if (Setting::getSettings()->webhook_selected === 'microsoft' && Setting::getSettings()->webhook_endpoint) {
- $notifyBy[] = MicrosoftTeamsChannel::class;
+ $notifyBy[] = TeamsNotification::class;
}
@@ -107,24 +111,33 @@ class CheckoutAssetNotification extends Notification
->content($note);
});
}
- public function toMicrosoftTeams()
+ public function toMicrosoftTeams() : array
{
$target = $this->target;
$admin = $this->admin;
$item = $this->item;
$note = $this->note;
- return MicrosoftTeamsMessage::create()
- ->to($this->settings->webhook_endpoint)
- ->type('success')
- ->title(trans('mail.Asset_Checkout_Notification'))
- ->addStartGroupToSection('activityText')
- ->fact(trans('mail.assigned_to'), $target->present()->name)
- ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
- ->fact(trans('mail.Asset_Checkout_Notification') . " by ", $admin->present()->fullName())
- ->fact(trans('mail.notes'), $note ?: '');
-
+ if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+ return MicrosoftTeamsMessage::create()
+ ->to($this->settings->webhook_endpoint)
+ ->type('success')
+ ->title(trans('mail.Asset_Checkout_Notification'))
+ ->addStartGroupToSection('activityText')
+ ->fact(trans('mail.assigned_to'), $target->present()->name)
+ ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
+ ->fact(trans('mail.Asset_Checkout_Notification') . " by ", $admin->present()->fullName())
+ ->fact(trans('mail.notes'), $note ?: '');
+ }
+ $message = trans('mail.Asset_Checkout_Notification');
+ $details = [
+ trans('mail.assigned_to') => $target->present()->name,
+ trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
+ trans('mail.Asset_Checkout_Notification'). ' by' => $admin->present()->fullName(),
+ trans('mail.notes') => $note ?: '',
+ ];
+ return array($message, $details);
}
public function toGoogleChat()
{
diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php
index e93d6e6ea6..ba7c5646ab 100644
--- a/app/Notifications/CheckoutConsumableNotification.php
+++ b/app/Notifications/CheckoutConsumableNotification.php
@@ -10,6 +10,7 @@ use Illuminate\Notifications\Channels\SlackWebhookChannel;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
use NotificationChannels\GoogleChat\Card;
use NotificationChannels\GoogleChat\GoogleChatChannel;
use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -100,17 +101,30 @@ class CheckoutConsumableNotification extends Notification
$item = $this->item;
$note = $this->note;
- return MicrosoftTeamsMessage::create()
- ->to($this->settings->webhook_endpoint)
- ->type('success')
- ->addStartGroupToSection('activityTitle')
- ->title(trans('mail.Consumable_checkout_notification'))
- ->addStartGroupToSection('activityText')
- ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
- ->fact(trans('mail.Consumable_checkout_notification')." by ", $admin->present()->fullName())
- ->fact(trans('mail.assigned_to'), $target->present()->fullName())
- ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
- ->fact(trans('mail.notes'), $note ?: '');
+ if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+ return MicrosoftTeamsMessage::create()
+ ->to($this->settings->webhook_endpoint)
+ ->type('success')
+ ->addStartGroupToSection('activityTitle')
+ ->title(trans('mail.Consumable_checkout_notification'))
+ ->addStartGroupToSection('activityText')
+ ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+ ->fact(trans('mail.Consumable_checkout_notification')." by ", $admin->present()->fullName())
+ ->fact(trans('mail.assigned_to'), $target->present()->fullName())
+ ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
+ ->fact(trans('mail.notes'), $note ?: '');
+ }
+
+ $message = trans('mail.Consumable_checkout_notification');
+ $details = [
+ trans('mail.assigned_to') => $target->present()->fullName(),
+ trans('mail.item') => htmlspecialchars_decode($item->present()->name),
+ trans('mail.Consumable_checkout_notification').' by' => $admin->present()->fullName(),
+ trans('admin/consumables/general.remaining') => $item->numRemaining(),
+ trans('mail.notes') => $note ?: '',
+ ];
+
+ return array($message, $details);
}
public function toGoogleChat()
{
diff --git a/app/Notifications/CheckoutLicenseSeatNotification.php b/app/Notifications/CheckoutLicenseSeatNotification.php
index 1c26138a6e..1aed0d2004 100644
--- a/app/Notifications/CheckoutLicenseSeatNotification.php
+++ b/app/Notifications/CheckoutLicenseSeatNotification.php
@@ -10,6 +10,7 @@ use Illuminate\Notifications\Channels\SlackWebhookChannel;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Messages\SlackMessage;
use Illuminate\Notifications\Notification;
+use Illuminate\Support\Str;
use NotificationChannels\GoogleChat\Card;
use NotificationChannels\GoogleChat\GoogleChatChannel;
use NotificationChannels\GoogleChat\GoogleChatMessage;
@@ -98,17 +99,29 @@ class CheckoutLicenseSeatNotification extends Notification
$item = $this->item;
$note = $this->note;
- return MicrosoftTeamsMessage::create()
- ->to($this->settings->webhook_endpoint)
- ->type('success')
- ->addStartGroupToSection('activityTitle')
- ->title(trans('mail.License_Checkout_Notification'))
- ->addStartGroupToSection('activityText')
- ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
- ->fact(trans('mail.License_Checkout_Notification')." by ", $admin->present()->fullName())
- ->fact(trans('mail.assigned_to'), $target->present()->fullName())
- ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
- ->fact(trans('mail.notes'), $note ?: '');
+ if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')) {
+ return MicrosoftTeamsMessage::create()
+ ->to($this->settings->webhook_endpoint)
+ ->type('success')
+ ->addStartGroupToSection('activityTitle')
+ ->title(trans('mail.License_Checkout_Notification'))
+ ->addStartGroupToSection('activityText')
+ ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
+ ->fact(trans('mail.License_Checkout_Notification')." by ", $admin->present()->fullName())
+ ->fact(trans('mail.assigned_to'), $target->present()->fullName())
+ ->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
+ ->fact(trans('mail.notes'), $note ?: '');
+ }
+
+ $message = trans('mail.License_Checkout_Notification');
+ $details = [
+ trans('mail.assigned_to') => $target->present()->fullName(),
+ trans('mail.license_for') => htmlspecialchars_decode($item->present()->name),
+ trans('mail.License_Checkout_Notification').' by' => $admin->present()->fullName(),
+ trans('admin/consumables/general.remaining') => $item->availCount()->count(),
+ trans('mail.notes') => $note ?: '',
+ ];
+ return array($message, $details);
}
public function toGoogleChat()
{
diff --git a/composer.json b/composer.json
index d3637c3a4b..865878280c 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
"intervention/image": "^2.5",
"javiereguiluz/easyslugger": "^1.0",
"laravel-notification-channels/google-chat": "^3.0",
- "laravel-notification-channels/microsoft-teams": "^1.1",
+ "laravel-notification-channels/microsoft-teams": "^1.2",
"laravel/framework": "^10.0",
"laravel/helpers": "^1.4",
"laravel/passport": "^11.0",
@@ -55,6 +55,7 @@
"nunomaduro/collision": "^7.0",
"okvpn/clock-lts": "^1.0",
"onelogin/php-saml": "^3.4",
+ "osa-eg/laravel-teams-notification": "^2.1",
"paragonie/constant_time_encoding": "^2.3",
"paragonie/sodium_compat": "^1.19",
"phpdocumentor/reflection-docblock": "^5.1",
diff --git a/composer.lock b/composer.lock
index 5850996b11..cdc86c22b4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "5341bc5be02b3c33e28e46e06dd99f29",
+ "content-hash": "0750e3a427347b2a56a05a8b9b533d48",
"packages": [
{
"name": "alek13/slack",
@@ -5572,6 +5572,71 @@
],
"time": "2024-05-30T15:14:26+00:00"
},
+ {
+ "name": "osa-eg/laravel-teams-notification",
+ "version": "v2.1.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/osa-eg/laravel-teams-notification.git",
+ "reference": "76173689930aca92b5174a3b102e705279192c0f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/osa-eg/laravel-teams-notification/zipball/76173689930aca92b5174a3b102e705279192c0f",
+ "reference": "76173689930aca92b5174a3b102e705279192c0f",
+ "shasum": ""
+ },
+ "require": {
+ "guzzlehttp/guzzle": ">=6.5",
+ "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
+ "monolog/monolog": ">=1.0",
+ "php": ">=7.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^8.5"
+ },
+ "type": "library",
+ "extra": {
+ "laravel": {
+ "providers": [
+ "Osama\\LaravelTeamsNotification\\LaravelTeamsNotificationServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Osama\\LaravelTeamsNotification\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Osama Saad",
+ "email": "osaad96eg@gmail.com"
+ }
+ ],
+ "description": "A Laravel package to send notifications to Microsoft Teams",
+ "keywords": [
+ "Teams",
+ "adaptive-card",
+ "laravel",
+ "logging",
+ "microsoft-teams-workflow",
+ "notification",
+ "teams-connector",
+ "teams-webhock",
+ "teams-workflow",
+ "teams_logging"
+ ],
+ "support": {
+ "issues": "https://github.com/osa-eg/laravel-teams-notification/issues",
+ "source": "https://github.com/osa-eg/laravel-teams-notification/tree/v2.1.2"
+ },
+ "time": "2024-09-23T05:24:48+00:00"
+ },
{
"name": "paragonie/constant_time_encoding",
"version": "v2.7.0",
diff --git a/resources/lang/en-US/mail.php b/resources/lang/en-US/mail.php
index 72fb70db80..76c0c1773d 100644
--- a/resources/lang/en-US/mail.php
+++ b/resources/lang/en-US/mail.php
@@ -23,6 +23,7 @@ return [
'Item_Requested' => 'Item Requested',
'License_Checkin_Notification' => 'License checked in',
'License_Checkout_Notification' => 'License checked out',
+ 'license_for' => 'License for',
'Low_Inventory_Report' => 'Low Inventory Report',
'a_user_canceled' => 'A user has canceled an item request on the website',
'a_user_requested' => 'A user has requested an item on the website',
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 1bf7db6f65..4d4289ab22 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -268,17 +268,24 @@ dir="{{ Helper::determineLanguageDirection() }}">
@can('admin')
@if ($snipeSettings->show_alerts_in_menu=='1')
-
+