From 74a891afbb2d86bdbca6baa824a710c4a8dcd168 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 27 Sep 2023 15:58:01 -0700
Subject: [PATCH 01/21] WIP: Render select box for field options in label
 engine

---
 .../label2-field-definitions.blade.php        | 49 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index 6522b951d8..5bc473418f 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -304,7 +304,52 @@
                         <label style="grid-area: label-title">Label</label>
                         <input style="grid-area: label-field" x-model="option.label" />
                         <label style="grid-area: source-title">DataSource</label>
-                        <input style="grid-area: source-field" x-model="option.datasource" />
+                        {{--<input style="grid-area: source-field" x-model="option.datasource" />--}}
+                        <select style="grid-area: source-field">
+                            <optgroup label="Asset">
+                                <option value="asset_eol_date">EOL Date</option>
+                                <option value="asset_tag">Asset Tag</option>
+                                <option value="byod">BYOD</option>
+                                <option value="expected_checkin">Expected Checkin</option>
+                                <option value="name">Name</option>
+                                <option value="order_number">Order Number</option>
+                                <option value="purchase_cost">Purchase Cost</option>
+                                <option value="purchase_date">Purchase Date</option>
+                                <option value="serial">Serial</option>
+                            </optgroup>
+                            <optgroup label="Asset Model">
+                                <option value="model.model_number">Asset Model Number</option>
+                                <option value="model.name">Asset Model Name</option>
+                            </optgroup>
+                            <optgroup label="Manufacturer">
+                                <option value="model.manufacturer.name">name</option>
+                                <option value="model.manufacturer.support_email">support_email</option>
+                                <option value="model.manufacturer.support_phone">support_phone</option>
+                                <option value="model.manufacturer.support_url">support_url</option>
+                            </optgroup>
+                            <optgroup label="Category">
+                                <option value="model.category.name">name</option>
+                            </optgroup>
+                            <optgroup label="Status">
+                                <option value="assetstatus.name">name</option>
+                            </optgroup>
+                            <optgroup label="Supplier">
+                                <option value="supplier.name">name</option>
+                            </optgroup>
+                            <optgroup label="Default Location">
+                                <option value="defaultLoc.name">name</option>
+                                <option value="defaultLoc.phone">phone</option>
+                            </optgroup>
+                            <optgroup label="Company">
+                                <option value="company.email">email</option>
+                                <option value="company.name">name</option>
+                                <option value="company.phone">phone</option>
+                            </optgroup>
+                            <optgroup label="Location">
+                                <option value="location.name">name</option>
+                                <option value="location.phone">phone</option>
+                            </optgroup>
+                        </select>
                     </div>
                 </template>
             </template>
@@ -331,4 +376,4 @@
                 ><i class="fa-solid fa-trash"></i></button>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>

From 518ae28a374aef744327b5b5fe7a26b9340adb24 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 27 Sep 2023 16:20:26 -0700
Subject: [PATCH 02/21] Improve option display values

---
 .../label2-field-definitions.blade.php        | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index 5bc473418f..fcdc97bc56 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -305,49 +305,49 @@
                         <input style="grid-area: label-field" x-model="option.label" />
                         <label style="grid-area: source-title">DataSource</label>
                         {{--<input style="grid-area: source-field" x-model="option.datasource" />--}}
-                        <select style="grid-area: source-field">
+                        <select style="grid-area: source-field" x-model="option.datasource">
                             <optgroup label="Asset">
-                                <option value="asset_eol_date">EOL Date</option>
                                 <option value="asset_tag">Asset Tag</option>
-                                <option value="byod">BYOD</option>
-                                <option value="expected_checkin">Expected Checkin</option>
-                                <option value="name">Name</option>
-                                <option value="order_number">Order Number</option>
-                                <option value="purchase_cost">Purchase Cost</option>
-                                <option value="purchase_date">Purchase Date</option>
-                                <option value="serial">Serial</option>
+                                <option value="byod">Asset BYOD</option>
+                                <option value="asset_eol_date">Asset EOL Date</option>
+                                <option value="expected_checkin">Asset Expected Checkin</option>
+                                <option value="name">Asset Name</option>
+                                <option value="order_number">Asset Order Number</option>
+                                <option value="purchase_cost">Asset Purchase Cost</option>
+                                <option value="purchase_date">Asset Purchase Date</option>
+                                <option value="serial">Asset Serial</option>
                             </optgroup>
                             <optgroup label="Asset Model">
                                 <option value="model.model_number">Asset Model Number</option>
                                 <option value="model.name">Asset Model Name</option>
                             </optgroup>
                             <optgroup label="Manufacturer">
