From c59fd7b8dabf9155c8ff0fa0467cf22d04e6c15b Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed, 24 Aug 2022 19:20:23 -0500
Subject: [PATCH 1/2] Fix importer field mapping for command line

---
 app/Importer/Importer.php     | 2 +-
 app/Importer/ItemImporter.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Importer/Importer.php b/app/Importer/Importer.php
index f5b0ae44d..203e788d2 100644
--- a/app/Importer/Importer.php
+++ b/app/Importer/Importer.php
@@ -56,7 +56,7 @@ abstract class Importer
         'reassignable' => 'reassignable',
         'requestable' => 'requestable',
         'seats' => 'seats',
-        'serial_number' => 'serial number',
+        'serial' => 'serial number',
         'status' => 'status',
         'supplier' => 'supplier',
         'termination_date' => 'termination date',
diff --git a/app/Importer/ItemImporter.php b/app/Importer/ItemImporter.php
index 5d8005ff2..f015de04d 100644
--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -90,7 +90,7 @@ class ItemImporter extends Importer
         $this->item['qty'] = $this->findCsvMatch($row, 'quantity');
         $this->item['requestable'] = $this->findCsvMatch($row, 'requestable');
         $this->item['user_id'] = $this->user_id;
-        $this->item['serial'] = $this->findCsvMatch($row, 'serial');
+        $this->item['serial'] = $this->findCsvMatch($row, 'serial number');
         // NO need to call this method if we're running the user import.
         // TODO: Merge these methods.
         $this->item['checkout_class'] = $this->findCsvMatch($row, 'checkout_class');

From 36ab794adc7a96f503ce5129d61905a0d15ec61e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Aug 2022 18:05:43 -0700
Subject: [PATCH 2/2] Added signature field to user history

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

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index cc01c4853..277439b9f 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -908,6 +908,9 @@
                 <th class="col-sm-3" data-field="created_at" data-formatter="dateDisplayFormatter" data-sortable="true">{{ trans('general.date') }}</th>
                 <th class="col-sm-2" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
                 <th class="col-sm-2" data-field="action_type">{{ trans('general.action') }}</th>
+                  @if  ($snipeSettings->require_accept_signature=='1')
+                      <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
+                  @endif
                 <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
                 <th class="col-sm-2" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
               </tr>