From 1a651b33fc46fb2a8879b2b867856188189aae10 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Wed, 8 Feb 2023 17:31:39 -0500
Subject: [PATCH 1/2] manufacturer marker removal

---
 resources/views/modals/model.blade.php | 12 ++++++------
 resources/views/models/edit.blade.php  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index 6fc0359c8..519767f30 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -16,17 +16,17 @@
                 </div>
 
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
-                        </label></div>
+                    <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:</label></div>
                     <div class="col-md-8 col-xs-12 required">
-                        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufactuer_id"></select>
+                        <select class="js-data-ajax" data-endpoint="categories/asset" name="category_id" style="width: 100%" id="modal-category_id"></select>
                     </div>
                 </div>
 
                 <div class="dynamic-form-row">
-                    <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:</label></div>
-                    <div class="col-md-8 col-xs-12 required">
-                        <select class="js-data-ajax" data-endpoint="categories/asset" name="category_id" style="width: 100%" id="modal-category_id"></select>
+                    <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
+                        </label></div>
+                    <div class="col-md-8 col-xs-12">
+                        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufactuer_id"></select>
                     </div>
                 </div>
 
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php
index f7ec2796b..a643ee2fe 100755
--- a/resources/views/models/edit.blade.php
+++ b/resources/views/models/edit.blade.php
@@ -11,8 +11,8 @@
 @section('inputFields')
 
 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/models/table.name'), 'required' => 'true'])
-@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true'])
 @include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'asset'])
+@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
 @include ('partials.forms.edit.model_number')
 @include ('partials.forms.edit.depreciation')
 

From 32ed70259e26a7f00b0ebccf35ccdc15b432be10 Mon Sep 17 00:00:00 2001
From: akemidx <kojotek.dx@gmail.com>
Date: Thu, 9 Feb 2023 15:39:10 -0500
Subject: [PATCH 2/2] sweedish chef fixes up your typos

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

diff --git a/resources/views/modals/model.blade.php b/resources/views/modals/model.blade.php
index 519767f30..360d14ce3 100644
--- a/resources/views/modals/model.blade.php
+++ b/resources/views/modals/model.blade.php
@@ -26,7 +26,7 @@
                     <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
                         </label></div>
                     <div class="col-md-8 col-xs-12">
-                        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufactuer_id"></select>
+                        <select class="js-data-ajax" data-endpoint="manufacturers" name="manufacturer_id" style="width: 100%" id="modal-manufacturer_id"></select>
                     </div>
                 </div>