-                                <option value="model.manufacturer.name">name</option>
-                                <option value="model.manufacturer.support_email">support_email</option>
-                                <option value="model.manufacturer.support_phone">support_phone</option>
-                                <option value="model.manufacturer.support_url">support_url</option>
+                                <option value="model.manufacturer.name">Manufacturer Name</option>
+                                <option value="model.manufacturer.support_email">Manufacturer Support Email</option>
+                                <option value="model.manufacturer.support_phone">Manufacturer Support Phone</option>
+                                <option value="model.manufacturer.support_url">Manufacturer Support URL</option>
                             </optgroup>
                             <optgroup label="Category">
-                                <option value="model.category.name">name</option>
+                                <option value="model.category.name">Category Name</option>
                             </optgroup>
                             <optgroup label="Status">
-                                <option value="assetstatus.name">name</option>
+                                <option value="assetstatus.name">Status</option>
                             </optgroup>
                             <optgroup label="Supplier">
-                                <option value="supplier.name">name</option>
+                                <option value="supplier.name">Supplier Name</option>
                             </optgroup>
                             <optgroup label="Default Location">
-                                <option value="defaultLoc.name">name</option>
-                                <option value="defaultLoc.phone">phone</option>
+                                <option value="defaultLoc.name">Default Location Name</option>
+                                <option value="defaultLoc.phone">Default Location Phone</option>
                             </optgroup>
                             <optgroup label="Company">
-                                <option value="company.email">email</option>
-                                <option value="company.name">name</option>
-                                <option value="company.phone">phone</option>
+                                <option value="company.email">Company Email</option>
+                                <option value="company.name">Company Name</option>
+                                <option value="company.phone">Company Phone</option>
                             </optgroup>
                             <optgroup label="Location">
-                                <option value="location.name">name</option>
-                                <option value="location.phone">phone</option>
+                                <option value="location.name">Location Name</option>
+                                <option value="location.phone">Location Phone</option>
                             </optgroup>
                         </select>
                     </div>

From a4a25ab9d0e1e3257d25e4974f3c0237d3d73281 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 27 Sep 2023 16:35:44 -0700
Subject: [PATCH 03/21] Remove a couple fields

---
 resources/views/partials/label2-field-definitions.blade.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index fcdc97bc56..73ee3935b6 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -304,13 +304,10 @@
                         <label style="grid-area: label-title">Label</label>
                         <input style="grid-area: label-field" x-model="option.label" />
                         <label style="grid-area: source-title">DataSource</label>
-                        {{--<input style="grid-area: source-field" x-model="option.datasource" />--}}
                         <select style="grid-area: source-field" x-model="option.datasource">
                             <optgroup label="Asset">
                                 <option value="asset_tag">Asset Tag</option>
-                                <option value="byod">Asset BYOD</option>
                                 <option value="asset_eol_date">Asset EOL Date</option>
-                                <option value="expected_checkin">Asset Expected Checkin</option>
                                 <option value="name">Asset Name</option>
                                 <option value="order_number">Asset Order Number</option>
                                 <option value="purchase_cost">Asset Purchase Cost</option>

From a47e36c1e54d58b508597cac9fa74aaf13597615 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 27 Sep 2023 16:51:53 -0700
Subject: [PATCH 04/21] Add custom fields as options

---
 app/Http/Controllers/SettingsController.php               | 8 +++++---
 .../views/partials/label2-field-definitions.blade.php     | 5 +++++
 resources/views/settings/labels.blade.php                 | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 7a7aa45b6e..c759713194 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -7,6 +7,7 @@ use App\Helpers\StorageHelper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SettingsSamlRequest;
 use App\Http\Requests\SetupUserRequest;
+use App\Models\CustomField;
 use App\Models\Group;
 use App\Models\Setting;
 use App\Models\Asset;
