mirror of
https://github.com/brunofontes/shareit.git
synced 2024-11-23 20:10:52 +00:00
Bug Fixed: avoiding item waiting_user across take/return
It happend once: a user asked to be added to the waiting list at the same time other user was returning the item. So the user ended up waiting for the user he was already using.
This commit is contained in:
parent
999157825f
commit
1f9da456a5
@ -22,6 +22,13 @@ class AlertController extends Controller
|
||||
public function store(Request $request)
|
||||
{
|
||||
$item = User::loggedIn()->items()->find(request('item'));
|
||||
if (!$item->used_by) {
|
||||
session()->flash(
|
||||
FlashMessage::PRIMARY,
|
||||
__('Oh! This item has just being returned. Take it before anyone else!')
|
||||
);
|
||||
return redirect('home');
|
||||
}
|
||||
$item->waiting_user_id = Auth::id();
|
||||
$item->timestamps = false;
|
||||
$item->save();
|
||||
|
@ -30,6 +30,7 @@ class TakeController extends Controller
|
||||
);
|
||||
}
|
||||
$item->used_by = Auth::id();
|
||||
$item->waiting_user_id = null;
|
||||
$item->save();
|
||||
return redirect('home');
|
||||
}
|
||||
|
@ -46,5 +46,6 @@
|
||||
|
||||
"The item doesn't exist.": "O item não existe.",
|
||||
"The product doesn't exist or doesn't belongs to you.": "O produto não existe ou não é seu.",
|
||||
"This item is already taken": "Esse item já está sendo usado"
|
||||
"This item is already taken": "Esse item já está sendo usado",
|
||||
"Oh! This item has just being returned. Take it before anyone else!": "Opa! Esse item acabou de ser devolvido. Aproveite!"
|
||||
}
|
Loading…
Reference in New Issue
Block a user