applies a conditional to have the the integration test button functio…

…n properly

app/Http/Livewire/SlackSettingsForm.php

@@ -79,6 +79,9 @@ public function mount() {
         $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 @@ public function updatedWebhookSelected() {
             $this->isDisabled= '';
             $this->save_button = trans('general.save');
         }
+        if($this->webhook_selected == 'microsoft' ||$this->webhook_selected == 'google'){
+            $this->webhook_channel = 'NA';
+        }
+
     }
 
     private function isButtonDisabled() {

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",

resources/lang/en-US/admin/hardware/form.php

@@ -16,7 +16,7 @@
     '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',