@@ -809,9 +810,10 @@ class SettingsController extends Controller
      */
     public function getLabels()
     {
-        $setting = Setting::getSettings();
-
-        return view('settings.labels', compact('setting'));
+        return view('settings.labels', [
+            'setting' => Setting::getSettings(),
+            'customFields' => CustomField::all(),
+        ]);
     }
 
     /**
diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index 73ee3935b6..710edda621 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -346,6 +346,11 @@
                                 <option value="location.name">Location Name</option>
                                 <option value="location.phone">Location Phone</option>
                             </optgroup>
+                            <optgroup label="Custom Fields">
+                                @foreach($customFields as $customField)
+                                    <option value="{{ $customField->db_column }}">{{ $customField->name }}</option>
+                                @endforeach
+                            </optgroup>
                         </select>
                     </div>
                 </template>
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 46ce4fe610..a6edd29154 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -216,7 +216,7 @@
                                     {{ Form::label('label2_fields', trans('admin/settings/general.label2_fields')) }}
                                 </div>
                                 <div class="col-md-9">
-                                    @include('partials.label2-field-definitions', [ 'name' => 'label2_fields', 'value' => old('label2_fields', $setting->label2_fields) ])
+                                    @include('partials.label2-field-definitions', [ 'name' => 'label2_fields', 'value' => old('label2_fields', $setting->label2_fields), 'customFields' => $customFields ])
                                     {!! $errors->first('label2_fields', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                     <p class="help-block">{{ trans('admin/settings/general.label2_fields_help') }}</p>
                                 </div>

From 4675f02349bd6bdadc02a43e256ec083e6302bb3 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 28 Sep 2023 11:35:20 -0700
Subject: [PATCH 05/21] Format assigned to field

---
 app/Models/Labels/FieldOption.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/Models/Labels/FieldOption.php b/app/Models/Labels/FieldOption.php
index 76427accaf..2f874ec389 100644
--- a/app/Models/Labels/FieldOption.php
+++ b/app/Models/Labels/FieldOption.php
@@ -14,6 +14,14 @@ class FieldOption {
 
     public function getValue(Asset $asset) {
         $dataPath = collect(explode('.', $this->dataSource));
+
+        // assignedTo directly on the asset is a special case where
+        // we want to avoid returning the property directly
+        // and instead return the entity's presented name.
+        if ($dataPath[0] === 'assignedTo'){
+           return $asset->assignedTo->present()->fullName();
+        }
+        
         return $dataPath->reduce(function ($myValue, $path) {
             try { return $myValue ? $myValue->{$path} : ${$myValue}; }
             catch (\Exception $e) { return $myValue; }
@@ -46,4 +54,4 @@ class FieldOption {
             return $option;
         }
     }
-}
\ No newline at end of file
+}

From 36638feac4619745d53229a88616d861fffe59a7 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 28 Sep 2023 11:37:02 -0700
Subject: [PATCH 06/21] Add assigned to as option

---
 resources/views/partials/label2-field-definitions.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index 710edda621..9ca4f191de 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -313,6 +313,7 @@
                                 <option value="purchase_cost">Asset Purchase Cost</option>
                                 <option value="purchase_date">Asset Purchase Date</option>
                                 <option value="serial">Asset Serial</option>
+                                <option value="assignedTo">Assigned To</option>
                             </optgroup>
                             <optgroup label="Asset Model">
                                 <option value="model.model_number">Asset Model Number</option>

From 3aa256ec021d7351fd07b472a927a1b432d96799 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 28 Sep 2023 12:33:20 -0700
Subject: [PATCH 07/21] Ensure non-checked out items can be displayed

---
 app/Models/Labels/FieldOption.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Labels/FieldOption.php b/app/Models/Labels/FieldOption.php
index 2f874ec389..7e45cc0ce7 100644
--- a/app/Models/Labels/FieldOption.php
+++ b/app/Models/Labels/FieldOption.php
@@ -19,7 +19,7 @@ class FieldOption {
         // we want to avoid returning the property directly
         // and instead return the entity's presented name.
         if ($dataPath[0] === 'assignedTo'){
-           return $asset->assignedTo->present()->fullName();
+            return $asset->assignedTo ?  $asset->assignedTo->present()->fullName() : null;
         }
         
         return $dataPath->reduce(function ($myValue, $path) {

From ed77e8768c7cc17c0292cce2ca448340876c9d41 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 28 Sep 2023 12:33:27 -0700
Subject: [PATCH 08/21] Re-order options

---
 .../partials/label2-field-definitions.blade.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php
index 9ca4f191de..21aa7a0cf9 100644
--- a/resources/views/partials/label2-field-definitions.blade.php
+++ b/resources/views/partials/label2-field-definitions.blade.php
@@ -307,17 +307,16 @@
                         <select style="grid-area: source-field" x-model="option.datasource">
                             <optgroup label="Asset">
                                 <option value="asset_tag">Asset Tag</option>
-                                <option value="asset_eol_date">Asset EOL Date</option>
                                 <option value="name">Asset Name</option>
-                                <option value="order_number">Asset Order Number</option>
-                                <option value="purchase_cost">Asset Purchase Cost</option>
-                                <option value="purchase_date">Asset Purchase Date</option>
                                 <option value="serial">Asset Serial</option>
+                                <option value="asset_eol_date">Asset EOL Date</option>
+                                <option value="order_number">Asset Order Number</option>
+                                <option value="purchase_date">Asset Purchase Date</option>
                                 <option value="assignedTo">Assigned To</option>
                             </optgroup>
                             <optgroup label="Asset Model">
-                                <option value="model.model_number">Asset Model Number</option>
                                 <option value="model.name">Asset Model Name</option>
+                                <option value="model.model_number">Asset Model Number</option>
                             </optgroup>
                             <optgroup label="Manufacturer">
                                 <option value="model.manufacturer.name">Manufacturer Name</option>
@@ -338,15 +337,15 @@
                                 <option value="defaultLoc.name">Default Location Name</option>
                                 <option value="defaultLoc.phone">Default Location Phone</option>
                             </optgroup>
+                            <optgroup label="Location">
+                                <option value="location.name">Location Name</option>
+                                <option value="location.phone">Location Phone</option>
+                            </optgroup>
                             <optgroup label="Company">
                                 <option value="company.email">Company Email</option>
                                 <option value="company.name">Company Name</option>
                                 <option value="company.phone">Company Phone</option>
                             </optgroup>
-                            <optgroup label="Location">
-                                <option value="location.name">Location Name</option>
-                                <option value="location.phone">Location Phone</option>
-                            </optgroup>
                             <optgroup label="Custom Fields">
                                 @foreach($customFields as $customField)
                                     <option value="{{ $customField->db_column }}">{{ $customField->name }}</option>

From eb2edb74759a9890327cb98d78a53cab24029de1 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 28 Sep 2023 13:40:51 -0700
Subject: [PATCH 09/21] Add more default values for label preview

---
 app/Http/Controllers/LabelsController.php | 28 +++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php
index 3e29323cb5..04838552c9 100755
--- a/app/Http/Controllers/LabelsController.php
+++ b/app/Http/Controllers/LabelsController.php
@@ -7,8 +7,10 @@ use App\Models\AssetModel;
 use App\Models\Category;
 use App\Models\Company;
 use App\Models\Labels\Label;
+use App\Models\Location;
 use App\Models\Manufacturer;
 use App\Models\Setting;
+use App\Models\Supplier;
 use App\Models\User;
 use App\View\Label as LabelView;
 use Illuminate\Support\Facades\Storage;
@@ -33,18 +35,20 @@ class LabelsController extends Controller
         $exampleAsset->name = 'JEN-867-5309';
         $exampleAsset->asset_tag = 'TCA-00001';
         $exampleAsset->serial = 'SN9876543210';
+        $exampleAsset->asset_eol_date = '2025-01-01';
+        $exampleAsset->order_number = '12345';
+        $exampleAsset->purchase_date = '2023-01-01';
+        $exampleAsset->status_id = 1;
 
-        $exampleAsset->company = new Company();
-        $exampleAsset->company->id = 999999;
-        $exampleAsset->company->name = 'Test Company Limited';
-        $exampleAsset->company->image = 'company-image-test.png';
+        $exampleAsset->company = new Company([
+            'name' => 'Test Company Limited',
+            'phone' => '1-555-555-5555',
+            'email' => 'company@example.com',
+        ]);
 
-        $exampleAsset->assignedto = new User();
-        $exampleAsset->assignedto->id = 999999;
-        $exampleAsset->assignedto->first_name = 'Test';
-        $exampleAsset->assignedto->last_name = 'Person';
-        $exampleAsset->assignedto->username = 'Test.Person';
-        $exampleAsset->assignedto->employee_num = '0123456789';
+        $exampleAsset->setRelation('assignedTo', new User(['first_name' => 'Luke', 'last_name' => 'Skywalker']));
+        $exampleAsset->defaultLoc = new Location(['name' => 'Building 1', 'phone' => '1-555-555-5555']);
+        $exampleAsset->location = new Location(['name' => 'Building 2', 'phone' => '1-555-555-5555']);
 
         $exampleAsset->model = new AssetModel();
         $exampleAsset->model->id = 999999;
@@ -53,6 +57,10 @@ class LabelsController extends Controller
         $exampleAsset->model->manufacturer = new Manufacturer();
         $exampleAsset->model->manufacturer->id = 999999;
         $exampleAsset->model->manufacturer->name = 'Test Manufacturing Inc.';
+        $exampleAsset->model->manufacturer->support_email = 'support@test.com';
+        $exampleAsset->model->manufacturer->support_phone = '1-555-555-5555';
+        $exampleAsset->model->manufacturer->support_url = 'https://example.com';
+        $exampleAsset->supplier = new Supplier(['name' => 'Test Company Limited']);
         $exampleAsset->model->category = new Category();
         $exampleAsset->model->category->id = 999999;
         $exampleAsset->model->category->name = 'Test Category';

From d4b9f6a2a47a3a7e9dc6310c25062493764aaeda Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 31 Oct 2023 21:00:22 -0500
Subject: [PATCH 10/21] add not_array (not ready, doesn't catch for specific
 exception)

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

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 9f15101d33..7f4f691628 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -91,7 +91,7 @@ class Asset extends Depreciable
 
     protected $rules = [
         'name'            => 'max:255|nullable',
-        'model_id'        => 'required|integer|exists:models,id,deleted_at,NULL',
+        'model_id'        => 'required|integer|exists:models,id,deleted_at,NULL|not_array',
         'status_id'       => 'required|integer|exists:status_labels,id',
         'company_id'      => 'integer|nullable',
         'warranty_months' => 'numeric|nullable|digits_between:0,240',

From b67b00dd82af6c32636d645d88990b5d5d19b9ab Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Tue, 31 Oct 2023 21:06:44 -0500
Subject: [PATCH 11/21] this is a start, something up with asset_tag unique
 rule

---
 app/Http/Controllers/Api/AssetsController.php |  4 +-
 app/Http/Requests/StoreAssetRequest.php       | 49 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Requests/StoreAssetRequest.php

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index bbdc982599..c32c3c4429 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;
 
 use App\Events\CheckoutableCheckedIn;
+use App\Http\Requests\StoreAssetRequest;
 use Illuminate\Support\Facades\Gate;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
@@ -33,6 +34,7 @@ use TCPDF;
 use Validator;
 use Route;
 
+
 /**
  * This class controls all actions related to assets for
  * the Snipe-IT Asset Management application.
@@ -532,7 +534,7 @@ class AssetsController extends Controller
      * @since [v4.0]
      * @return \Illuminate\Http\JsonResponse
      */
