From 90afec864ed6d4d5bb9f743ef78b6fda5494a77c Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 2 Oct 2025 08:07:54 +0100 Subject: [PATCH 1/9] Fixed info text help block class --- resources/views/partials/forms/edit/image-upload.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php index 61c961c5bb..c6fdffdd5d 100644 --- a/resources/views/partials/forms/edit/image-upload.blade.php +++ b/resources/views/partials/forms/edit/image-upload.blade.php @@ -38,8 +38,8 @@ @elseif (isset($item) && (isset($item->model)) && ($item->model->image != ''))
-

- {{ trans('general.use_cloned_no_image_help') }} +

+ {{ trans('general.use_cloned_no_image_help') }}

From ef0a6aa25e0889fd5ca80f6689c2efb90d54832c Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Oct 2025 13:53:19 -0700 Subject: [PATCH 2/9] Add failing condition --- tests/Feature/Assets/Ui/EditAssetTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/Feature/Assets/Ui/EditAssetTest.php b/tests/Feature/Assets/Ui/EditAssetTest.php index 0fe29c6936..0e1432e893 100644 --- a/tests/Feature/Assets/Ui/EditAssetTest.php +++ b/tests/Feature/Assets/Ui/EditAssetTest.php @@ -75,7 +75,10 @@ class EditAssetTest extends TestCase $user = User::factory()->create(); $deployable_status = Statuslabel::factory()->rtd()->create(); $achived_status = Statuslabel::factory()->archived()->create(); - $asset = Asset::factory()->assignedToUser($user)->create(['status_id' => $deployable_status->id]); + $asset = Asset::factory()->assignedToUser($user)->create([ + 'status_id' => $deployable_status->id, + 'last_checkin' => null, + ]); $this->assertTrue($asset->assignedTo->is($user)); $currentTimestamp = now(); @@ -96,6 +99,7 @@ class EditAssetTest extends TestCase $this->assertNull($asset->assigned_to); $this->assertNull($asset->assigned_type); $this->assertEquals($achived_status->id, $asset->status_id); + $this->assertNotNull($asset->last_checkin); Event::assertDispatched(function (CheckoutableCheckedIn $event) use ($currentTimestamp) { return (int) Carbon::parse($event->action_date)->diffInSeconds($currentTimestamp, true) < 2; From 93082e1e8717f70f44a8ef95d3082b1c1c973b60 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Oct 2025 13:56:42 -0700 Subject: [PATCH 3/9] Set last_checkin if asset checked in during update --- app/Http/Controllers/Assets/AssetsController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 65b64ef0da..83c7a08ea1 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -398,6 +398,7 @@ class AssetsController extends Controller $asset->assigned_to = null; $asset->assigned_type = null; $asset->accepted = null; + $asset->last_checkin = now(); event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update with '.$status->getStatuslabelType().' status', date('Y-m-d H:i:s'), $originalValues)); } From 908c8bc39708a110322b343559d00555cea44d25 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Oct 2025 14:33:48 -0700 Subject: [PATCH 4/9] Remove Form::checkbox on user create screen --- resources/views/users/edit.blade.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 9cf4eb6a30..feeffce485 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -295,7 +295,14 @@
From 71d622b6ddbd7d2a8da991ae1e07c8546a134750 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Oct 2025 15:51:41 -0700 Subject: [PATCH 5/9] Replace Form:: email_format --- .../blade/input/email-format-select.blade.php | 27 +++++++++++++++++++ resources/views/settings/general.blade.php | 7 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 resources/views/blade/input/email-format-select.blade.php diff --git a/resources/views/blade/input/email-format-select.blade.php b/resources/views/blade/input/email-format-select.blade.php new file mode 100644 index 0000000000..fcb750d10c --- /dev/null +++ b/resources/views/blade/input/email-format-select.blade.php @@ -0,0 +1,27 @@ +@php + $formats = [ + 'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'), + 'firstname' => trans('admin/settings/general.email_formats.first_name_format'), + 'lastname' => trans('admin/settings/general.email_formats.last_name_format'), + 'filastname' => trans('admin/settings/general.email_formats.filastname_format'), + 'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'), + 'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'), + 'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial_lastname'), + 'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'), + 'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'), + 'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'), + 'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'), + 'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'), + ]; +@endphp + + + @foreach($formats as $format => $label) + + @endforeach + diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index 43ce9aa1aa..ac3330be73 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -87,7 +87,12 @@
- {!! Form::email_format('email_format', old('email_format', $setting->email_format), 'select2') !!} + {!! $errors->first('email_format', '') !!}
From 03fd8df8bddd74fa4455b6459d84d3bf0a4a3b81 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Oct 2025 15:52:09 -0700 Subject: [PATCH 6/9] Remove Form::email_format --- resources/macros/macros.php | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/resources/macros/macros.php b/resources/macros/macros.php index b048c407fa..166b4a654e 100644 --- a/resources/macros/macros.php +++ b/resources/macros/macros.php @@ -168,32 +168,6 @@ Form::macro('barcode_types', function ($name = 'barcode_type', $selected = null, return $select; }); -Form::macro('email_format', function ($name = 'email_format', $selected = null, $class = null) { - $formats = [ - 'firstname.lastname' => trans('admin/settings/general.email_formats.firstname_lastname_format'), - 'firstname' => trans('admin/settings/general.email_formats.first_name_format'), - 'lastname' => trans('admin/settings/general.email_formats.last_name_format'), - 'filastname' => trans('admin/settings/general.email_formats.filastname_format'), - 'lastnamefirstinitial' => trans('admin/settings/general.email_formats.lastnamefirstinitial_format'), - 'firstname_lastname' => trans('admin/settings/general.email_formats.firstname_lastname_underscore_format'), - 'firstinitial.lastname' => trans('admin/settings/general.email_formats.firstinitial_lastname'), - 'lastname_firstinitial' => trans('admin/settings/general.email_formats.lastname_firstinitial'), - 'lastname.firstinitial' => trans('admin/settings/general.email_formats.lastname_dot_firstinitial_format'), - 'firstnamelastname' => trans('admin/settings/general.email_formats.firstnamelastname'), - 'firstnamelastinitial' => trans('admin/settings/general.email_formats.firstnamelastinitial'), - 'lastname.firstname' => trans('admin/settings/general.email_formats.lastnamefirstname'), - ]; - - $select = ''; - - return $select; -}); - Form::macro('username_format', function ($name = 'username_format', $selected = null, $class = null) { $formats = [ 'firstname.lastname' => trans('admin/settings/general.username_formats.firstname_lastname_format'), From 71644c1cbec02bf5b4f2636498ca8034e4e5a2c7 Mon Sep 17 00:00:00 2001 From: akemidx Date: Thu, 2 Oct 2025 19:00:18 -0400 Subject: [PATCH 7/9] added term date --- resources/views/reports/licenses.blade.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/resources/views/reports/licenses.blade.php b/resources/views/reports/licenses.blade.php index 3c0b11d5e6..8897bc0543 100644 --- a/resources/views/reports/licenses.blade.php +++ b/resources/views/reports/licenses.blade.php @@ -31,6 +31,7 @@ {{ trans('admin/licenses/form.seats') }} {{ trans('admin/licenses/form.remaining_seats') }} {{ trans('admin/licenses/form.expiration') }} + {{ trans('admin/licenses/form.termination_date') }} {{ trans('general.purchase_date') }} {{ trans('general.purchase_cost') }} {{ trans('general.depreciation') }} @@ -54,6 +55,12 @@ {{ $license->seats }} {{ $license->remaincount() }} {{ $license->expiration_date }} + {{ $license->termination_date }} + @if ($license->isTerminated()) + + + + @endif {{ $license->purchase_date }} {{ $snipeSettings->default_currency }}{{ Helper::formatCurrencyOutput($license->purchase_cost) }} From edbe8001e6f382b4bd8c2ade6c8d3afd267b4c38 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Oct 2025 16:08:16 -0700 Subject: [PATCH 8/9] Replace Form::name_display_format --- resources/views/settings/localization.blade.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php index c358350cd6..63cfdd54ce 100644 --- a/resources/views/settings/localization.blade.php +++ b/resources/views/settings/localization.blade.php @@ -58,8 +58,12 @@
- {!! Form::name_display_format('name_display_format', old('name_display_format', $setting->name_display_format), 'select2') !!} - + {!! $errors->first('name_display_format', '') !!}
From 3457e7d617e95d37fe747dc721c98f0518682466 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 2 Oct 2025 16:08:37 -0700 Subject: [PATCH 9/9] Remove Form::name_display_format macro --- resources/macros/macros.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/resources/macros/macros.php b/resources/macros/macros.php index b048c407fa..dd2660887a 100644 --- a/resources/macros/macros.php +++ b/resources/macros/macros.php @@ -104,23 +104,6 @@ Form::macro('digit_separator', function ($name = 'digit_separator', $selected = return $select; }); - -Form::macro('name_display_format', function ($name = 'name_display_format', $selected = null, $class = null) { - $formats = [ - 'first_last' => trans('general.firstname_lastname_display'), - 'last_first' => trans('general.lastname_firstname_display'), - ]; - - $select = ''; - - return $select; -}); - /** * Barcode macro * Generates the dropdown menu of available 1D barcodes