From 576b8f8c48d1eb6316a16d5b7d9284173a529405 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 13 Mar 2023 13:33:03 -0700
Subject: [PATCH 01/10] adds translations to edit and index of categories

---
 app/Helpers/Helper.php                        | 28 +++++++++++++++----
 .../Transformers/CategoriesTransformer.php    |  2 +-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 1913c86286..4d862d8627 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -532,15 +532,33 @@ class Helper
     {
         $category_types = [
             '' => '',
-            'accessory' => 'Accessory',
-            'asset' => 'Asset',
-            'consumable' => 'Consumable',
-            'component' => 'Component',
-            'license' => 'License',
+            'accessory' => trans('general.accessories'),
+            'asset' => trans('general.asset'),
+            'consumable' => trans('general.consumable'),
+            'component' => trans('general.component'),
+            'license' => trans('general.license'),
         ];
 
         return $category_types;
     }
+    public static function categoryType($category_type){
+
+        switch ($category_type) {
+            case ('accessory'):
+                return trans('general.accessory');
+                break;
+            case ('consumable'):
+                return trans('general.consumable');
+                break;
+            case ('component'):
+                return trans('general.component');
+                break;
+            case ('asset'):
+                return trans('general.asset');
+            case ('license'):
+                return trans('general.license');
+        }
+    }
 
     /**
      * Get the list of custom fields in an array to make a dropdown menu
diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php
index 5ea8ee3e01..84c1aad8ca 100644
--- a/app/Http/Transformers/CategoriesTransformer.php
+++ b/app/Http/Transformers/CategoriesTransformer.php
@@ -47,7 +47,7 @@ class CategoriesTransformer
                 'id' => (int) $category->id,
                 'name' => e($category->name),
                 'image' =>   ($category->image) ? Storage::disk('public')->url('categories/'.e($category->image)) : null,
-                'category_type' => ucwords(e($category->category_type)),
+                'category_type' => Helper::categoryType($category->category_type),
                 'has_eula' => ($category->getEula() ? true : false),
                 'use_default_eula' => ($category->use_default_eula=='1' ? true : false),
                 'eula' => ($category->getEula()),

From 371e142bae986a97f529d7e890f4066b7deb8d3e Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 15 Mar 2023 15:57:45 -0700
Subject: [PATCH 02/10] removes unnecessary function

---
 app/Helpers/Helper.php                        | 25 ++++---------------
 .../Transformers/CategoriesTransformer.php    |  2 +-
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 4d862d8627..c77e0f8f27 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -528,7 +528,7 @@ class Helper
      * @since [v2.5]
      * @return array
      */
-    public static function categoryTypeList()
+    public static function categoryTypeList($selection=null)
     {
         $category_types = [
             '' => '',
@@ -539,27 +539,12 @@ class Helper
             'license' => trans('general.license'),
         ];
 
+        if($selection != null){
+            return $category_types[$selection];
+        }
+        else
         return $category_types;
     }
