From 554a6e4fd6ce983632bb17c3fb216ec28c61286d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 17 Nov 2016 16:18:15 -0800
Subject: [PATCH 1/3] Make length match validation

---
 .../2016_11_17_161317_longer_state_field_in_location.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2016_11_17_161317_longer_state_field_in_location.php b/database/migrations/2016_11_17_161317_longer_state_field_in_location.php
index 19d52dea3d..b60466597b 100644
--- a/database/migrations/2016_11_17_161317_longer_state_field_in_location.php
+++ b/database/migrations/2016_11_17_161317_longer_state_field_in_location.php
@@ -13,7 +13,7 @@ class LongerStateFieldInLocation extends Migration
     public function up()
     {
         Schema::table('locations', function ($table) {
-            $table->string('state', 20)->nullable()->default(null)->change();
+            $table->string('state', 32)->nullable()->default(null)->change();
         });
     }
 

From 54848b5edf8f14e9f3115a847b8828d6181634ea Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 17 Nov 2016 16:56:08 -0800
Subject: [PATCH 2/3] Added enum conversion

---
 .../2016_11_16_172119_increase_purchase_cost_size.php         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php b/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
index 138e4e7b96..ea14c915c7 100644
--- a/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
+++ b/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
@@ -12,6 +12,10 @@ class IncreasePurchaseCostSize extends Migration
      */
     public function up()
     {
+        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+
+        
         Schema::table('assets', function ($table) {
             $table->decimal('purchase_cost',  20, 2)->nullable()->default(null)->change();
         });

From d0d9d82579296a31ca19fcacb48145b3072a6e45 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 17 Nov 2016 19:57:53 -0800
Subject: [PATCH 3/3] Add model number to accessories

---
 .../Controllers/AccessoriesController.php     |  5 ++-
 ..._16_172119_increase_purchase_cost_size.php |  2 +-
 ...193706_add_model_number_to_accessories.php | 31 +++++++++++++++++++
 resources/views/accessories/edit.blade.php    | 13 ++++++++
 resources/views/accessories/index.blade.php   |  1 +
 resources/views/accessories/view.blade.php    |  4 +++
 6 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2016_11_17_193706_add_model_number_to_accessories.php

diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php
index 33d49d35be..be747fb5ef 100755
--- a/app/Http/Controllers/AccessoriesController.php
+++ b/app/Http/Controllers/AccessoriesController.php
@@ -82,6 +82,7 @@ class AccessoriesController extends Controller
         $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_id'));
         $accessory->order_number            = e(Input::get('order_number'));
         $accessory->manufacturer_id         = e(Input::get('manufacturer_id'));
+        $accessory->model_number            = e(Input::get('model_number'));
 
         if (e(Input::get('purchase_date')) == '') {
             $accessory->purchase_date       =  null;
@@ -164,6 +165,7 @@ class AccessoriesController extends Controller
         $accessory->company_id              = Company::getIdForCurrentUser(Input::get('company_id'));
         $accessory->manufacturer_id         = e(Input::get('manufacturer_id'));
         $accessory->order_number            = e(Input::get('order_number'));
+        $accessory->model_number            = e(Input::get('model_number'));
 
         if (e(Input::get('purchase_date')) == '') {
             $accessory->purchase_date       =  null;
@@ -552,7 +554,7 @@ class AccessoriesController extends Controller
         }
 
 
-        $allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','companyName','category'];
+        $allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','companyName','category','model_number'];
         $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
 
@@ -594,6 +596,7 @@ class AccessoriesController extends Controller
             $rows[] = array(
             'name'          => '<a href="'.url('admin/accessories/'.$accessory->id).'/view">'. $accessory->name.'</a>',
             'category'      => ($accessory->category) ? (string)link_to('admin/settings/categories/'.$accessory->category->id.'/view', $accessory->category->name) : '',
+            'model_number'      =>  e($accessory->model_number),
             'qty'           => e($accessory->qty),
             'order_number'  => e($accessory->order_number),
             'min_amt'  => e($accessory->min_amt),
diff --git a/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php b/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
index ea14c915c7..54dfed581f 100644
--- a/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
+++ b/database/migrations/2016_11_16_172119_increase_purchase_cost_size.php
@@ -15,7 +15,7 @@ class IncreasePurchaseCostSize extends Migration
         $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
         $platform->registerDoctrineTypeMapping('enum', 'string');
 
-        
+
         Schema::table('assets', function ($table) {
             $table->decimal('purchase_cost',  20, 2)->nullable()->default(null)->change();
         });
diff --git a/database/migrations/2016_11_17_193706_add_model_number_to_accessories.php b/database/migrations/2016_11_17_193706_add_model_number_to_accessories.php
new file mode 100644
index 0000000000..284bb4b894
--- /dev/null
+++ b/database/migrations/2016_11_17_193706_add_model_number_to_accessories.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddModelNumberToAccessories extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accessories', function ($table) {
+            $table->string('model_number')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('accessories', function ($table) {
+            $table->dropColumn('model_number');
+        });
+    }
+}
diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
index 38a3824444..66b87b3e47 100755
--- a/resources/views/accessories/edit.blade.php
+++ b/resources/views/accessories/edit.blade.php
@@ -98,6 +98,19 @@
           </div>
         </div>
 
+        <!-- Model NUmber -->
+        <div class="form-group{{ $errors->has('model_number') ? ' has-error' : '' }}">
+            <div class="col-md-3">
+                {{ Form::label('name', trans('admin/models/table.modelnumber')) }}
+            </div>
+            <div class="col-md-8">
+                <input class="form-control" type="text" name="model_number" id="model_number" value="{{ Input::old('model_number', $accessory->model_number) }}" />
+                {!! $errors->first('model_number', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
+            </div>
+        </div>
+
+
+
         <!--  Location -->
         <div class="form-group{{ $errors->has('location_id') ? ' has-error' : '' }}">
            <div class="col-md-3">
diff --git a/resources/views/accessories/index.blade.php b/resources/views/accessories/index.blade.php
index 1ad97dfdd4..1895a87d3c 100755
--- a/resources/views/accessories/index.blade.php
+++ b/resources/views/accessories/index.blade.php
@@ -35,6 +35,7 @@
                   <th data-switchable="true" data-searchable="true" data-sortable="true" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
                   <th data-sortable="true" data-searchable="true"  data-field="name">{{ trans('admin/accessories/table.title') }}</th>
                   <th data-searchable="true" data-sortable="true" data-field="category">{{ trans('admin/accessories/general.accessory_category') }}</th>
+                  <th data-searchable="true" data-sortable="true" data-field="model_number">{{ trans('admin/models/table.modelnumber') }}</th>
                   <th data-field="manufacturer" data-searchable="true" data-sortable="true">{{ trans('general.manufacturer') }}</th>
                   <th data-searchable="true" data-sortable="true" data-field="location">{{ trans('general.location') }}</th>
                   <th data-searchable="false" data-sortable="false" data-field="qty">{{ trans('admin/accessories/general.total') }}</th>
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 1f742d2958..69837de047 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -5,6 +5,10 @@
 
  {{ $accessory->name }}
  {{ trans('general.accessory') }}
+ @if ($accessory->model_number!='')
+     ({{ $accessory->model_number }})
+ @endif
+
 @parent
 @stop