-    public function store(ImageUploadRequest $request)
+    public function store(StoreAssetRequest $request)
     {
         $this->authorize('create', Asset::class);
 
diff --git a/app/Http/Requests/StoreAssetRequest.php b/app/Http/Requests/StoreAssetRequest.php
new file mode 100644
index 0000000000..992d67e25b
--- /dev/null
+++ b/app/Http/Requests/StoreAssetRequest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Models\Asset;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Gate;
+
+class StoreAssetRequest extends ImageUploadRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        //TODO: make sure this works
+        //return Gate::allows('create', new Asset);
+    }
+
+    public function prepareForValidation(): void
+    {
+        //
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = array_merge(
+            (new Asset)->getRules(),
+            parent::rules(),
+        );
+
+        if(!$this->expectsJson()) {
+            //accepts an array for the gui form
+            $rules['asset_tags.*'] = $rules['asset_tag'];
+            unset($rules['asset_tag']);
+            $rules['serials.*'] = $rules['serial'];
+            unset($rules['serial']);
+        }
+
+        return $rules;
+    }
+}

From 53bd5626c9e3fda94f0394993d8384941d9a7f20 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 1 Nov 2023 11:33:29 -0500
Subject: [PATCH 12/21] this works, need to write up pr

---
 app/Exceptions/Handler.php              | 6 ++++++
 app/Http/Requests/StoreAssetRequest.php | 8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 3d4db93452..b3317ad2df 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -4,6 +4,7 @@ namespace App\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use App\Helpers\Helper;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Auth\AuthenticationException;
 use ArieTimmerman\Laravel\SCIMServer\Exceptions\SCIMException;
