From fd73bee8505b766d102cb2003ae6bb6e0437dc92 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 14:38:05 -0800
Subject: [PATCH 01/40] Fixed hardcoded string and added new checkout count to
 accessory view

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/accessories/view.blade.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 82d7c8201a..59ff1b9c80 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -327,13 +327,22 @@
 
       <div class="row">
           <div class="col-md-4" style="padding-bottom: 15px;">
-              Number remaining
+              <strong>{{ trans('admin/accessories/general.remaining') }}</strong>
           </div>
           <div class="col-md-8">
               {{ $accessory->numRemaining() }}
           </div>
       </div>
 
+      <div class="row">
+          <div class="col-md-4" style="padding-bottom: 15px;">
+              <strong>{{ trans('general.checked_out') }}</strong>
+          </div>
+          <div class="col-md-8">
+              {{ $accessory->users_count }}
+          </div>
+      </div>
+
 
 
           @can('checkout', \App\Models\Accessory::class)

From 56090bc64534f73d9e2cab10ff4f70e4d97d65ef Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 14:38:35 -0800
Subject: [PATCH 02/40] Re-ordered notes to be more consistent, fixed missing
 iCheck class

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/accessories/edit.blade.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
index d6233d4e5a..c16e57cb22 100755
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -21,22 +21,24 @@
 @include ('partials.forms.edit.purchase_cost')
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
-
+@include ('partials.forms.edit.notes')
 
 <!-- Image -->
 @if ($item->image)
     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
-            <img src="{{  Storage::disk('public')->url('accessories/'.e($item->image)) }}" class="img-responsive" />
-            {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+            <label class="control-label" for="image_delete">
+                <input type="checkbox" value="1" name="image_delete" id="image_delete" class="minimal" {{ Request::old('image_delete') == '1' ? ' checked="checked"' : '' }}>
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </label>
+            <div style="margin-top: 0.5em">
+                <img src="{{ Storage::disk('public')->url(app('accessories_upload_path').e($item->image)) }}" class="img-responsive" />
+            </div>
         </div>
     </div>
 @endif
 
-@include ('partials.forms.edit.notes')
-
 @include ('partials.forms.edit.image-upload')
 
 @stop

From 46e3e8a3dd9b80e1c33b0a3af951ec547f8b638c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 14:39:53 -0800
Subject: [PATCH 03/40] Added new users_count field to API

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Presenters/AccessoryPresenter.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index 7d77acc8d7..cc4f9badfc 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -80,19 +80,25 @@ class AccessoryPresenter extends Presenter
             ], [
                 'field' => 'qty',
                 'searchable' => false,
-                'sortable' => false,
-                'title' => trans('admin/accessories/general.total'),
-            ],  [
-                'field' => 'min_qty',
-                'searchable' => false,
                 'sortable' => true,
-                'title' => trans('general.min_amt'),
+                'title' => trans('admin/accessories/general.total'),
             ], [
                 'field' => 'remaining_qty',
                 'searchable' => false,
                 'sortable' => false,
                 'visible' => false,
                 'title' => trans('admin/accessories/general.remaining'),
+            ],[
+                'field' => 'users_count',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => true,
+                'title' => trans('general.checked_out'),
+            ], [
+                'field' => 'min_qty',
+                'searchable' => false,
+                'sortable' => true,
+                'title' => trans('general.min_amt'),
             ], [
                 'field' => 'purchase_date',
                 'searchable' => true,

From dceb77d4d4a70df6a1ab0b4a70b1bf0ad500e64a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 14:40:20 -0800
Subject: [PATCH 04/40] Refactored numRemaining, removed unnecessary
 numCheckout

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Accessory.php | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index 3f2004b047..d39d653382 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -327,20 +327,6 @@ class Accessory extends SnipeModel
         return null;
     }
 
