DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Code cleanup, better validation

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-04-06 22:03:40 -07:00
parent 358b0548fa
commit 4c88c751ef
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/Http/Controllers/Components/ComponentCheckoutController.php
View file

@ -33,6 +33,11 @@ class ComponentCheckoutController extends Controller
} }
$this->authorize('checkout', $component); $this->authorize('checkout', $component);
// Make sure there is at least one available to checkout
if ($component->numRemaining() <= 0){
return redirect()->route('components.index')->with('error', trans('admin/components/message.checkout.unavailable'));
}
return view('components/checkout', compact('component')); return view('components/checkout', compact('component'));
} }
@ -50,7 +55,7 @@ class ComponentCheckoutController extends Controller
public function store(Request $request, $componentId) public function store(Request $request, $componentId)
{ {
// Check if the component exists // Check if the component exists
if (is_null($component = Component::find($componentId))) { if (!$component = Component::find($componentId)) {
// Redirect to the component management page with error // Redirect to the component management page with error
return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found')); return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
} }
@ -58,9 +63,15 @@ class ComponentCheckoutController extends Controller
$this->authorize('checkout', $component); $this->authorize('checkout', $component);
$max_to_checkout = $component->numRemaining(); $max_to_checkout = $component->numRemaining();
// Make sure there is at least one available to checkout
if ($max_to_checkout <= $request->get('assigned_qty')) {
return redirect()->back()->withInput()->with('error', trans('admin/components/message.checkout.unavailable', ['remaining' => $max_to_checkout, 'requested' => $request->get('assigned_qty')]));
}
$validator = Validator::make($request->all(), [ $validator = Validator::make($request->all(), [
'asset_id' => 'required', 'asset_id' => 'required|exists:assets,id',
'assigned_qty' => "required|numeric|between:1,$max_to_checkout", 'assigned_qty' => "required|numeric|min:1|digits_between:1,$max_to_checkout",
]); ]);
if ($validator->fails()) { if ($validator->fails()) {
@ -70,13 +81,10 @@ class ComponentCheckoutController extends Controller
} }
$admin_user = Auth::user(); $admin_user = Auth::user();
$asset_id = e($request->input('asset_id')); $asset_id = $request->input('asset_id');
// Check if the user exists // Check if the user exists
if (is_null($asset = Asset::find($asset_id))) { $asset = Asset::find($asset_id);
// Redirect to the component management page with error
return redirect()->route('components.index')->with('error', trans('admin/components/message.asset_does_not_exist'));
}
// Update the component data // Update the component data
$component->asset_id = $asset_id; $component->asset_id = $asset_id;