@@ -150,6 +151,11 @@ class Handler extends ExceptionHandler
         return redirect()->guest('login');
     }
 
+    protected function invalidJson($request, ValidationException $exception)
+    {
+        return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors()), 200);
+    }
+
 
     /** 
      * A list of the inputs that are never flashed for validation exceptions.
diff --git a/app/Http/Requests/StoreAssetRequest.php b/app/Http/Requests/StoreAssetRequest.php
index 992d67e25b..a9a06baed4 100644
--- a/app/Http/Requests/StoreAssetRequest.php
+++ b/app/Http/Requests/StoreAssetRequest.php
@@ -15,8 +15,8 @@ class StoreAssetRequest extends ImageUploadRequest
      */
     public function authorize(): bool
     {
-        //TODO: make sure this works
-        //return Gate::allows('create', new Asset);
+        // TODO: make sure this works
+        return Gate::allows('create', new Asset);
     }
 
     public function prepareForValidation(): void
@@ -36,13 +36,11 @@ class StoreAssetRequest extends ImageUploadRequest
             parent::rules(),
         );
 
-        if(!$this->expectsJson()) {
-            //accepts an array for the gui form
+            // unsets unique check here, that check cannot run twice.
             $rules['asset_tags.*'] = $rules['asset_tag'];
             unset($rules['asset_tag']);
             $rules['serials.*'] = $rules['serial'];
             unset($rules['serial']);
-        }
 
         return $rules;
     }

