diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php index e2d8e2565f..58e5a721b5 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' => ''. $accessory->name.'', '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 a4e0b8b2a3..d86720c035 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(); }); 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 @@ +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/index.blade.php b/resources/views/accessories/index.blade.php index 1786f6a6f1..1722e0b691 100755 --- a/resources/views/accessories/index.blade.php +++ b/resources/views/accessories/index.blade.php @@ -35,6 +35,7 @@ {{ trans('admin/companies/table.title') }} {{ trans('admin/accessories/table.title') }} {{ trans('admin/accessories/general.accessory_category') }} + {{ trans('admin/models/table.modelnumber') }} {{ trans('general.manufacturer') }} {{ trans('general.location') }} {{ trans('admin/accessories/general.total') }} diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 82f87b6b6f..094333a94f 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