From 980cb53efa3357ee028db0bbfcc4a46cd0a38b12 Mon Sep 17 00:00:00 2001
From: NojoudAlshehri <111287779+NojoudAlshehri@users.noreply.github.com>
Date: Sat, 27 May 2023 07:05:59 +0700
Subject: [PATCH 1/8] Added asset_tag column in requestable assets page

---
 resources/views/account/requestable-assets.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php
index ceadd2e37..f5e438397 100644
--- a/resources/views/account/requestable-assets.blade.php
+++ b/resources/views/account/requestable-assets.blade.php
@@ -57,6 +57,7 @@
                                         <thead>
                                             <tr>
                                                 <th class="col-md-1" data-field="image" data-formatter="imageFormatter" data-sortable="true">{{ trans('general.image') }}</th>
+                                                <th class="col-md-2" data-field="asset_tag" data-sortable="true" >{{ trans('general.asset_tag') }}</th>                                                
                                                 <th class="col-md-2" data-field="model" data-sortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
                                                 <th class="col-md-2" data-field="model_number" data-sortable="true">{{ trans('admin/models/table.modelnumber') }}</th>
                                                 <th class="col-md-2" data-field="name" data-sortable="true">{{ trans('admin/hardware/form.name') }}</th>

From 825a9a384d752d539fbe17b382724bed88dcc8e5 Mon Sep 17 00:00:00 2001
From: ak-piracha <abdulkareem.w@outlook.com>
Date: Mon, 29 May 2023 14:07:53 +0930
Subject: [PATCH 2/8] Fixed

---
 resources/views/statuslabels/edit.blade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 407aef9b9..36bca794a 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -71,11 +71,14 @@
 
 @section('moar_scripts')
     <!-- bootstrap color picker -->
+    <?php 
+    $color = request()->old('color', $item->color) ? request()->old('color', $item->color) : '#AA3399';
+    ?>
     <script nonce="{{ csrf_token() }}">
 
         $(function() {
             $('.color').colorpicker({
-                color: '#AA3399',
+                color: '{{ $color }}',
                 format: 'hex'
             });
         });

From daf6bcb6d569ae8aee39f9835b9734efc364044b Mon Sep 17 00:00:00 2001
From: ak-piracha <abdulkareem.w@outlook.com>
Date: Thu, 1 Jun 2023 11:07:21 +0930
Subject: [PATCH 3/8] follow best practices when working with blade and
 javascript

---
 resources/views/statuslabels/edit.blade.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 36bca794a..363409ce3 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -71,14 +71,11 @@
 
 @section('moar_scripts')
     <!-- bootstrap color picker -->
-    <?php 
-    $color = request()->old('color', $item->color) ? request()->old('color', $item->color) : '#AA3399';
-    ?>
     <script nonce="{{ csrf_token() }}">
 
         $(function() {
             $('.color').colorpicker({
-                color: '{{ $color }}',
+                color: `{{ old('color', $item->color) ?: '#AA3399' }}`,
                 format: 'hex'
             });
         });

From 9fca8c2438a4d1f9a7e18184d4c44ded3a07704f Mon Sep 17 00:00:00 2001
From: Lukas Jung <jung@synyx.de>
Date: Fri, 9 Jun 2023 11:00:46 +0200
Subject: [PATCH 4/8] Fixed #12434: Include Docker Specific Paths for dompdf
 chroot

---
 config/dompdf.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/dompdf.php b/config/dompdf.php