From d971172cf35ddd96cf2f8b3526341284c14193d5 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 1 Nov 2023 11:34:15 -0500
Subject: [PATCH 13/21] rm unnecessary import

---
 app/Exceptions/Handler.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index b3317ad2df..e76d8e5dae 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -4,7 +4,6 @@ namespace App\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use App\Helpers\Helper;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Auth\AuthenticationException;
 use ArieTimmerman\Laravel\SCIMServer\Exceptions\SCIMException;

From 3f834cb88fdc99cf7fe3b6a55a80f0f2da226aa7 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 1 Nov 2023 11:43:53 -0500
Subject: [PATCH 14/21] authorization tested in request

---
 app/Http/Controllers/Api/AssetsController.php | 2 --
 app/Http/Requests/StoreAssetRequest.php       | 1 -
 2 files changed, 3 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index c32c3c4429..eb2be64442 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -536,8 +536,6 @@ class AssetsController extends Controller
      */
     public function store(StoreAssetRequest $request)
     {
-        $this->authorize('create', Asset::class);
-
         $asset = new Asset();
         $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
 
diff --git a/app/Http/Requests/StoreAssetRequest.php b/app/Http/Requests/StoreAssetRequest.php
index a9a06baed4..d42ead35d5 100644
--- a/app/Http/Requests/StoreAssetRequest.php
+++ b/app/Http/Requests/StoreAssetRequest.php
@@ -15,7 +15,6 @@ class StoreAssetRequest extends ImageUploadRequest
      */
     public function authorize(): bool
     {
-        // TODO: make sure this works
         return Gate::allows('create', new Asset);
     }
 

From e05af5216e3c8474533e3e573e29db863876d23c Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 1 Nov 2023 12:14:46 -0500
Subject: [PATCH 15/21] formatting

---
 app/Http/Requests/StoreAssetRequest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Requests/StoreAssetRequest.php b/app/Http/Requests/StoreAssetRequest.php
index d42ead35d5..2fb2544160 100644
--- a/app/Http/Requests/StoreAssetRequest.php
+++ b/app/Http/Requests/StoreAssetRequest.php
@@ -35,11 +35,11 @@ class StoreAssetRequest extends ImageUploadRequest
             parent::rules(),
         );
 
-            // unsets unique check here, that check cannot run twice.
-            $rules['asset_tags.*'] = $rules['asset_tag'];
-            unset($rules['asset_tag']);
-            $rules['serials.*'] = $rules['serial'];
-            unset($rules['serial']);
+        // unsets unique check here, that check cannot run twice.
+        $rules['asset_tags.*'] = $rules['asset_tag'];
+        unset($rules['asset_tag']);
+        $rules['serials.*'] = $rules['serial'];
+        unset($rules['serial']);
 
         return $rules;
     }

From d167ec6dc0ec8b87fbb7522c53ba37848d030e51 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 1 Nov 2023 13:36:35 -0500
Subject: [PATCH 16/21] unique undeleted recreated with laravel rule

---
 app/Http/Requests/StoreAssetRequest.php | 6 ------
 app/Models/Asset.php                    | 5 ++++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/Http/Requests/StoreAssetRequest.php b/app/Http/Requests/StoreAssetRequest.php
index 2fb2544160..254895f134 100644
--- a/app/Http/Requests/StoreAssetRequest.php
+++ b/app/Http/Requests/StoreAssetRequest.php
@@ -35,12 +35,6 @@ class StoreAssetRequest extends ImageUploadRequest
             parent::rules(),
         );
 
-        // unsets unique check here, that check cannot run twice.
-        $rules['asset_tags.*'] = $rules['asset_tag'];
-        unset($rules['asset_tag']);
-        $rules['serials.*'] = $rules['serial'];
-        unset($rules['serial']);
-
         return $rules;
     }
 }
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 7f4f691628..fac914dcb0 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -100,7 +100,10 @@ class Asset extends Depreciable
         'expected_checkin' => 'date|nullable',
         'location_id'     => 'exists:locations,id|nullable',
         'rtd_location_id' => 'exists:locations,id|nullable',
-        'asset_tag'       => 'required|min:1|max:255|unique_undeleted',
+        // okay, i know this looks scary - but it's not. it checks to see if the asset tag is unique, but only if the asset is not deleted - `NULL,NULL` says to ignore the unique rule if following conditions are met
+        // https://laracasts.com/discuss/channels/laravel/unique-validation-with-soft-delete
+        // this is tested and verified
+        'asset_tag'       => 'required|min:1|max:255|unique:assets,asset_tag,NULL,NULL,deleted_at,NULL',
         'purchase_date'   => 'date|date_format:Y-m-d|nullable',
         'serial'          => 'unique_serial|nullable',
         'purchase_cost'   => 'numeric|nullable|gte:0',

