From f452204d624e049544b9a3b2c7a803cfa911eee4 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 31 Jan 2024 10:47:25 -0800
Subject: [PATCH] applies a conditional to have the the integration test button
 function properly

---
 app/Http/Livewire/SlackSettingsForm.php      | 7 +++++++
 composer.json                                | 2 +-
 resources/lang/en-US/admin/hardware/form.php | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index e2f1b4ef14..fa611afe85 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -79,6 +79,9 @@ 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->webhook_channel = 'NA';
+        }
 
 
         if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
@@ -103,6 +106,10 @@ class SlackSettingsForm extends Component
             $this->isDisabled= '';
             $this->save_button = trans('general.save');
         }
+        if($this->webhook_selected == 'microsoft' ||$this->webhook_selected == 'google'){
+            $this->webhook_channel = 'NA';
+        }
+
     }
 
     private function isButtonDisabled() {
diff --git a/composer.json b/composer.json
index 502cb796e2..207d7d9f8c 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
     "guzzlehttp/guzzle": "^7.0.1",
     "intervention/image": "^2.5",
     "javiereguiluz/easyslugger": "^1.0",
-    "laravel-notification-channels/google-chat": "*",
+    "laravel-notification-channels/google-chat": "^1.0",
     "laravel-notification-channels/microsoft-teams": "^1.1",
     "laravel/framework": "^8.46",
     "laravel/helpers": "^1.4",
diff --git a/resources/lang/en-US/admin/hardware/form.php b/resources/lang/en-US/admin/hardware/form.php
index d37d9eac98..a7aba0813c 100644
--- a/resources/lang/en-US/admin/hardware/form.php
+++ b/resources/lang/en-US/admin/hardware/form.php
@@ -16,7 +16,7 @@ return [
     'checkedout_to'		=> 'Checked Out To',
     'checkout_date'		=> 'Checkout Date',
     'checkin_date'		=> 'Checkin Date',
-    'checkout_to'		=> 'Checked out to',
+    'checkout_to'		=> 'Checkout to',
     'cost'				=> 'Purchase Cost',
     'create'			=> 'Create Asset',
     'date'				=> 'Purchase Date',