-     /**
-     * Check how many items within an accessory are checked out
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v5.0]
-     * @return int
-     */
-    public function numCheckedOut()
-    {
-        $checkedout = 0;
-        $checkedout = $this->users->count();
-
-        return $checkedout;
-    }
 
     /**
      * Check how many items of an accessory remain
@@ -351,11 +337,11 @@ class Accessory extends SnipeModel
      */
     public function numRemaining()
     {
-        $checkedout = $this->users->count();
+        $checkedout = $this->users_count;
         $total = $this->qty;
         $remaining = $total - $checkedout;
 
-        return $remaining;
+        return (int) $remaining;
     }
 
     /**

From 90c16318201b45fa233e07ca19f0e4f8a38c7c54 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 14:40:35 -0800
Subject: [PATCH 05/40] Added users_count to transformer for API

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Transformers/AccessoriesTransformer.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php
index 6f254b3b87..00c30f9ea2 100644
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -38,7 +38,8 @@ class AccessoriesTransformer
             'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
             'order_number' => ($accessory->order_number) ? e($accessory->order_number) : null,
             'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null,
-            'remaining_qty' => $accessory->numRemaining(),
+            'remaining_qty' => (int) $accessory->numRemaining(),
+            'users_count' =>  $accessory->users_count,
 
             'created_at' => Helper::getFormattedDateObject($accessory->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($accessory->updated_at, 'datetime'),

From 60eab08735187044240c3f180867411c9b772813 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 14:41:07 -0800
Subject: [PATCH 06/40] =?UTF-8?q?Added=20`->with(=E2=80=98users=20as=20use?=
 =?UTF-8?q?rs=5Fcount=E2=80=99)`=20in=20Accessory=20query?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Accessories/AccessoriesController.php     | 74 +++++++++----------
 .../Controllers/Api/AccessoriesController.php |  5 +-
 2 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
index d1af79adf1..96f83d7665 100755
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -127,45 +127,45 @@ class AccessoriesController extends Controller
      */
     public function update(ImageUploadRequest $request, $accessoryId = null)
     {
-        if (is_null($accessory = Accessory::find($accessoryId))) {
+        if ($accessory = Accessory::withCount('users as users_count')->find($accessoryId)) {
+
+            $validator = Validator::make($request->all(), [
+                "qty" => "required|numeric|min:$accessory->users_count"
+            ]);
+
+            if ($validator->fails()) {
+                return redirect()->back()
+                    ->withErrors($validator)
+                    ->withInput();
+            }
+
+            $this->authorize($accessory);
+
+            // Update the accessory data
+            $accessory->name = request('name');
+            $accessory->location_id = request('location_id');
+            $accessory->min_amt = request('min_amt');
+            $accessory->category_id = request('category_id');
+            $accessory->company_id = Company::getIdForCurrentUser(request('company_id'));
+            $accessory->manufacturer_id = request('manufacturer_id');
+            $accessory->order_number = request('order_number');
+            $accessory->model_number = request('model_number');
+            $accessory->purchase_date = request('purchase_date');
+            $accessory->purchase_cost = Helper::ParseCurrency(request('purchase_cost'));
+            $accessory->qty = request('qty');
+            $accessory->supplier_id = request('supplier_id');
+            $accessory->notes = request('notes');
+
+            $accessory = $request->handleImages($accessory);
+
+            // Was the accessory updated?
+            if ($accessory->save()) {
+                return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
+            }
+        } else {
             return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
         }
 
-        $min = $accessory->numCheckedOut();
-        $validator = Validator::make($request->all(), [
-            "qty" => "required|numeric|min:$min"
-        ]);
-
-        if ($validator->fails()) {
-            return redirect()->back()
-                ->withErrors($validator)
-                ->withInput();
-        }
-
-        $this->authorize($accessory);
-
-        // Update the accessory data
-        $accessory->name                    = request('name');
-        $accessory->location_id             = request('location_id');
-        $accessory->min_amt                 = request('min_amt');
-        $accessory->category_id             = request('category_id');
-        $accessory->company_id              = Company::getIdForCurrentUser(request('company_id'));
-        $accessory->manufacturer_id         = request('manufacturer_id');
-        $accessory->order_number            = request('order_number');
-        $accessory->model_number            = request('model_number');
-        $accessory->purchase_date           = request('purchase_date');
-        $accessory->purchase_cost           = Helper::ParseCurrency(request('purchase_cost'));
-        $accessory->qty                     = request('qty');
-        $accessory->supplier_id             = request('supplier_id');
-        $accessory->notes                   = request('notes');
-
-        $accessory = $request->handleImages($accessory);
-
-        // Was the accessory updated?
-        if ($accessory->save()) {
-            return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.update.success'));
-        }
-
         return redirect()->back()->withInput()->withErrors($accessory->getErrors());
     }
 
@@ -217,7 +217,7 @@ class AccessoriesController extends Controller
      */
     public function show($accessoryID = null)
     {
-        $accessory = Accessory::find($accessoryID);
+        $accessory = Accessory::withCount('users as users_count')->find($accessoryID);
         $this->authorize('view', $accessory);
         if (isset($accessory->id)) {
             return view('accessories/view', compact('accessory'));
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index a894dc3760..fd21ebaf3a 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -41,10 +41,13 @@ class AccessoriesController extends Controller
                 'min_amt',
                 'company_id',
                 'notes',
+                'users_count',
+                'qty',
             ];
 
 
-        $accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'users', 'location', 'supplier');
+        $accessories = Accessory::select('accessories.*')->with('category', 'company', 'manufacturer', 'users', 'location', 'supplier')
+                                ->withCount('users as users_count');
 
         if ($request->filled('search')) {
             $accessories = $accessories->TextSearch($request->input('search'));

From 2bdf3d3f44cc460c26f68949891ea16c5f0025c8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 14:44:10 -0800
Subject: [PATCH 07/40] Missed a few strong HTML tags

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/accessories/view.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 59ff1b9c80..fd31722204 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -290,7 +290,7 @@
       @if ($accessory->company)
           <div class="row">
               <div class="col-md-4" style="padding-bottom: 15px;">
-                  {{ trans('general.company')}}
+                  <strong> {{ trans('general.company')}}</strong>
               </div>
               <div class="col-md-8">
                   <a href="{{ route('companies.show', $accessory->company->id) }}">{{ $accessory->company->name }} </a>
@@ -302,7 +302,7 @@
       @if ($accessory->category)
           <div class="row">
               <div class="col-md-4" style="padding-bottom: 15px;">
-                  {{ trans('general.category')}}
+                  <strong>{{ trans('general.category')}}</strong>
               </div>
               <div class="col-md-8">
                   <a href="{{ route('categories.show', $accessory->category->id) }}">{{ $accessory->category->name }} </a>

From 563a252d180b0d2ad20101e05a30b5f5ef47f35b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 14:57:52 -0800
Subject: [PATCH 08/40] Updated checkboxed with missing `minimal` class for
 iCheck

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/accessories/edit.blade.php   | 6 ++----
 resources/views/categories/edit.blade.php    | 2 +-
 resources/views/companies/edit.blade.php     | 2 +-
 resources/views/components/edit.blade.php    | 2 +-
 resources/views/consumables/edit.blade.php   | 5 +++--
 resources/views/departments/edit.blade.php   | 2 +-
 resources/views/locations/edit.blade.php     | 2 +-
 resources/views/manufacturers/edit.blade.php | 2 +-
 resources/views/models/edit.blade.php        | 2 +-
 resources/views/suppliers/edit.blade.php     | 2 +-
 resources/views/users/edit.blade.php         | 3 ++-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
index d6233d4e5a..6bef8201b6 100755
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -21,22 +21,20 @@
 @include ('partials.forms.edit.purchase_cost')
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
-
+@include ('partials.forms.edit.notes')
 
 <!-- Image -->
 @if ($item->image)
     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
+            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
             <img src="{{  Storage::disk('public')->url('accessories/'.e($item->image)) }}" class="img-responsive" />
             {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
         </div>
     </div>
 @endif
 
-@include ('partials.forms.edit.notes')
-
 @include ('partials.forms.edit.image-upload')
 
 @stop
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index 9d4d25c814..e09182743d 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -91,7 +91,7 @@
     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-9">
-            {{ Form::checkbox('image_delete') }}
+            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
             <img src="{{ Storage::disk('public')->url(app('categories_upload_path').e($item->image)) }}" class="img-responsive" />
             {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
diff --git a/resources/views/companies/edit.blade.php b/resources/views/companies/edit.blade.php
index bc74c7357d..a2bf8e5d84 100644
--- a/resources/views/companies/edit.blade.php
+++ b/resources/views/companies/edit.blade.php
@@ -15,7 +15,7 @@
     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
+            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
             <img src="{{ Storage::disk('public')->url(app('companies_upload_path').e($item->image)) }}" class="img-responsive" />
             {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php
index 77cdb17c3c..8c7c74d6e8 100644
--- a/resources/views/components/edit.blade.php
+++ b/resources/views/components/edit.blade.php
@@ -26,7 +26,7 @@
     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
+            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
             <img src="{{ Storage::disk('public')->url(app('components_upload_path').e($item->image)) }}"  class="img-responsive" />
             {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php
index a270cc33db..4ae61fa0a5 100644
--- a/resources/views/consumables/edit.blade.php
+++ b/resources/views/consumables/edit.blade.php
@@ -20,20 +20,21 @@
 @include ('partials.forms.edit.purchase_cost')
 @include ('partials.forms.edit.quantity')
 @include ('partials.forms.edit.minimum_quantity')
+@include ('partials.forms.edit.notes')
 
 <!-- Image -->
 @if ($item->image)
     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-5">
-            {{ Form::checkbox('image_delete') }}
+            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
             <img src="{{ Storage::disk('public')->url(app('consumables_upload_path').e($item->image)) }}"  class="img-responsive" />
             {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
     </div>
 @endif
 
-@include ('partials.forms.edit.notes')
+
 
 @include ('partials.forms.edit.image-upload')
 @stop
diff --git a/resources/views/departments/edit.blade.php b/resources/views/departments/edit.blade.php
index 0a2c1a7d46..b120b2924a 100644
--- a/resources/views/departments/edit.blade.php
+++ b/resources/views/departments/edit.blade.php
@@ -28,7 +28,7 @@
         <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
             <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
             <div class="col-md-5">
-                {{ Form::checkbox('image_delete') }}
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
                 <img src="{{ Storage::disk('public')->url(app('departments_upload_path').e($item->image)) }}" class="img-responsive" />
                 {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
             </div>
diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php
index c7fe202fa8..86cf7894bd 100755
--- a/resources/views/locations/edit.blade.php
+++ b/resources/views/locations/edit.blade.php
@@ -49,7 +49,7 @@
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-9">
             <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
             </label>
             <br>
             <img src="{{ url('/') }}/uploads/locations/{{ $item->image }}" alt="Image for {{ $item->name }}">
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index 355dd478df..bc3012f8a6 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -56,7 +56,7 @@
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-5">
             <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
             </label>
             <br>
             <img src="{{ url('/') }}/uploads/manufacturers/{{ $item->image }}" alt="Image for {{ $item->name }}" class="img-responsive">
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index 436e425179..1f2deff371 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -45,7 +45,7 @@
     <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
     <div class="col-md-5">
         <label for="image_delete">
-            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
+            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
         </label>
         <br>
         <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($item->image )) }}" alt="Image for {{ $item->name }}" class="img-responsive">
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index 8a9014f708..285d6627c1 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -49,7 +49,7 @@
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-5">
             <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
             </label>
             <br>
             <img src="{{ url('/') }}/uploads/suppliers/{{ $item->image }}" alt="Image for {{ $item->name }}" class="img-responsive">
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 93b8fb7a21..7428fafe7f 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -272,12 +272,13 @@
                           </div>
                       </div> <!--/form-group-->
                   @endif
+
                   <!-- Image -->
                   @if ($user->avatar)
                       <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
                           <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
                           <div class="col-md-5">
-                              {{ Form::checkbox('image_delete') }}
+                              {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
                               <img src="{{ Storage::disk('public')->url(app('users_upload_path').e($user->avatar)) }}" class="img-responsive" />
                               {!! $errors->first('image_delete', '<span class="alert-msg"><br>:message</span>') !!}
                           </div>

From cfa342c81aaa8e894500f17d8e9f7f1db3de0b20 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 16:23:04 -0800
Subject: [PATCH 09/40] =?UTF-8?q?Updated=20HTML=20for=20=E2=80=9Cstandard?=
 =?UTF-8?q?=E2=80=9D=20image=20edit/delete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/accessories/edit.blade.php   | 21 ++++++++++------
 resources/views/categories/edit.blade.php    | 23 ++++++++++-------
 resources/views/companies/edit.blade.php     | 20 +++++++++------
 resources/views/components/edit.blade.php    | 19 +++++++++-----
 resources/views/consumables/edit.blade.php   | 19 +++++++++-----
 resources/views/departments/edit.blade.php   | 19 +++++++++-----
 resources/views/hardware/edit.blade.php      | 25 ++++++++++---------
 resources/views/locations/edit.blade.php     | 18 ++++++++------
 resources/views/manufacturers/edit.blade.php | 13 ++++------
 resources/views/models/edit.blade.php        | 26 +++++++++++---------
 resources/views/suppliers/edit.blade.php     | 20 ++++++++-------
 resources/views/users/edit.blade.php         | 21 ++++++++++------
 12 files changed, 149 insertions(+), 95 deletions(-)

diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
index 6bef8201b6..532336182b 100755
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -24,13 +24,20 @@
 @include ('partials.forms.edit.notes')
 
 <!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-            <img src="{{  Storage::disk('public')->url('accessories/'.e($item->image)) }}" class="img-responsive" />
-            {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+@if (($item->image) && ($item->image!=''))
+    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+        <div class="col-md-9 col-md-offset-3">
+            <label for="image_delete">
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </label>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-9 col-md-offset-3">
+            <img src="{{ Storage::disk('public')->url(app('accessories_upload_path').e($item->image)) }}" class="img-responsive">
+            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
     </div>
 @endif
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index e09182743d..3d24650a73 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -74,9 +74,7 @@
 
 <!-- Email on Checkin -->
 <div class="form-group">
-    <div class="col-md-3">
-    </div>
-    <div class="col-md-9">
+    <div class="col-md-9 col-md-offset-3">
         <label for="checkin_email">
         {{ Form::checkbox('checkin_email', '1', old('checkin_email', $item->checkin_email), ['class'=>'minimal','aria-label'=>'checkin_email']) }}
         {{ trans('admin/categories/general.checkin_email') }}
@@ -87,12 +85,19 @@
 
 
 <!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-9">
-            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-            <img src="{{ Storage::disk('public')->url(app('categories_upload_path').e($item->image)) }}" class="img-responsive" />
+@if (($item->image) && ($item->image!=''))
+    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+        <div class="col-md-9 col-md-offset-3">
+            <label for="image_delete">
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </label>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-9 col-md-offset-3">
+            <img src="{{ Storage::disk('public')->url(app('companies_upload_path').e($item->image)) }}" class="img-responsive">
             {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
     </div>
diff --git a/resources/views/companies/edit.blade.php b/resources/views/companies/edit.blade.php
index a2bf8e5d84..0023ce2891 100644
--- a/resources/views/companies/edit.blade.php
+++ b/resources/views/companies/edit.blade.php
@@ -10,13 +10,19 @@
 @section('inputFields')
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/companies/table.name')])
 
-<!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-            <img src="{{ Storage::disk('public')->url(app('companies_upload_path').e($item->image)) }}" class="img-responsive" />
+@if (($item->image) && ($item->image!=''))
+    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+        <div class="col-md-9 col-md-offset-3">
+            <label for="image_delete">
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </label>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-9 col-md-offset-3">
+            <img src="{{ Storage::disk('public')->url(app('companies_upload_path').e($item->image)) }}" class="img-responsive">
             {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
     </div>
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php
index 8c7c74d6e8..6ab7ca40ac 100644
--- a/resources/views/components/edit.blade.php
+++ b/resources/views/components/edit.blade.php
@@ -22,12 +22,19 @@
 @include ('partials.forms.edit.purchase_cost')
 
 <!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-            <img src="{{ Storage::disk('public')->url(app('components_upload_path').e($item->image)) }}"  class="img-responsive" />
+@if (($item->image) && ($item->image!=''))
+    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+        <div class="col-md-9 col-md-offset-3">
+            <label for="image_delete">
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </label>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-9 col-md-offset-3">
+            <img src="{{ Storage::disk('public')->url(app('components_upload_path').e($item->image)) }}" class="img-responsive">
             {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
     </div>
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php
index 4ae61fa0a5..83212bb148 100644
--- a/resources/views/consumables/edit.blade.php
+++ b/resources/views/consumables/edit.blade.php
@@ -23,12 +23,19 @@
 @include ('partials.forms.edit.notes')
 
 <!-- Image -->
-@if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-            <img src="{{ Storage::disk('public')->url(app('consumables_upload_path').e($item->image)) }}"  class="img-responsive" />
+@if (($item->image) && ($item->image!=''))
+    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+        <div class="col-md-9 col-md-offset-3">
+            <label for="image_delete">
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </label>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-9 col-md-offset-3">
+            <img src="{{ Storage::disk('public')->url(app('consumables_upload_path').e($item->image)) }}" class="img-responsive">
             {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
     </div>
diff --git a/resources/views/departments/edit.blade.php b/resources/views/departments/edit.blade.php
index b120b2924a..d345bcc97e 100644
--- a/resources/views/departments/edit.blade.php
+++ b/resources/views/departments/edit.blade.php
@@ -24,12 +24,19 @@
     @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
 
     <!-- Image -->
-    @if ($item->image)
-        <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-            <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-            <div class="col-md-5">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-                <img src="{{ Storage::disk('public')->url(app('departments_upload_path').e($item->image)) }}" class="img-responsive" />
+    @if (($item->image) && ($item->image!=''))
+        <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+            <div class="col-md-9 col-md-offset-3">
+                <label for="image_delete">
+                    {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                    {{ trans('general.image_delete') }}
+                    {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-9 col-md-offset-3">
+                <img src="{{ Storage::disk('public')->url(app('departments_upload_path').e($item->image)) }}" class="img-responsive">
                 {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
             </div>
         </div>
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 07c04d7f8b..c5cd302a2c 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -68,19 +68,22 @@
     @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/hardware/general.requestable')])
 
     <!-- Image -->
-    @if ($item->image)
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
-            <label class="control-label" for="image_delete">
-            <input type="checkbox" value="1" name="image_delete" id="image_delete" class="minimal" {{ Request::old('image_delete') == '1' ? ' checked="checked"' : '' }}>
-            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
-            </label>
-            <div style="margin-top: 0.5em">
-                <img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($item->image)) }}" class="img-responsive" />
+    @if (($item->image) && ($item->image!=''))
+        <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+            <div class="col-md-9 col-md-offset-3">
+                <label for="image_delete">
+                    {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                    {{ trans('general.image_delete') }}
+                    {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-9 col-md-offset-3">
+                <img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($item->image)) }}" class="img-responsive">
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
             </div>
         </div>
-    </div>
     @endif
 
     @include ('partials.forms.edit.image-upload')
diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php
index 86cf7894bd..0c93c83a81 100755
--- a/resources/views/locations/edit.blade.php
+++ b/resources/views/locations/edit.blade.php
@@ -45,15 +45,19 @@
 
 <!-- Image -->
 @if (($item->image) && ($item->image!=''))
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-9">
+    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+        <div class="col-md-9 col-md-offset-3">
             <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
             </label>
-            <br>
-            <img src="{{ url('/') }}/uploads/locations/{{ $item->image }}" alt="Image for {{ $item->name }}">
-            {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-9 col-md-offset-3">
+            <img src="{{ Storage::disk('public')->url(app('locations_upload_path').e($item->image)) }}" class="img-responsive">
+            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
     </div>
 @endif
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index bc3012f8a6..23b06209ab 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -51,19 +51,16 @@
     </div>
 
 <!-- Image -->
-    @if (($item->image) && ($item->image!=''))
+@if ($item->image)
     <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
         <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
         <div class="col-md-5">
-            <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-            </label>
-            <br>
-            <img src="{{ url('/') }}/uploads/manufacturers/{{ $item->image }}" alt="Image for {{ $item->name }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
+            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
+            <img src="{{ Storage::disk('public')->url(app('manufacturers_upload_path').e($item->image)) }}"  class="img-responsive" />
+            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
         </div>
     </div>
-    @endif
+@endif
 
 
     @include ('partials.forms.edit.image-upload')
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index 1f2deff371..f7ec2796b6 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -41,19 +41,21 @@
 
 <!-- Image -->
 @if (($item->image) && ($item->image!=''))
-<div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-    <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-    <div class="col-md-5">
-        <label for="image_delete">
-            {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-        </label>
-        <br>
-        <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($item->image )) }}" alt="Image for {{ $item->name }}" class="img-responsive">
-        {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
+    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+        <div class="col-md-9 col-md-offset-3">
+            <label for="image_delete">
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+            </label>
+        </div>
+    </div>
+    <div class="form-group">
+        <div class="col-md-9 col-md-offset-3">
+            <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($item->image)) }}" class="img-responsive">
+            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+        </div>
     </div>
-</div>
-
-
 @endif
 
 @include ('partials.forms.edit.image-upload')
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index 285d6627c1..1f8e51c0e6 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -45,19 +45,21 @@
 
 <!-- Image -->
 @if (($item->image) && ($item->image!=''))
-    <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-        <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-        <div class="col-md-5">
+    <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+        <div class="col-md-9 col-md-offset-3">
             <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
             </label>
-            <br>
-            <img src="{{ url('/') }}/uploads/suppliers/{{ $item->image }}" alt="Image for {{ $item->name }}" class="img-responsive">
-            {!! $errors->first('image_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
         </div>
     </div>
-
-
+    <div class="form-group">
+        <div class="col-md-9 col-md-offset-3">
+            <img src="{{ Storage::disk('public')->url(app('suppliers_upload_path').e($item->image)) }}" class="img-responsive">
+            {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+        </div>
+    </div>
 @endif
 
 @include ('partials.forms.edit.image-upload')
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 7428fafe7f..adfa261ca5 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -274,13 +274,20 @@
                   @endif
 
                   <!-- Image -->
-                  @if ($user->avatar)
-                      <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-                          <label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
-                          <div class="col-md-5">
-                              {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'image_delete')) }}
-                              <img src="{{ Storage::disk('public')->url(app('users_upload_path').e($user->avatar)) }}" class="img-responsive" />
-                              {!! $errors->first('image_delete', '<span class="alert-msg"><br>:message</span>') !!}
+                  @if (($user->avatar) && ($user->avatar!=''))
+                      <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+                          <div class="col-md-9 col-md-offset-3">
+                              <label for="image_delete">
+                                  {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                                  {{ trans('general.image_delete') }}
+                                  {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
+                              </label>
+                          </div>
+                      </div>
+                      <div class="form-group">
+                          <div class="col-md-9 col-md-offset-3">
+                              <img src="{{ Storage::disk('public')->url(app('users_upload_path').$user->avatar) }}" class="img-responsive">
+                              {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
                           </div>
                       </div>
                   @endif

From 3674f46ce08034048d6ca4139f77fd388576d8eb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 16:42:44 -0800
Subject: [PATCH 10/40] Added arial labels

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/forms/edit/image-upload.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index c30c03082b..0e24df1dcf 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -2,11 +2,11 @@
     <label class="col-md-3 control-label" for="image">{{ trans('general.image_upload') }}</label>
     <div class="col-md-9">
 
-        <input type="file" id="image" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-label="image" class="sr-only">
+        <input type="file" id="image" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="sr-only">
 
         <label class="btn btn-default" aria-hidden="true">
             {{ trans('button.select_file')  }}
-            <input type="file" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml" style="display:none; max-width: 90%" aria-label="image" aria-hidden="true">
+            <input type="file" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/gif,image/jpeg,image/webp,image/png,image/svg,image/svg+xml" style="display:none; max-width: 90%" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-hidden="true">
         </label>
         <span class='label label-default' id="uploadFile-info"></span>
 

From f77d871dff64a6940c34255c4fddcf162069f45b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 18:05:20 -0800
Subject: [PATCH 11/40] Use the imageHandler for profile avatar changes

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/ProfileController.php | 32 ++--------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 739376e3ab..cf5f49feb0 100755
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -67,37 +67,9 @@ class ProfileController extends Controller
             $user->location_id = $request->input('location_id');
         }
 
+        // Handle the avatar upload and/or delete if necessary
+        app('\App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
-        if ($request->input('avatar_delete') == 1) {
-            $user->avatar = null;
-        }
-
-
-        if ($request->hasFile('avatar')) {
-            $path = 'avatars';
-
-            if (! Storage::disk('public')->exists($path)) {
-                Storage::disk('public')->makeDirectory($path, 775);
-            }
-
-            $upload = $image = $request->file('avatar');
-            $ext = $image->getClientOriginalExtension();
-            $file_name = 'avatar-'.str_random(18).'.'.$ext;
-
-            if ($image->getClientOriginalExtension() != 'svg') {
-                $upload = Image::make($image->getRealPath())->resize(84, 84);
-            }
-
-            // This requires a string instead of an object, so we use ($string)
-            Storage::disk('public')->put($path.'/'.$file_name, (string) $upload->encode());
-
-            // Remove Current image if exists
-            if (($user->avatar) && (Storage::disk('public')->exists($path.'/'.$user->avatar))) {
-                Storage::disk('public')->delete($path.'/'.$user->avatar);
-            }
-
-            $user->avatar = $file_name;
-        }
 
         if ($user->save()) {
             return redirect()->route('profile')->with('success', 'Account successfully updated');

From a0aed19f958bf8cdf88cb00f6f78d107441dc1b5 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 18:05:55 -0800
Subject: [PATCH 12/40] Refactor image handler

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Requests/ImageUploadRequest.php | 58 ++++++++++--------------
 1 file changed, 25 insertions(+), 33 deletions(-)

diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index 1b0b051366..6fb6ead210 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -63,11 +63,13 @@ class ImageUploadRequest extends Request
      * @param string $path  location for uploaded images, defaults to uploads/plural of item type.
      * @return SnipeModel        Target asset is being checked out to.
      */
-    public function handleImages($item, $w = 600, $form_fieldname = null, $path = null, $db_fieldname = 'image')
+    public function handleImages($item, $w = 600, $form_fieldname = 'image', $path = null, $db_fieldname = 'image')
     {
+
         $type = strtolower(class_basename(get_class($item)));
 
         if (is_null($path)) {
+
             $path = str_plural($type);
 
             if ($type == 'assetmodel') {
@@ -79,42 +81,31 @@ class ImageUploadRequest extends Request
             }
         }
 
-        if (is_null($form_fieldname)) {
-            $form_fieldname = 'image';
-        }
-
-        // This is dumb, but we need it for overriding field names for exceptions like avatars and logo uploads
-        if (is_null($db_fieldname)) {
-            $use_db_field = $form_fieldname;
-        } else {
-            $use_db_field = $db_fieldname;
-        }
-
-        
-        // ConvertBase64ToFiles just changes object type, 
-        // as it cannot currently insert files to $this->files
         if ($this->offsetGet($form_fieldname) instanceof UploadedFile) {
-           $image=$this->offsetGet($form_fieldname);
+           $image = $this->offsetGet($form_fieldname);
+           \Log::debug('Image is an instance of UploadedFile');
+        } elseif ($this->hasFile($form_fieldname)) {
+            $image = $this->file($form_fieldname);
+            \Log::debug('Just use regular upload for '.$form_fieldname);
         } else {
-            if ($this->hasFile($form_fieldname)) {
-                $image = $this->file($form_fieldname);
-            }
+            \Log::debug('No image found for form fieldname: '.$form_fieldname);
         }
 
         if (isset($image)) {
-            \Log::debug($image);
 
             if (!config('app.lock_passwords')) {
 
                 $ext = $image->getClientOriginalExtension();
-                $file_name = $type.'-'.$form_fieldname.'-'.str_random(10).'.'.$ext;
+                $file_name = $type.'-'.$form_fieldname.'-'.$item->id.'-'.str_random(10).'.'.$ext;
 
                 \Log::info('File name will be: '.$file_name);
                 \Log::debug('File extension is: '.$ext);
 
                 if (($image->getClientOriginalExtension() !== 'webp') && ($image->getClientOriginalExtension() !== 'svg')) {
+
                     \Log::debug('Not an SVG or webp - resize');
                     \Log::debug('Trying to upload to: '.$path.'/'.$file_name);
+
                     $upload = Image::make($image->getRealPath())->resize(null, $w, function ($constraint) {
                         $constraint->aspectRatio();
                         $constraint->upsize();
@@ -122,6 +113,7 @@ class ImageUploadRequest extends Request
 
                     // This requires a string instead of an object, so we use ($string)
                     Storage::disk('public')->put($path.'/'.$file_name, (string) $upload->encode());
+
                 } else {
                     // If the file is a webp, we need to just move it since webp support
                     // needs to be compiled into gd for resizing to be available
@@ -146,30 +138,30 @@ class ImageUploadRequest extends Request
                 }
 
                  // Remove Current image if exists
-                if (($item->{$use_db_field}!='') && (Storage::disk('public')->exists($path.'/'.$item->{$use_db_field}))) {
+                if (($item->{$form_fieldname}!='') && (Storage::disk('public')->exists($path.'/'.$item->{$db_fieldname}))) {
                     \Log::debug('A file already exists that we are replacing - we should delete the old one.');
                     try {
-                         Storage::disk('public')->delete($path.'/'.$item->{$use_db_field});
+                         Storage::disk('public')->delete($path.'/'.$item->{$form_fieldname});
                          \Log::debug('Old file '.$path.'/'.$file_name.' has been deleted.');
                     } catch (\Exception $e) {
                         \Log::debug('Could not delete old file. '.$path.'/'.$file_name.' does not exist?');
                     }
                 }
 
-                $item->{$use_db_field} = $file_name;
+                $item->{$db_fieldname} = $file_name;
             }
 
+
         // If the user isn't uploading anything new but wants to delete their old image, do so
-        } else {
-            if ($this->input('image_delete') == '1') {
-                \Log::debug('Deleting image');
-                try {
-                    Storage::disk('public')->delete($path.'/'.$item->{$use_db_field});
-                        $item->{$use_db_field} = null;
-                } catch (\Exception $e) {
-                    \Log::debug($e);
-                }
+        } elseif ($this->input('image_delete') == '1') {
+            \Log::debug('Deleting image');
+            try {
+                Storage::disk('public')->delete($path.'/'.$item->{$db_fieldname});
+                    $item->{$db_fieldname} = null;
+            } catch (\Exception $e) {
+                \Log::debug($e);
             }
+
         }
 
         return $item;

From 48c85966d74b86963dea93dca7b690a47803a551 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 18:07:17 -0800
Subject: [PATCH 13/40] Added gravatar and avatar as fillable

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/User.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 399008430b..34c0af6b2e 100755
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -61,7 +61,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'remote',
         'start_date',
         'end_date',
-        'scim_externalid'
+        'scim_externalid',
+        'avatar',
+        'gravatar',
     ];
 
     protected $casts = [

From 93ad0d02b93bcf6df9ad2183884aa2eb75535e3a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 18:20:02 -0800
Subject: [PATCH 14/40] Use fieldname for aria labels too

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/forms/edit/image-upload.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index 0e24df1dcf..8e69477cc1 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -1,8 +1,8 @@
 <div class="form-group {{ $errors->has((isset($fieldname) ? $fieldname : 'image')) ? 'has-error' : '' }}">
-    <label class="col-md-3 control-label" for="image">{{ trans('general.image_upload') }}</label>
+    <label class="col-md-3 control-label" for="{{ (isset($fieldname) ? $fieldname : 'image') }}">{{ trans('general.image_upload') }}</label>
     <div class="col-md-9">
 
-        <input type="file" id="image" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="sr-only">
+        <input type="file" id="{{ (isset($fieldname) ? $fieldname : 'image') }}" name="{{ (isset($fieldname) ? $fieldname : 'image') }}" aria-label="{{ (isset($fieldname) ? $fieldname : 'image') }}" class="sr-only">
 
         <label class="btn btn-default" aria-hidden="true">
             {{ trans('button.select_file')  }}
@@ -14,7 +14,7 @@
         {!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
     <div class="col-md-4 col-md-offset-3" aria-hidden="true">
-        <img id="uploadFile-imagePreview" style="max-width: 200px; display: none;" alt="{{ trans('partials/forms/general.alt_uploaded_image_thumbnail') }}">
+        <img id="uploadFile-imagePreview" style="max-width: 300px; display: none;" alt="{{ trans('partials/forms/general.alt_uploaded_image_thumbnail') }}">
     </div>
 </div>
 

From 2dc1182582d1c91a8fdd7f4a86a6e6ca3b64f9ac Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 18:20:26 -0800
Subject: [PATCH 15/40] =?UTF-8?q?Don=E2=80=99t=20offer=20the=20delete=20op?=
 =?UTF-8?q?tion=20if=20there=20is=20no=20avatar=20currently?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/account/profile.blade.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index 0764a3033c..86abc7aff9 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -104,16 +104,20 @@
 
         <!-- Avatar -->
 
-        @if ($user->avatar)
-          <div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
-            <label class="col-md-3 control-label" for="avatar_delete">{{ trans('general.image_delete') }}</label>
-            <div class="col-md-9">
-              <label for="avatar_delete">
-                {{ Form::checkbox('avatar_delete', '1', old('avatar_delete'), array('class' => 'minimal')) }}
+        @if (($user->avatar) && ($user->avatar!=''))
+          <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
+            <div class="col-md-9 col-md-offset-3">
+              <label for="image_delete">
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+                {{ trans('general.image_delete') }}
+                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
               </label>
-              <br>
-              <img src="{{ url('/') }}/uploads/avatars/{{  $user->avatar }}" alt="{{ $user->present()->fullName() }} avatar image">
-              {!! $errors->first('avatar_delete', '<span class="alert-msg" aria-hidden="true"><br>:message</span>') !!}
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-md-9 col-md-offset-3">
+              <img src="{{ Storage::disk('public')->url(app('users_upload_path').e($user->avatar)) }}" class="img-responsive">
+              {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
             </div>
           </div>
         @endif

From cd8cb445bae325902f055166a8ede6ec8532b885 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 21 Jan 2023 18:20:53 -0800
Subject: [PATCH 16/40] Corrected fieldname for user fieldname for avatar in
 Controller

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Users/UsersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 52d423036f..04df6c0139 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -131,7 +131,7 @@ class UsersController extends Controller
         $user->permissions = json_encode($permissions_array);
 
         // we have to invoke the
-        app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'image', 'avatars', 'avatar');
+        app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
         if ($user->save()) {
             if ($request->filled('groups')) {

From d3bcc48ae51fa31e3477476501e992aea885c445 Mon Sep 17 00:00:00 2001
From: Jeremy Price <jeremy@grokability.com>
Date: Mon, 23 Jan 2023 15:08:59 -0800
Subject: [PATCH 17/40] [imports] fix "Backup before importing?" checkbox on
 import page

We were always taking backups before import, no matter the status of
this box.

Turns out we were testing for the presence of the property defined by
the checkbox, rather than the value of the property, and as such were
always doing a backup.

We're now checking the status, and it behaves as expected
---
 app/Http/Controllers/Api/ImportController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php
index e5f0c6ab1f..9742cc1644 100644
--- a/app/Http/Controllers/Api/ImportController.php
+++ b/app/Http/Controllers/Api/ImportController.php
@@ -127,7 +127,7 @@ class ImportController extends Controller
         $this->authorize('import');
 
         // Run a backup immediately before processing
-        if ($request->has('run-backup')) {
+        if ($request->get('run-backup')) {
             \Log::debug('Backup manually requested via importer');
             Artisan::call('backup:run');
         } else {

From 02dcb0fbd728914d9a16bb6359f4c30170ee97b7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 23 Jan 2023 21:37:35 -0800
Subject: [PATCH 18/40] Shorten the additiona form request invocation to just
 `ImageUploadRequest`

We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file.

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Users/UsersController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 04df6c0139..2a34992552 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -131,7 +131,7 @@ class UsersController extends Controller
         $user->permissions = json_encode($permissions_array);
 
         // we have to invoke the
-        app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
         if ($user->save()) {
             if ($request->filled('groups')) {
@@ -296,7 +296,7 @@ class UsersController extends Controller
         $user->permissions = json_encode($permissions_array);
 
         // Handle uploaded avatar
-        app(\App\Http\Requests\ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
+        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
 
         //\Log::debug(print_r($user, true));
 

From dc155846ca11d404aed416bf7bc0bc64f2252b1b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 23 Jan 2023 21:49:17 -0800
Subject: [PATCH 19/40] =?UTF-8?q?Hoist=20the=20autorization=20higher=20in?=
 =?UTF-8?q?=20the=20stack=20so=20we=E2=80=99re=20not=20doing=20logic=20or?=
 =?UTF-8?q?=20math=20when=20the=20user=20isn=E2=80=99t=20authorized=20to?=
 =?UTF-8?q?=20touch=20this?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Accessories/AccessoriesController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
index 96f83d7665..f0b54a9498 100755
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -63,6 +63,7 @@ class AccessoriesController extends Controller
     public function store(ImageUploadRequest $request)
     {
         $this->authorize(Accessory::class);
+        
         // create a new model instance
         $accessory = new Accessory();
 
@@ -82,7 +83,6 @@ class AccessoriesController extends Controller
         $accessory->supplier_id             = request('supplier_id');
         $accessory->notes                   = request('notes');
 
-
         $accessory = $request->handleImages($accessory);
 
         // Was the accessory created?
@@ -129,6 +129,8 @@ class AccessoriesController extends Controller
     {
         if ($accessory = Accessory::withCount('users as users_count')->find($accessoryId)) {
 
+            $this->authorize($accessory);
+
             $validator = Validator::make($request->all(), [
                 "qty" => "required|numeric|min:$accessory->users_count"
             ]);
@@ -139,7 +141,7 @@ class AccessoriesController extends Controller
                     ->withInput();
             }
 
-            $this->authorize($accessory);
+
 
             // Update the accessory data
             $accessory->name = request('name');

From 4b514247238db048820894e8e8b467077d198180 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 24 Jan 2023 09:42:03 -0800
Subject: [PATCH 20/40] fixes a couple buttons color choices in high contrast

---
 resources/assets/less/skins/skin-contrast.less | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/resources/assets/less/skins/skin-contrast.less b/resources/assets/less/skins/skin-contrast.less
index f66e76676b..eba7001b0b 100644
--- a/resources/assets/less/skins/skin-contrast.less
+++ b/resources/assets/less/skins/skin-contrast.less
@@ -84,7 +84,13 @@
     color: #fff;
   }
 }
-
+a.btn.btn-link.text-left{
+  color:@navy;
+  border: 1px solid #000;
+}
+a.btn.btn-link.text-left:hover{
+  color:@navy;
+}
 
 a {
   color: @navy;
@@ -102,10 +108,6 @@ a.btn {
   &:hover {
     color: #fff;
     text-decoration: underline;
-
-  }
-  &:visited {
-    color: #fff;
   }
 }
 

From 3ba79600fb6e163c9afec105a345cfabeef07c56 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Tue, 24 Jan 2023 18:17:49 -0500
Subject: [PATCH 21/40] checkin limit for the components checkin

---
 resources/lang/en/admin/components/general.php | 1 +
 resources/views/components/checkin.blade.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/en/admin/components/general.php b/resources/lang/en/admin/components/general.php
index f7689a7ad1..5d93036054 100644
--- a/resources/lang/en/admin/components/general.php
+++ b/resources/lang/en/admin/components/general.php
@@ -12,4 +12,5 @@ return array(
     'remaining' 			             => 'Remaining',
     'total' 			                 => 'Total',
     'update'                            => 'Update Component',
+    'checkin_limit'            => 'Amount checked in must be equal to or less than this amount'
 );
diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php
index 8dca260443..55822fb9cf 100644
--- a/resources/views/components/checkin.blade.php
+++ b/resources/views/components/checkin.blade.php
@@ -42,7 +42,7 @@
                                 <input type="text" class="form-control" name="checkin_qty" aria-label="checkin_qty" value="{{ old('assigned_qty', $component_assets->assigned_qty) }}">
                             </div>
                             <div class="col-md-9 col-md-offset-2">
-                            <p class="help-block">Must be {{ $component_assets->assigned_qty }} or less.</p>
+                            <p class="help-block">{{ trans(admin/components/general.checkin_limit) }}: {{ $component_assets->assigned_qty }}</p>
                             {!! $errors->first('checkin_qty', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i>
                             :message</span>') !!}
                             </div>

From ab12ad11400ddaa5214f305662923b06e74b9da2 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Tue, 24 Jan 2023 18:19:26 -0800
Subject: [PATCH 22/40] Resolves Rollbar error 16746 - missing array key
 'extension'

---
 app/Console/Commands/RestoreFromBackup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.php
index c5e3a4c790..b1f1753564 100644
--- a/app/Console/Commands/RestoreFromBackup.php
+++ b/app/Console/Commands/RestoreFromBackup.php
@@ -149,7 +149,7 @@ class RestoreFromBackup extends Command
                 $boring_files[] = $raw_path;
                 continue;
             }
-            if (@pathinfo($raw_path)['extension'] == 'sql') {
+            if (@pathinfo($raw_path, PATHINFO_EXTENSION) == 'sql') {
                 \Log::debug("Found a sql file!");
                 $sqlfiles[] = $raw_path;
                 $sqlfile_indices[] = $i;

From 6b729502c6ed6ca3a1173b5f4a570ee1db50ee63 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 24 Jan 2023 19:13:40 -0800
Subject: [PATCH 23/40] Rebuilt dev assets

Signed-off-by: snipe <snipe@snipe.net>
---
 public/css/dist/skins/skin-contrast.css     | Bin 5176 -> 5269 bytes
 public/css/dist/skins/skin-contrast.min.css | Bin 5176 -> 5269 bytes
 public/mix-manifest.json                    |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/css/dist/skins/skin-contrast.css b/public/css/dist/skins/skin-contrast.css
index b5d7fc4e9ba47c27422f48b326d9e613577aef81..50dfc577e2baab97de6b046b349d3084ba79d917 100644
GIT binary patch
delta 84
zcmdm?F;#Oz5Wl!yQb`^N>*i$UW$TrsR+Q-Gq^6ZjF5nlRoWdzAZ(v|x%~i{lh)Z1-
Pzw~5({>__}1w>f@w*4Eu

delta 34
qcmbQLxkF<^5dY*0{2O=^^^!{RtjaQrGfPraCMPh9Zf+D1VF3W?#tcgU

diff --git a/public/css/dist/skins/skin-contrast.min.css b/public/css/dist/skins/skin-contrast.min.css
index b5d7fc4e9ba47c27422f48b326d9e613577aef81..50dfc577e2baab97de6b046b349d3084ba79d917 100644
GIT binary patch
delta 84
zcmdm?F;#Oz5Wl!yQb`^N>*i$UW$TrsR+Q-Gq^6ZjF5nlRoWdzAZ(v|x%~i{lh)Z1-
Pzw~5({>__}1w>f@w*4Eu

delta 34
qcmbQLxkF<^5dY*0{2O=^^^!{RtjaQrGfPraCMPh9Zf+D1VF3W?#tcgU

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 719da79a95..b200128c7d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -16,7 +16,7 @@
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
     "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=c0d21166315b7c2cdd4819fa4a5e4d1e",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=8e538625ebd4b8096e150d1aa483547b",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
     "/css/dist/all.css": "/css/dist/all.css?id=ef030b613d45620b907cf0184a14e868",
     "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150",
@@ -49,5 +49,5 @@
     "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=713b1205aa2d7c9db282f8cd5754c0e4",
     "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
     "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=f343f659ca1d45534d2c2c3cc30fb619",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=8e538625ebd4b8096e150d1aa483547b"
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=da6c7997d9de2f8329142399f0ce50da"
 }

From 91cf683f3db002299d9237c1411f4969804ed339 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Thu, 10 Nov 2022 17:14:37 +0000
Subject: [PATCH 24/40] Re-do the entire SCIM config so it no longer inherits

---
 app/Models/SnipeSCIMConfig.php | 328 ++++++++++++++++++++-------------
 1 file changed, 195 insertions(+), 133 deletions(-)

diff --git a/app/Models/SnipeSCIMConfig.php b/app/Models/SnipeSCIMConfig.php
index 36a9ac855c..ea442bbdda 100644
--- a/app/Models/SnipeSCIMConfig.php
+++ b/app/Models/SnipeSCIMConfig.php
@@ -12,94 +12,9 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig
 {
     public function getUserConfig()
     {
-        $config = parent::getUserConfig();
-
         // Much of this is copied verbatim from the library, then adjusted for our needs
-        $config['class'] = SCIMUser::class;
 
-        unset($config['mapping']['example:name:space']);
-
-        $config['map_unmapped'] = false; // anything we don't explicitly map will _not_ show up.
-
-        $core_namespace = 'urn:ietf:params:scim:schemas:core:2.0:User';
-        $core = $core_namespace.':'; 
-        $mappings =& $config['mapping'][$core_namespace]; //grab this entire key, we don't want to be repeating ourselves
-
-        //username - *REQUIRED*
-        $config['validations'][$core.'userName'] = 'required';
-        $mappings['userName'] = AttributeMapping::eloquent('username');
-
-        //human name - *FIRST NAME REQUIRED*
-        $config['validations'][$core.'name.givenName'] = 'required';
-        $config['validations'][$core.'name.familyName'] = 'string'; //not required
-
-        $mappings['name']['familyName'] = AttributeMapping::eloquent("last_name");
-        $mappings['name']['givenName'] = AttributeMapping::eloquent("first_name");
-        $mappings['name']['formatted'] = (new AttributeMapping())->ignoreWrite()->setRead(
-            function (&$object) {
-                return $object->getFullNameAttribute();
-            } 
-        );
-
-        // externalId support
-        $config['validations'][$core.'externalId'] = 'string|nullable'; // not required, but supported mostly just for Okta
-        // note that the mapping is *not* namespaced like the other $mappings
-        $config['mapping']['externalId'] = AttributeMapping::eloquent('scim_externalid');
-
-        $config['validations'][$core.'emails'] = 'nullable|array';         // emails are not required in Snipe-IT...
-        $config['validations'][$core.'emails.*.value'] = 'email'; // ...(had to remove the recommended 'required' here)
-
-        $mappings['emails'] = [[
-            "value" => AttributeMapping::eloquent("email"),
-            "display" => null,
-            "type" => AttributeMapping::constant("work")->ignoreWrite(),
-            "primary" => AttributeMapping::constant(true)->ignoreWrite()
-        ]];
-
-        //active
-        $config['validations'][$core.'active'] = 'boolean';
-
-        $mappings['active'] = AttributeMapping::eloquent('activated');
-
-        //phone
-        $config['validations'][$core.'phoneNumbers'] = 'nullable|array';
-        $config['validations'][$core.'phoneNumbers.*.value'] = 'string'; // another one where want to say 'we don't _need_ a phone number, but if you have one it better have a value.
-
-        $mappings['phoneNumbers'] = [[
-            "value" => AttributeMapping::eloquent("phone"),
-            "display" => null,
-            "type" => AttributeMapping::constant("work")->ignoreWrite(),
-            "primary" => AttributeMapping::constant(true)->ignoreWrite()
-        ]];
-
-        //address
-        $config['validations'][$core.'addresses'] = 'nullable|array';
-        $config['validations'][$core.'addresses.*.streetAddress'] = 'string';
-        $config['validations'][$core.'addresses.*.locality'] = 'string';
-        $config['validations'][$core.'addresses.*.region'] = 'nullable|string';
-        $config['validations'][$core.'addresses.*.postalCode'] = 'nullable|string';
-        $config['validations'][$core.'addresses.*.country'] = 'string';
-
-        $mappings['addresses'] = [[
-            'type' => AttributeMapping::constant("work")->ignoreWrite(),
-            'formatted' => AttributeMapping::constant("n/a")->ignoreWrite(), // TODO - is this right? This doesn't look right.
-            'streetAddress' => AttributeMapping::eloquent("address"),
-            'locality' => AttributeMapping::eloquent("city"),
-            'region' => AttributeMapping::eloquent("state"),
-            'postalCode' => AttributeMapping::eloquent("zip"),
-            'country' => AttributeMapping::eloquent("country"),
-            'primary' => AttributeMapping::constant(true)->ignoreWrite() //this isn't in the example?
-        ]];
-
-        //title
-        $config['validations'][$core.'title'] = 'string';
-        $mappings['title'] = AttributeMapping::eloquent('jobtitle');
-
-        //Preferred Language
-        $config['validations'][$core.'preferredLanguage'] = 'string';
-        $mappings['preferredLanguage'] = AttributeMapping::eloquent('locale');
-
-        /* 
+        /*
           more snipe-it attributes I'd like to check out (to map to 'enterprise' maybe?):
          - website
          - notes?
@@ -108,66 +23,213 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig
          - company_id to "organization?"
         */
 
-        $enterprise_namespace = 'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User';
-        $ent = $enterprise_namespace.':';
 
-        // we remove the 'example' namespace and add the Enterprise one
-        $config['mapping']['schemas'] = AttributeMapping::constant( [$core_namespace, $enterprise_namespace] )->ignoreWrite();
+        $user_prefix = 'urn:ietf:params:scim:schemas:core:2.0:User:';
+        $enterprise_prefix = 'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:';
 
-        $config['validations'][$ent.'employeeNumber'] = 'string';
-        $config['validations'][$ent.'department'] = 'string';
-        $config['validations'][$ent.'manager'] = 'nullable';
-        $config['validations'][$ent.'manager.value'] = 'string';
+        return [
 
-        $config['mapping'][$enterprise_namespace] = [
-            'employeeNumber' => AttributeMapping::eloquent('employee_num'),
-            'department' =>(new AttributeMapping())->setAdd( // FIXME parent?
-                function ($value, &$object) {
-                    $department = Department::where("name", $value)->first();
-                    if ($department) {
-                        $object->department_id = $department->id;
-                    }
-                }
-                )->setReplace(
-                    function ($value, &$object) {
-                        $department = Department::where("name", $value)->first();
-                        if ($department) {
-                            $object->department_id = $department->id;
+            // Set to 'null' to make use of auth.providers.users.model (App\User::class)
+            'class' => SCIMUser::class,
+
+            'validations' => [
+                $user_prefix . 'userName' => 'required',
+                $user_prefix . 'name.givenName' => 'required',
+                $user_prefix . 'name.familyName' => 'string',
+                $user_prefix . 'externalId' => 'string|nullable',
+                $user_prefix . 'emails' => 'nullable|array',
+                $user_prefix . 'emails.*.value' => 'email',
+                $user_prefix . 'active' => 'boolean',
+                $user_prefix . 'phoneNumbers' => 'nullable|array',
+                $user_prefix . 'phoneNumbers.*.value' => 'string',
+                $user_prefix . 'addresses' => 'nullable|array',
+                $user_prefix . 'addresses.*.streetAddress' => 'string',
+                $user_prefix . 'addresses.*.locality' => 'string',
+                $user_prefix . 'addresses.*.region' => 'nullable|string',
+                $user_prefix . 'addresses.*.postalCode' => 'nullable|string',
+                $user_prefix . 'addresses.*.country' => 'string',
+                $user_prefix . 'title' => 'string',
+                $user_prefix . 'preferredLanguage' => 'string',
+
+                // Enterprise validations:
+                $enterprise_prefix . 'employeeNumber' => 'string',
+                $enterprise_prefix . 'department' => 'string',
+                $enterprise_prefix . 'manager' => 'nullable',
+                $enterprise_prefix . 'manager.value' => 'string'
+            ],
+
+            'singular' => 'User',
+            'schema' => [Schema::SCHEMA_USER],
+
+            //eager loading
+            'withRelations' => [],
+            'map_unmapped' => false,
+//            'unmapped_namespace' => 'urn:ietf:params:scim:schemas:laravel:unmapped',
+            'description' => 'User Account',
+
+            // Map a SCIM attribute to an attribute of the object.
+            'mapping' => [
+
+                'id' => AttributeMapping::eloquent("id")->disableWrite(),
+
+                'externalId' => AttributeMapping::eloquent('scim_externalid'), // FIXME - I have a PR that changes a lot of this.
+
+                'meta' => [
+                    'created' => AttributeMapping::eloquent("created_at")->disableWrite(),
+                    'lastModified' => AttributeMapping::eloquent("updated_at")->disableWrite(),
+
+                    'location' => (new AttributeMapping())->setRead(
+                        function ($object) {
+                            return route(
+                                'scim.resource',
+                                [
+                                    'resourceType' => 'Users',
+                                    'resourceObject' => $object->id
+                                ]
+                            );
                         }
-                    }
-                )->setRead(
-                    function (&$object) {
-                        return $object->department ? $object->department->name : null;
-                    } 
-                ),
-            'manager' => [
-                // FIXME - manager writes are disabled. This kinda works but it leaks errors all over the place. Not cool.
-                // '$ref' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
-                // 'displayName' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
-                // NOTE: you could probably do a 'plain' Eloquent mapping here, but we don't for future-proofing
-                'value' => (new AttributeMapping())->setAdd(
-                    function ($value, &$object) {
-                        $manager = User::find($value);
-                        if ($manager) {
-                            $object->manager_id = $manager->id;
+                    )->disableWrite(),
+
+                    'resourceType' => AttributeMapping::constant("User")
+                ],
+
+                'schemas' => AttributeMapping::constant(
+                    [
+                        'urn:ietf:params:scim:schemas:core:2.0:User',
+                        'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'
+                    ]
+                )->ignoreWrite(),
+
+                'urn:ietf:params:scim:schemas:core:2.0:User' => [
+
+                    'userName' => AttributeMapping::eloquent("username"),
+
+                    'name' => [
+                        'formatted' => (new AttributeMapping())->ignoreWrite()->setRead(
+                            function (&$object) {
+                                return $object->getFullNameAttribute();
+                            }
+                        ),
+                        'familyName' => AttributeMapping::eloquent("last_name"),
+                        'givenName' => AttributeMapping::eloquent("first_name"),
+                        'middleName' => null,
+                        'honorificPrefix' => null,
+                        'honorificSuffix' => null
+                    ],
+
+                    'displayName' => null,
+                    'nickName' => null,
+                    'profileUrl' => null,
+                    'title' => AttributeMapping::eloquent('jobtitle'),
+                    'userType' => null,
+                    'preferredLanguage' => AttributeMapping::eloquent('locale'), // Section 5.3.5 of [RFC7231]
+                    'locale' => null, // see RFC5646
+                    'timezone' => null, // see RFC6557
+                    'active' => AttributeMapping::eloquent('activated'),
+
+                    'password' => AttributeMapping::eloquent('password')->disableRead(),
+
+                    // Multi-Valued Attributes
+                    'emails' => [[
+                        "value" => AttributeMapping::eloquent("email"),
+                        "display" => null,
+                        "type" => AttributeMapping::constant("work")->ignoreWrite(),
+                        "primary" => AttributeMapping::constant(true)->ignoreWrite()
+                    ]],
+
+                    'phoneNumbers' => [[
+                        "value" => AttributeMapping::eloquent("phone"),
+                        "display" => null,
+                        "type" => AttributeMapping::constant("work")->ignoreWrite(),
+                        "primary" => AttributeMapping::constant(true)->ignoreWrite()
+                    ]],
+
+                    'ims' => [[
+                        "value" => null,
+                        "display" => null,
+                        "type" => null,
+                        "primary" => null
+                    ]], // Instant messaging addresses for the User
+
+                    'photos' => [[
+                        "value" => null,
+                        "display" => null,
+                        "type" => null,
+                        "primary" => null
+                    ]],
+
+                    'addresses' => [[
+                        'type' => AttributeMapping::constant("work")->ignoreWrite(),
+                        'formatted' => AttributeMapping::constant("n/a")->ignoreWrite(), // TODO - is this right? This doesn't look right.
+                        'streetAddress' => AttributeMapping::eloquent("address"),
+                        'locality' => AttributeMapping::eloquent("city"),
+                        'region' => AttributeMapping::eloquent("state"),
+                        'postalCode' => AttributeMapping::eloquent("zip"),
+                        'country' => AttributeMapping::eloquent("country"),
+                        'primary' => AttributeMapping::constant(true)->ignoreWrite() //this isn't in the example?
+                    ]],
+
+                    'groups' => [[
+                        'value' => null,
+                        '$ref' => null,
+                        'display' => null,
+                        'type' => null,
+                        'type' => null
+                    ]],
+
+                    'entitlements' => null,
+                    'roles' => null,
+                    'x509Certificates' => null
+                ],
+
+                'urn:ietf:params:scim:schemas:extension:enterprise:2.0:User' => [
+                    'employeeNumber' => AttributeMapping::eloquent('employee_num'),
+                    'department' => (new AttributeMapping())->setAdd( // FIXME parent?
+                        function ($value, &$object) {
+                            $department = Department::where("name", $value)->first();
+                            if ($department) {
+                                $object->department_id = $department->id;
+                            }
                         }
-                    }
                     )->setReplace(
                         function ($value, &$object) {
-                            $manager = User::find($value);
-                            if ($manager) {
-                                $object->manager_id = $manager->id;
+                            $department = Department::where("name", $value)->first();
+                            if ($department) {
+                                $object->department_id = $department->id;
                             }
                         }
                     )->setRead(
                         function (&$object) {
-                            return $object->manager_id;
-                        } 
+                            return $object->department ? $object->department->name : null;
+                        }
                     ),
+                    'manager' => [
+                        // FIXME - manager writes are disabled. This kinda works but it leaks errors all over the place. Not cool.
+                        // '$ref' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
+                        // 'displayName' => (new AttributeMapping())->ignoreWrite()->ignoreRead(),
+                        // NOTE: you could probably do a 'plain' Eloquent mapping here, but we don't for future-proofing
+                        'value' => (new AttributeMapping())->setAdd(
+                            function ($value, &$object) {
+                                $manager = User::find($value);
+                                if ($manager) {
+                                    $object->manager_id = $manager->id;
+                                }
+                            }
+                        )->setReplace(
+                            function ($value, &$object) {
+                                $manager = User::find($value);
+                                if ($manager) {
+                                    $object->manager_id = $manager->id;
+                                }
+                            }
+                        )->setRead(
+                            function (&$object) {
+                                return $object->manager_id;
+                            }
+                        ),
+                    ]
+                ]
             ]
         ];
-
-        return $config;
     }
-
 }

From cfe9c687f980dfab7656fcaffe7675a8bc1c1b9d Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Wed, 4 Jan 2023 12:17:08 -0800
Subject: [PATCH 25/40] Mark a bunch of SCIM config as nullable

---
 app/Models/SnipeSCIMConfig.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/Models/SnipeSCIMConfig.php b/app/Models/SnipeSCIMConfig.php
index ea442bbdda..77cbf01c1a 100644
--- a/app/Models/SnipeSCIMConfig.php
+++ b/app/Models/SnipeSCIMConfig.php
@@ -35,27 +35,27 @@ class SnipeSCIMConfig extends \ArieTimmerman\Laravel\SCIMServer\SCIMConfig
             'validations' => [
                 $user_prefix . 'userName' => 'required',
                 $user_prefix . 'name.givenName' => 'required',
-                $user_prefix . 'name.familyName' => 'string',
-                $user_prefix . 'externalId' => 'string|nullable',
+                $user_prefix . 'name.familyName' => 'nullable|string',
+                $user_prefix . 'externalId' => 'nullable|string',
                 $user_prefix . 'emails' => 'nullable|array',
-                $user_prefix . 'emails.*.value' => 'email',
+                $user_prefix . 'emails.*.value' => 'nullable|email',
                 $user_prefix . 'active' => 'boolean',
                 $user_prefix . 'phoneNumbers' => 'nullable|array',
-                $user_prefix . 'phoneNumbers.*.value' => 'string',
+                $user_prefix . 'phoneNumbers.*.value' => 'nullable|string',
                 $user_prefix . 'addresses' => 'nullable|array',
-                $user_prefix . 'addresses.*.streetAddress' => 'string',
-                $user_prefix . 'addresses.*.locality' => 'string',
+                $user_prefix . 'addresses.*.streetAddress' => 'nullable|string',
+                $user_prefix . 'addresses.*.locality' => 'nullable|string',
                 $user_prefix . 'addresses.*.region' => 'nullable|string',
                 $user_prefix . 'addresses.*.postalCode' => 'nullable|string',
-                $user_prefix . 'addresses.*.country' => 'string',
-                $user_prefix . 'title' => 'string',
-                $user_prefix . 'preferredLanguage' => 'string',
+                $user_prefix . 'addresses.*.country' => 'nullable|string',
+                $user_prefix . 'title' => 'nullable|string',
+                $user_prefix . 'preferredLanguage' => 'nullable|string',
 
                 // Enterprise validations:
-                $enterprise_prefix . 'employeeNumber' => 'string',
-                $enterprise_prefix . 'department' => 'string',
+                $enterprise_prefix . 'employeeNumber' => 'nullable|string',
+                $enterprise_prefix . 'department' => 'nullable|string',
                 $enterprise_prefix . 'manager' => 'nullable',
-                $enterprise_prefix . 'manager.value' => 'string'
+                $enterprise_prefix . 'manager.value' => 'nullable|string'
             ],
 
             'singular' => 'User',

From c5d3b3ab8155f485eef6b64af70205be22f75044 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Wed, 11 Jan 2023 17:15:52 -0800
Subject: [PATCH 26/40] Change out the SCIM config for a fixed one; update our
 fork of the SCIM-server

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index bf8cb1f758..d6067c5e27 100644
--- a/composer.lock
+++ b/composer.lock
@@ -78,12 +78,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/grokability/laravel-scim-server.git",
-                "reference": "2c7ecc450eee59234e059ec2e7724b2d8f3a8369"
+                "reference": "9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/2c7ecc450eee59234e059ec2e7724b2d8f3a8369",
-                "reference": "2c7ecc450eee59234e059ec2e7724b2d8f3a8369",
+                "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419",
+                "reference": "9e8dd2d3958d3c3c05d0a99fe6475361ad9e9419",
                 "shasum": ""
             },
             "require": {
@@ -133,7 +133,7 @@
             "support": {
                 "source": "https://github.com/grokability/laravel-scim-server/tree/master"
             },
-            "time": "2022-11-22T20:26:54+00:00"
+            "time": "2023-01-12T00:32:07+00:00"
         },
         {
             "name": "asm89/stack-cors",

From cd573c484ddc19218be1407dcc66e3f329127e54 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Thu, 26 Jan 2023 12:48:41 -0800
Subject: [PATCH 27/40] Change the SCIM_STANDARDS_COMPLIANCE config to default
 to 'true'

---
 config/scim.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/scim.php b/config/scim.php
index d7d578efc2..4e343cd3a6 100644
--- a/config/scim.php
+++ b/config/scim.php
@@ -3,6 +3,6 @@
 return [
     "trace" => env("SCIM_TRACE",false),
     // below, if we ever get 'sure' that we can change this default to 'true' we should
-    "omit_main_schema_in_return" => env('SCIM_STANDARDS_COMPLIANCE', false),
+    "omit_main_schema_in_return" => env('SCIM_STANDARDS_COMPLIANCE', true),
     "publish_routes" => false,
 ];

From 37f5cfa8ce0844edc65cc4e329d8a70a8fc6f845 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 26 Jan 2023 17:02:53 -0800
Subject: [PATCH 28/40] Added edit button for fieldsets

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/custom_fields/index.blade.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index 08c43cdd7b..d2435d7db5 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -69,8 +69,18 @@
                 @endforeach
               </td>
               <td>
+
+                <nobr>
+
+                @can('update', $fieldset)
+                  <a href="{{ route('fieldsets.edit', $fieldset->id) }}" class="btn btn-warning btn-sm">
+                    <i class="fas fa-pencil-alt" aria-hidden="true"></i>
+                    <span class="sr-only">{{ trans('button.edit') }}</span>
+                  </a>
+                @endcan
+
                 @can('delete', $fieldset)
-                {{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete']) }}
+                {{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete','style' => 'display:inline-block']) }}
                   @if($fieldset->models->count() > 0)
                   <button type="submit" class="btn btn-danger btn-sm disabled" disabled><i class="fas fa-trash"></i></button>
                   @else
@@ -78,6 +88,7 @@
                   @endif
                 {{ Form::close() }}
                 @endcan
+                  </nobr>
               </td>
             </tr>
             @endforeach

From a16604285c5d8460f559af3c5eadbffa433c06cd Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 26 Jan 2023 17:03:07 -0800
Subject: [PATCH 29/40] Normalize the fieldset form

Signed-off-by: snipe <snipe@snipe.net>
---
 .../custom_fields/fieldsets/edit.blade.php    | 58 ++++---------------
 1 file changed, 11 insertions(+), 47 deletions(-)

diff --git a/resources/views/custom_fields/fieldsets/edit.blade.php b/resources/views/custom_fields/fieldsets/edit.blade.php
index 04885891ec..a43769255d 100644
--- a/resources/views/custom_fields/fieldsets/edit.blade.php
+++ b/resources/views/custom_fields/fieldsets/edit.blade.php
@@ -1,49 +1,13 @@
-@extends('layouts.default')
+@extends('layouts/edit-form', [
+    'createText' => trans('admin/custom_fields/general.create_fieldset') ,
+    'updateText' => trans('admin/custom_fields/general.update_fieldset'),
+    'formAction' => (isset($item->id)) ? route('fieldsets.update', ['fieldset' => $item->id]) : route('fieldsets.store'),
+])
+
+@section('inputFields')
+
+  @include ('partials.forms.edit.name', ['translated_name' => trans('general.name')])
+
+
 
-{{-- Page title --}}
-@section('title')
-  {{ trans('admin/custom_fields/general.create_fieldset') }}
-@parent
-@stop
-
-@section('header_right')
-<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
-  {{ trans('general.back') }}</a>
-@stop
-
-
-{{-- Page content --}}
-@section('content')
-<div class="row">
-  <div class="col-md-9">
-
-  {{ Form::open(['route' => 'fieldsets.store', 'class'=>'form-horizontal']) }}
-    <!-- Horizontal Form -->
-    <div class="box box-default">
-      <div class="box-body">
-
-          <!-- Name -->
-        <div class="form-group {{ $errors->has('name') ? ' has-error' : '' }}">
-          <label for="name" class="col-md-4 control-label">
-            {{ trans('admin/custom_fields/general.fieldset_name') }}
-          </label>
-          <div class="col-md-6">
-            <input class="form-control" type="text" name="name" id="name" value="{{ old('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>
-
-      </div> <!-- /.box-body-->
-      <div class="box-footer text-right">
-        <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
-      </div>
-
-    </div> <!-- /.box.box-default-->
-    {{ Form::close() }}
-  </div>
-  <div class="col-md-3">
-    <h2>{{ trans('admin/custom_fields/general.about_fieldsets_title') }}</h4>
-    <p>{{ trans('admin/custom_fields/general.about_fieldsets_text') }}</p>
-  </div>
-</div>
 @stop

From 583a0412fedba46f36598c5ddc65eb461d55ccc8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 26 Jan 2023 17:03:23 -0800
Subject: [PATCH 30/40] Added edit fieldsets translations

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Controllers/CustomFieldsetsController.php | 61 +++++++++++++------
 .../lang/en/admin/custom_fields/general.php   |  3 +
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php
index c7c00a7bd2..bee0f38e27 100644
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -75,9 +75,9 @@ class CustomFieldsetsController extends Controller
      */
     public function create()
     {
-        $this->authorize('create', CustomFieldset::class);
+        $this->authorize('create', CustomField::class);
 
-        return view('custom_fields.fieldsets.edit');
+        return view('custom_fields.fieldsets.edit')->with('item', new CustomFieldset());
     }
 
     /**
@@ -91,7 +91,7 @@ class CustomFieldsetsController extends Controller
      */
     public function store(Request $request)
     {
-        $this->authorize('create', CustomFieldset::class);
+        $this->authorize('create', CustomField::class);
 
         $cfset = new CustomFieldset([
                 'name' => e($request->get('name')),
@@ -110,31 +110,52 @@ class CustomFieldsetsController extends Controller
     }
 
     /**
-     * What the actual fuck, Brady?
+     * Presents edit form for fieldset
      *
-     * @todo Uhh, build this?
-     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $id
-     * @since [v1.8]
-     * @return Fuckall
+     * @since [v6.0.14]
+     * @return Redirect
+     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
     public function edit($id)
     {
-        //
+        $this->authorize('create', CustomField::class);
+
+        if ($fieldset = CustomFieldset::find($id)) {
+            return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
+        }
+
+        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
+
     }
 
     /**
-     * GET IN THE SEA BRADY.
+     * Saves updated fieldset data
      *
-     * @todo Uhh, build this too?
-     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
      * @param  int  $id
-     * @since [v1.8]
-     * @return Fuckall
+     * @since [v6.0.14]
+     * @return Redirect
+     * @throws \Illuminate\Auth\Access\AuthorizationException
      */
-    public function update($id)
+    public function update(Request $request, $id)
     {
-        //
+        $this->authorize('create', CustomField::class);
+
+        if ($fieldset = CustomFieldset::find($id)) {
+
+            $fieldset->name = $request->input('name');
+
+            if ($fieldset->save()) {
+                return redirect()->route('fields.index')->with('success', trans('admin/custom_fields/general.fieldset_updated'));
+            }
+
+            return redirect()->back()->withInput()->withErrors($fieldset->getErrors());
+
+        }
+
+        return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
     }
 
     /**
@@ -148,7 +169,7 @@ class CustomFieldsetsController extends Controller
      */
     public function destroy($id)
     {
-        $fieldset = CustomFieldset::find($id);
+        $fieldset = CustomField::find($id);
 
         $this->authorize('delete', $fieldset);
 
@@ -175,7 +196,7 @@ class CustomFieldsetsController extends Controller
      */
     public function associate(Request $request, $id)
     {
-        $set = CustomFieldset::find($id);
+        $set = CustomField::find($id);
 
         $this->authorize('update', $set);
 
@@ -202,7 +223,7 @@ class CustomFieldsetsController extends Controller
      */
     public function makeFieldRequired($fieldset_id, $field_id)
     {
-        $this->authorize('update', CustomFieldset::class);
+        $this->authorize('update', CustomField::class);
         $field = CustomField::findOrFail($field_id);
         $fieldset = CustomFieldset::findOrFail($fieldset_id);
         $fields[$field->id] = ['required' => 1];
@@ -220,7 +241,7 @@ class CustomFieldsetsController extends Controller
      */
     public function makeFieldOptional($fieldset_id, $field_id)
     {
-        $this->authorize('update', CustomFieldset::class);
+        $this->authorize('update', CustomField::class);
         $field = CustomField::findOrFail($field_id);
         $fieldset = CustomFieldset::findOrFail($fieldset_id);
         $fields[$field->id] = ['required' => 0];
diff --git a/resources/lang/en/admin/custom_fields/general.php b/resources/lang/en/admin/custom_fields/general.php
index 92bf240a76..9dae380aa5 100644
--- a/resources/lang/en/admin/custom_fields/general.php
+++ b/resources/lang/en/admin/custom_fields/general.php
@@ -27,6 +27,9 @@ return [
     'used_by_models'   		    => 'Used By Models',
     'order'   		            => 'Order',
     'create_fieldset'         => 'New Fieldset',
+    'update_fieldset'         => 'Update Fieldset',
+    'fieldset_does_not_exist'   => 'Fieldset :id does not exist',
+    'fieldset_updated'         => 'Fieldset updated',
     'create_fieldset_title' => 'Create a new fieldset',
     'create_field'            => 'New Custom Field',
     'create_field_title' => 'Create a new custom field',

From 22b0b9b090b0fc85fa1209cd6fa3a978666383d4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 26 Jan 2023 17:05:41 -0800
Subject: [PATCH 31/40] Fixed gates on fieldsets

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Controllers/Api/CustomFieldsetsController.php  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Api/CustomFieldsetsController.php b/app/Http/Controllers/Api/CustomFieldsetsController.php
index 18da1b67c2..27da7733cd 100644
--- a/app/Http/Controllers/Api/CustomFieldsetsController.php
+++ b/app/Http/Controllers/Api/CustomFieldsetsController.php
@@ -33,7 +33,7 @@ class CustomFieldsetsController extends Controller
      */
     public function index()
     {
-        $this->authorize('index', CustomFieldset::class);
+        $this->authorize('index', CustomField::class);
         $fieldsets = CustomFieldset::withCount('fields as fields_count', 'models as models_count')->get();
 
         return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count());
@@ -49,7 +49,7 @@ class CustomFieldsetsController extends Controller
      */
     public function show($id)
     {
-        $this->authorize('view', CustomFieldset::class);
+        $this->authorize('view', CustomField::class);
         if ($fieldset = CustomFieldset::find($id)) {
             return (new CustomFieldsetsTransformer)->transformCustomFieldset($fieldset);
         }
@@ -68,7 +68,7 @@ class CustomFieldsetsController extends Controller
      */
     public function update(Request $request, $id)
     {
-        $this->authorize('update', CustomFieldset::class);
+        $this->authorize('update', CustomField::class);
         $fieldset = CustomFieldset::findOrFail($id);
         $fieldset->fill($request->all());
 
@@ -89,7 +89,7 @@ class CustomFieldsetsController extends Controller
      */
     public function store(Request $request)
     {
-        $this->authorize('create', CustomFieldset::class);
+        $this->authorize('create', CustomField::class);
         $fieldset = new CustomFieldset;
         $fieldset->fill($request->all());
 
@@ -109,7 +109,7 @@ class CustomFieldsetsController extends Controller
      */
     public function destroy($id)
     {
-        $this->authorize('delete', CustomFieldset::class);
+        $this->authorize('delete', CustomField::class);
         $fieldset = CustomFieldset::findOrFail($id);
 
         $modelsCount = $fieldset->models->count();
@@ -136,7 +136,7 @@ class CustomFieldsetsController extends Controller
      */
     public function fields($id)
     {
-        $this->authorize('view', CustomFieldset::class);
+        $this->authorize('view', CustomField::class);
         $set = CustomFieldset::findOrFail($id);
         $fields = $set->fields;
 
@@ -153,7 +153,7 @@ class CustomFieldsetsController extends Controller
      */
     public function fieldsWithDefaultValues($fieldsetId, $modelId)
     {
-        $this->authorize('view', CustomFieldset::class);
+        $this->authorize('view', CustomField::class);
 
         $set = CustomFieldset::findOrFail($fieldsetId);
 

From c2854f1bcb79a9f0fbe8342a4993e9c375b16f57 Mon Sep 17 00:00:00 2001
From: Ben Periton <104396+benperiton@users.noreply.github.com>
Date: Tue, 18 Oct 2022 08:00:36 +0100
Subject: [PATCH 32/40] Update database.php

Although Postgres is not officially supported, it does seem to work ok, but to help a little bit with the Docker image, this is non-breaking change but allows the env file to specify the pgsql connection port
---
 config/database.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/database.php b/config/database.php
index 9d94454db2..36440b2127 100755
--- a/config/database.php
+++ b/config/database.php
@@ -102,6 +102,7 @@ return [
         'pgsql' => [
             'driver'   => 'pgsql',
             'host'     => env('DB_HOST', 'localhost'),
+            'port'     => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'forge'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),

From ccc7b78f623678ada9ef37a5ec34c45f76521b3c Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Mon, 30 Jan 2023 15:11:41 -0600
Subject: [PATCH 33/40] Store the acceptance dates with format YYY-mm-dd

---
 app/Http/Controllers/Account/AcceptanceController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php
index 59c8f88430..726e164ba8 100644
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -222,8 +222,8 @@ class AcceptanceController extends Controller
                 'item_model' => $display_model,
                 'item_serial' => $item->serial,
                 'eula' => $item->getEula(),
-                'check_out_date' => Carbon::parse($acceptance->created_at)->format($branding_settings->date_display_format),
-                'accepted_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format),
+                'check_out_date' => Carbon::parse($acceptance->created_at)->format('Y-m-d'),
+                'accepted_date' => Carbon::parse($acceptance->accepted_at)->format('Y-m-d'),
                 'assigned_to' => $assigned_to,
                 'company_name' => $branding_settings->site_name,
                 'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
@@ -273,7 +273,7 @@ class AcceptanceController extends Controller
                 'item_tag' => $item->asset_tag,
                 'item_model' => $display_model,
                 'item_serial' => $item->serial,
-                'declined_date' => Carbon::parse($acceptance->accepted_at)->format($branding_settings->date_display_format),
+                'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'),
                 'assigned_to' => $assigned_to,
                 'company_name' => $branding_settings->site_name,
                 'date_settings' => $branding_settings->date_display_format,

From a7a578bf51462d52ef5fdf091ad3c114e3f8ba51 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue, 31 Jan 2023 00:13:44 -0600
Subject: [PATCH 34/40] Added head only logo to be used as default in
 apple-touch-icon

---
 public/img/snipe-logo-bug.png             | Bin 0 -> 22482 bytes
 resources/views/layouts/default.blade.php |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 public/img/snipe-logo-bug.png

diff --git a/public/img/snipe-logo-bug.png b/public/img/snipe-logo-bug.png
new file mode 100644
index 0000000000000000000000000000000000000000..423a5b74906c4a1f67dab665a59a6731f0dbaa98
GIT binary patch
literal 22482
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

literal 0
HcmV?d00001

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index daf4275481..ceabe13553 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -15,8 +15,8 @@
 
 
 
-      <link rel="apple-touch-icon" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->logo)) :  config('app.url').'/img/logo.png' }}">
-      <link rel="apple-touch-startup-image" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->logo)) :  config('app.url').'/img/logo.png' }}">
+      <link rel="apple-touch-icon" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->logo)) :  config('app.url').'/img/snipe-logo-bug.png' }}">
+      <link rel="apple-touch-startup-image" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->logo)) :  config('app.url').'/img/snipe-logo-bug.png' }}">
       <link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url(e($snipeSettings->favicon)) : config('app.url').'/favicon.ico' }} ">
 
 

From cddae4869fcce2e4d2de3b313c5e929d4efac5ae Mon Sep 17 00:00:00 2001
From: lukasfehling <6AQmxBp2VWLzo3.LXH*ApJbbje8GYaqq>
Date: Tue, 31 Jan 2023 18:27:25 +0100
Subject: [PATCH 35/40] fixed the endpoint for user notification with all their
 assigned assets

---
 app/Http/Controllers/Api/UsersController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index cca829c23f..9a9135a380 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -542,9 +542,10 @@ class UsersController extends Controller
         if (empty($user->email)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.inventorynotification.error')));
         }
+
+        $user->notify((new CurrentInventory($user)));
  
-        return response()->Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success'));
- 
+        return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success')));
     }
 
     /**

From a4173e38819a717e702a487d93112ce6c1e753e3 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Tue, 31 Jan 2023 16:49:41 -0800
Subject: [PATCH 36/40] Permit
 not-delegated+dont-expire-password+normal-accounts to login

---
 app/Console/Commands/LdapSync.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php
index c6f8dd379a..ea99e74d1f 100755
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -303,17 +303,18 @@ class LdapSync extends Command
                         $user->activated = 0;
                     } */
                     $enabled_accounts = [
-                    '512',    // 0x200    NORMAL_ACCOUNT
-                    '544',    // 0x220    NORMAL_ACCOUNT, PASSWD_NOTREQD
-                    '66048',  // 0x10200  NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD
-                    '66080',  // 0x10220  NORMAL_ACCOUNT, PASSWD_NOTREQD, DONT_EXPIRE_PASSWORD
-                    '262656', // 0x40200  NORMAL_ACCOUNT, SMARTCARD_REQUIRED
-                    '262688', // 0x40220  NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED
-                    '328192', // 0x50200  NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
-                    '328224', // 0x50220  NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
-                    '4194816',// 0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH
+                    '512',    //     0x200 NORMAL_ACCOUNT
+                    '544',    //     0x220 NORMAL_ACCOUNT, PASSWD_NOTREQD
+                    '66048',  //   0x10200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD
+                    '66080',  //   0x10220 NORMAL_ACCOUNT, PASSWD_NOTREQD, DONT_EXPIRE_PASSWORD
+                    '262656', //   0x40200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED
+                    '262688', //   0x40220 NORMAL_ACCOUNT, PASSWD_NOTREQD, SMARTCARD_REQUIRED
+                    '328192', //   0x50200 NORMAL_ACCOUNT, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
+                    '328224', //   0x50220 NORMAL_ACCOUNT, PASSWD_NOT_REQD, SMARTCARD_REQUIRED, DONT_EXPIRE_PASSWORD
+                    '4194816',//  0x400200 NORMAL_ACCOUNT, DONT_REQ_PREAUTH
                     '4260352', // 0x410200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, DONT_REQ_PREAUTH
                     '1049088', // 0x100200 NORMAL_ACCOUNT, NOT_DELEGATED
+                    '1114624', // 0x110200 NORMAL_ACCOUNT, DONT_EXPIRE_PASSWORD, NOT_DELEGATED,
                   ];
                     $user->activated = (in_array($results[$i]['useraccountcontrol'][0], $enabled_accounts)) ? 1 : 0;
 

From 02ca5248b10670728ef7f5874adea0c8c83b59cc Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Tue, 31 Jan 2023 17:44:09 -0800
Subject: [PATCH 37/40] Don't append username to the user's name if it's
 already there

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

diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 5a6e9dd464..d3a0fddc14 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -327,8 +327,8 @@
                 item_icon = '';
             }
 
-            // display the username if it's checked out to a user
-            if (value.username) {
+            // display the username if it's checked out to a user, but don't do it if the username's there already
+            if (value.username && !value.name.match('\\(') && !value.name.match('\\)')) {
                 value.name = value.name + ' (' + value.username + ')';
             }
 

From de1141491aa7441e7153f43e3cb73f0de18a9895 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 31 Jan 2023 19:41:42 -0800
Subject: [PATCH 38/40] Replaced help text

Signed-off-by: snipe <snipe@snipe.net>
---
 .../views/custom_fields/fieldsets/edit.blade.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/resources/views/custom_fields/fieldsets/edit.blade.php b/resources/views/custom_fields/fieldsets/edit.blade.php
index a43769255d..7a35ca146f 100644
--- a/resources/views/custom_fields/fieldsets/edit.blade.php
+++ b/resources/views/custom_fields/fieldsets/edit.blade.php
@@ -1,13 +1,17 @@
 @extends('layouts/edit-form', [
     'createText' => trans('admin/custom_fields/general.create_fieldset') ,
     'updateText' => trans('admin/custom_fields/general.update_fieldset'),
+    'helpText' => trans('admin/custom_fields/general.about_fieldsets_text'),
+    'helpPosition' => 'right',
     'formAction' => (isset($item->id)) ? route('fieldsets.update', ['fieldset' => $item->id]) : route('fieldsets.store'),
 ])
 
-@section('inputFields')
-
-  @include ('partials.forms.edit.name', ['translated_name' => trans('general.name')])
-
-
-
+@section('content')
+    @parent
 @stop
+
+@section('inputFields')
+@include ('partials.forms.edit.name', ['translated_name' => trans('general.name')])
+@stop
+
+

From a8643e5d35f1535bd28000bcbbaa44dc64b36a0a Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 1 Feb 2023 15:55:16 -0500
Subject: [PATCH 39/40] cleaning up/adding variable

---
 resources/lang/en/admin/components/general.php | 2 +-
 resources/views/components/checkin.blade.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en/admin/components/general.php b/resources/lang/en/admin/components/general.php
index 5d93036054..5b788a51ec 100644
--- a/resources/lang/en/admin/components/general.php
+++ b/resources/lang/en/admin/components/general.php
@@ -12,5 +12,5 @@ return array(
     'remaining' 			             => 'Remaining',
     'total' 			                 => 'Total',
     'update'                            => 'Update Component',
-    'checkin_limit'            => 'Amount checked in must be equal to or less than this amount'
+    'checkin_limit'            => 'Amount checked in must be equal to or less than :assigned_qty'
 );
diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php
index 55822fb9cf..0bbc46eff1 100644
--- a/resources/views/components/checkin.blade.php
+++ b/resources/views/components/checkin.blade.php
@@ -42,7 +42,7 @@
                                 <input type="text" class="form-control" name="checkin_qty" aria-label="checkin_qty" value="{{ old('assigned_qty', $component_assets->assigned_qty) }}">
                             </div>
                             <div class="col-md-9 col-md-offset-2">
-                            <p class="help-block">{{ trans(admin/components/general.checkin_limit) }}: {{ $component_assets->assigned_qty }}</p>
+                            <p class="help-block">{{ trans(admin/components/general.checkin_limit, ['assigned_qty' => '$component_assets->assigned_qty']) }}</p>
                             {!! $errors->first('checkin_qty', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i>
                             :message</span>') !!}
                             </div>

From 0ffd40a2170a51feea442a8eac3e0f3f4a4473da Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 1 Feb 2023 16:30:07 -0500
Subject: [PATCH 40/40] fixing syntax

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

diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php
index 0bbc46eff1..6a7055f727 100644
--- a/resources/views/components/checkin.blade.php
+++ b/resources/views/components/checkin.blade.php
@@ -42,7 +42,7 @@
                                 <input type="text" class="form-control" name="checkin_qty" aria-label="checkin_qty" value="{{ old('assigned_qty', $component_assets->assigned_qty) }}">
                             </div>
                             <div class="col-md-9 col-md-offset-2">
-                            <p class="help-block">{{ trans(admin/components/general.checkin_limit, ['assigned_qty' => '$component_assets->assigned_qty']) }}</p>
+                            <p class="help-block">{{ trans('admin/components/general.checkin_limit', ['assigned_qty' => $component_assets->assigned_qty]) }}</p>
                             {!! $errors->first('checkin_qty', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i>
                             :message</span>') !!}
                             </div>