From c9604b896a0c777cb180dfea55e731867e914932 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 1 Nov 2023 13:46:32 -0500
Subject: [PATCH 17/21] nevermind

---
 app/Models/Asset.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index fac914dcb0..a7d4d7442a 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -100,10 +100,7 @@ class Asset extends Depreciable
         'expected_checkin' => 'date|nullable',
         'location_id'     => 'exists:locations,id|nullable',
         'rtd_location_id' => 'exists:locations,id|nullable',
-        // okay, i know this looks scary - but it's not. it checks to see if the asset tag is unique, but only if the asset is not deleted - `NULL,NULL` says to ignore the unique rule if following conditions are met
-        // https://laracasts.com/discuss/channels/laravel/unique-validation-with-soft-delete
-        // this is tested and verified
-        'asset_tag'       => 'required|min:1|max:255|unique:assets,asset_tag,NULL,NULL,deleted_at,NULL',
+        'asset_tag'      => 'required|min:1|max:255|unique_undeleted:assets,asset_tag',
         'purchase_date'   => 'date|date_format:Y-m-d|nullable',
         'serial'          => 'unique_serial|nullable',
         'purchase_cost'   => 'numeric|nullable|gte:0',

From 938ec75aa70b7e9da3c264b2a57e378283fce389 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 1 Nov 2023 14:09:03 -0500
Subject: [PATCH 18/21] clarifying note

---
 app/Providers/ValidationServiceProvider.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Providers/ValidationServiceProvider.php b/app/Providers/ValidationServiceProvider.php
index 70fa64702e..30c5a0197e 100644
--- a/app/Providers/ValidationServiceProvider.php
+++ b/app/Providers/ValidationServiceProvider.php
@@ -48,6 +48,8 @@ class ValidationServiceProvider extends ServiceProvider
         // Unique only if undeleted
         // This works around the use case where multiple deleted items have the same unique attribute.
         // (I think this is a bug in Laravel's validator?)
+        // $parameters is the rule parameters, like `unique_undeleted:users,id` - $parameters[0] is users, $parameters[1] is id
+        // the UniqueUndeletedTrait prefills these so you can just use `unique_undeleted` in your rules (but this would only work directly in the model)
         Validator::extend('unique_undeleted', function ($attribute, $value, $parameters, $validator) {
             if (count($parameters)) {
                 $count = DB::table($parameters[0])->select('id')->where($attribute, '=', $value)->whereNull('deleted_at')->where('id', '!=', $parameters[1])->count();

From 75532d96622f77324be8fb6a3a3b4fac3ecb7130 Mon Sep 17 00:00:00 2001
From: spencerrlongg <spencer@spencerlong.com>
Date: Wed, 1 Nov 2023 16:49:59 -0500
Subject: [PATCH 19/21] adds permission test

---
 tests/Feature/Api/Assets/AssetStoreTest.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 tests/Feature/Api/Assets/AssetStoreTest.php

diff --git a/tests/Feature/Api/Assets/AssetStoreTest.php b/tests/Feature/Api/Assets/AssetStoreTest.php
new file mode 100644
index 0000000000..5a68aebccb
--- /dev/null
+++ b/tests/Feature/Api/Assets/AssetStoreTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Feature\Api\Assets;
+
+use App\Models\User;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class AssetStoreTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testRequiresPermissionToCreateAsset()
+    {
+        $this->actingAsForApi(User::factory()->create())
+            ->postJson(route('api.assets.store'))
+            ->assertForbidden();
+    }
+}

From 3b6a0d65250371bb895b447dd0552a114626c30b Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 2 Nov 2023 16:50:19 -0700
Subject: [PATCH 20/21] allows multi location sync for ldap

---
 app/Console/Commands/LdapSync.php             | 37 ++++++++++---------
 .../Users/LDAPImportController.php            |  6 +--
 resources/views/users/ldap.blade.php          |  2 +-
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/Console/Commands/LdapSync.php b/app/Console/Commands/LdapSync.php
index edb29614ee..1a8521487b 100755
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -18,7 +18,7 @@ class LdapSync extends Command
      *
      * @var string
      */
-    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--base_dn=} {--filter=} {--summary} {--json_summary}';
+    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=*} {--base_dn=} {--filter=} {--summary} {--json_summary}';
 
     /**
      * The console command description.
@@ -84,10 +84,13 @@ class LdapSync extends Command
 
         try {
             if ( $this->option('location_id') != '') {
-                $location_ou= Location::where('id', '=', $this->option('location_id'))->value('ldap_ou');
-                $search_base = $location_ou;
-                Log::debug('Importing users from specified location OU: \"'.$search_base.'\".');
-             }
+
+                foreach($this->option('location_id') as $location_id){
+                    $location_ou= Location::where('id', '=', $location_id)->value('ldap_ou');
+                    $search_base = $location_ou;
+                    Log::debug('Importing users from specified location OU: \"'.$search_base.'\".');
+                 }
+            }
             else if ($this->option('base_dn') != '') {
                 $search_base = $this->option('base_dn');
                 Log::debug('Importing users from specified base DN: \"'.$search_base.'\".');
@@ -111,21 +114,21 @@ class LdapSync extends Command
 
         /* Determine which location to assign users to by default. */
         $location = null; // TODO - this would be better called "$default_location", which is more explicit about its purpose
