From e26abb8684acdb81e247f3a095c6cdabca386799 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 27 Jan 2025 11:07:19 -0800
Subject: [PATCH 01/67] Replace Form::hidden with @csrf

---
 resources/views/settings/backups.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index 6313a6e40..a5d06738b 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -12,7 +12,7 @@
     </a>
 
     <form method="POST" style="display: inline">
-      {{ Form::hidden('_token', csrf_token()) }}
+            @csrf
             <button class="btn btn-primary {{ (config('app.lock_passwords')) ? ' disabled': '' }}">{{ trans('admin/settings/general.generate_backup') }}</button>
       </form>
 

From ef6d747b376b4983ea05fefa1cf97d91d84aa231 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 27 Jan 2025 11:15:09 -0800
Subject: [PATCH 02/67] Convert some Form:hidden in labels view

---
 resources/views/settings/labels.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index fa8c5dc85..0516dcedc 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -308,10 +308,10 @@
                         @else
 
                             <!-- Hidden version of new settings -->
-                            {{ Form::hidden('label2_template', old('label2_template', $setting->label2_template)) }}
-                            {{ Form::hidden('label2_title', old('label2_title', $setting->label2_title)) }}
-                            {{ Form::hidden('label2_asset_logo', old('label2_asset_logo', $setting->label2_asset_logo)) }}
-                            {{ Form::hidden('label2_fields', old('label2_fields', $setting->label2_fields)) }}
+                            <input name="label2_template" type="hidden" value="{{ old('label2_template', $setting->label2_template) }}" />
+                            <input name="label2_title" type="hidden" value="{{ old('label2_title', $setting->label2_title) }}" />
+                            <input name="label2_asset_logo" type="hidden" value="{{ old('label2_asset_logo', $setting->label2_asset_logo) }}" />
+                            <input name="label2_fields" type="hidden" value="{{ old('label2_fields', $setting->label2_fields) }}" />
                         @endif
 
                         @if ($setting->label2_enable && ($setting->label2_template != 'DefaultLabel'))

From 00cdb13803d47a6ade55985455e6c6bb2cd9402a Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 27 Jan 2025 11:23:01 -0800
Subject: [PATCH 03/67] Convert remaining Form:hidden in labels view

---
 resources/views/settings/labels.blade.php | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 0516dcedc..28967e7ed 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -316,23 +316,23 @@
 
                         @if ($setting->label2_enable && ($setting->label2_template != 'DefaultLabel'))
                             <!-- Hidden version of legacy settings -->
-                            {{ Form::hidden('labels_per_page', old('labels_per_page', $setting->labels_per_page)) }}
-                            {{ Form::hidden('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize)) }}
-                            {{ Form::hidden('labels_width', old('labels_width', $setting->labels_width)) }}
-                            {{ Form::hidden('labels_height', old('labels_height', $setting->labels_height)) }}
-                            {{ Form::hidden('labels_display_sgutter', old('labels_display_sgutter', $setting->labels_display_sgutter)) }}
-                            {{ Form::hidden('labels_display_bgutter', old('labels_display_bgutter', $setting->labels_display_bgutter)) }}
-                            {{ Form::hidden('labels_pmargin_top', old('labels_pmargin_top', $setting->labels_pmargin_top)) }}
-                            {{ Form::hidden('labels_pmargin_bottom', old('labels_pmargin_bottom', $setting->labels_pmargin_bottom)) }}
-                            {{ Form::hidden('labels_pmargin_left', old('labels_pmargin_left', $setting->labels_pmargin_left)) }}
-                            {{ Form::hidden('labels_pmargin_right', old('labels_pmargin_right', $setting->labels_pmargin_right)) }}
-                            {{ Form::hidden('labels_pagewidth', old('labels_pagewidth', $setting->labels_pagewidth)) }}
-                            {{ Form::hidden('labels_pageheight', old('labels_pageheight', $setting->labels_pageheight)) }}
-                            {{ Form::hidden('labels_display_name', old('labels_display_name', $setting->labels_display_name)) }}
-                            {{ Form::hidden('labels_display_serial', old('labels_display_serial', $setting->labels_display_serial)) }}
-                            {{ Form::hidden('labels_display_tag', old('labels_display_tag', $setting->labels_display_tag)) }}
-                            {{ Form::hidden('labels_display_model', old('labels_display_model', $setting->labels_display_model)) }}
-                            {{ Form::hidden('labels_display_company_name', old('labels_display_company_name', $setting->labels_display_company_name)) }}
+                            <input name="labels_per_page" type="hidden" value="{{ old('labels_per_page', $setting->labels_per_page) }}" />
+                            <input name="labels_fontsize" type="hidden" value="{{ old('labels_fontsize', $setting->labels_fontsize) }}" />
+                            <input name="labels_width" type="hidden" value="{{ old('labels_width', $setting->labels_width) }}" />
+                            <input name="labels_height" type="hidden" value="{{ old('labels_height', $setting->labels_height) }}" />
+                            <input name="labels_display_sgutter" type="hidden" value="{{ old('labels_display_sgutter', $setting->labels_display_sgutter) }}" />
+                            <input name="labels_display_bgutter" type="hidden" value="{{ old('labels_display_bgutter', $setting->labels_display_bgutter) }}" />
+                            <input name="labels_pmargin_top" type="hidden" value="{{ old('labels_pmargin_top', $setting->labels_pmargin_top) }}" />
+                            <input name="labels_pmargin_bottom" type="hidden" value="{{ old('labels_pmargin_bottom', $setting->labels_pmargin_bottom) }}" />
+                            <input name="labels_pmargin_left" type="hidden" value="{{ old('labels_pmargin_left', $setting->labels_pmargin_left) }}" />
+                            <input name="labels_pmargin_right" type="hidden" value="{{ old('labels_pmargin_right', $setting->labels_pmargin_right) }}" />
+                            <input name="labels_pagewidth" type="hidden" value="{{ old('labels_pagewidth', $setting->labels_pagewidth) }}" />
+                            <input name="labels_pageheight" type="hidden" value="{{ old('labels_pageheight', $setting->labels_pageheight) }}" />
+                            <input name="labels_display_name" type="hidden" value="{{ old('labels_display_name', $setting->labels_display_name) }}" />
+                            <input name="labels_display_serial" type="hidden" value="{{ old('labels_display_serial', $setting->labels_display_serial) }}" />
+                            <input name="labels_display_tag" type="hidden" value="{{ old('labels_display_tag', $setting->labels_display_tag) }}" />
+                            <input name="labels_display_model" type="hidden" value="{{ old('labels_display_model', $setting->labels_display_model) }}" />
+                            <input name="labels_display_company_name" type="hidden" value="{{ old('labels_display_company_name', $setting->labels_display_company_name) }}" />
                         @else
                             <!-- Legacy settings -->
                     <style>

From 4f08b2360cd5cdaab483dc09ebbf6c496fcee288 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 27 Jan 2025 13:36:59 -0800
Subject: [PATCH 04/67] Migrate radios on custom report page

---
 resources/views/reports/custom.blade.php | 29 ++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 3ab43ed6b..3a2d5b254 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -581,15 +581,36 @@
 
               <div class="col-md-9 col-md-offset-3">
                   <label class="form-control">
-                    {{ Form::radio('deleted_assets', 'exclude_deleted', $template->radioValue('deleted_assets', 'exclude_deleted', true), ['aria-label'=>'deleted_assets', 'id'=>'deleted_assets_exclude_deleted'])}}
-                    {{ trans('general.exclude_deleted') }}
+                      <input
+                          name="deleted_assets"
+                          id="deleted_assets_exclude_deleted"
+                          type="radio"
+                          value="exclude_deleted"
+                          @checked($template->radioValue('deleted_assets', 'exclude_deleted', true))
+                          aria-label="deleted_assets"
+                      >
+                      {{ trans('general.exclude_deleted') }}
                   </label>
                   <label class="form-control">
-                    {{ Form::radio('deleted_assets', 'include_deleted', $template->radioValue('deleted_assets', 'include_deleted'), ['aria-label'=>'deleted_assets', 'id'=>'deleted_assets_include_deleted']) }}
+                      <input
+                          name="deleted_assets"
+                          id="deleted_assets_include_deleted"
+                          type="radio"
+                          value="include_deleted"
+                          @checked($template->radioValue('deleted_assets', 'include_deleted'))
+                          aria-label="deleted_assets"
+                      >
                     {{ trans('general.include_deleted') }}
                   </label>
                   <label class="form-control">
-                    {{ Form::radio('deleted_assets', 'only_deleted', $template->radioValue('deleted_assets', 'only_deleted'), ['aria-label'=>'deleted_assets','id'=>'deleted_assets_only_deleted']) }}
+                      <input
+                          name="deleted_assets"
+                          type="radio"
+                          id="deleted_assets_only_deleted"
+                          value="only_deleted"
+                          @checked($template->radioValue('deleted_assets', 'only_deleted'))
+                          aria-label="deleted_assets"
+                      >
                     {{ trans('general.only_deleted') }}
                   </label>
               </div>

From ac925af3d072a35909009838453b92bb0a458a24 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 27 Jan 2025 13:50:22 -0800
Subject: [PATCH 05/67] Replace a few radio inputs on bulk user edit page

---
 resources/views/users/bulk-edit.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index 19b24bbe8..6d4a09f59 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -125,15 +125,15 @@
                             <div class="col-sm-9">
 
                                     <label for="no_change" class="form-control">
-                                        {{ Form::radio('remote', '', true, ['id' => 'no_change', 'aria-label'=>'no_change']) }}
+                                        <input type="radio" name="remote" id="no_change" value="" checked="checked" aria-label="no_change">
                                         {{  trans('general.do_not_change') }}
                                     </label>
                                     <label for="remote" class="form-control">
-                                        {{ Form::radio('remote', '1', old('remote'), ['id' => 'remote', 'aria-label'=>'remote']) }}
+                                        <input type="radio" name="remote" id="remote" value="1" aria-label="remote">
                                         {{ trans('admin/users/general.remote_label') }}
                                     </label>
                                     <label for="not_remote" class="form-control">
-                                        {{ Form::radio('remote', '0', old('remote'), ['id' => 'not_remote', 'aria-label'=>'not_remote']) }}
+                                        <input type="radio" name="remote" id="not_remote" value="0" aria-label="not_remote">
                                         {{ trans('admin/users/general.not_remote_label') }}
                                     </label>
 

From 0defed9abe42f1b7801fe35d53c73a83a94d8863 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 29 Jan 2025 11:27:02 -0600
Subject: [PATCH 06/67] add nullsafe

---
 app/Listeners/CheckoutableListener.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php
index b297a4f72..c1ac134fd 100644
--- a/app/Listeners/CheckoutableListener.php
+++ b/app/Listeners/CheckoutableListener.php
@@ -156,7 +156,7 @@ class CheckoutableListener
         $ccEmails = array_filter($adminCcEmailsArray);
         $mailable =  $this->getCheckinMailType($event);
         $notifiable = $this->getNotifiables($event);
-        if  ($event->checkedOutTo->locale){
+        if ($event->checkedOutTo?->locale) {
             $mailable->locale($event->checkedOutTo->locale);
         }
         // Send email notifications

From eb4aeb47c154667c42d359c3624e0a45f8f62743 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 30 Jan 2025 15:36:38 -0800
Subject: [PATCH 07/67] Replace Form::radio in top section of group permissions
 page

---
 resources/views/groups/edit.blade.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index cb95b3762..62a1be277 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -88,11 +88,23 @@
                     </td>
                     <td class="col-md-1 permissions-item">
                         <label for="{{ 'permission['.$localPermission['permission'].']' }}" style="form-control"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
-                        {{ Form::radio('permission['.$localPermission['permission'].']', '1',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null),['value'=>"grant", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+                        <input
+                            value="1"
+                            aria-label="permission[{{ $localPermission['permission'] }}]"
+                            name="permission[{{ $localPermission['permission'] }}]"
+                            type="radio"
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null)
+                        >
                     </td>
                     <td class="col-md-1 permissions-item">
                         <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
-                        {{ Form::radio('permission['.$localPermission['permission'].']', '0',(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null),['value'=>"grant", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }}
+                        <input
+                            value="0"
+                            aria-label="permission[{{ $localPermission['permission'] }}]"
+                            name="permission[{{ $localPermission['permission'] }}]"
+                            type="radio"
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null)
+                        >
                     </td>
                 </tr>
             </tbody>

From bf96688aef9c4ce1b89de5fae560606c97e0bee4 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 30 Jan 2025 15:37:05 -0800
Subject: [PATCH 08/67] Re-order parameters

---
 resources/views/groups/edit.blade.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 62a1be277..171ffcff3 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -89,21 +89,21 @@
                     <td class="col-md-1 permissions-item">
                         <label for="{{ 'permission['.$localPermission['permission'].']' }}" style="form-control"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
                         <input
-                            value="1"
-                            aria-label="permission[{{ $localPermission['permission'] }}]"
-                            name="permission[{{ $localPermission['permission'] }}]"
                             type="radio"
+                            name="permission[{{ $localPermission['permission'] }}]"
+                            value="1"
                             @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null)
+                            aria-label="permission[{{ $localPermission['permission'] }}]"
                         >
                     </td>
                     <td class="col-md-1 permissions-item">
                         <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
                         <input
-                            value="0"
-                            aria-label="permission[{{ $localPermission['permission'] }}]"
-                            name="permission[{{ $localPermission['permission'] }}]"
                             type="radio"
+                            name="permission[{{ $localPermission['permission'] }}]"
+                            value="0"
                             @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null)
+                            aria-label="permission[{{ $localPermission['permission'] }}]"
                         >
                     </td>
                 </tr>

From 6fb83d66a2562f424c1c104293c012440a0e408e Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 30 Jan 2025 15:46:22 -0800
Subject: [PATCH 09/67] Revert "Re-order parameters"

This reverts commit bf96688aef9c4ce1b89de5fae560606c97e0bee4.
---
 resources/views/groups/edit.blade.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 171ffcff3..62a1be277 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -89,21 +89,21 @@
                     <td class="col-md-1 permissions-item">
                         <label for="{{ 'permission['.$localPermission['permission'].']' }}" style="form-control"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
                         <input
-                            type="radio"
-                            name="permission[{{ $localPermission['permission'] }}]"
                             value="1"
-                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null)
                             aria-label="permission[{{ $localPermission['permission'] }}]"
+                            name="permission[{{ $localPermission['permission'] }}]"
+                            type="radio"
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null)
                         >
                     </td>
                     <td class="col-md-1 permissions-item">
                         <label for="{{ 'permission['.$localPermission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$localPermission['permission'].']' }}</span></label>
                         <input
-                            type="radio"
-                            name="permission[{{ $localPermission['permission'] }}]"
                             value="0"
-                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null)
                             aria-label="permission[{{ $localPermission['permission'] }}]"
+                            name="permission[{{ $localPermission['permission'] }}]"
+                            type="radio"
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null)
                         >
                     </td>
                 </tr>

From 0e390f1a9b4398e6224899c6e5f8fa6b824e9be8 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 30 Jan 2025 15:54:27 -0800
Subject: [PATCH 10/67] Temporarily order properties

---
 resources/views/groups/edit.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 62a1be277..6cd4c0aca 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -91,9 +91,9 @@
                         <input
                             value="1"
                             aria-label="permission[{{ $localPermission['permission'] }}]"
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null)
                             name="permission[{{ $localPermission['permission'] }}]"
                             type="radio"