-    public static function categoryType($category_type){
-
-        switch ($category_type) {
-            case ('accessory'):
-                return trans('general.accessory');
-                break;
-            case ('consumable'):
-                return trans('general.consumable');
-                break;
-            case ('component'):
-                return trans('general.component');
-                break;
-            case ('asset'):
-                return trans('general.asset');
-            case ('license'):
-                return trans('general.license');
-        }
-    }
-
     /**
      * Get the list of custom fields in an array to make a dropdown menu
      *
diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php
index 84c1aad8ca..35dac986dd 100644
--- a/app/Http/Transformers/CategoriesTransformer.php
+++ b/app/Http/Transformers/CategoriesTransformer.php
@@ -47,7 +47,7 @@ class CategoriesTransformer
                 'id' => (int) $category->id,
                 'name' => e($category->name),
                 'image' =>   ($category->image) ? Storage::disk('public')->url('categories/'.e($category->image)) : null,
-                'category_type' => Helper::categoryType($category->category_type),
+                'category_type' => Helper::categoryTypeList($category->category_type),
                 'has_eula' => ($category->getEula() ? true : false),
                 'use_default_eula' => ($category->use_default_eula=='1' ? true : false),
                 'eula' => ($category->getEula()),

From aa8dfcf89fb9a447ee35eb3ffba68b9dce9bbddb Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed, 22 Mar 2023 13:48:23 -0600
Subject: [PATCH 03/10] Added a ternary to avoid null offset in array

---
 .../notifications/markdown/report-expiring-assets.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/notifications/markdown/report-expiring-assets.blade.php b/resources/views/notifications/markdown/report-expiring-assets.blade.php
index 4311096a6d..7c91fff974 100644
--- a/resources/views/notifications/markdown/report-expiring-assets.blade.php
+++ b/resources/views/notifications/markdown/report-expiring-assets.blade.php
@@ -10,7 +10,7 @@ $expires = Helper::getFormattedDateObject($asset->present()->warranty_expires, '
 $diff = round(abs(strtotime($asset->present()->warranty_expires) - strtotime(date('Y-m-d')))/86400);
 $icon = ($diff <= ($threshold / 2)) ? '🚨' : (($diff <= $threshold) ? '⚠️' : ' ');
 @endphp
-<tr><td>{{ $icon }} </td><td> <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->present()->name }}</a> </td><td> {{ $diff }} {{ trans('mail.Days') }} </td><td> {{ $expires['formatted'] }} </td><td> {{ ($asset->supplier ? e($asset->supplier->name) : '') }} </td><td> {{ ($asset->assignedTo ? e($asset->assignedTo->present()->name()) : '') }} </td></tr>
+<tr><td>{{ $icon }} </td><td> <a href="{{ route('hardware.show', $asset->id) }}">{{ $asset->present()->name }}</a> </td><td> {{ $diff }} {{ trans('mail.Days') }} </td><td> {{ !is_null($expires) ? $expires['formatted'] : '' }} </td><td> {{ ($asset->supplier ? e($asset->supplier->name) : '') }} </td><td> {{ ($asset->assignedTo ? e($asset->assignedTo->present()->name()) : '') }} </td></tr>
 @endforeach
 </table>
 @endcomponent

From fbb368402242a8ffc31c33b78fd8b11c018a81d8 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Thu, 23 Mar 2023 12:43:02 -0600
Subject: [PATCH 04/10] Add a condition to 'restart' the color index for the
 status pie chart

---
 app/Helpers/Helper.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index df498da8c9..78693b60c4 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -334,7 +334,11 @@ class Helper
             '#92896B',
         ];
 
+        $total_colors = count($colors);
 
+        if ($index >= $total_colors) {
+            $index = $index - $total_colors;
+        }
 
         return $colors[$index];
     }

From 317335e79ff40c27169e28b41c87cc13e1b0ec46 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 23 Mar 2023 17:40:03 -0700
Subject: [PATCH 05/10] Allow the migration of sqlite databases

---
 .../2021_04_14_180125_add_ids_to_tables.php   |  7 +++++-
 ..._adds_webhook_option_to_settings_table.php | 23 +++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/database/migrations/2021_04_14_180125_add_ids_to_tables.php b/database/migrations/2021_04_14_180125_add_ids_to_tables.php
index 07172164fe..bac56466ce 100644
--- a/database/migrations/2021_04_14_180125_add_ids_to_tables.php
+++ b/database/migrations/2021_04_14_180125_add_ids_to_tables.php
@@ -22,7 +22,7 @@ class AddIdsToTables extends Migration
 
         Schema::table('password_resets', function (Blueprint $table) {
             // Add the id column to the password_resets table if it doesn't yet have one
-            if (! Schema::hasColumn('password_resets', 'id')) {
+            if (! Schema::hasColumn('password_resets', 'id') && $this->notUsingSqlite()) {
                 $table->increments('id');
             }
         });
@@ -47,4 +47,9 @@ class AddIdsToTables extends Migration
             }
         });
     }
+
+    private function notUsingSqlite()
+    {
+        return Schema::connection($this->getConnection())->getConnection()->getDriverName() !== 'sqlite';
+    }
 }
diff --git a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
index c3409c9d6f..269a625182 100644
--- a/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
+++ b/database/migrations/2023_02_28_173527_adds_webhook_option_to_settings_table.php
@@ -13,12 +13,27 @@ class AddsWebhookOptionToSettingsTable extends Migration
      */
     public function up()
     {
+        /**
+         * So...you're probably wondering why this isn't all in one Schema::table()...
+         * Turns out we'll get the following error:
+         * "SQLite doesn't support multiple calls to dropColumn / renameColumn in a single modification."
+         * if we're running sqlite so a solution is to make multiple calls.
+         * ¯\_(ツ)_/¯
+         */
         Schema::table('settings', function (Blueprint $table) {
-                $table->string('webhook_selected')->after('slack_botname')->default('slack')->nullable();
-                $table->renameColumn('slack_botname', 'webhook_botname');
-                $table->renameColumn('slack_endpoint', 'webhook_endpoint');
-                $table->renameColumn('slack_channel', 'webhook_channel');
+            $table->string('webhook_selected')->after('slack_botname')->default('slack')->nullable();
+        });
 
+        Schema::table('settings', function (Blueprint $table) {
+            $table->renameColumn('slack_botname', 'webhook_botname');
+        });
+
+        Schema::table('settings', function (Blueprint $table) {
+            $table->renameColumn('slack_endpoint', 'webhook_endpoint');
+        });
+
+        Schema::table('settings', function (Blueprint $table) {
+            $table->renameColumn('slack_channel', 'webhook_channel');
         });
     }
 