+            if ($this->option('location') != '') {
+                if ($location = Location::where('name', '=', $this->option('location'))->first()) {
+                    Log::debug('Location name ' . $this->option('location') . ' passed');
+                    Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
+                }
+
+            } elseif ($this->option('location_id') != '') {
+                foreach($this->option('location_id') as $location_id) {
+                if ($location = Location::where('id', '=', $location_id)->first()) {
+                    Log::debug('Location ID ' . $location_id . ' passed');
+                    Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
+                }
 
-        if ($this->option('location') != '') {
-            if ($location = Location::where('name', '=', $this->option('location'))->first()) {
-                Log::debug('Location name '.$this->option('location').' passed');
-                Log::debug('Importing to '.$location->name.' ('.$location->id.')');
             }
-
-        } elseif ($this->option('location_id') != '') {
-            if ($location = Location::where('id', '=', $this->option('location_id'))->first()) {
-                Log::debug('Location ID '.$this->option('location_id').' passed');
-                Log::debug('Importing to '.$location->name.' ('.$location->id.')');
-            }
-
         }
-
         if (! isset($location)) {
             Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
         }
diff --git a/app/Http/Controllers/Users/LDAPImportController.php b/app/Http/Controllers/Users/LDAPImportController.php
index b86be03d99..e535a171a0 100644
--- a/app/Http/Controllers/Users/LDAPImportController.php
+++ b/app/Http/Controllers/Users/LDAPImportController.php
@@ -49,19 +49,19 @@ class LDAPImportController extends Controller
     {
         $this->authorize('update', User::class);
         // Call Artisan LDAP import command.
-        $location_id = $request->input('location_id');
-        Artisan::call('snipeit:ldap-sync', ['--location_id' => $location_id, '--json_summary' => true]);
+
+        Artisan::call('snipeit:ldap-sync', ['--location_id' => $request->input('location_id'), '--json_summary' => true]);
 
         // Collect and parse JSON summary.
         $ldap_results_json = Artisan::output();
         $ldap_results = json_decode($ldap_results_json, true);
-
         if (!$ldap_results) {
             return redirect()->back()->withInput()->with('error', trans('general.no_results'));
         }
 
         // Direct user to appropriate status page.
         if ($ldap_results['error']) {
+
             return redirect()->back()->withInput()->with('error', $ldap_results['error_message']);
         }
 
diff --git a/resources/views/users/ldap.blade.php b/resources/views/users/ldap.blade.php
index 0dbbbc2fa4..555dc65829 100644
--- a/resources/views/users/ldap.blade.php
+++ b/resources/views/users/ldap.blade.php
@@ -29,7 +29,7 @@
             
             <div class="col-md-12">
                <!-- Location -->
-              @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
+              @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id[]', 'multiple' => true])
             </div>
           </div>
 

From 7d30001ff803c84149571d53dde8c8fa81497724 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed, 8 Nov 2023 15:32:33 -0600
Subject: [PATCH 21/21] Ignore the importer checkout if user is not found

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

diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php
index cd2b29205f..cf762a8fd4 100644
--- a/app/Importer/AssetImporter.php
+++ b/app/Importer/AssetImporter.php
@@ -144,7 +144,7 @@ class AssetImporter extends ItemImporter
             // If we have a target to checkout to, lets do so.
             //-- user_id is a property of the abstract class Importer, which this class inherits from and it's setted by
             //-- the class that needs to use it (command importer or GUI importer inside the project).
-            if (isset($target)) {
+            if (isset($target) && ($target !== false)) {
                 if (!is_null($asset->assigned_to)){
                     if ($asset->assigned_to != $target->id){
                         event(new CheckoutableCheckedIn($asset, User::find($asset->assigned_to), Auth::user(), $asset->notes, date('Y-m-d H:i:s')));