-                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null)
                         >
                     </td>
                     <td class="col-md-1 permissions-item">
@@ -101,9 +101,9 @@
                         <input
                             value="0"
                             aria-label="permission[{{ $localPermission['permission'] }}]"
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null)
                             name="permission[{{ $localPermission['permission'] }}]"
                             type="radio"
-                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null)
                         >
                     </td>
                 </tr>

From 8dd432c3a2894d379fd13d590a3ac25c0b3bfeaf Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 30 Jan 2025 15:56:08 -0800
Subject: [PATCH 11/67] Convert section headings

---
 resources/views/groups/edit.blade.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 6cd4c0aca..7a3c87403 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -121,11 +121,23 @@
                     </td>
                     <td class="col-md-1 permissions-item" style="vertical-align: bottom">
                         <label for="{{ $area }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ $area }}</span></label>
-                        {{ Form::radio("$area", '1',false,['value'=>"grant",  'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
+                        <input
+                            value="1"
+                            data-checker-group="{{ str_slug($area) }}"
+                            aria-label="{{ $area }}"
+                            name="{{ $area }}"
+                            type="radio"
+                        >
                     </td>
                     <td class="col-md-1 permissions-item">
                         <label for="{{ $area }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ $area }}</span></label>
-                        {{ Form::radio("$area", '0',false,['value'=>"deny", 'data-checker-group' => str_slug($area), 'aria-label'=> $area]) }}
+                        <input
+                            value="0"
+                            data-checker-group="{{ str_slug($area) }}"
+                            aria-label="{{ $area }}"
+                            name="{{ $area }}"
+                            type="radio"
+                        >
                     </td>
                 </tr>
 

From 26b4063435fd598e055d40860f7bad971b1d9a97 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 30 Jan 2025 16:07:46 -0800
Subject: [PATCH 12/67] Convert section items

---
 resources/views/groups/edit.blade.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 7a3c87403..83615381b 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -153,11 +153,24 @@
                         </td>
                         <td class="col-md-1 permissions-item">
                             <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.allow')}} {{ 'permission['.$this_permission['permission'].']' }}</span></label>
-                            {{ Form::radio('permission['.$this_permission['permission'].']', '1',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '1' : null),['class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
+                            <input
+                                class="radiochecker-{{ str_slug($area) }}"
+                                aria-label="permission[{{ $this_permission['permission'] }}]"
+                                name="permission[{{ $this_permission['permission'] }}]"
+                                type="radio"
+                                value="1"
+                            >
                         </td>
                         <td class="col-md-1 permissions-item">
                             <label for="{{ 'permission['.$this_permission['permission'].']' }}"><span class="sr-only">{{ trans('admin/groups/titles.deny')}} {{ 'permission['.$this_permission['permission'].']' }}</span></label>
-                            {{ Form::radio('permission['.$this_permission['permission'].']', '0',(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null),['class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$this_permission['permission'].']']) }}
+                            <input
+                                class="radiochecker-{{ str_slug($area) }}"
+                                aria-label="permission[{{ $this_permission['permission'] }}]"
+                                @checked(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null)
+                                name="permission[{{ $this_permission['permission'] }}]"
+                                type="radio"
+                                value="0"
+                            >
                         </td>
 
                     </tr>

From 9a75131a981497681978f4d204f4923b21d9972a Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 3 Feb 2025 10:18:13 -0800
Subject: [PATCH 13/67] removed old label artifact

---
 app/View/Label.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/View/Label.php b/app/View/Label.php
index bafe97ffe..22dbe6d26 100644
--- a/app/View/Label.php
+++ b/app/View/Label.php
@@ -116,12 +116,9 @@ class Label implements View
                         }
                     }
               
-                if ($template->getSupport2DBarcode()) {
+            if ($template->getSupport2DBarcode()) {
                     $barcode2DType = $settings->label2_2d_type;
-                    $barcode2DType = ($barcode2DType == 'default') ? 
-                        $settings->barcode_type :
-                        $barcode2DType;
-                    if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
+                if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
                         switch ($settings->label2_2d_target) {
                             case 'ht_tag': 
                                 $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); 

From ddc22b4d6b680bf6bad34241f165ade49608b401 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 3 Feb 2025 10:38:49 -0800
Subject: [PATCH 14/67] adds a check to see that qr code type is not none

---
 app/Http/Controllers/Assets/AssetsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 6fd27ed03..8f3b1f054 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -535,7 +535,7 @@ class AssetsController extends Controller
     {
         $settings = Setting::getSettings();
 
-        if ($settings->qr_code == '1') {
+        if (($settings->qr_code === '1') && ($settings->label2_2d_type !== 'none')) {
             $asset = Asset::withTrashed()->find($assetId);
             if ($asset) {
                 $size = Helper::barcodeDimensions($settings->label2_2d_type);

From 24bb6793053fb01748eb317fb2bbfe0750e0ef99 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 3 Feb 2025 12:24:22 -0800
Subject: [PATCH 15/67] adds check that asset has asset status before checking
 archived

---
 app/Notifications/CheckinAssetNotification.php | 2 +-
 resources/views/locations/print.blade.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index fa4780c1f..024298117 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -143,7 +143,7 @@ class CheckinAssetNotification extends Notification
                             KeyValue::create(
                                 trans('mail.checked_into') ?: '',
                                 $item->location->name ? $item->location->name : '',
-                                trans('admin/hardware/form.status').": ".$item->assetstatus->name,
+                                trans('admin/hardware/form.status').": ".$item->assetstatus?->name,
                             )
                                 ->onClick(route('hardware.show', $item->id))
                         )
diff --git a/resources/views/locations/print.blade.php b/resources/views/locations/print.blade.php
index 9f54978ff..a047f0227 100644
--- a/resources/views/locations/print.blade.php
+++ b/resources/views/locations/print.blade.php
@@ -126,7 +126,7 @@
     	
     	@foreach ($assets as $asset)
             @php
-                if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus->archived == 1){
+                if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus?->archived == 1){
                     continue;
                 }
             @endphp

From 6bb0927f262b19d2f0126c6d0cf464d457b66bc2 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 3 Feb 2025 12:30:21 -0800
Subject: [PATCH 16/67] remove unrelated change

---
 app/Notifications/CheckinAssetNotification.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index 024298117..fa4780c1f 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -143,7 +143,7 @@ class CheckinAssetNotification extends Notification
                             KeyValue::create(
                                 trans('mail.checked_into') ?: '',
                                 $item->location->name ? $item->location->name : '',
-                                trans('admin/hardware/form.status').": ".$item->assetstatus?->name,
+                                trans('admin/hardware/form.status').": ".$item->assetstatus->name,
                             )
                                 ->onClick(route('hardware.show', $item->id))
                         )

From 295875c45e9a24069c512523ffc289c34e20d58d Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 4 Feb 2025 11:02:40 -0800
Subject: [PATCH 17/67] Fix and replace remaining radios on bulk user edit page

---
 resources/views/users/bulk-edit.blade.php | 28 +++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index 6d4a09f59..5909e4a25 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -124,8 +124,8 @@
                             </div>
                             <div class="col-sm-9">
 
-                                    <label for="no_change" class="form-control">
-                                        <input type="radio" name="remote" id="no_change" value="" checked="checked" aria-label="no_change">
+                                    <label for="no_change_remote" class="form-control">
+                                        <input type="radio" name="remote" id="no_change_remote" value="" checked aria-label="no_change_remote">
                                         {{  trans('general.do_not_change') }}
                                     </label>
                                     <label for="remote" class="form-control">
@@ -147,16 +147,16 @@
                                 {{ trans('general.user_managed_passwords') }}
                             </div>
                             <div class="col-sm-9">
-                                    <label for="no_change" class="form-control">
-                                        {{ Form::radio('ldap_import', '', true, ['id' => 'no_change', 'aria-label'=>'ldap_import']) }}
+                                    <label for="no_change_ldap_import" class="form-control">
+                                        <input type="radio" name="ldap_import" id="no_change_ldap_import" value="" checked aria-label="no_change_ldap_import">
                                         {{  trans('general.do_not_change') }}
                                     </label>
-                                    <label for="ldap_import" class="form-control">
-                                        {{ Form::radio('ldap_import', '0', old('ldap_import'), ['id' => 'ldap_import', 'aria-label'=>'ldap_import']) }}
+                                    <label for="no_ldap_import" class="form-control">
+                                        <input type="radio" name="ldap_import" id="no_ldap_import" value="0" aria-label="no_ldap_import">
                                         {{ trans('general.user_managed_passwords_allow') }}
                                     </label>
                                     <label for="ldap_import" class="form-control">
-                                        {{ Form::radio('ldap_import', '1', old('ldap_import'), ['id' => 'ldap_import', 'aria-label'=>'ldap_import']) }}
+                                        <input type="radio" name="ldap_import" id="ldap_import" value="1" aria-label="ldap_import">
                                         {{ trans('general.user_managed_passwords_disallow') }}
                                     </label>
                             </div>
@@ -170,15 +170,15 @@
                             <div class="col-sm-9">
 
                                 <label for="no_change_autoassign_licenses" class="form-control">
-                                    {{ Form::radio('autoassign_licenses', '', true, ['id' => 'no_change_autoassign_licenses', 'aria-label'=>'no_change_autoassign_licenses']) }}
+                                    <input type="radio" name="autoassign_licenses" id="no_change_autoassign_licenses" value="" checked aria-label="no_change_autoassign_licenses">
                                     {{  trans('general.do_not_change') }}
                                 </label>
                                 <label for="autoassign_licenses" class="form-control">
-                                    {{ Form::radio('autoassign_licenses', '1', old('autoassign_licenses'), ['id' => 'autoassign_licenses', 'aria-label'=>'autoassign_licenses']) }}
+                                    <input type="radio" name="autoassign_licenses" id="autoassign_licenses" value="1" aria-label="autoassign_licenses">
                                     {{  trans('general.autoassign_licenses_help')}}
                                 </label>
                                 <label for="dont_autoassign_licenses" class="form-control">
-                                    {{ Form::radio('autoassign_licenses', '0', old('autoassign_licenses'), ['id' => 'dont_autoassign_licenses', 'aria-label'=>'dont_autoassign_licenses']) }}
+                                    <input type="radio" name="autoassign_licenses" id="dont_autoassign_licenses" value="0" aria-label="dont_autoassign_licenses">
                                     {{  trans('general.no_autoassign_licenses_help')}}
                                 </label>
 
@@ -192,16 +192,16 @@
                             </div>
                             <div class="col-sm-9">
 
-                                    <label for="no_change" class="form-control">
-                                        {{ Form::radio('activated', '', true, ['id' => 'no_change', 'aria-label'=>'no_change']) }}
+                                    <label for="no_change_activated" class="form-control">
+                                        <input type="radio" name="activated" id="no_change_activated" value="" checked aria-label="no_change_activated">
                                         {{  trans('general.do_not_change') }}
                                     </label>
                                     <label for="activated" class="form-control">
-                                        {{ Form::radio('activated', '1', old('activated'), ['id' => 'activated', 'aria-label'=>'activated']) }}
+                                        <input type="radio" name="activated" id="activated" value="1" aria-label="activated">
                                         {{  trans('admin/users/general.user_activated')}}
                                     </label>
                                     <label for="deactivated" class="form-control">
-                                        {{ Form::radio('activated', '0', old('activated'), ['id' => 'deactivated', 'aria-label'=>'deactivated']) }}
+                                        <input type="radio" name="activated" id="deactivated" value="0" aria-label="deactivated">
                                         {{  trans('admin/users/general.user_deactivated')}}
                                     </label>
 

From cbf9239d86afb7293b1fd649b1d545713f3b1a11 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 4 Feb 2025 11:21:56 -0800
Subject: [PATCH 18/67] adds channel not found warning

---
 app/Listeners/CheckoutableListener.php         | 18 +++++++++++++++---
 .../lang/en-US/admin/settings/message.php      |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php
index c1ac134fd..0811e9ee5 100644
--- a/app/Listeners/CheckoutableListener.php
+++ b/app/Listeners/CheckoutableListener.php
@@ -106,7 +106,13 @@ class CheckoutableListener
                 }
             }
         } catch (ClientException $e) {
-            Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+            if (strpos($e->getMessage(), 'channel_not_found') !== false) {
+                Log::warning(Setting::getSettings()->webhook_selected." notification failed: " . $e->getMessage());
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_channel_not_found') );
+            }
+            else {
+                Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+            }
             return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_fail') );
         } catch (Exception $e) {
             Log::error(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
@@ -196,8 +202,14 @@ class CheckoutableListener
                 }
             }
         } catch (ClientException $e) {
-            Log::error("ClientException caught during checkin notification: " . $e->getMessage());
-            return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_fail'));
+            if (strpos($e->getMessage(), 'channel_not_found') !== false) {
+                Log::warning(Setting::getSettings()->webhook_selected." notification failed: " . $e->getMessage());
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_channel_not_found') );
+            }
+            else {
+                Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
+            }
         } catch (Exception $e) {
             Log::error(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
                 'error' => $e->getMessage(),
diff --git a/resources/lang/en-US/admin/settings/message.php b/resources/lang/en-US/admin/settings/message.php
index 98a889393..a256402c6 100644
--- a/resources/lang/en-US/admin/settings/message.php
+++ b/resources/lang/en-US/admin/settings/message.php
@@ -46,5 +46,6 @@ return [
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
         'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
+        'webhook_channel_not_found' => ' webhook channel not found.'
     ]
 ];

From 0d62ab2ad4309a1aafef28fff06f825c49e82b72 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 4 Feb 2025 13:31:28 -0800
Subject: [PATCH 19/67] Fix call to @checked

---
 resources/views/groups/edit.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 83615381b..addbfabe5 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -156,6 +156,7 @@
                             <input
                                 class="radiochecker-{{ str_slug($area) }}"
                                 aria-label="permission[{{ $this_permission['permission'] }}]"
+                                @checked(array_key_exists($this_permission['permission'], $groupPermissions) && $groupPermissions[$this_permission['permission']] == '1')
                                 name="permission[{{ $this_permission['permission'] }}]"
                                 type="radio"
                                 value="1"
@@ -166,7 +167,7 @@
                             <input
                                 class="radiochecker-{{ str_slug($area) }}"
                                 aria-label="permission[{{ $this_permission['permission'] }}]"
-                                @checked(array_key_exists($this_permission['permission'], $groupPermissions) ? $groupPermissions[$this_permission['permission'] ] == '0' : null)
+                                @checked(array_key_exists($this_permission['permission'], $groupPermissions) && $groupPermissions[$this_permission['permission']] == '0')
                                 name="permission[{{ $this_permission['permission'] }}]"
                                 type="radio"
                                 value="0"

From f3959323ff8eb83680216ed6e628eea987673442 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 4 Feb 2025 13:33:16 -0800
Subject: [PATCH 20/67] Add required attribute to name field

---
 resources/views/groups/edit.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index addbfabe5..0aaa0a623 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -56,7 +56,7 @@
 <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
     <label for="name" class="col-md-3 control-label">{{ trans('admin/groups/titles.group_name') }}</label>
     <div class="col-md-6 required">
-        <input class="form-control" type="text" name="name" id="name" value="{{ old('name', $group->name) }}" />
+        <input class="form-control" type="text" name="name" id="name" value="{{ old('name', $group->name) }}" required />
         {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>

From d29a62a3352308ba74e7ab087036ffed77f43415 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 4 Feb 2025 13:50:08 -0800
Subject: [PATCH 21/67] Simplify @checked

---
 resources/views/groups/edit.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 0aaa0a623..bd6bd85d1 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -91,7 +91,7 @@
                         <input
                             value="1"
                             aria-label="permission[{{ $localPermission['permission'] }}]"
-                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '1' : null)
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) && $groupPermissions[$localPermission['permission']] == '1')
                             name="permission[{{ $localPermission['permission'] }}]"
                             type="radio"
                         >
@@ -101,7 +101,7 @@
                         <input
                             value="0"
                             aria-label="permission[{{ $localPermission['permission'] }}]"
-                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) ? $groupPermissions[$localPermission['permission'] ] == '0' : null)
+                            @checked(array_key_exists($localPermission['permission'], $groupPermissions) && $groupPermissions[$localPermission['permission']] == '0')
                             name="permission[{{ $localPermission['permission'] }}]"
                             type="radio"
                         >

From fbe19738cb4b09b22c7d80a46f939a867cbc70a3 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 4 Feb 2025 15:49:46 -0800
Subject: [PATCH 22/67] Swap Form::radio in bulk hardware edit view

---
 resources/views/hardware/bulk.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index cc44993af..b8189d59c 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -140,15 +140,15 @@
           <div class="form-group">
             <div class="col-md-9 col-md-offset-3">
                 <label class="form-control">
-                  {{ Form::radio('update_real_loc', '1', old('update_real_loc'), ['checked'=> 'checked', 'aria-label'=>'update_real_loc']) }}
+                  <input type="radio" name="update_real_loc" value="1" checked aria-label="update_real_loc">
                   {{ trans('admin/hardware/form.asset_location_update_default_current') }}
                 </label>
               <label class="form-control">
-                {{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
+                <input type="radio" name="update_real_loc" value="0" aria-label="update_default_loc">
                 {{ trans('admin/hardware/form.asset_location_update_default') }}
               </label>
                 <label class="form-control">
-                  {{ Form::radio('update_real_loc', '2', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
+                  <input type="radio" name="update_real_loc" value="2" aria-label="update_default_loc">
                   {{ trans('admin/hardware/form.asset_location_update_actual') }}
                 </label>
 

From fe485acd4a3f9fa797a5f3685b52616ddc64ff40 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 4 Feb 2025 16:18:49 -0800
Subject: [PATCH 23/67] Swap Form::radio in bulk model edit view

---
 resources/views/models/bulk-edit.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 8a053b048..7a283fbba 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -84,15 +84,15 @@
                                     <div class="col-md-7 col-md-offset-3">
 
                                         <label for="requestable_nochange" class="form-control">
-                                            {{ Form::radio('requestable', '', true, ['id' => 'requestable_nochange', 'aria-label'=>'requestable_nochange']) }}
+                                            <input type="radio" name="requestable" id="requestable_nochange" value="" aria-label="requestable_nochange" checked>
                                             {{  trans('admin/hardware/general.requestable_status_warning')}}
                                         </label>
                                         <label for="requestable" class="form-control">
-                                            {{ Form::radio('requestable', '1', old('requestable'), ['id' => 'requestable', 'aria-label'=>'requestable']) }}
+                                            <input type="radio" name="requestable" id="requestable" value="1" aria-label="requestable">
                                             {{  trans('admin/hardware/general.requestable')}}
                                         </label>
                                         <label for="not_requestable" class="form-control">
-                                            {{ Form::radio('requestable', '0', old('requestable'), ['id' => 'not_requestable','aria-label'=>'not_requestable']) }}
+                                            <input type="radio" name="requestable" id="not_requestable" value="0" aria-label="not_requestable">
                                             {{  trans('admin/hardware/general.not_requestable')}}
                                         </label>
 

From 5c6757ecf6119bb332d8d9fccc1a546dd5c53498 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 12:07:17 -0800
Subject: [PATCH 24/67] Migrate labels on quick checkin page

---
 resources/views/hardware/quickscan-checkin.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index de892399c..0fca07307 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -31,7 +31,7 @@
 
                     <!-- Asset Tag -->
                     <div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
-                        {{ Form::label('asset_tag', trans('general.asset_tag'), array('class' => 'col-md-3 control-label', 'id' => 'checkin_tag')) }}
+                        <label for="asset_tag" class="col-md-3 control-label" id="checkin_tag">{{ trans('general.asset_tag') }}</label>
                         <div class="col-md-9">
                             <div class="input-group col-md-11 required">
                                 <input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ old('asset_tag') }}" required>
@@ -57,7 +57,7 @@
 
                     <!-- Note -->
                         <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
-                            {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
+                            <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
                             <div class="col-md-8">
                                 <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note') }}</textarea>
                                 {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}

From 478a5c0e1ab106fba9f13fe20c40fa054864c908 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 12:12:43 -0800
Subject: [PATCH 25/67] Migrate labels on bulk audit pag

---
 resources/views/hardware/quickscan.blade.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 867eeaa2b..9daf65650 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -16,7 +16,7 @@
         }
     </style>
 
-    
+
 
     <div class="row">
     {{ Form::open(['method' => 'POST', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'audit-form' ]) }}
@@ -29,7 +29,7 @@
 
                     <!-- Next Audit -->
                         <div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
-                            {{ Form::label('asset_tag', trans('general.asset_tag'), array('class' => 'col-md-3 control-label', 'id' => 'audit_tag')) }}
+                            <label for="asset_tag" class="col-md-3 control-label" id="audit_tag">{{ trans('general.asset_tag') }}</label>
                             <div class="col-md-9">
                                 <div class="input-group date col-md-11 required" data-date-format="yyyy-mm-dd">
                                     <input type="text" class="form-control" name="asset_tag" id="asset_tag" value="{{ old('asset_tag') }}">
@@ -60,7 +60,7 @@
 
                         <!-- Next Audit -->
                         <div class="form-group {{ $errors->has('next_audit_date') ? 'error' : '' }}">
-                            {{ Form::label('next_audit_date', trans('general.next_audit_date'), array('class' => 'col-md-3 control-label')) }}
+                            <label for="next_audit_date" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
                             <div class="col-md-9">
                                 <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-clear-btn="true">
                                     <input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $next_audit_date) }}">
@@ -73,7 +73,7 @@
 
                         <!-- Note -->
                         <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
-                            {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
+                            <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>
                             <div class="col-md-8">
                                 <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note') }}</textarea>
                                 {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -101,7 +101,7 @@
                     <h2 class="box-title"> {{ trans('general.bulkaudit_status') }} (<span id="audit-counter">0</span> {{ trans('general.assets_audited') }}) </h2>
                 </div>
                 <div class="box-body">
-    
+
                     <table id="audited" class="table table-striped snipe-table">
                         <thead>
                         <tr>
@@ -158,7 +158,7 @@
                         var audio = new Audio('{{ config('app.url') }}/sounds/success.mp3');
                         audio.play()
                         @endif
-                            
+
                         incrementOnSuccess();
                     } else {
                         handleAuditFail(data);

From d77547aecf11d9ac874f9944a898a4ef01c44734 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 12:40:00 -0800
Subject: [PATCH 26/67] Migrate labels on slack component

---
 resources/views/livewire/slack-settings-form.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index 76b398722..48e0fb72a 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -83,7 +83,7 @@
                         <!--Webhook endpoint-->
                         <div class="form-group{{ $errors->has('webhook_endpoint') ? ' error' : '' }}">
                             <div class="col-md-2">
-                                {{ Form::label('webhook_endpoint', trans('admin/settings/general.webhook_endpoint',['app' => $webhook_name ])) }}
+                                <label for="webhook_endpoint">{{ trans('admin/settings/general.webhook_endpoint',['app' => $webhook_name ]) }}</label>
                             </div>
                             <div class="col-md-9 required">
                                     <input type="text" wire:model.blur="webhook_endpoint" class="form-control" placeholder="{{$webhook_placeholder}}" value="{{old('webhook_endpoint', $webhook_endpoint)}}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
@@ -100,7 +100,7 @@
                         @if($webhook_selected != 'microsoft' && $webhook_selected!= 'google')
                             <div class="form-group{{ $errors->has('webhook_channel') ? ' error' : '' }}">
                                 <div class="col-md-2">
-                                    {{ Form::label('webhook_channel', trans('admin/settings/general.webhook_channel',['app' => $webhook_name ])) }}
+                                    <label for="webhook_channel">{{ trans('admin/settings/general.webhook_channel',['app' => $webhook_name ]) }}</label>
                                 </div>
                                 <div class="col-md-9 required">
                                         <input type="text" wire:model.blur="webhook_channel" class="form-control" placeholder="#IT-Ops" value="{{ old('webhook_channel', $webhook_channel) }}"{{ Helper::isDemoMode() ? ' disabled' : ''}}>
@@ -118,7 +118,7 @@
                         @if($webhook_selected != 'microsoft' && $webhook_selected != 'google')
                             <div class="form-group{{ $errors->has('webhook_botname') ? ' error' : '' }}">
                                 <div class="col-md-2">
-                                    {{ Form::label('webhook_botname', trans('admin/settings/general.webhook_botname',['app' => $webhook_name ])) }}
+                                    <label for="webhook_botname">{{ trans('admin/settings/general.webhook_botname',['app' => $webhook_name ]) }}</label>
                                 </div>
                                 <div class="col-md-9">
                                         <input type="text" wire:model.blur="webhook_botname" class='form-control' placeholder="Snipe-Bot" {{ old('webhook_botname', $webhook_botname)}}{{ Helper::isDemoMode() ? ' disabled' : ''}}>

From 8b7c1a195cb970f2386d40b2c270a2c3edb5add3 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 12:41:35 -0800
Subject: [PATCH 27/67] Migrate label on accessory select partial

---
 resources/views/partials/forms/edit/accessory-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/accessory-select.blade.php b/resources/views/partials/forms/edit/accessory-select.blade.php
index d34b6b2fe..e047d16d2 100644
--- a/resources/views/partials/forms/edit/accessory-select.blade.php
+++ b/resources/views/partials/forms/edit/accessory-select.blade.php
@@ -1,6 +1,6 @@
 <!-- Accessory -->
 <div id="assigned_accessory" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="col-md-7">
         <select class="js-data-ajax select2" data-endpoint="accessories" data-placeholder="{{ trans('general.select_accessory') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_accessory_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}>
 

From 189c1487615b8e70685296a994bd153a4bc9594a Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 12:47:06 -0800
Subject: [PATCH 28/67] Migrate labels on address partial

---
 resources/views/partials/forms/edit/address.blade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php
index 0412287a9..22c39da6a 100644
--- a/resources/views/partials/forms/edit/address.blade.php
+++ b/resources/views/partials/forms/edit/address.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group {{ $errors->has('address') ? ' has-error' : '' }}">
-    {{ Form::label('address', trans('general.address'), array('class' => 'col-md-3 control-label')) }}
+    <label for="address" class="col-md-3 control-label">{{ trans('general.address') }}</label>
     <div class="col-md-7">
         {{Form::text('address', old('address', $item->address), array('class' => 'form-control', 'aria-label'=>'address', 'maxlength'=>'191')) }}
         {!! $errors->first('address', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -15,7 +15,7 @@
 </div>
 
 <div class="form-group {{ $errors->has('city') ? ' has-error' : '' }}">
-    {{ Form::label('city', trans('general.city'), array('class' => 'col-md-3 control-label')) }}
+    <label for="city" class="col-md-3 control-label">{{ trans('general.city') }}</label>
     <div class="col-md-7">
     {{Form::text('city', old('city', $item->city), array('class' => 'form-control', 'aria-label'=>'city', 'maxlength'=>'191')) }}
         {!! $errors->first('city', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -23,7 +23,7 @@
 </div>
 
 <div class="form-group {{ $errors->has('state') ? ' has-error' : '' }}">
-    {{ Form::label('state', trans('general.state'), array('class' => 'col-md-3 control-label')) }}
+    <label for="state" class="col-md-3 control-label">{{ trans('general.state') }}</label>
     <div class="col-md-7">
     {{Form::text('state', old('state', $item->state), array('class' => 'form-control', 'aria-label'=>'state', 'maxlength'=>'191')) }}
         {!! $errors->first('state', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -32,7 +32,7 @@
 </div>
 
 <div class="form-group {{ $errors->has('country') ? ' has-error' : '' }}">
-    {{ Form::label('country', trans('general.country'), array('class' => 'col-md-3 control-label')) }}
+    <label for="country" class="col-md-3 control-label">{{ trans('general.country') }}</label>
     <div class="col-md-7">
     {!! Form::countries('country', old('country', $item->country), 'select2') !!}
         <p class="help-block">{{ trans('general.countries_manually_entered_help') }}</p>
@@ -41,7 +41,7 @@
 </div>
 
 <div class="form-group {{ $errors->has('zip') ? ' has-error' : '' }}">
-    {{ Form::label('zip', trans('general.zip'), array('class' => 'col-md-3 control-label', 'maxlength'=>'10')) }}
+    <label for="zip" class="col-md-3 control-label" maxlength="10">{{ trans('general.zip') }}</label>
     <div class="col-md-7">
     {{Form::text('zip', old('zip', $item->zip), array('class' => 'form-control')) }}
         {!! $errors->first('zip', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}

From e4ab6c0c24ea5780e10fd0cc0cfa1911bc262067 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 12:59:00 -0800
Subject: [PATCH 29/67] Migrate form label on asset select partial

---
 resources/views/partials/forms/edit/asset-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/asset-select.blade.php b/resources/views/partials/forms/edit/asset-select.blade.php
index 9867a8e55..6a8c72957 100644
--- a/resources/views/partials/forms/edit/asset-select.blade.php
+++ b/resources/views/partials/forms/edit/asset-select.blade.php
@@ -1,7 +1,7 @@
 <!-- Asset -->
 <div id="{{ $asset_selector_div_id ?? "assigned_asset" }}"
      class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="col-md-7">
         <select class="js-data-ajax select2" data-endpoint="hardware" data-placeholder="{{ trans('general.select_asset') }}" aria-label="{{ $fieldname }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_asset_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}>
 

From 1866426f11c5513a040858f5336fbb9c432c5579 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:02:36 -0800
Subject: [PATCH 30/67] Migrate form label in category select partial

---
 resources/views/partials/forms/edit/category-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php
index f4b2ace30..51a5c81a6 100644
--- a/resources/views/partials/forms/edit/category-select.blade.php
+++ b/resources/views/partials/forms/edit/category-select.blade.php
@@ -1,7 +1,7 @@
 <!-- Asset Model -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="categories/{{ (isset($category_type)) ? $category_type : 'assets' }}" data-placeholder="{{ trans('general.select_category') }}" name="{{ $fieldname }}" style="width: 100%" id="category_select_id" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' required ' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>

From a205ae12a488852ce060b07bd9c2a74edc1fff1d Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:11:49 -0800
Subject: [PATCH 31/67] Migrate form label on (unsed?) company select partial

---
 resources/views/partials/forms/edit/company.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/company.blade.php b/resources/views/partials/forms/edit/company.blade.php
index 22cb62358..767bdeb9f 100644
--- a/resources/views/partials/forms/edit/company.blade.php
+++ b/resources/views/partials/forms/edit/company.blade.php
@@ -1,7 +1,7 @@
 @if (\App\Models\Company::isCurrentUserAuthorized())
 <div class="form-group {{ $errors->has('company_id') ? ' has-error' : '' }}">
    <div class="col-md-3 control-label">
-       {{ Form::label('company_id', trans('general.company'), array('class' => 'col-md-3 control-label', 'for' => 'company_id')) }}
+       <label for="company_id" class="col-md-3 control-label">{{ trans('general.company') }}</label>
    </div>
     <div class="col-md-7 col-sm-12">
        {{ Form::select('company_id', $company_list , old('company_id', $item->company_id), array('class'=>'select2', 'style'=>'width:100%', 'required' => Helper::checkIfRequired($item, 'company_id') ? true : '')) }}

From 288f7e4e935c5f7206cb4508463f089a21a3a240 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:12:52 -0800
Subject: [PATCH 32/67] Migrate form label on consumable select

---
 resources/views/partials/forms/edit/consumable-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/consumable-select.blade.php b/resources/views/partials/forms/edit/consumable-select.blade.php
index d2d084d0b..ccc8030a7 100644
--- a/resources/views/partials/forms/edit/consumable-select.blade.php
+++ b/resources/views/partials/forms/edit/consumable-select.blade.php
@@ -1,6 +1,6 @@
 <!-- Consumable -->
 <div id="assigned_consumable" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="col-md-7{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}">
         <select class="js-data-ajax select2" data-endpoint="consumables" data-placeholder="{{ trans('general.select_consumable') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_consumable_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}>
         

From 830f095a6e9af2e9f49d3d917f3fb0198edef559 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:16:28 -0800
Subject: [PATCH 33/67] Migrate form label in datepicker partial

---
 resources/views/partials/forms/edit/datepicker.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/datepicker.blade.php b/resources/views/partials/forms/edit/datepicker.blade.php
index 3bd0200d0..d91659134 100644
--- a/resources/views/partials/forms/edit/datepicker.blade.php
+++ b/resources/views/partials/forms/edit/datepicker.blade.php
@@ -1,6 +1,6 @@
 <!-- Datepicker -->
 <div class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="input-group col-md-4">
         <div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd"  data-autoclose="true">
             <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $fieldname }}" id="{{ $fieldname }}" value="{{ old($fieldname, ($item->{$fieldname}) ? date('Y-m-d', strtotime($item->{$fieldname})) : '') }}" readonly style="background-color:inherit" maxlength="10">

From ecc1bd69b926847e1bae2b1dc39a2572c3ad6c23 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:19:16 -0800
Subject: [PATCH 34/67] Migrate form label in department select partial

---
 resources/views/partials/forms/edit/department-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/department-select.blade.php b/resources/views/partials/forms/edit/department-select.blade.php
index f0fc16dd6..0648f991d 100644
--- a/resources/views/partials/forms/edit/department-select.blade.php
+++ b/resources/views/partials/forms/edit/department-select.blade.php
@@ -1,6 +1,6 @@
 <div id="assigned_user" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
     <div class="col-md-6">
         <select class="js-data-ajax" data-endpoint="departments" data-placeholder="{{ trans('general.select_department') }}" name="{{ $fieldname }}" style="width: 100%" id="department_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>

From fb9e7cf5e1f791299865700750a5b5e89661d9c4 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:19:22 -0800
Subject: [PATCH 35/67] Migrate form label in fax input partial

---
 resources/views/partials/forms/edit/fax.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/partials/forms/edit/fax.blade.php b/resources/views/partials/forms/edit/fax.blade.php
index 7ed4d3070..19cf6ecef 100644
--- a/resources/views/partials/forms/edit/fax.blade.php
+++ b/resources/views/partials/forms/edit/fax.blade.php
@@ -1,7 +1,7 @@
 <div class="form-group {{ $errors->has('fax') ? ' has-error' : '' }}">
-    {{ Form::label('fax', trans('admin/suppliers/table.fax'), array('class' => 'col-md-3 control-label')) }}
+    <label for="fax" class="col-md-3 control-label">{{ trans('admin/suppliers/table.fax') }}</label>
     <div class="col-md-7">
         <input class="form-control" type="text" name="fax" aria-label="fax" id="fax" value="{{ old('fax', $item->fax) }}"  maxlength="34"  />
         {!! $errors->first('fax', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
-</div>
\ No newline at end of file
+</div>

From 09882556936857b4e32ec949cd91df11b173f947 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:23:10 -0800
Subject: [PATCH 36/67] Replace calls to Form::label in (unused?) kit select

---
 resources/views/partials/forms/edit/kit-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/kit-select.blade.php b/resources/views/partials/forms/edit/kit-select.blade.php
index d8c6ba101..cd1801f16 100644
--- a/resources/views/partials/forms/edit/kit-select.blade.php
+++ b/resources/views/partials/forms/edit/kit-select.blade.php
@@ -1,6 +1,6 @@
 <div id="kit_id" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="kits" data-placeholder="{{ trans('partials/forms/general.placeholder_kit') }}" name="{{ $fieldname }}" style="width: 100%" id="kit_id_select"{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}>

From 0aa77d281f242cb53c3ea205a2dc727349e80cf4 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:24:02 -0800
Subject: [PATCH 37/67] Replace calls to Form::label in license-select partial

---
 resources/views/partials/forms/edit/license-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/license-select.blade.php b/resources/views/partials/forms/edit/license-select.blade.php
index 707b9768c..e6b8a8d7c 100644
--- a/resources/views/partials/forms/edit/license-select.blade.php
+++ b/resources/views/partials/forms/edit/license-select.blade.php
@@ -1,6 +1,6 @@
 <!-- License -->
 <div id="assigned_license" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="col-md-7">
         <select class="js-data-ajax select2" data-endpoint="licenses" data-placeholder="{{ trans('general.select_license') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_license_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}>
 

From f963df0658d6432c5acbde5fceb103a4ef7f9129 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:26:08 -0800
Subject: [PATCH 38/67] Migrate form label in location profile select partial

---
 .../views/partials/forms/edit/location-profile-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/location-profile-select.blade.php b/resources/views/partials/forms/edit/location-profile-select.blade.php
index 14dc4793a..f3db9ad9b 100644
--- a/resources/views/partials/forms/edit/location-profile-select.blade.php
+++ b/resources/views/partials/forms/edit/location-profile-select.blade.php
@@ -1,7 +1,7 @@
 <!-- Location -->
 <div id="location_id" class="form-group{{ $errors->has('location_id') ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
 
-    {{ Form::label('location_id', $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="location_id" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="col-md-8">
         <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="location_id" style="width: 100%" id="location_id_location_select" aria-label="location_id">
             @if ($location_id = old('location_id', (isset($user)) ? $user->location_id : ''))

From 03bcc3b73fdf2635ef1bb935ad6cdf269c7f9533 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:27:29 -0800
Subject: [PATCH 39/67] Migrate form label in location select partial

---
 resources/views/partials/forms/edit/location-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/location-select.blade.php b/resources/views/partials/forms/edit/location-select.blade.php
index 0abf2308e..f7077e4de 100644
--- a/resources/views/partials/forms/edit/location-select.blade.php
+++ b/resources/views/partials/forms/edit/location-select.blade.php
@@ -1,7 +1,7 @@
 <!-- Location -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="locations" data-placeholder="{{ trans('general.select_location') }}" name="{{ $fieldname }}" style="width: 100%" id="{{ $fieldname }}_location_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}{!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' required ' : '' !!}>
             @isset($selected)

From 40e002911cf8a3a57f4a014aca458a731e1bdee7 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:29:06 -0800
Subject: [PATCH 40/67] Migrate form label in manufacturer select partial

---
 .../views/partials/forms/edit/manufacturer-select.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/manufacturer-select.blade.php b/resources/views/partials/forms/edit/manufacturer-select.blade.php
index c8cafddf8..44e831fd5 100644
--- a/resources/views/partials/forms/edit/manufacturer-select.blade.php
+++ b/resources/views/partials/forms/edit/manufacturer-select.blade.php
@@ -1,7 +1,7 @@
 <!-- Asset Model -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="manufacturers" data-placeholder="{{ trans('general.select_manufacturer') }}" name="{{ $fieldname }}" style="width: 100%" id="manufacturer_select_id" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' required ' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>

From 3327e1d8f24895bc8e44750b2b1b49ce4c5b0e1d Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:30:14 -0800
Subject: [PATCH 41/67] Migrate form label in asset model select partial

---
 resources/views/partials/forms/edit/model-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php
index 850a97608..7a846a7a1 100644
--- a/resources/views/partials/forms/edit/model-select.blade.php
+++ b/resources/views/partials/forms/edit/model-select.blade.php
@@ -1,7 +1,7 @@
 <!-- Asset Model -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="models" data-placeholder="{{ trans('general.select_model') }}" name="{{ $fieldname }}" style="width: 100%" id="model_select_id" aria-label="{{ $fieldname }}"{{  ((isset($field_req)) || ((isset($required) && ($required =='true')))) ?  ' required' : '' }}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>

From 4834f60a44d7e313d49a4fff0dda06e1b349f58f Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:32:06 -0800
Subject: [PATCH 42/67] Migrate form label in phone input partial

---
 resources/views/partials/forms/edit/phone.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/phone.blade.php b/resources/views/partials/forms/edit/phone.blade.php
index 1a9d407a1..b44480f16 100644
--- a/resources/views/partials/forms/edit/phone.blade.php
+++ b/resources/views/partials/forms/edit/phone.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group {{ $errors->has('phone') ? ' has-error' : '' }}">
-    {{ Form::label('phone', trans('admin/suppliers/table.phone'), array('class' => 'col-md-3 control-label')) }}
+    <label for="phone" class="col-md-3 control-label">{{ trans('admin/suppliers/table.phone') }}</label>
     <div class="col-md-7">
     {{Form::text('phone', old('phone', $item->phone), array('class' => 'form-control', 'aria-label'=>'phone', 'maxlength'=>'191')) }}
         {!! $errors->first('phone', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}

From 015cd44136f9993221297e1ddc205fbce05dc731 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:34:07 -0800
Subject: [PATCH 43/67] Migrate form label in status select partial

---
 resources/views/partials/forms/edit/status-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/status-select.blade.php b/resources/views/partials/forms/edit/status-select.blade.php
index ae4a4f2d1..bd1fb5014 100644
--- a/resources/views/partials/forms/edit/status-select.blade.php
+++ b/resources/views/partials/forms/edit/status-select.blade.php
@@ -1,7 +1,7 @@
 <!-- Asset Model -->
 <div id="{{ $fieldname }}" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="statuslabels" data-placeholder="{{ trans('general.select_statuslabel') }}" name="{{ $fieldname }}" style="width: 100%" id="status_select_id" aria-label="{{ $fieldname }}" {!!  ((isset($item)) && (Helper::checkIfRequired($item, $fieldname))) ? ' required ' : '' !!}{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>

From 13d2d41f0c7f844d3a0afe7199bc64874defdbf7 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:39:03 -0800
Subject: [PATCH 44/67] Migrate form label in supplier select partial

---
 resources/views/partials/forms/edit/supplier-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/supplier-select.blade.php b/resources/views/partials/forms/edit/supplier-select.blade.php
index 0f0f4f18e..c5f0264a1 100644
--- a/resources/views/partials/forms/edit/supplier-select.blade.php
+++ b/resources/views/partials/forms/edit/supplier-select.blade.php
@@ -1,6 +1,6 @@
 <div id="assigned_user" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="suppliers" data-placeholder="{{ trans('general.select_supplier') }}" name="{{ $fieldname }}" style="width: 100%" id="supplier_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}{{ (isset($item) && (Helper::checkIfRequired($item, $fieldname))) ? ' required' : '' }}>

From f639d826932f35375906f3d401ff4814a52b82b9 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:40:27 -0800
Subject: [PATCH 45/67] Migrate form label in user select partial

---
 resources/views/partials/forms/edit/user-select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/user-select.blade.php b/resources/views/partials/forms/edit/user-select.blade.php
index 629e94239..e73d09def 100644
--- a/resources/views/partials/forms/edit/user-select.blade.php
+++ b/resources/views/partials/forms/edit/user-select.blade.php
@@ -1,6 +1,6 @@
 <div id="assigned_user" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
 
-    {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
+    <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
 
     <div class="col-md-7">
         <select class="js-data-ajax" data-endpoint="users" data-placeholder="{{ trans('general.select_user') }}" name="{{ $fieldname }}" style="width: 100%" id="assigned_user_select" aria-label="{{ $fieldname }}"{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}>

From 0620b8b16350b41bfbdb4cb2160f28121f63dec6 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:44:00 -0800
Subject: [PATCH 46/67] Migrate form label in checkout select partial

---
 resources/views/partials/forms/checkout-selector.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/checkout-selector.blade.php b/resources/views/partials/forms/checkout-selector.blade.php
index 268089a7d..4fb4ccbd8 100644
--- a/resources/views/partials/forms/checkout-selector.blade.php
+++ b/resources/views/partials/forms/checkout-selector.blade.php
@@ -1,5 +1,5 @@
 <div class="form-group" id="assignto_selector"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
-    {{ Form::label('checkout_to_type', trans('admin/hardware/form.checkout_to'), array('class' => 'col-md-3 control-label')) }}
+    <label for="checkout_to_type" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkout_to') }}</label>
     <div class="col-md-8">
         <div class="btn-group" data-toggle="buttons">
             @if ((isset($user_select)) && ($user_select!='false'))

From b59674ab77e2974217ef3b8eb123fc5a8e3eaafe Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 13:48:50 -0800
Subject: [PATCH 47/67] Migrate form labels on settings alert page

---
 resources/views/settings/alerts.blade.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php
index fb614a2e8..703b3cfd7 100644
--- a/resources/views/settings/alerts.blade.php
+++ b/resources/views/settings/alerts.blade.php
@@ -66,7 +66,7 @@
                         <!-- Alert Email -->
                         <div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('alert_email', trans('admin/settings/general.alert_email')) }}
+                                <label for="alert_email">{{ trans('admin/settings/general.alert_email') }}</label>
                             </div>
                             <div class="col-md-7">
                                 <input type="text" name="alert_email" value="{{ old('alert_email', $setting->alert_email) }}" class="form-control" placeholder="admin@yourcompany.com" maxlength="191">
@@ -80,7 +80,7 @@
                         <!-- Admin CC Email -->
                         <div class="form-group {{ $errors->has('admin_cc_email') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('admin_cc_email', trans('admin/settings/general.admin_cc_email')) }}
+                                <label for="admin_cc_email">{{ trans('admin/settings/general.admin_cc_email') }}</label>
                             </div>
                             <div class="col-md-7">
                                 <input type="text" name="admin_cc_email" value="{{ old('admin_cc_email', $setting->admin_cc_email) }}" class="form-control" placeholder="admin@yourcompany.com" maxlength="191">
@@ -95,7 +95,7 @@
                         <!-- Alert interval -->
                         <div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('alert_interval', trans('admin/settings/general.alert_interval')) }}
+                                <label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label>
                             </div>
                             <div class="col-md-9">
                                 {{ Form::text('alert_interval', old('alert_interval', $setting->alert_interval), array('class' => 'form-control','placeholder' => '30', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
@@ -106,7 +106,7 @@
                         <!-- Alert threshold -->
                         <div class="form-group {{ $errors->has('alert_threshold') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('alert_threshold', trans('admin/settings/general.alert_inv_threshold')) }}
+                                <label for="alert_threshold">{{ trans('admin/settings/general.alert_inv_threshold') }}</label>
                             </div>
                             <div class="col-md-9">
                                 {{ Form::text('alert_threshold', old('alert_threshold', $setting->alert_threshold), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
@@ -118,7 +118,7 @@
                         <!-- Alert interval -->
                         <div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('audit_interval', trans('admin/settings/general.audit_interval')) }}
+                                <label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label>
                             </div>
                             <div class="input-group col-md-3">
                                 {{ Form::text('audit_interval', old('audit_interval', $setting->audit_interval), array('class' => 'form-control','placeholder' => '12', 'maxlength'=>'3')) }}
@@ -133,7 +133,7 @@
                         <!-- Alert threshold -->
                         <div class="form-group {{ $errors->has('audit_warning_days') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('audit_warning_days', trans('admin/settings/general.audit_warning_days')) }}
+                                <label for="audit_warning_days">{{ trans('admin/settings/general.audit_warning_days') }}</label>
                             </div>
                             <div class="input-group col-md-3">
                                 {{ Form::text('audit_warning_days', old('audit_warning_days', $setting->audit_warning_days), array('class' => 'form-control','placeholder' => '14', 'maxlength'=>'3')) }}
@@ -148,7 +148,7 @@
                         <!-- Due for checkin days -->
                         <div class="form-group {{ $errors->has('due_checkin_days') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('due_checkin_days', trans('admin/settings/general.due_checkin_days')) }}
+                                <label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label>
                             </div>
                             <div class="input-group col-md-3">
                                 {{ Form::text('due_checkin_days', old('due_checkin_days', $setting->due_checkin_days), array('class' => 'form-control','placeholder' => '14', 'maxlength'=>'3')) }}

From f8d7291923e6d6269f609e7790dbd977036b6cbc Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:11:36 -0800
Subject: [PATCH 48/67] Migrate form labels on asset tag settings page

---
 resources/views/settings/asset_tags.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php
index 020d97a75..e9a33fa21 100644
--- a/resources/views/settings/asset_tags.blade.php
+++ b/resources/views/settings/asset_tags.blade.php
@@ -55,7 +55,7 @@
 
                         <div class="form-group">
                             <div class="col-md-5">
-                                {{ Form::label('next_auto_tag_base', trans('admin/settings/general.next_auto_tag_base')) }}
+                                <label for="next_auto_tag_base">{{ trans('admin/settings/general.next_auto_tag_base') }}</label>
                             </div>
                             <div class="col-md-7">
                                 {{ Form::text('next_auto_tag_base', old('next_auto_tag_base', $setting->next_auto_tag_base), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'next_auto_tag_base')) }}
@@ -67,7 +67,7 @@
                         <!-- auto prefix -->
                         <div class="form-group {{ $errors->has('auto_increment_prefix') ? 'error' : '' }}">
                             <div class="col-md-5">
-                                {{ Form::label('auto_increment_prefix', trans('admin/settings/general.auto_increment_prefix')) }}
+                                <label for="auto_increment_prefix">{{ trans('admin/settings/general.auto_increment_prefix') }}</label>
                             </div>
                             <div class="col-md-7">
                                 @if ($setting->auto_increment_assets == 1)
@@ -82,7 +82,7 @@
                         <!-- auto zerofill -->
                         <div class="form-group {{ $errors->has('zerofill_count') ? 'error' : '' }}">
                             <div class="col-md-5">
-                                {{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }}
+                                <label for="zerofill_count">{{ trans('admin/settings/general.zerofill_count') }}</label>
                             </div>
                             <div class="col-md-7">
                                 {{ Form::text('zerofill_count', old('zerofill_count', $setting->zerofill_count), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'zerofill_count')) }}

From d6b4c273025886567fd077dc63645ff6b1861145 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:14:50 -0800
Subject: [PATCH 49/67] Migrate form label on branding settings page

---
 resources/views/settings/branding.blade.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index c586917ef..ee31677bc 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -45,7 +45,7 @@
                         <div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
 
                             <div class="col-md-3">
-                                {{ Form::label('site_name', trans('admin/settings/general.site_name')) }}
+                                <label for="site_name">{{ trans('admin/settings/general.site_name') }}</label>
                             </div>
                             <div class="col-md-7 required">
                                 @if (config('app.lock_passwords')===true)
@@ -64,7 +64,7 @@
                         <!-- Branding -->
                         <div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                 {{ Form::label('brand', trans('admin/settings/general.web_brand')) }}
+                                <label for="brand">{{ trans('admin/settings/general.web_brand') }}</label>
                             </div>
                             <div class="col-md-9">
                                 {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
@@ -188,7 +188,7 @@
                         <!-- Header color -->
                         <div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('header_color', trans('admin/settings/general.header_color')) }}
+                                <label for="header_color">{{ trans('admin/settings/general.header_color') }}</label>
                             </div>
                             <div class="col-md-2">
                                 <div class="input-group header-color">
@@ -204,7 +204,7 @@
                         <!-- Skin -->
                         <div class="form-group {{ $errors->has('skin') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('skin', trans('general.skin')) }}
+                                <label for="skin">{{ trans('general.skin') }}</label>
                             </div>
                             <div class="col-md-9">
                                 {!! Form::skin('skin', old('skin', $setting->skin), 'select2') !!}
@@ -229,7 +229,7 @@
                         <!-- Custom css -->
                         <div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('custom_css', trans('admin/settings/general.custom_css')) }}
+                                <label for="custom_css">{{ trans('admin/settings/general.custom_css') }}</label>
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
@@ -248,7 +248,7 @@
                         <!-- Support Footer -->
                         <div class="form-group {{ $errors->has('support_footer') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('support_footer', trans('admin/settings/general.support_footer')) }}
+                                <label for="support_footer">{{ trans('admin/settings/general.support_footer') }}</label>
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
@@ -267,7 +267,7 @@
                         <!-- Version Footer -->
                         <div class="form-group {{ $errors->has('version_footer') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('version_footer', trans('admin/settings/general.version_footer')) }}
+                                <label for="version_footer">{{ trans('admin/settings/general.version_footer') }}</label>
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
@@ -285,7 +285,7 @@
                         <!-- Additional footer -->
                         <div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('footer_text', trans('admin/settings/general.footer_text')) }}
+                                <label for="footer_text">{{ trans('admin/settings/general.footer_text') }}</label>
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)

From a331e14ef25524fb369e725c983533e5388386a3 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:19:34 -0800
Subject: [PATCH 50/67] Migrate form labels on general settings page

---
 resources/views/settings/general.blade.php | 31 ++++++++++------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 1de5d4035..be19a9ee3 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -77,7 +77,7 @@
                     <!-- Email domain -->
                     <div class="form-group {{ $errors->has('email_domain') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('email_domain', trans('general.email_domain')) }}
+                            <label for="email_domain">{{ trans('general.email_domain') }}</label>
                         </div>
                         <div class="col-md-9">
                             {{ Form::text('email_domain', old('email_domain', $setting->email_domain), array('class' => 'form-control','placeholder' => 'example.com')) }}
@@ -90,7 +90,7 @@
                     <!-- Email format -->
                     <div class="form-group {{ $errors->has('email_format') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('email_format', trans('general.email_format')) }}
+                            <label for="email_format">{{ trans('general.email_format') }}</label>
                         </div>
                         <div class="col-md-9">
                             {!! Form::username_format('email_format', old('email_format', $setting->email_format), 'select2') !!}
@@ -101,7 +101,7 @@
                     <!-- Username format -->
                     <div class="form-group {{ $errors->has('username_format') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('username_format', trans('general.username_format')) }}
+                            <label for="username_format">{{ trans('general.username_format') }}</label>
                         </div>
                         <div class="col-md-9">
                             {!! Form::username_format('username_format', old('username_format', $setting->username_format), 'select2') !!}
@@ -182,7 +182,7 @@
                        <!-- Per Page -->
                     <div class="form-group {{ $errors->has('per_page') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('per_page', trans('admin/settings/general.per_page')) }}
+                            <label for="per_page">{{ trans('admin/settings/general.per_page') }}</label>
                         </div>
                         <div class="col-md-9">
                             {{ Form::text('per_page', old('per_page', $setting->per_page), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
@@ -193,7 +193,7 @@
                    <!-- Thumb Size -->
                    <div class="form-group {{ $errors->has('thumbnail_max_h') ? 'error' : '' }}">
                        <div class="col-md-3">
-                           {{ Form::label('thumbnail_max_h', trans('admin/settings/general.thumbnail_max_h')) }}
+                           <label for="thumbnail_max_h">{{ trans('admin/settings/general.thumbnail_max_h') }}</label>
                        </div>
                        <div class="col-md-9">
                            {{ Form::text('thumbnail_max_h', old('thumbnail_max_h', $setting->thumbnail_max_h), array('class' => 'form-control','placeholder' => '50', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
@@ -205,7 +205,7 @@
                     <!-- Default EULA -->
                    <div class="form-group {{ $errors->has('default_eula_text') ? 'error' : '' }}">
                        <div class="col-md-3">
-                           {{ Form::label('default_eula_text', trans('admin/settings/general.default_eula_text')) }}
+                           <label for="default_eula_text">{{ trans('admin/settings/general.default_eula_text') }}</label>
                        </div>
                        <div class="col-md-9">
                            {{ Form::textarea('default_eula_text', old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }}
@@ -236,7 +236,7 @@
                     <!-- login text -->
                     <div class="form-group {{ $errors->has('login_note') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('login_note', trans('admin/settings/general.login_note')) }}
+                            <label for="login_note">{{ trans('admin/settings/general.login_note') }}</label>
                         </div>
                         <div class="col-md-9">
                             @if (config('app.lock_passwords'))
@@ -255,7 +255,7 @@
                        <!-- Mail test -->
                        <div class="form-group">
                            <div class="col-md-3">
-                               {{ Form::label('login_note', 'Test Mail') }}
+                               <label for="login_note">Test Mail</label>
                            </div>
                            <div class="col-md-9" id="mailtestrow">
                                <a class="btn btn-default btn-sm pull-left" id="mailtest" style="margin-right: 10px;">
@@ -278,7 +278,7 @@
                        <!-- dashboard text -->
                        <div class="form-group {{ $errors->has('dashboard_message') ? 'error' : '' }}">
                            <div class="col-md-3">
-                               {{ Form::label('dashboard_message', trans('admin/settings/general.dashboard_message')) }}
+                               <label for="dashboard_message">{{ trans('admin/settings/general.dashboard_message') }}</label>
                            </div>
                            <div class="col-md-9">
                                @if (config('app.lock_passwords'))
@@ -302,8 +302,7 @@
                        <!-- Archived in List -->
                        <div class="form-group {{ $errors->has('show_archived_in_list') ? 'error' : '' }}">
                            <div class="col-md-3">
-                               {{ Form::label('show_archived_in_list',
-                                              trans('admin/settings/general.show_archived_in_list')) }}
+                               <label for="show_archived_in_list">{{ trans('admin/settings/general.show_archived_in_list') }}</label>
                            </div>
                            <div class="col-md-9">
 
@@ -318,8 +317,7 @@
                        <!-- Show assets assigned to user's assets -->
                        <div class="form-group {{ $errors->has('show_assigned_assets') ? 'error' : '' }}">
                            <div class="col-md-3">
-                               {{ Form::label('show_assigned_assets',
-                                              trans('admin/settings/general.show_assigned_assets')) }}
+                               <label for="show_assigned_assets">{{ trans('admin/settings/general.show_assigned_assets') }}</label>
                            </div>
                            <div class="col-md-9">
                                <label class="form-control">
@@ -355,8 +353,7 @@
                        <!-- dash chart -->
                        <div class="form-group {{ $errors->has('dash_chart_type') ? 'error' : '' }}">
                            <div class="col-md-3">
-                               {{ Form::label('show_in_model_list',
-                                              trans('general.pie_chart_type')) }}
+                               <label for="show_in_model_list">{{ trans('general.pie_chart_type') }}</label>
                            </div>
                            <div class="col-md-9">
                                {{ Form::select('dash_chart_type', array(
@@ -369,7 +366,7 @@
                        <!-- Depreciation method -->
                        <div class="form-group {{ $errors->has('depreciation_method') ? 'error' : '' }}">
                            <div class="col-md-3">
-                                {{ Form::label('depreciation_method', trans('Depreciation method')) }}
+                               <label for="depreciation_method">{{ trans('Depreciation method') }}</label>
                            </div>
                            <div class="col-md-9">
                                {{ Form::select('depreciation_method', array(
@@ -384,7 +381,7 @@
                        <!-- Privacy Policy Footer-->
                        <div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}">
                            <div class="col-md-3">
-                               {{ Form::label('privacy_policy_link', trans('admin/settings/general.privacy_policy_link')) }}
+                               <label for="privacy_policy_link">{{ trans('admin/settings/general.privacy_policy_link') }}</label>
                            </div>
                            <div class="col-md-9">
                                @if (config('app.lock_passwords'))

From e797705dad21514d948da8f1508f56c5f70392fc Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:27:22 -0800
Subject: [PATCH 51/67] Migrate form labels on google settings page

---
 resources/views/settings/google.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php
index 83e88b936..fc8e40e0c 100644
--- a/resources/views/settings/google.blade.php
+++ b/resources/views/settings/google.blade.php
@@ -65,7 +65,7 @@
                         <!-- Google Client ID -->
                         <div class="form-group {{ $errors->has('google_client_id') ? 'error' : '' }}">
                             <div class="col-md-3 text-right">
-                                {{ Form::label('google_client_id', 'Client ID') }}
+                                <label for="google_client_id">Client ID</label>
                             </div>
                             <div class="col-md-8">
                                 {{ Form::text('google_client_id', old('google_client_id', $setting->google_client_id), ['class' => 'form-control','placeholder' => trans('general.example') .'000000000000-XXXXXXXXXXX.apps.googleusercontent.com', (config('app.lock_passwords')===true) ? 'disabled': '']) }}
@@ -79,7 +79,7 @@
                         <!-- Google Client Secret -->
                         <div class="form-group {{ $errors->has('google_client_secret') ? 'error' : '' }}">
                             <div class="col-md-3 text-right">
-                                {{ Form::label('google_client_secret', 'Client Secret') }}
+                                <label for="google_client_secret">Client Secret</label>
                             </div>
                             <div class="col-md-8">
 

From f346c55cf10d6381b975a5619e5c947fd4cd5641 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:27:33 -0800
Subject: [PATCH 52/67] Migrate form labels on localization settings page

---
 resources/views/settings/localization.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php
index d8f3e436e..f7459467c 100644
--- a/resources/views/settings/localization.blade.php
+++ b/resources/views/settings/localization.blade.php
@@ -43,7 +43,7 @@
                         <!-- Language -->
                         <div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
                             <div class="col-md-3 col-xs-12">
-                                {{ Form::label('site_name', trans('admin/settings/general.default_language')) }}
+                                <label for="site_name">{{ trans('admin/settings/general.default_language') }}</label>
                             </div>
                             <div class="col-md-5 col-xs-12">
                                 {!! Form::locales('locale', old('locale', $setting->locale), 'select2') !!}
@@ -55,7 +55,7 @@
                         <!-- name display format -->
                         <div class="form-group {{ $errors->has('name_display_format') ? 'error' : '' }}">
                             <div class="col-md-3 col-xs-12">
-                                {{ Form::label('name_display_format', trans('general.name_display_format')) }}
+                                <label for="name_display_format">{{ trans('general.name_display_format') }}</label>
                             </div>
                             <div class="col-md-5 col-xs-12">
                                 {!! Form::name_display_format('name_display_format', old('name_display_format', $setting->name_display_format), 'select2') !!}
@@ -69,7 +69,7 @@
                         <!-- Date format -->
                         <div class="form-group {{ $errors->has('time_display_format') ? 'error' : '' }}">
                             <div class="col-md-3 col-xs-12">
-                                {{ Form::label('time_display_format', trans('general.time_and_date_display')) }}
+                                <label for="time_display_format">{{ trans('general.time_and_date_display') }}</label>
                             </div>
                             <div class="col-md-5 col-xs-12">
                                 {!! Form::date_display_format('date_display_format', old('date_display_format', $setting->date_display_format), 'select2') !!}
@@ -85,7 +85,7 @@
                         <!-- Currency -->
                         <div class="form-group {{ $errors->has('default_currency') ? 'error' : '' }}">
                             <div class="col-md-3 col-xs-12">
-                                {{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }}
+                                <label for="default_currency">{{ trans('admin/settings/general.default_currency') }}</label>
                             </div>
                             <div class="col-md-9 col-xs-12">
                                 {{ Form::text('default_currency', old('default_currency', $setting->default_currency), array('class' => 'form-control select2-container','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px; display: inline-block; ')) }}

From 19ceb3f5b73421237e00e80dfc664e70a581257d Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:28:49 -0800
Subject: [PATCH 53/67] Migrate form label on purge page

---
 resources/views/settings/purge-form.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/settings/purge-form.blade.php b/resources/views/settings/purge-form.blade.php
index 86ad28fc5..2b3ebaea4 100644
--- a/resources/views/settings/purge-form.blade.php
+++ b/resources/views/settings/purge-form.blade.php
@@ -28,7 +28,7 @@
                 <div class="box-body">
                     <p>{{ trans('admin/settings/general.confirm_purge_help') }}</p>
                     <div class="col-md-3{{ $errors->has('confirm_purge') ? 'error' : '' }}">
-                        {{ Form::label('confirm_purge', trans('admin/settings/general.confirm_purge')) }}
+                        <label for="confirm_purge">{{ trans('admin/settings/general.confirm_purge') }}</label>
                     </div>
                     <div class="col-md-9{{ $errors->has('confirm_purge') ? 'error' : '' }}">
                         @if (config('app.lock_passwords')===true)

From f8d5af836fe817e0676b74936940cb8e538f35a5 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:35:53 -0800
Subject: [PATCH 54/67] Migrate form labels on saml settings page

---
 resources/views/settings/saml.blade.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 9349023fc..bc3f7b11a 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -69,25 +69,25 @@
                                     <div class="col-md-9 col-md-offset-3">
                                     <!-- SAML SP Details -->
                                     <!-- SAML SP Entity ID -->
-                                    {{ Form::label('saml_sp_entitiyid', trans('admin/settings/general.saml_sp_entityid')) }}
+                                    <label for="saml_sp_entitiyid">{{ trans('admin/settings/general.saml_sp_entityid') }}</label>
                                     {{ Form::text('saml_sp_entitiyid', config('app.url'), ['class' => 'form-control', 'readonly']) }}
                                     <br>
                                     <!-- SAML SP ACS -->
-                                    {{ Form::label('saml_sp_acs_url', trans('admin/settings/general.saml_sp_acs_url')) }}
+                                    <label for="saml_sp_acs_url">{{ trans('admin/settings/general.saml_sp_acs_url') }}</label>
                                     {{ Form::text('saml_sp_acs_url', route('saml.acs'), ['class' => 'form-control', 'readonly']) }}
                                     <br>
                                     <!-- SAML SP SLS -->
-                                    {{ Form::label('saml_sp_sls_url', trans('admin/settings/general.saml_sp_sls_url')) }}
+                                    <label for="saml_sp_sls_url">{{ trans('admin/settings/general.saml_sp_sls_url') }}</label>
                                     {{ Form::text('saml_sp_sls_url', route('saml.sls'), ['class' => 'form-control', 'readonly']) }}
                                     <br>
                                     <!-- SAML SP Certificate -->
                                     @if (!empty($setting->saml_sp_x509cert))
-                                        {{ Form::label('saml_sp_x509cert', trans('admin/settings/general.saml_sp_x509cert')) }}
+                                        <label for="saml_sp_x509cert">{{ trans('admin/settings/general.saml_sp_x509cert') }}</label>
                                         {{ Form::textarea('saml_sp_x509cert', $setting->saml_sp_x509cert, ['class' => 'form-control', 'wrap' => 'off', 'readonly']) }}
                                         <br>
                                     @endif
                                     <!-- SAML SP Metadata URL -->
-                                    {{ Form::label('saml_sp_metadata_url', trans('admin/settings/general.saml_sp_metadata_url')) }}
+                                    <label for="saml_sp_metadata_url">{{ trans('admin/settings/general.saml_sp_metadata_url') }}</label>
                                     {{ Form::text('saml_sp_metadata_url', route('saml.metadata'), ['class' => 'form-control', 'readonly']) }}
                                     <br>
                                     <p class="help-block">
@@ -103,7 +103,7 @@
                         <!-- SAML IdP Metadata -->
                         <div class="form-group {{ $errors->has('saml_idp_metadata') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('saml_idp_metadata', trans('admin/settings/general.saml_idp_metadata')) }}
+                            <label for="saml_idp_metadata">{{ trans('admin/settings/general.saml_idp_metadata') }}</label>
                         </div>
                         <div class="col-md-9">
                             {{ Form::textarea('saml_idp_metadata', old('saml_idp_metadata', $setting->saml_idp_metadata), ['class' => 'form-control','placeholder' => 'https://example.com/idp/metadata', 'wrap' => 'off', $setting->demoMode]) }}
@@ -120,7 +120,7 @@
                         <!-- SAML Attribute Mapping Username -->
                         <div class="form-group {{ $errors->has('saml_attr_mapping_username') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('saml_attr_mapping_username', trans('admin/settings/general.saml_attr_mapping_username')) }}
+                                <label for="saml_attr_mapping_username">{{ trans('admin/settings/general.saml_attr_mapping_username') }}</label>
                             </div>
                             <div class="col-md-9">
                                 {{ Form::text('saml_attr_mapping_username', old('saml_attr_mapping_username', $setting->saml_attr_mapping_username), ['class' => 'form-control','placeholder' => '', $setting->demoMode]) }}
@@ -163,7 +163,7 @@
                         <!-- SAML Custom Options -->
                         <div class="form-group {{ $errors->has('saml_custom_settings') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('saml_custom_settings', trans('admin/settings/general.saml_custom_settings')) }}
+                            <label for="saml_custom_settings">{{ trans('admin/settings/general.saml_custom_settings') }}</label>
                         </div>
                         <div class="col-md-9">
                             {{ Form::textarea('saml_custom_settings', old('saml_custom_settings', $setting->saml_custom_settings), ['class' => 'form-control','placeholder' => 'example.option=false&#13;&#10;sp_x509cert=file:///...&#13;&#10;sp_private_key=file:///', 'wrap' => 'off', $setting->demoMode]) }}

From 32e1d4b2ef9c527b0e0c2e5031eff1b167cca2a1 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:39:16 -0800
Subject: [PATCH 55/67] Migrate form labels on security settings page

---
 resources/views/settings/security.blade.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index a51c86fcc..3e5410def 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -41,7 +41,7 @@
                         <!-- Two Factor -->
                         <div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('two_factor_enabled', trans('admin/settings/general.two_factor_enabled_text')) }}
+                                <label for="two_factor_enabled">{{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
                             </div>
                             <div class="col-md-9">
 
@@ -59,7 +59,7 @@
                         <!-- Min characters -->
                         <div class="form-group {{ $errors->has('pwd_secure_min') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('pwd_secure_min', trans('admin/settings/general.pwd_secure_min')) }}
+                                <label for="pwd_secure_min">{{ trans('admin/settings/general.pwd_secure_min') }}</label>
                             </div>
                             <div class="col-md-9">
                                 {{ Form::text('pwd_secure_min', old('pwd_secure_min', $setting->pwd_secure_min), array('class' => 'form-control',  'style'=>'width: 50px;')) }}
@@ -78,7 +78,7 @@
                         <!-- Common Passwords -->
                         <div class="form-group {{ $errors->has('pwd_secure_complexity.*') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('pwd_secure_complexity', trans('admin/settings/general.pwd_secure_complexity')) }}
+                                <label for="pwd_secure_complexity">{{ trans('admin/settings/general.pwd_secure_complexity') }}</label>
                             </div>
                             <div class="col-md-9">
                                 <label class="form-control">
@@ -130,7 +130,7 @@
                                 @else
                                     <label class="form-control">
                                         {{ Form::checkbox('login_remote_user_enabled', '1', old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('aria-label'=>'login_remote_user')) }}
-                                        {{ Form::label('login_remote_user_enabled',  trans('admin/settings/general.login_remote_user_enabled_text')) }}
+                                        <label for="login_remote_user_enabled">{{ trans('admin/settings/general.login_remote_user_enabled_text') }}</label>
                                     </label>
 
                                     {!! $errors->first('login_remote_user_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -138,14 +138,14 @@
                                         {{ trans('admin/settings/general.login_remote_user_enabled_help') }}
                                     </p>
                                     <!-- Use custom remote user header name -->
-                                    {{ Form::label('login_remote_user_header_name',  trans('admin/settings/general.login_remote_user_header_name_text')) }}
+                                    <label for="login_remote_user_header_name">{{ trans('admin/settings/general.login_remote_user_header_name_text') }}</label>
                                     {{ Form::text('login_remote_user_header_name', old('login_remote_user_header_name', $setting->login_remote_user_header_name),array('class' => 'form-control')) }}
                                     {!! $errors->first('login_remote_user_header_name', '<span class="alert-msg">:message</span>') !!}
                                     <p class="help-block">
                                         {{ trans('admin/settings/general.login_remote_user_header_name_help') }}
                                     </p>
                                     <!-- Custom logout url to redirect to authentication provider -->
-                                    {{ Form::label('login_remote_user_custom_logout_url',  trans('admin/settings/general.login_remote_user_custom_logout_url_text')) }}
+                                    <label for="login_remote_user_custom_logout_url">{{ trans('admin/settings/general.login_remote_user_custom_logout_url_text') }}</label>
                                     {{ Form::text('login_remote_user_custom_logout_url', old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url),array('class' => 'form-control', 'aria-label'=>'login_remote_user_custom_logout_url')) }}
 
                                     {!! $errors->first('login_remote_user_custom_logout_url', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}

From 85bc8bc8f07033aae690e7de43e8545a5bccd21e Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:40:20 -0800
Subject: [PATCH 56/67] Migrate form label on create status label page

---
 resources/views/statuslabels/edit.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index af69f35de..4eb7bddf3 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -34,7 +34,7 @@
 
 <!-- Chart color -->
 <div class="form-group{{ $errors->has('color') ? ' has-error' : '' }}">
-    {{ Form::label('color', trans('admin/statuslabels/table.color'), ['class' => 'col-md-3 control-label']) }}
+    <label for="color" class="col-md-3 control-label">{{ trans('admin/statuslabels/table.color') }}</label>
     <div class="col-md-9">
         <div class="input-group color">
             {{ Form::text('color', old('color', $item->color), array('class' => 'form-control col-md-10', 'maxlength'=>'20')) }}

From 7f0133a4d6c3ad4abbb7321f6167087d6f42da75 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 14:42:07 -0800
Subject: [PATCH 57/67] Migrate form labels on create supplier page

---
 resources/views/suppliers/edit.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index 50341be92..6fd8caee9 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -14,7 +14,7 @@
 @include ('partials.forms.edit.address')
 
 <div class="form-group {{ $errors->has('contact') ? ' has-error' : '' }}">
-    {{ Form::label('contact', trans('admin/suppliers/table.contact'), array('class' => 'col-md-3 control-label')) }}
+    <label for="contact" class="col-md-3 control-label">{{ trans('admin/suppliers/table.contact') }}</label>
     <div class="col-md-7">
         {{Form::text('contact', old('contact', $item->contact), array('class' => 'form-control')) }}
         {!! $errors->first('contact', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -26,7 +26,7 @@
 @include ('partials.forms.edit.email')
 
 <div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
-    {{ Form::label('url', trans('general.url'), array('class' => 'col-md-3 control-label')) }}
+    <label for="url" class="col-md-3 control-label">{{ trans('general.url') }}</label>
     <div class="col-md-7">
         {{Form::text('url', old('url', $item->url), array('class' => 'form-control')) }}
         {!! $errors->first('url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}

From b39b24e6b935881b7273571f083840d3d74e9f4f Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 15:01:51 -0800
Subject: [PATCH 58/67] Migrate form labels on user setup

---
 resources/views/setup/user.blade.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php
index 18da69513..a583d45cc 100644
--- a/resources/views/setup/user.blade.php
+++ b/resources/views/setup/user.blade.php
@@ -40,7 +40,7 @@
 
     <!-- Currency -->
     <div class="form-group col-lg-6{{$errors->has('default_currency') ? ' error' : ''}}">
-      {{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }}
+      <label for="default_currency">{{ trans('admin/settings/general.default_currency') }}</label>
       {{ Form::text('default_currency', old('default_currency'), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
 
       {!! $errors->first('default_currency', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -71,14 +71,14 @@
   <div class="row">
 
     <div class="form-group col-lg-6{{ $errors->has('auto_increment_prefix') ? ' error' : '' }}">
-      {{ Form::label('auto_increment_prefix', trans('admin/settings/general.auto_increment_prefix')) }}
+      <label for="auto_increment_prefix">{{ trans('admin/settings/general.auto_increment_prefix') }}</label>
       {{ Form::text('auto_increment_prefix', old('auto_increment_prefix'), array('class' => 'form-control')) }}
 
       {!! $errors->first('auto_increment_prefix', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
 
     <div class="form-group col-lg-6{{ $errors->has('zerofill_count') ? ' error' : '' }}">
-      {{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }}
+      <label for="zerofill_count">{{ trans('admin/settings/general.zerofill_count') }}</label>
       {{ Form::text('zerofill_count', old('zerofill_count', 5), array('class' => 'form-control')) }}
 
       {!! $errors->first('zerofill_count', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -89,7 +89,7 @@
     <!-- email domain -->
     <div class="row">
       <div class="form-group col-lg-6 required {{ $errors->has('email_domain') ? 'error' : '' }}">
-        {{ Form::label('email_domain', trans('general.email_domain')) }}
+        <label for="email_domain">{{ trans('general.email_domain') }}</label>
         {{ Form::text('email_domain', old('email_domain'), array('class' => 'form-control','placeholder' => 'example.com','required' => true)) }}
         <span class="help-block">{{ trans('general.email_domain_help')  }}</span>
 
@@ -98,7 +98,7 @@
 
       <!-- email format  -->
       <div class="form-group col-lg-6 {{ $errors->has('email_format') ? 'error' : '' }}">
-        {{ Form::label('email_format', trans('general.email_format')) }}
+        <label for="email_format">{{ trans('general.email_format') }}</label>
         {!! Form::username_format('email_format', old('email_format', 'filastname'), 'select2') !!}
         {!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
@@ -108,14 +108,14 @@
     <div class="row">
       <!-- first name -->
       <div class="form-group col-lg-6">
-        {{ Form::label('first_name', trans('general.first_name'), 'required') }}
+        <label for="first_name">{{ trans('general.first_name') }}</label>
         {{ Form::text('first_name', old('first_name'), array('class' => 'form-control','placeholder' => 'Jane', 'required' => true)) }}
         {!! $errors->first('first_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
 
       <!-- last name -->
       <div class="form-group col-lg-6 required {{ $errors->has('last_name') ? 'error' : '' }}">
-        {{ Form::label('last_name', trans('general.last_name')) }}
+        <label for="last_name">{{ trans('general.last_name') }}</label>
         {{ Form::text('last_name', old('last_name'), array('class' => 'form-control','placeholder' => 'Smith', 'required' => true)) }}
         {!! $errors->first('last_name', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
@@ -124,14 +124,14 @@
     <div class="row">
       <!-- email-->
       <div class="form-group col-lg-6{{ $errors->has('email') ? 'error' : '' }}">
-        {{ Form::label('email', trans('admin/users/table.email')) }}
+        <label for="email">{{ trans('admin/users/table.email') }}</label>
         {{ Form::email('email', config('mail.from.address'), array('class' => 'form-control','placeholder' => 'you@example.com', 'required' => true)) }}
         {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
 
       <!-- username -->
       <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'username')) ? ' required' : '' }} {{ $errors->has('username') ? 'error' : '' }}">
-        {{ Form::label('username', trans('admin/users/table.username')) }}
+        <label for="username">{{ trans('admin/users/table.username') }}</label>
         {{ Form::text('username', old('username'), array('class' => 'form-control','placeholder' => 'jsmith', 'required' => true)) }}
         {!! $errors->first('username', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
@@ -140,14 +140,14 @@
     <div class="row">
       <!-- password -->
       <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password') ? 'error' : '' }}">
-        {{ Form::label('password', trans('admin/users/table.password')) }}
+        <label for="password">{{ trans('admin/users/table.password') }}</label>
         <input class="form-control" type="password" name="password" id="password" value="" required>
         {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
 
       <!-- password confirm -->
       <div class="form-group col-lg-6{{  (Helper::checkIfRequired(\App\Models\User::class, 'password')) ? ' required' : '' }} {{ $errors->has('password_confirm') ? 'error' : '' }}">
-        {{ Form::label('password_confirmation', trans('admin/users/table.password_confirm')) }}
+        <label for="password_confirmation">{{ trans('admin/users/table.password_confirm') }}</label>
         <input class="form-control" type="password" name="password_confirmation" id="password_confirmation" value="" required>
         {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>

From f46ad4811e906fbbf64cd8f070858eaef1182bea Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 5 Feb 2025 16:44:09 -0800
Subject: [PATCH 59/67] Migrate form email helper on user setup page

---
 resources/views/setup/user.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php
index 18da69513..a6a01782a 100644
--- a/resources/views/setup/user.blade.php
+++ b/resources/views/setup/user.blade.php
@@ -125,7 +125,7 @@
       <!-- email-->
       <div class="form-group col-lg-6{{ $errors->has('email') ? 'error' : '' }}">
         {{ Form::label('email', trans('admin/users/table.email')) }}
-        {{ Form::email('email', config('mail.from.address'), array('class' => 'form-control','placeholder' => 'you@example.com', 'required' => true)) }}
+        <input class="form-control" type="email" name="email" id="email" value="{{ old('email', config('mail.from.address')) }}" placeholder="you@example.com" required>
         {!! $errors->first('email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
       </div>
 

From ec45833cd8da08edbcb9a1a7812e9ff8a1a751f6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 6 Feb 2025 10:22:17 +0000
Subject: [PATCH 60/67] Upgraded papaparse to 5.5.1

Signed-off-by: snipe <snipe@snipe.net>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7de7aaea7..ed97eb48c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
                 "less-loader": "^6.0",
                 "list.js": "^1.5.0",
                 "morris.js": "github:morrisjs/morris.js",
-                "papaparse": "5.4.1",
+                "papaparse": "5.5.1",
                 "select2": "4.0.13",
                 "sheetjs": "^2.0.0",
                 "signature_pad": "^4.2.0",
@@ -8368,9 +8368,9 @@
             "license": "(MIT AND Zlib)"
         },
         "node_modules/papaparse": {
-            "version": "5.4.1",
-            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz",
-            "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw=="
+            "version": "5.5.1",
+            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.5.1.tgz",
+            "integrity": "sha512-EuEKUhyxrHVozD7g3/ztsJn6qaKse8RPfR6buNB2dMJvdtXNhcw8jccVi/LxNEY3HVrV6GO6Z4OoeCG9Iy9wpA=="
         },
         "node_modules/param-case": {
             "version": "3.0.4",
diff --git a/package.json b/package.json
index e86bf9066..db5f72189 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
         "less-loader": "^6.0",
         "list.js": "^1.5.0",
         "morris.js": "github:morrisjs/morris.js",
-        "papaparse": "5.4.1",
+        "papaparse": "5.5.1",
         "select2": "4.0.13",
         "sheetjs": "^2.0.0",
         "signature_pad": "^4.2.0",

From de3ebfecfe1668107aa58638314b87646112d840 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Thu, 6 Feb 2025 13:24:39 +0000
Subject: [PATCH 61/67] Ensure we don't call preg_split() with a null as the
 second parameter

---
 app/Http/Requests/SettingsSamlRequest.php | 2 +-
 app/Models/CustomField.php                | 2 +-
 app/Services/Saml.php                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Requests/SettingsSamlRequest.php b/app/Http/Requests/SettingsSamlRequest.php
index 8f02d64f0..2ab876141 100644
--- a/app/Http/Requests/SettingsSamlRequest.php
+++ b/app/Http/Requests/SettingsSamlRequest.php
@@ -62,7 +62,7 @@ class SettingsSamlRequest extends FormRequest
             $custom_privateKey = '';
             $custom_x509certNew = '';
             if (! empty($this->input('saml_custom_settings'))) {
-                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings'));
+                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings', ''));
                 $custom_settings = [];
 
                 foreach ($req_custom_settings as $custom_setting) {
diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
index dfa497136..81eff9b4c 100644
--- a/app/Models/CustomField.php
+++ b/app/Models/CustomField.php
@@ -307,7 +307,7 @@ class CustomField extends Model
     public function formatFieldValuesAsArray()
     {
         $result = [];
-        $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values);
+        $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values ?? '');
 
         if (($this->element != 'checkbox') && ($this->element != 'radio')) {
             $result[''] = 'Select '.strtolower($this->format);
diff --git a/app/Services/Saml.php b/app/Services/Saml.php
index 860ec7617..222c2c2ea 100644
--- a/app/Services/Saml.php
+++ b/app/Services/Saml.php
@@ -209,7 +209,7 @@ class Saml
                 }
             }
 
-            $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings);
+            $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings ?? '');
             if ($custom_settings) {
                 foreach ($custom_settings as $custom_setting) {
                     $split = explode('=', $custom_setting, 2);

From f41583fd59eec20da07957089232165a45115981 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 6 Feb 2025 11:34:14 -0800
Subject: [PATCH 62/67] adds ternary checks on locations before pulling names
 in notifications

---
 app/Notifications/CheckinAssetNotification.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index fa4780c1f..c6828ef8e 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -79,7 +79,7 @@ class CheckinAssetNotification extends Notification
 
         $fields = [
             trans('general.administrator') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
-            trans('general.status') => $item->assetstatus->name,
+            trans('general.status') => $item->assetstatus?->name,
             trans('general.location') => ($item->location) ? $item->location->name : '',
         ];
 
@@ -106,9 +106,9 @@ class CheckinAssetNotification extends Notification
                 ->title(trans('mail.Asset_Checkin_Notification'))
                 ->addStartGroupToSection('activityText')
                 ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
-                ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+                ->fact(trans('mail.checked_into'), ($item->location) ? $item->location->name : '')
                 ->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->present()->fullName())
-                ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
+                ->fact(trans('admin/hardware/form.status'), $item->assetstatus?->name)
                 ->fact(trans('mail.notes'), $note ?: '');
         }
 
@@ -116,9 +116,9 @@ class CheckinAssetNotification extends Notification
         $message = trans('mail.Asset_Checkin_Notification');
         $details = [
             trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
-            trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
+            trans('mail.checked_into') => ($item->location) ? $item->location->name : '',
             trans('mail.Asset_Checkin_Notification')." by " => $admin->present()->fullName(),
-            trans('admin/hardware/form.status') => $item->assetstatus->name,
+            trans('admin/hardware/form.status') => $item->assetstatus?->name,
             trans('mail.notes') => $note ?: '',
         ];
 
@@ -142,8 +142,8 @@ class CheckinAssetNotification extends Notification
                         Section::create(
                             KeyValue::create(
                                 trans('mail.checked_into') ?: '',
-                                $item->location->name ? $item->location->name : '',
-                                trans('admin/hardware/form.status').": ".$item->assetstatus->name,
+                                ($item->location) ? $item->location->name : '',
+                                trans('admin/hardware/form.status').": ".$item->assetstatus?->name,
                             )
                                 ->onClick(route('hardware.show', $item->id))
                         )

From 42fa2e12db48ab52c4594b9601c00342116e6b9a Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Feb 2025 13:55:33 -0800
Subject: [PATCH 63/67] Replace Form::checkbox

---
 resources/views/account/profile.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index d27367192..153492a3b 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -128,7 +128,7 @@
           <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
             <div class="col-md-9 col-md-offset-3">
               <label for="image_delete" class="form-control">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['id' => 'image_delete', 'aria-label'=>'image_delete']) }}
+                <input type="checkbox" name="image_delete" id="image_delete" value="1" @checked(old('image_delete')) aria-label="image_delete">
                 {{ trans('general.image_delete') }}
               </label>
               {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}

From 9559c5a0251e5cd335a698ea7522a4a9b8aad2ce Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Feb 2025 14:08:13 -0800
Subject: [PATCH 64/67] Replace Form::checkbox and inline label

---
 resources/views/account/profile.blade.php | 24 ++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index 153492a3b..b745c1936 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -150,13 +150,23 @@
         @if ($snipeSettings->two_factor_enabled=='1')
         <div class="form-group {{ $errors->has('two_factor_optin') ? 'has-error' : '' }}">
           <div class="col-md-7 col-md-offset-3">
-            @can('self.two_factor')
-              <label class="form-control">{{ Form::checkbox('two_factor_optin', '1', old('two_factor_optin', $user->two_factor_optin)) }}
-            @else
-                <label class="form-control form-control--disabled">{{ Form::checkbox('two_factor_optin', '1', old('two_factor_optin', $user->two_factor_optin),['disabled' => 'disabled']) }}
-            @endcan
-
-            {{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
+              <label
+                  for="two_factor_optin"
+                  @class([
+                    'form-control',
+                    'form-control--disabled' => auth()->user()->cannot('self.two_factor'),
+                  ])
+              >
+                <input
+                    type="checkbox"
+                    name="two_factor_optin"
+                    id="two_factor_optin"
+                    value="1"
+                    @checked(old('two_factor_optin', $user->two_factor_optin))
+                    @disabled(auth()->user()->cannot('self.two_factor'))
+                >
+                {{ trans('admin/settings/general.two_factor_enabled_text') }}
+              </label>
             @can('self.two_factor')
               <p class="help-block">{{ trans('admin/settings/general.two_factor_enabled_warning') }}</p>
             @else

From 04e4b6c1811f3d93191844978f0127ef5b814eab Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Feb 2025 14:16:18 -0800
Subject: [PATCH 65/67] Replace Form::checkbox

---
 resources/views/custom_fields/fieldsets/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index b73ae708c..626b5b73a 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -109,7 +109,7 @@
 
                 <div class="checkbox-inline">
                     <label>
-                    {{ Form::checkbox('required', 'on', old('required')) }}
+                      <input type="checkbox" name="required" value="on" @checked(old('required'))>
                       <span style="padding-left: 10px;">{{ trans('admin/custom_fields/general.required') }}</span>
                     </label>
                 </div>

From 38df5e8b07c1260a052c0e91d7613e52107a6a45 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 6 Feb 2025 15:52:23 -0800
Subject: [PATCH 66/67] Replace more Form::checkboxes

---
 resources/views/hardware/bulk.blade.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index b8189d59c..4ac80e982 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -47,7 +47,7 @@
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_name', '1', false) }}
+                <input type="checkbox" name="null_name" value="1">
                 {{ trans_choice('general.set_to_null', count($assets), ['selection_count' => count($assets)]) }}
               </label>
             </div>
@@ -66,7 +66,7 @@
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_purchase_date', '1', false) }}
+                <input type="checkbox" name="null_purchase_date" value="1">
                 {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
               </label>
             </div>
@@ -85,7 +85,7 @@
              </div>
               <div class="col-md-5">
                 <label class="form-control">
-                  {{ Form::checkbox('null_expected_checkin_date', '1', false) }}
+                  <input type="checkbox" name="null_expected_checkin_date" value="1">
                   {{ trans_choice('general.set_to_null', count($assets), ['selection_count' => count($assets)]) }}
                 </label>
               </div>
@@ -103,7 +103,7 @@
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_asset_eol_date', '1', false) }}
+                <input type="checkbox" name="null_asset_eol_date" value="1">
                 {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
               </label>
             </div>
@@ -112,7 +112,7 @@
           <div class="form-group">
             <div class="col-md-9 col-md-offset-3">
               <label class="form-control">
-                {{ Form::checkbox('calc_eol', '1', false) }}
+                <input type="checkbox" name="calc_eol" value="1">
                 {{ trans('admin/hardware/form.calc_eol') }}
               </label>
             </div>
@@ -215,7 +215,7 @@
             </div>
             <div class="col-md-5">
               <label class="form-control">
-                {{ Form::checkbox('null_next_audit_date', '1', false) }}
+                <input type="checkbox" name="null_next_audit_date" value="1">
                 {{ trans_choice('general.set_to_null', count($assets), ['selection_count' => count($assets)]) }}
               </label>
             </div>

From c420670ebbd5a68752501e7a65909052f19fa228 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 10 Feb 2025 22:26:00 +0000
Subject: [PATCH 67/67] Small fixes to accessories files handling

Signed-off-by: snipe <snipe@snipe.net>
---
 .../AccessoriesFilesController.php            | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/app/Http/Controllers/Accessories/AccessoriesFilesController.php b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
index c251166ce..9dbb16d83 100644
--- a/app/Http/Controllers/Accessories/AccessoriesFilesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
@@ -55,11 +55,11 @@ class AccessoriesFilesController extends Controller
 
             }
 
-            return redirect()->route('accessories.show', $accessory->id)->with('error', trans('general.no_files_uploaded'));
+            return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded'));
         }
         // Prepare the error message
-        return redirect()->route('accessories.index')
-            ->with('error', trans('general.file_does_not_exist'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
     }
 
     /**
@@ -72,29 +72,27 @@ class AccessoriesFilesController extends Controller
      */
     public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
     {
-        $accessory = Accessory::find($accessoryId);
-
-        // the asset is valid
-        if (isset($accessory->id)) {
+        if ($accessory = Accessory::find($accessoryId)) {
             $this->authorize('update', $accessory);
-            $log = Actionlog::find($fileId);
 
-            // Remove the file if one exists
-            if (Storage::exists('accessories/'.$log->filename)) {
-                try {
-                    Storage::delete('accessories/'.$log->filename);
-                } catch (\Exception $e) {
-                    Log::debug($e);
+            if ($log = Actionlog::find($fileId)) {
+
+                if (Storage::exists('private_uploads/accessories/'.$log->filename)) {
+                    try {
+                        Storage::delete('private_uploads/accessories/' . $log->filename);
+                        $log->delete();
+                        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+                    } catch (\Exception $e) {
+                        Log::debug($e);
+                        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+                    }
                 }
+
             }
-
-            $log->delete();
-
-            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
         }
 
-        // Redirect to the licence management page
-        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
     }
 
     /**
@@ -124,10 +122,11 @@ class AccessoriesFilesController extends Controller
                 }
             }
 
-            return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error',  trans('general.log_record_not_found'));
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
 
         }
 
-        return redirect()->route('accessories.index')->with('error', trans('general.file_not_found'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
     }
 }