Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
3d26fbd82f
2 changed files with 10 additions and 0 deletions
|
@ -77,6 +77,15 @@ class AccessoryCheckoutController extends Controller
|
||||||
'note' => $request->input('note'),
|
'note' => $request->input('note'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
$available= new Accessory();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if($available->numRemaining()<=0){
|
||||||
|
|
||||||
|
return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkout.unavailable'));
|
||||||
|
}
|
||||||
|
|
||||||
DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
|
DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
|
||||||
|
|
||||||
event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note')));
|
event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note')));
|
||||||
|
|
|
@ -24,6 +24,7 @@ return array(
|
||||||
'checkout' => array(
|
'checkout' => array(
|
||||||
'error' => 'Accessory was not checked out, please try again',
|
'error' => 'Accessory was not checked out, please try again',
|
||||||
'success' => 'Accessory checked out successfully.',
|
'success' => 'Accessory checked out successfully.',
|
||||||
|
'unavailable' => 'Accessory is not available for checkout. Check quantity available',
|
||||||
'user_does_not_exist' => 'That user is invalid. Please try again.'
|
'user_does_not_exist' => 'That user is invalid. Please try again.'
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue