mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
Added notes field to controllers
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
08a2fe4edb
commit
9acb5413f6
|
@ -78,6 +78,8 @@ class AccessoriesController extends Controller
|
||||||
$accessory->qty = request('qty');
|
$accessory->qty = request('qty');
|
||||||
$accessory->user_id = Auth::user()->id;
|
$accessory->user_id = Auth::user()->id;
|
||||||
$accessory->supplier_id = request('supplier_id');
|
$accessory->supplier_id = request('supplier_id');
|
||||||
|
$accessory->notes = request('notes');
|
||||||
|
|
||||||
|
|
||||||
$accessory = $request->handleImages($accessory);
|
$accessory = $request->handleImages($accessory);
|
||||||
|
|
||||||
|
@ -140,6 +142,7 @@ class AccessoriesController extends Controller
|
||||||
$accessory->purchase_cost = Helper::ParseCurrency(request('purchase_cost'));
|
$accessory->purchase_cost = Helper::ParseCurrency(request('purchase_cost'));
|
||||||
$accessory->qty = request('qty');
|
$accessory->qty = request('qty');
|
||||||
$accessory->supplier_id = request('supplier_id');
|
$accessory->supplier_id = request('supplier_id');
|
||||||
|
$accessory->notes = request('notes');
|
||||||
|
|
||||||
$accessory = $request->handleImages($accessory);
|
$accessory = $request->handleImages($accessory);
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,8 @@ class AccessoriesController extends Controller
|
||||||
'notes',
|
'notes',
|
||||||
'created_at',
|
'created_at',
|
||||||
'min_amt',
|
'min_amt',
|
||||||
'company_id'
|
'company_id',
|
||||||
|
'notes',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
@ -69,6 +70,10 @@ class AccessoriesController extends Controller
|
||||||
$accessories->where('location_id','=',$request->input('location_id'));
|
$accessories->where('location_id','=',$request->input('location_id'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($request->filled('notes')) {
|
||||||
|
$accessories->where('notes','=',$request->input('notes'));
|
||||||
|
}
|
||||||
|
|
||||||
// Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
|
// Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
|
||||||
// case we override with the actual count, so we should return 0 items.
|
// case we override with the actual count, so we should return 0 items.
|
||||||
$offset = (($accessories) && ($request->get('offset') > $accessories->count())) ? $accessories->count() : $request->get('offset', 0);
|
$offset = (($accessories) && ($request->get('offset') > $accessories->count())) ? $accessories->count() : $request->get('offset', 0);
|
||||||
|
|
|
@ -40,6 +40,7 @@ class ComponentsController extends Controller
|
||||||
'purchase_cost',
|
'purchase_cost',
|
||||||
'qty',
|
'qty',
|
||||||
'image',
|
'image',
|
||||||
|
'notes',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
@ -62,6 +63,10 @@ class ComponentsController extends Controller
|
||||||
$components->where('location_id','=',$request->input('location_id'));
|
$components->where('location_id','=',$request->input('location_id'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($request->filled('notes')) {
|
||||||
|
$components->where('notes','=',$request->input('notes'));
|
||||||
|
}
|
||||||
|
|
||||||
// Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
|
// Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
|
||||||
// case we override with the actual count, so we should return 0 items.
|
// case we override with the actual count, so we should return 0 items.
|
||||||
$offset = (($components) && ($request->get('offset') > $components->count())) ? $components->count() : $request->get('offset', 0);
|
$offset = (($components) && ($request->get('offset') > $components->count())) ? $components->count() : $request->get('offset', 0);
|
||||||
|
|
|
@ -42,6 +42,7 @@ class ConsumablesController extends Controller
|
||||||
'item_no',
|
'item_no',
|
||||||
'qty',
|
'qty',
|
||||||
'image',
|
'image',
|
||||||
|
'notes',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,6 +75,10 @@ class ConsumablesController extends Controller
|
||||||
$consumables->where('location_id','=',$request->input('location_id'));
|
$consumables->where('location_id','=',$request->input('location_id'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($request->filled('notes')) {
|
||||||
|
$consumables->where('notes','=',$request->input('notes'));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
|
// Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
|
||||||
// case we override with the actual count, so we should return 0 items.
|
// case we override with the actual count, so we should return 0 items.
|
||||||
|
|
|
@ -78,6 +78,7 @@ class ComponentsController extends Controller
|
||||||
$component->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost', null));
|
$component->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost', null));
|
||||||
$component->qty = $request->input('qty');
|
$component->qty = $request->input('qty');
|
||||||
$component->user_id = Auth::id();
|
$component->user_id = Auth::id();
|
||||||
|
$component->notes = $request->input('notes');
|
||||||
|
|
||||||
$component = $request->handleImages($component);
|
$component = $request->handleImages($component);
|
||||||
|
|
||||||
|
@ -147,6 +148,7 @@ class ComponentsController extends Controller
|
||||||
$component->purchase_date = $request->input('purchase_date');
|
$component->purchase_date = $request->input('purchase_date');
|
||||||
$component->purchase_cost = Helper::ParseCurrency(request('purchase_cost'));
|
$component->purchase_cost = Helper::ParseCurrency(request('purchase_cost'));
|
||||||
$component->qty = $request->input('qty');
|
$component->qty = $request->input('qty');
|
||||||
|
$component->notes = $request->input('notes');
|
||||||
|
|
||||||
$component = $request->handleImages($component);
|
$component = $request->handleImages($component);
|
||||||
|
|
||||||
|
|
|
@ -78,6 +78,8 @@ class ConsumablesController extends Controller
|
||||||
$consumable->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost'));
|
$consumable->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost'));
|
||||||
$consumable->qty = $request->input('qty');
|
$consumable->qty = $request->input('qty');
|
||||||
$consumable->user_id = Auth::id();
|
$consumable->user_id = Auth::id();
|
||||||
|
$consumable->notes = $request->input('notes');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$consumable = $request->handleImages($consumable);
|
$consumable = $request->handleImages($consumable);
|
||||||
|
@ -143,6 +145,7 @@ class ConsumablesController extends Controller
|
||||||
$consumable->purchase_date = $request->input('purchase_date');
|
$consumable->purchase_date = $request->input('purchase_date');
|
||||||
$consumable->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost'));
|
$consumable->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost'));
|
||||||
$consumable->qty = Helper::ParseFloat($request->input('qty'));
|
$consumable->qty = Helper::ParseFloat($request->input('qty'));
|
||||||
|
$consumable->notes = $request->input('notes');
|
||||||
|
|
||||||
$consumable = $request->handleImages($consumable);
|
$consumable = $request->handleImages($consumable);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue