redid url check

Author: Godmartinz

app/Listeners/CheckoutableListener.php

@@ -94,15 +94,13 @@ public function onCheckedOut($event)
         }
 //                 Send Webhook notification
         try {
-            if ($this->shouldSendWebhookNotification()) {
-                if ($this->newMicrosoftTeamsWebhookEnabled()) {
-                    if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')){
-                        return redirect()->back()->with('warning',trans('admin/settings/message.webhook.webhook_fail'));
-                    }
-                    $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
+            if ($this->shouldSendWebhookNotification()){
+                if($this->isDeprecatedTeamsWebhook()){
+                    return redirect()->back()->with('warning',trans('admin/settings/message.webhook.webhook_fail'));
                 }
+                $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
             }
         } catch (ClientException $e) {
             if (strpos($e->getMessage(), 'channel_not_found') !== false) {
@@ -190,15 +188,13 @@ public function onCheckedIn($event)
 
         // Send Webhook notification
         try {
-            if ($this->shouldSendWebhookNotification()) {
-                if ($this->newMicrosoftTeamsWebhookEnabled()) {
-                    if(!Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows')){
-                        return redirect()->back()->with('warning',trans('admin/settings/message.webhook.webhook_fail'));
-                    }
-                    $message = $this->getCheckinNotification($event)->toMicrosoftTeams();
-                    $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
-                    $notification->success()->sendMessage($message[0], $message[1]); // Send the message to Microsoft Teams
+            if ($this->shouldSendWebhookNotification()){
+                if($this->isDeprecatedTeamsWebhook()){
+                    return redirect()->back()->with('warning',trans('admin/settings/message.webhook.webhook_fail'));
                 }
+                $message = $this->getCheckinNotification($event)->toMicrosoftTeams();
+                $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
+                $notification->success()->sendMessage($message[0], $message[1]); // Send the message to Microsoft Teams
             }
         } catch (ClientException $e) {
             if (strpos($e->getMessage(), 'channel_not_found') !== false) {
@@ -380,8 +376,8 @@ private function checkoutableShouldSendEmail($event): bool
         return (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email());
     }
 
-    private function newMicrosoftTeamsWebhookEnabled(): bool
+    private function isDeprecatedTeamsWebhook(): bool
     {
-        return Setting::getSettings()->webhook_selected === 'microsoft' && Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows');
+        return !Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows');
     }
 }