From e869b1fd53bccb1d1788655f9e5b567546c7ff2a Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 24 Mar 2023 06:11:24 -0700
Subject: [PATCH 06/10] Fixed #12724 - fieldset not saving on model

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/AssetModelsController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index 54d2310e8c..dbefb2e7b7 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -82,8 +82,8 @@ class AssetModelsController extends Controller
         $model->user_id = Auth::id();
         $model->requestable = Request::has('requestable');
 
-        if ($request->input('custom_fieldset') != '') {
-            $model->fieldset_id = e($request->input('custom_fieldset'));
+        if ($request->input('fieldset_id') != '') {
+            $model->fieldset_id = e($request->input('fieldset_id'));
         }
 
         $model = $request->handleImages($model);
@@ -160,10 +160,10 @@ class AssetModelsController extends Controller
 
         $this->removeCustomFieldsDefaultValues($model);
 
-        if ($request->input('custom_fieldset') == '') {
+        if ($request->input('fieldset_id') == '') {
             $model->fieldset_id = null;
         } else {
-            $model->fieldset_id = $request->input('custom_fieldset');
+            $model->fieldset_id = $request->input('fieldset_id');
 
             if ($this->shouldAddDefaultValues($request->input())) {
                 if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
@@ -444,7 +444,7 @@ class AssetModelsController extends Controller
     {
         return ! empty($input['add_default_values'])
             && ! empty($input['default_values'])
-            && ! empty($input['custom_fieldset']);
+            && ! empty($input['fieldset_id']);
     }
 
     /**

From 16dcc2d3ed32bc77794a7d5a20a44d9653918634 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 24 Mar 2023 06:57:43 -0700
Subject: [PATCH 07/10] Fixed #12641 - add JSON to mimes

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Requests/AssetFileRequest.php       | 2 +-
 resources/views/modals/upload-file.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/AssetFileRequest.php b/app/Http/Requests/AssetFileRequest.php
index f8631f23ba..697b49f3d6 100644
--- a/app/Http/Requests/AssetFileRequest.php
+++ b/app/Http/Requests/AssetFileRequest.php
@@ -24,7 +24,7 @@ class AssetFileRequest extends Request
         $max_file_size = \App\Helpers\Helper::file_upload_max_size();
 
         return [
-          'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,xlsx,lic,xml,rtf,webp|max:'.$max_file_size,
+          'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,xlsx,lic,xml,rtf,json,webp|max:'.$max_file_size,
         ];
     }
 }
diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index 5f4ab989ed..f87e3e4962 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -19,7 +19,7 @@
 
                         <label class="btn btn-default">
                             {{ trans('button.select_file')  }}
-                            <input type="file" name="file[]" multiple="true" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/*,.csv,.zip,.rar,.doc,.docx,.xls,.xlsx,.xml,.lic,.xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,text/plain,.pdf,application/rtf" style="display:none" required>
+                            <input type="file" name="file[]" multiple="true" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="image/*,.csv,.zip,.rar,.doc,.docx,.xls,.xlsx,.xml,.lic,.xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,text/plain,.pdf,application/rtf,application/json" style="display:none" required>
                         </label>
 
                     </div>

From 150a2b572e334df87cb408d58b1174424ef19f4b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 24 Mar 2023 07:14:02 -0700
Subject: [PATCH 08/10] =?UTF-8?q?Use=20single=20=E2=80=9Caccessory?=
 =?UTF-8?q?=E2=80=9D=20translation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 1f1228bb0a..c85564fc3c 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -536,7 +536,7 @@ class Helper
     {
         $category_types = [
             '' => '',
-            'accessory' => trans('general.accessories'),
+            'accessory' => trans('general.accessory'),
             'asset' => trans('general.asset'),
             'consumable' => trans('general.consumable'),
             'component' => trans('general.component'),

From 697cb4fe6ddc7eae5cdd44eff6bbf9daae5fb52e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 24 Mar 2023 08:27:53 -0700
Subject: [PATCH 09/10] Fixed translation string for importer

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/livewire/importer.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index fa3b884efb..a7b9c3e51c 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -353,7 +353,7 @@
                     }).done( function (body) {
                         // Success
                         @this.statusType="success";
-                        @this.statusText = {{ trans('general.success_redirecting') }};
+                        @this.statusText = "{{ trans('general.success_redirecting') }}";
                         // console.dir(body)
                         window.location.href = body.messages.redirect_url;
                     }).fail( function (jqXHR, textStatus, error) {

From cd49f65c0bcc0b95bdb0eb6333f8ebdd5012f016 Mon Sep 17 00:00:00 2001
From: Joe Ferguson <joe@Joeferguson.me>
Date: Fri, 24 Mar 2023 15:27:08 -0500
Subject: [PATCH 10/10] User preflight fix translation strings w/ bad path

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

diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php
index a45d37a3e0..04c5dfb82c 100644
--- a/resources/views/setup/user.blade.php
+++ b/resources/views/setup/user.blade.php
@@ -1,14 +1,14 @@
 @extends('layouts/setup')
-{{ trans('admin/user/table.createuser') }}
+{{ trans('admin/users/table.createuser') }}
 @section('title')
-{{ trans('admin/user/general.create_user') }} ::
+{{ trans('admin/users/general.create_user') }} ::
 @parent
 @stop
 
 {{-- Page content --}}
 @section('content')
 
-<p>{{ trans('admin/user/general.create_user_page_explanation') }}</p>
+<p>{{ trans('admin/users/general.create_user_page_explanation') }}</p>
 
 <form action="{{ route('setup.user.save') }}" method="POST">
   {{ csrf_field() }}
@@ -156,10 +156,10 @@
 
     <!-- Email credentials -->
     <div class="form-group col-lg-12">
-      <label>{{ trans('admin/user/general.email_credentials') }}</label>
+      <label>{{ trans('admin/users/general.email_credentials') }}</label>
       <div class="checkbox">
         <label>
-          <input type="checkbox" value="1" name="email_creds">{{ trans('admin/user/general.email_credentials_text') }}
+          <input type="checkbox" value="1" name="email_creds">{{ trans('admin/users/general.email_credentials_text') }}
         </label>
       </div>
     </div>
@@ -167,7 +167,7 @@
 @stop
 
 @section('button')
-  <button class="btn btn-primary">{{ trans('admin/user/general.next_save_user') }}</button>
+  <button class="btn btn-primary">{{ trans('admin/users/general.next_save_user') }}</button>
 </form>
 @parent
 @stop