From b716db225ff5aaa6157fd4c8de9cc1526817cc72 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 19 Dec 2017 20:30:46 -0800
Subject: [PATCH] =?UTF-8?q?Added=20=E2=80=9Cnew=E2=80=9D=20buttons=20for?=
 =?UTF-8?q?=20manufacturer=20and=20category=20in=20asset=20model=20creatio?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/ModalController.php      |  9 +++++
 resources/views/modals/category.blade.php     | 39 +++++++++++++++++++
 resources/views/modals/manufacturer.blade.php | 25 ++++++++++++
 .../forms/edit/category-select.blade.php      |  7 ++++
 .../forms/edit/manufacturer-select.blade.php  | 10 ++++-
 routes/web.php                                |  2 +
 6 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 resources/views/modals/category.blade.php
 create mode 100644 resources/views/modals/manufacturer.blade.php

diff --git a/app/Http/Controllers/ModalController.php b/app/Http/Controllers/ModalController.php
index 7ae8c61427..c5446aaef3 100644
--- a/app/Http/Controllers/ModalController.php
+++ b/app/Http/Controllers/ModalController.php
@@ -29,4 +29,13 @@ class ModalController extends Controller
     function user() {
         return view('modals.user');
     }
+
+    function category() {
+        return view('modals.category');
+    }
+
+    function manufacturer() {
+        return view('modals.manufacturer');
+    }
+
 }
diff --git a/resources/views/modals/category.blade.php b/resources/views/modals/category.blade.php
new file mode 100644
index 0000000000..1ded211bbf
--- /dev/null
+++ b/resources/views/modals/category.blade.php
@@ -0,0 +1,39 @@
+<div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">{{ trans('admin/categories/general.create') }}</h4>
+        </div>
+        <div class="modal-body">
+            <div class="alert alert-danger" id="modal_error_msg" style="display:none">
+            </div>
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required">
+                    <input type='text' id='modal-name' class="form-control">
+                </div>
+            </div>
+
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required">
+                    <select class="select2" id="modal-category_type" style="width: 100%">
+                        <option value="asset">Asset</option>
+                        <option value="accessory" disabled>Accessory</option>
+                        <option value="consumable" disabled>Consumable</option>
+                        <option value="component" disabled>Component</option>
+                    </select>
+                </div>
+            </div>
+
+
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->
diff --git a/resources/views/modals/manufacturer.blade.php b/resources/views/modals/manufacturer.blade.php
new file mode 100644
index 0000000000..5f7bd11382
--- /dev/null
+++ b/resources/views/modals/manufacturer.blade.php
@@ -0,0 +1,25 @@
+<div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">{{ trans('admin/manufacturers/table.create') }}</h4>
+        </div>
+        <div class="modal-body">
+            <div class="alert alert-danger" id="modal_error_msg" style="display:none">
+            </div>
+            <div class="dynamic-form-row">
+                <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
+                    </label></div>
+                <div class="col-md-8 col-xs-12 required">
+                    <input type='text' id='modal-name' class="form-control">
+                </div>
+            </div>
+
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
+            <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->
diff --git a/resources/views/partials/forms/edit/category-select.blade.php b/resources/views/partials/forms/edit/category-select.blade.php
index c7885dc5f0..95db54821a 100644
--- a/resources/views/partials/forms/edit/category-select.blade.php
+++ b/resources/views/partials/forms/edit/category-select.blade.php
@@ -15,6 +15,13 @@
 
         </select>
     </div>
+    <div class="col-md-1 col-sm-1 text-left">
+        @can('create', \App\Models\Category::class)
+            @if ((!isset($hide_new)) || ($hide_new!='true'))
+                <a href='{{ route('modal.category') }}' data-toggle="modal"  data-target="#createModal" data-dependency="categorie" data-select='category_select_id' class="btn btn-sm btn-default">New</a>
+            @endif
+        @endcan
+    </div>
 
 
     {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times"></i> :message</span></div>') !!}
diff --git a/resources/views/partials/forms/edit/manufacturer-select.blade.php b/resources/views/partials/forms/edit/manufacturer-select.blade.php
index 7740a5a1fc..d3d9249ce5 100644
--- a/resources/views/partials/forms/edit/manufacturer-select.blade.php
+++ b/resources/views/partials/forms/edit/manufacturer-select.blade.php
@@ -4,7 +4,7 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
     <div class="col-md-7{{  ((isset($required)) && ($required=='true')) ? ' required' : '' }}">
-        <select class="js-data-ajax" data-endpoint="manufacturers" name="{{ $fieldname }}" style="width: 100%" id="category_select_id">
+        <select class="js-data-ajax" data-endpoint="manufacturers" name="{{ $fieldname }}" style="width: 100%" id="manufacturer_select_id">
             @if ($manufacturer_id = Input::old($fieldname,  (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $manufacturer_id }}" selected="selected">
                     {{ (\App\Models\Manufacturer::find($manufacturer_id)) ? \App\Models\Manufacturer::find($manufacturer_id)->name : '' }}
@@ -16,6 +16,14 @@
         </select>
     </div>
 
+    <div class="col-md-1 col-sm-1 text-left">
+        @can('create', \App\Models\Manufacturer::class)
+            @if ((!isset($hide_new)) || ($hide_new!='true'))
+                <a href='{{ route('modal.manufacturer') }}' data-toggle="modal"  data-target="#createModal" data-dependency="manufacturer" data-select='manufacturer_select_id' class="btn btn-sm btn-default">New</a>
+            @endif
+        @endcan
+    </div>
+
 
     {!! $errors->first($fieldname, '<div class="col-md-8 col-md-offset-3"><span class="alert-msg"><i class="fa fa-times"></i> :message</span></div>') !!}
 </div>
diff --git a/routes/web.php b/routes/web.php
index bff52081a9..74cc045626 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -82,6 +82,8 @@ Route::group(['middleware' => 'auth'], function () {
 
 Route::group(['middleware' => 'auth','prefix' => 'modals'], function () {
     Route::get('location',['as' => 'modal.location','uses' => 'ModalController@location']);
+    Route::get('category',['as' => 'modal.category','uses' => 'ModalController@category']);
+    Route::get('manufacturer',['as' => 'modal.manufacturer','uses' => 'ModalController@manufacturer']);
     Route::get('model',['as' => 'modal.model','uses' => 'ModalController@model']);
     Route::get('statuslabel',['as' => 'modal.statuslabel','uses' => 'ModalController@statuslabel']);
     Route::get('supplier',['as' => 'modal.supplier','uses' => 'ModalController@supplier']);