removed translation fixed via method

snipe · Jan 24, 2024 · c65b32b · c65b32b
1 parent 00f07ac
commit c65b32b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php
@@ -44,7 +44,7 @@ public function via()
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_endpoint != '') {
+        if (Setting::getSettings()->webhook_selected == 'slack') {
             $notifyBy[] = 'slack';
         }
 
@@ -130,7 +130,7 @@ public function toMicrosoftTeams()
             ->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 ?: 'No notes');
+            ->fact(trans('mail.notes'), $note ?: '');
     }
 
     /**

diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
@@ -51,7 +51,7 @@ public function via()
 
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
-        if (Setting::getSettings()->webhook_endpoint != '') {
+        if (Setting::getSettings()->webhook_selected == 'slack') {
             \Log::debug('use webhook');
             $notifyBy[] = 'slack';
         }
@@ -106,7 +106,7 @@ public function toMicrosoftTeams()
             ->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 ?: trans('mail.no_notes'));
+            ->fact(trans('mail.notes'), $note ?: '');
     }
 
     /**

diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php
@@ -48,7 +48,7 @@ public function via()
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_endpoint != '') {
+        if (Setting::getSettings()->webhook_selected == 'slack') {
             $notifyBy[] = 'slack';
         }
 
@@ -108,10 +108,10 @@ public function toMicrosoftTeams()
             ->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.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 ?: trans('mail.no_notes'));
+            ->fact(trans('mail.notes'), $note ?: '');
     }
 
     /**

diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php
@@ -120,7 +120,7 @@ public function toMicrosoftTeams()
                 ->fact(trans('mail.checkedout_from'), $item->location->name ? $item->location->name : '')
                 ->fact(trans('mail.Accessory_Checkout_Notification') . " by ", $admin->present()->fullName())
                 ->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
-                ->fact(trans('mail.notes'), $note ?: trans('mail.no_notes'));
+                ->fact(trans('mail.notes'), $note ?: '');
 
     }
 

diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
@@ -60,7 +60,7 @@ public function via()
         }
         $notifyBy = [];
 
-        if ((Setting::getSettings()) && (Setting::getSettings()->webhook_endpoint != '')) {
+        if ((Setting::getSettings()) && (Setting::getSettings()->webhook_selected == 'slack')) {
             \Log::debug('use webhook');
             $notifyBy[] = 'slack';
         }
@@ -139,7 +139,7 @@ public function toMicrosoftTeams()
             ->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 ?: trans('mail.no_notes'));
+            ->fact(trans('mail.notes'), $note ?: '');
 
 
     }

diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php
@@ -50,7 +50,7 @@ public function via()
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_endpoint != '') {
+        if (Setting::getSettings()->webhook_selected == 'slack') {
             $notifyBy[] = 'slack';
         }
 
@@ -126,7 +126,7 @@ public function toMicrosoftTeams()
             ->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 ?: trans('mail.no_notes'));
+            ->fact(trans('mail.notes'), $note ?: '');
     }
 
     /**

diff --git a/app/Notifications/CheckoutLicenseSeatNotification.php b/app/Notifications/CheckoutLicenseSeatNotification.php
@@ -51,7 +51,7 @@ public function via()
             $notifyBy[] = MicrosoftTeamsChannel::class;
         }
 
-        if (Setting::getSettings()->webhook_endpoint != '') {
+        if (Setting::getSettings()->webhook_selected == 'slack') {
             $notifyBy[] = 'slack';
         }
 
@@ -127,7 +127,7 @@ public function toMicrosoftTeams()
             ->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 ?: trans('mail.no_notes'));
+            ->fact(trans('mail.notes'), $note ?: '');
     }
 
     /**

diff --git a/resources/lang/en-US/admin/hardware/form.php b/resources/lang/en-US/admin/hardware/form.php
@@ -35,7 +35,6 @@
     'months'			=> 'months',
     'name'				=> 'Asset Name',
     'notes'				=> 'Notes',
-    'no_notes'          => 'No Notes',
     'order'				=> 'Order Number',
     'qr'				=> 'QR Code',
     'requestable'		=> 'Users may request this asset',