DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout

Browse source 
Bulk Consumable Checkout
This commit is contained in:
snipe 2024-05-29 19:42:25 +01:00 committed by GitHub
parent fba72e1e8d 457f4c410a
commit 12e107a71b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/Consumables/ConsumableCheckoutController.php
View file

@ -71,8 +71,14 @@ class ConsumableCheckoutController extends Controller
$this->authorize('checkout', $consumable); $this->authorize('checkout', $consumable);
// If the quantity is not present in the request or is not a positive integer, set it to 1
$quantity = $request->input('qty');
if (!isset($quantity) || !ctype_digit((string)$quantity) || $quantity <= 0) {
$quantity = 1;
}
// Make sure there is at least one available to checkout // Make sure there is at least one available to checkout
if ($consumable->numRemaining() <= 0) { if ($consumable->numRemaining() <= 0 || $quantity > $consumable->numRemaining()) {
return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable')); return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.checkout.unavailable'));
} }
@ -88,13 +94,14 @@ class ConsumableCheckoutController extends Controller
// Update the consumable data // Update the consumable data
$consumable->assigned_to = e($request->input('assigned_to')); $consumable->assigned_to = e($request->input('assigned_to'));
for($i = 0; $i < $quantity; $i++){
$consumable->users()->attach($consumable->id, [ $consumable->users()->attach($consumable->id, [
'consumable_id' => $consumable->id, 'consumable_id' => $consumable->id,
'user_id' => $admin_user->id, 'user_id' => $admin_user->id,
'assigned_to' => e($request->input('assigned_to')), 'assigned_to' => e($request->input('assigned_to')),
'note' => $request->input('note'), 'note' => $request->input('note'),
]); ]);
}
event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note'))); event(new CheckoutableCheckedOut($consumable, $user, Auth::user(), $request->input('note')));
// Redirect to the new consumable page // Redirect to the new consumable page

12
resources/views/consumables/checkout.blade.php
View file

@ -66,6 +66,18 @@
</div> </div>
</div> </div>
@endif @endif
<!-- Checkout QTY -->
<div class="form-group {{ $errors->has('qty') ? 'error' : '' }} ">
<label for="qty" class="col-md-3 control-label">{{ trans('general.qty') }}</label>
<div class="col-md-7 col-sm-12 required">
<div class="col-md-2" style="padding-left:0px">
<input class="form-control" type="number" name="qty" id="qty" value="1" min="1" max="{{$consumable->numRemaining()}}" />
</div>
</div>
{!! $errors->first('qty', '<div class="col-md-8 col-md-offset-3"><span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span></div>') !!}
</div>
<!-- Note --> <!-- Note -->
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}"> <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
<label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label> <label for="note" class="col-md-3 control-label">{{ trans('admin/hardware/form.notes') }}</label>