Fixes #2809 - adds serial number to components
This commit is contained in:
parent
9c3c611b37
commit
a929b635ff
6 changed files with 56 additions and 1 deletions
|
@ -89,6 +89,7 @@ class ComponentsController extends Controller
|
||||||
$component->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
|
$component->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
|
||||||
$component->order_number = e(Input::get('order_number'));
|
$component->order_number = e(Input::get('order_number'));
|
||||||
$component->min_amt = e(Input::get('min_amt'));
|
$component->min_amt = e(Input::get('min_amt'));
|
||||||
|
$component->serial_number = e(Input::get('serial_number'));
|
||||||
|
|
||||||
if (e(Input::get('purchase_date')) == '') {
|
if (e(Input::get('purchase_date')) == '') {
|
||||||
$component->purchase_date = null;
|
$component->purchase_date = null;
|
||||||
|
@ -174,6 +175,7 @@ class ComponentsController extends Controller
|
||||||
$component->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
|
$component->company_id = Company::getIdForCurrentUser(Input::get('company_id'));
|
||||||
$component->order_number = e(Input::get('order_number'));
|
$component->order_number = e(Input::get('order_number'));
|
||||||
$component->min_amt = e(Input::get('min_amt'));
|
$component->min_amt = e(Input::get('min_amt'));
|
||||||
|
$component->serial_number = e(Input::get('serial_number'));
|
||||||
|
|
||||||
if (e(Input::get('purchase_date')) == '') {
|
if (e(Input::get('purchase_date')) == '') {
|
||||||
$component->purchase_date = null;
|
$component->purchase_date = null;
|
||||||
|
@ -422,7 +424,7 @@ class ComponentsController extends Controller
|
||||||
$limit = 50;
|
$limit = 50;
|
||||||
}
|
}
|
||||||
|
|
||||||
$allowed_columns = ['id','name','min_amt','order_number','purchase_date','purchase_cost','companyName','category','total_qty'];
|
$allowed_columns = ['id','name','min_amt','order_number','serial_number','purchase_date','purchase_cost','companyName','category','total_qty'];
|
||||||
$order = Input::get('order') === 'asc' ? 'asc' : 'desc';
|
$order = Input::get('order') === 'asc' ? 'asc' : 'desc';
|
||||||
$sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
|
$sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at';
|
||||||
|
|
||||||
|
@ -470,6 +472,7 @@ class ComponentsController extends Controller
|
||||||
'checkbox' =>'<div class="text-center"><input type="checkbox" name="component['.$component->id.']" class="one_required"></div>',
|
'checkbox' =>'<div class="text-center"><input type="checkbox" name="component['.$component->id.']" class="one_required"></div>',
|
||||||
'id' => $component->id,
|
'id' => $component->id,
|
||||||
'name' => (string)link_to('admin/components/'.$component->id.'/view', e($component->name)),
|
'name' => (string)link_to('admin/components/'.$component->id.'/view', e($component->name)),
|
||||||
|
'serial_number' => $component->serial_number,
|
||||||
'location' => ($component->location) ? e($component->location->name) : '',
|
'location' => ($component->location) ? e($component->location->name) : '',
|
||||||
'total_qty' => e($component->total_qty),
|
'total_qty' => e($component->total_qty),
|
||||||
'min_amt' => e($component->min_amt),
|
'min_amt' => e($component->min_amt),
|
||||||
|
|
|
@ -141,6 +141,7 @@ class Component extends Model
|
||||||
});
|
});
|
||||||
})->orWhere('components.name', 'LIKE', '%'.$search.'%')
|
})->orWhere('components.name', 'LIKE', '%'.$search.'%')
|
||||||
->orWhere('components.order_number', 'LIKE', '%'.$search.'%')
|
->orWhere('components.order_number', 'LIKE', '%'.$search.'%')
|
||||||
|
->orWhere('components.serial_number', 'LIKE', '%'.$search.'%')
|
||||||
->orWhere('components.purchase_cost', 'LIKE', '%'.$search.'%')
|
->orWhere('components.purchase_cost', 'LIKE', '%'.$search.'%')
|
||||||
->orWhere('components.purchase_date', 'LIKE', '%'.$search.'%');
|
->orWhere('components.purchase_date', 'LIKE', '%'.$search.'%');
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
|
||||||
|
class AddSerialToComponents extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::table('components', function ($table) {
|
||||||
|
$table->string('serial_number')->nullable()->default(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::table('components', function ($table) {
|
||||||
|
$table->dropColumn('serial_number');
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -96,6 +96,17 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Serial -->
|
||||||
|
<div class="form-group {{ $errors->has('serial_number') ? ' has-error' : '' }}">
|
||||||
|
|
||||||
|
{{ Form::label('name', trans('admin/hardware/form.serial'), array('class' => 'col-md-3 control-label')) }}
|
||||||
|
|
||||||
|
<div class="col-md-8">
|
||||||
|
<input class="form-control" type="text" name="serial_number" id="serial_number" value="{{ Input::old('serial_number', $component->serial_number) }}" />
|
||||||
|
{!! $errors->first('serial_number', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<!-- Company -->
|
<!-- Company -->
|
||||||
@if (\App\Models\Company::isCurrentUserAuthorized())
|
@if (\App\Models\Company::isCurrentUserAuthorized())
|
||||||
|
|
|
@ -52,6 +52,7 @@
|
||||||
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
|
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
|
||||||
<th data-switchable="true" data-visible="false" data-searchable="true" data-sortable="true" data-field="companyName">{{ trans('admin/companies/table.title') }}</th>
|
<th data-switchable="true" data-visible="false" data-searchable="true" data-sortable="true" data-field="companyName">{{ trans('admin/companies/table.title') }}</th>
|
||||||
<th data-sortable="true" data-searchable="true" data-field="name">{{ trans('admin/components/table.title') }}</th>
|
<th data-sortable="true" data-searchable="true" data-field="name">{{ trans('admin/components/table.title') }}</th>
|
||||||
|
<th data-sortable="true" data-searchable="true" data-field="serial_number" data-visible="false">{{ trans('admin/hardware/form.serial') }}</th>
|
||||||
<th data-searchable="true" data-sortable="true" data-field="location">{{ trans('general.location') }}</th>
|
<th data-searchable="true" data-sortable="true" data-field="location">{{ trans('general.location') }}</th>
|
||||||
<th data-searchable="true" data-sortable="true" data-field="category">{{ trans('general.category') }}</th>
|
<th data-searchable="true" data-sortable="true" data-field="category">{{ trans('general.category') }}</th>
|
||||||
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="total_qty"> {{ trans('admin/components/general.total') }}</th>
|
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="total_qty"> {{ trans('admin/components/general.total') }}</th>
|
||||||
|
|
|
@ -74,6 +74,12 @@
|
||||||
|
|
||||||
<!-- side address column -->
|
<!-- side address column -->
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
|
|
||||||
|
@if ($component->serial_number!='')
|
||||||
|
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/hardware/form.serial') }}: </strong>
|
||||||
|
{{ $component->serial_number }} </div>
|
||||||
|
@endif
|
||||||
|
|
||||||
@if ($component->purchase_date)
|
@if ($component->purchase_date)
|
||||||
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/components/general.date') }}: </strong>
|
<div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('admin/components/general.date') }}: </strong>
|
||||||
{{ $component->purchase_date }} </div>
|
{{ $component->purchase_date }} </div>
|
||||||
|
|
Loading…
Add table
Reference in a new issue