Add min_qty to asset model bulk edit
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
dbe78c30d5
commit
f1e70eb7a0
4 changed files with 14 additions and 3 deletions
|
@ -71,20 +71,28 @@ class BulkAssetModelsController extends Controller
|
||||||
if (($request->filled('manufacturer_id') && ($request->input('manufacturer_id') != 'NC'))) {
|
if (($request->filled('manufacturer_id') && ($request->input('manufacturer_id') != 'NC'))) {
|
||||||
$update_array['manufacturer_id'] = $request->input('manufacturer_id');
|
$update_array['manufacturer_id'] = $request->input('manufacturer_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($request->filled('category_id') && ($request->input('category_id') != 'NC'))) {
|
if (($request->filled('category_id') && ($request->input('category_id') != 'NC'))) {
|
||||||
$update_array['category_id'] = $request->input('category_id');
|
$update_array['category_id'] = $request->input('category_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($request->input('fieldset_id') != 'NC') {
|
if ($request->input('fieldset_id') != 'NC') {
|
||||||
$update_array['fieldset_id'] = $request->input('fieldset_id');
|
$update_array['fieldset_id'] = $request->input('fieldset_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($request->input('depreciation_id') != 'NC') {
|
if ($request->input('depreciation_id') != 'NC') {
|
||||||
$update_array['depreciation_id'] = $request->input('depreciation_id');
|
$update_array['depreciation_id'] = $request->input('depreciation_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($request->filled('requestable') != '') {
|
if ($request->input('requestable') != '') {
|
||||||
$update_array['requestable'] = $request->input('requestable');
|
$update_array['requestable'] = $request->input('requestable');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($request->filled('min_amt')) {
|
||||||
|
$update_array['min_amt'] = $request->input('min_amt');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (count($update_array) > 0) {
|
if (count($update_array) > 0) {
|
||||||
AssetModel::whereIn('id', $models_raw_array)->update($update_array);
|
AssetModel::whereIn('id', $models_raw_array)->update($update_array);
|
||||||
|
|
|
@ -47,7 +47,7 @@ class AssetModelsTransformer
|
||||||
] : null,
|
] : null,
|
||||||
'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null,
|
'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null,
|
||||||
'model_number' => e($assetmodel->model_number),
|
'model_number' => e($assetmodel->model_number),
|
||||||
'min_amt' => ($assetmodel->min_amt) ? (int) $assetmodel->min_amt : null,
|
'min_amt' => ($assetmodel->min_amt!='') ? (int) $assetmodel->min_amt : null,
|
||||||
'depreciation' => ($assetmodel->depreciation) ? [
|
'depreciation' => ($assetmodel->depreciation) ? [
|
||||||
'id' => (int) $assetmodel->depreciation->id,
|
'id' => (int) $assetmodel->depreciation->id,
|
||||||
'name'=> e($assetmodel->depreciation->name),
|
'name'=> e($assetmodel->depreciation->name),
|
||||||
|
|
|
@ -90,6 +90,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@include ('partials.forms.edit.minimum_quantity')
|
||||||
|
|
||||||
|
|
||||||
<!-- requestable -->
|
<!-- requestable -->
|
||||||
<div class="form-group{{ $errors->has('requestable') ? ' has-error' : '' }}">
|
<div class="form-group{{ $errors->has('requestable') ? ' has-error' : '' }}">
|
||||||
<div class="col-md-7 col-md-offset-3">
|
<div class="col-md-7 col-md-offset-3">
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<label for="min_amt" class="col-md-3 control-label">{{ trans('general.min_amt') }}</label>
|
<label for="min_amt" class="col-md-3 control-label">{{ trans('general.min_amt') }}</label>
|
||||||
<div class="col-md-9">
|
<div class="col-md-9">
|
||||||
<div class="col-md-2" style="padding-left:0px">
|
<div class="col-md-2" style="padding-left:0px">
|
||||||
<input class="form-control col-md-3" maxlength="5" type="text" name="min_amt" id="min_amt" aria-label="min_amt" value="{{ old('min_amt', $item->min_amt) }}"{{ (Helper::checkIfRequired($item, 'min_amt')) ? ' required' : '' }}/>
|
<input class="form-control col-md-3" maxlength="5" type="text" name="min_amt" id="min_amt" aria-label="min_amt" value="{{ old('min_amt', ($item->min_amt ?? '')) }}"{{ (isset($item) ?? (Helper::checkIfRequired($item, 'min_amt')) ? ' required' : '') }}/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-7" style="margin-left: -15px;">
|
<div class="col-md-7" style="margin-left: -15px;">
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue