From c756849497d23a9cc921c04f1c87a14125deacc3 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Oct 2023 17:01:51 +0100 Subject: [PATCH 1/3] Removed debug line Signed-off-by: snipe --- app/Notifications/CheckinAccessoryNotification.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php index 53be68f58f..7735f7dc11 100644 --- a/app/Notifications/CheckinAccessoryNotification.php +++ b/app/Notifications/CheckinAccessoryNotification.php @@ -26,7 +26,6 @@ class CheckinAccessoryNotification extends Notification $this->admin = $checkedInby; $this->note = $note; $this->settings = Setting::getSettings(); - \Log::debug('Constructor for notification fired'); } /** From aae289e150eeda09948d766ab86bd5d8c22ef9ef Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Oct 2023 17:02:07 +0100 Subject: [PATCH 2/3] Added missing string Signed-off-by: snipe --- resources/lang/en/admin/accessories/message.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/admin/accessories/message.php b/resources/lang/en/admin/accessories/message.php index 542f71f03c..c688d5e03d 100644 --- a/resources/lang/en/admin/accessories/message.php +++ b/resources/lang/en/admin/accessories/message.php @@ -3,6 +3,7 @@ return array( 'does_not_exist' => 'The accessory [:id] does not exist.', + 'not_found' => 'That accessory was not found.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( From 944520bc5de380d3b8ea3d76e22c2d74844f3944 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 24 Oct 2023 17:02:16 +0100 Subject: [PATCH 3/3] Fixed notification formatting Signed-off-by: snipe --- resources/views/notifications.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/notifications.blade.php b/resources/views/notifications.blade.php index 1811b3cdd7..eca773e219 100755 --- a/resources/views/notifications.blade.php +++ b/resources/views/notifications.blade.php @@ -41,7 +41,7 @@
- {{ trans('general.asset_information') }} + {{ trans('general.asset_information') }}:
    @isset ($asset->model->name)
  • {{ trans('general.model_name') }} {{ $asset->model->name }}
  • @@ -67,7 +67,7 @@
    - {{ trans('general.consumable_information') }} + {{ trans('general.consumable_information') }}:
    • {{ trans('general.consumable_name') }} {{ $consumable->name }}
@@ -81,7 +81,7 @@
- {{ trans('general.accessory_information') }} + {{ trans('general.accessory_information') }}:
  • {{ trans('general.accessory_name') }} {{ $accessory->name }}
@@ -94,7 +94,7 @@
- {{ trans('general.error') }} + {{ trans('general.error') }}: {{ $message }}
@@ -107,7 +107,7 @@
- {{ trans('general.notification_error') }} + {{ trans('general.notification_error') }}: {{ $message }}