index a2cdae859..22f5f6c27 100644
--- a/config/dompdf.php
+++ b/config/dompdf.php
@@ -74,8 +74,11 @@ return array(
          * This is only checked on command line call by dompdf.php, but not by
          * direct class use like:
          * $dompdf = new DOMPDF();	$dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output();
+         * 
+         * 
+         * Hardcoding 2 Paths needed for Docker Containers
          */
-        "chroot" => realpath(base_path()),
+        "chroot" => realpath(base_path()) . ",/var/lib/snipeit/data/uploads,/var/lib/snipeit/data/private_uploads",
 
         /**
          * Whether to enable font subsetting or not.

From 69325beddbf0166e1570b3b668e6932443d0b86a Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 12 Jun 2023 11:03:32 -0700
Subject: [PATCH 5/8] adds warranty confirmation to asset maintenance table

---
 app/Http/Transformers/AssetMaintenancesTransformer.php | 1 +
 resources/views/reports/asset_maintenances.blade.php   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/AssetMaintenancesTransformer.php
index 7766d7cd3..3db87a162 100644
--- a/app/Http/Transformers/AssetMaintenancesTransformer.php
+++ b/app/Http/Transformers/AssetMaintenancesTransformer.php
@@ -59,6 +59,7 @@ class AssetMaintenancesTransformer
             'user_id'    => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id, 'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null,
             'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'),
+            'is_warranty'=> ($assetmaintenance->is_warranty) ? trans('general.yes') : trans('general.no'),
 
         ];
 
diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php
index e8d86fcb3..6747cbb78 100644
--- a/resources/views/reports/asset_maintenances.blade.php
+++ b/resources/views/reports/asset_maintenances.blade.php
@@ -48,6 +48,7 @@
                     <th data-searchable="true" data-sortable="true" data-field="cost" class="text-right" data-footer-formatter="sumFormatter">{{ trans('admin/asset_maintenances/form.cost') }}</th>
                     <th data-sortable="true" data-field="location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('general.location') }}</th>
                     <th data-sortable="true" data-field="rtd_location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('admin/hardware/form.default_location') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="is_warranty">{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="user_id" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="notes" data-visible="false">{{ trans('admin/asset_maintenances/form.notes') }}</th>
                 </tr>

From fc86530c9488e43cbd660cf6756531d64c09b24b Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 13 Jun 2023 09:10:42 -0700
Subject: [PATCH 6/8] uses the trueFalseFormatter now

---
 app/Http/Transformers/AssetMaintenancesTransformer.php | 2 +-
 app/Presenters/AssetMaintenancesPresenter.php          | 1 +
 resources/views/reports/asset_maintenances.blade.php   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Transformers/AssetMaintenancesTransformer.php b/app/Http/Transformers/AssetMaintenancesTransformer.php
index 3db87a162..10b05b33a 100644
--- a/app/Http/Transformers/AssetMaintenancesTransformer.php
+++ b/app/Http/Transformers/AssetMaintenancesTransformer.php
@@ -59,7 +59,7 @@ class AssetMaintenancesTransformer
             'user_id'    => ($assetmaintenance->admin) ? ['id' => $assetmaintenance->admin->id, 'name'=> e($assetmaintenance->admin->getFullNameAttribute())] : null,
             'created_at' => Helper::getFormattedDateObject($assetmaintenance->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($assetmaintenance->updated_at, 'datetime'),
-            'is_warranty'=> ($assetmaintenance->is_warranty) ? trans('general.yes') : trans('general.no'),
+            'is_warranty'=> $assetmaintenance->is_warranty,
 
         ];
 
diff --git a/app/Presenters/AssetMaintenancesPresenter.php b/app/Presenters/AssetMaintenancesPresenter.php
index 8906b420d..c4446c0b2 100644
--- a/app/Presenters/AssetMaintenancesPresenter.php
+++ b/app/Presenters/AssetMaintenancesPresenter.php
@@ -95,6 +95,7 @@ class AssetMaintenancesPresenter extends Presenter
                 'searchable' => true,
                 'sortable' => true,
                 'title' => trans('admin/asset_maintenances/table.is_warranty'),
+                'formatter' => 'trueFalseFormatter'
             ], [
                 'field' => 'cost',
                 'searchable' => true,
diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php
index 6747cbb78..984555336 100644
--- a/resources/views/reports/asset_maintenances.blade.php
+++ b/resources/views/reports/asset_maintenances.blade.php
@@ -48,7 +48,7 @@
                     <th data-searchable="true" data-sortable="true" data-field="cost" class="text-right" data-footer-formatter="sumFormatter">{{ trans('admin/asset_maintenances/form.cost') }}</th>
                     <th data-sortable="true" data-field="location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('general.location') }}</th>
                     <th data-sortable="true" data-field="rtd_location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('admin/hardware/form.default_location') }}</th>
-                    <th data-searchable="true" data-sortable="true" data-field="is_warranty">{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="is_warranty" data-formatter="trueFalseformatter">{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="user_id" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="notes" data-visible="false">{{ trans('admin/asset_maintenances/form.notes') }}</th>
                 </tr>

From ee50906e44b882e203841cd911870f44ad492058 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 13 Jun 2023 11:20:55 -0700
Subject: [PATCH 7/8] attempt to add warranty to api controller

---
 app/Http/Controllers/Api/AssetMaintenancesController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/AssetMaintenancesController.php
index b2870792f..6da7ce23a 100644
--- a/app/Http/Controllers/Api/AssetMaintenancesController.php
+++ b/app/Http/Controllers/Api/AssetMaintenancesController.php
@@ -71,7 +71,8 @@ class AssetMaintenancesController extends Controller
                                 'asset_tag',
                                 'asset_name',
                                 'user_id',
-                                'supplier'
+                                'supplier',
+                                'is_warranty',
                             ];
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';

From 6c684bccd041d3e44e5d3a5e1c39b62086850dea Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 15 Jun 2023 10:02:05 +0100
Subject: [PATCH 8/8] Accept user ID as authoratative field for updates

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Livewire/Importer.php |  1 +
 app/Importer/UserImporter.php  | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php
index 29837700e..94f48fbad 100644
--- a/app/Http/Livewire/Importer.php
+++ b/app/Http/Livewire/Importer.php
@@ -288,6 +288,7 @@ class Importer extends Component
         ];
 
         $this->users_fields  = [
+            'id' => trans('general.id'),
             'company' => trans('general.company'),
             'location' => trans('general.location'),
             'department' => trans('general.department'),
diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index 7d8e1a314..e13d4c4cc 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -42,6 +42,7 @@ class UserImporter extends ItemImporter
     public function createUserIfNotExists(array $row)
     {
         // Pull the records from the CSV to determine their values
+        $this->item['id'] = $this->findCsvMatch($row, 'id');
         $this->item['username'] = $this->findCsvMatch($row, 'username');
         $this->item['first_name'] = $this->findCsvMatch($row, 'first_name');
         $this->item['last_name'] = $this->findCsvMatch($row, 'last_name');
@@ -76,13 +77,18 @@ class UserImporter extends ItemImporter
             $user_formatted_array = User::generateFormattedNameFromFullName($user_full_name, Setting::getSettings()->username_format);
             $this->item['username'] = $user_formatted_array['username'];
         }
-        
-        $user = User::where('username', $this->item['username'])->first();
-        if ($user) {
-            if (! $this->updating) {
-                $this->log('A matching User '.$this->item['name'].' already exists.  ');
-                \Log::debug('A matching User '.$this->item['name'].' already exists.  ');
 
+        // Check if a numeric ID was passed. If it does, use that above all else.
+        if ((array_key_exists('id', $this->item) && ($this->item['id'] != "") && (is_numeric($this->item['id']))))  {
+            $user = User::find($this->item['id']);
+        } else {
+            $user = User::where('username', $this->item['username'])->first();
+        }
+
+        if ($user) {
+
+            if (! $this->updating) {
+                \Log::debug('A matching User '.$this->item['name'].' already exists.  ');
                 return;
             }
             $this->log('Updating User');
@@ -109,7 +115,6 @@ class UserImporter extends ItemImporter
         $user->fill($this->sanitizeItemForStoring($user));
 
         if ($user->save()) {
-            // $user->logCreate('Imported using CSV Importer');
             $this->log('User '.$this->item['name'].' was created');
 
             if (($user->email) && ($user->activated == '1')) {