brunofontes/shareit
1
0
Fork 0
mirror of https://github.com/brunofontes/shareit.git synced 2025-11-15 07:50:54 -03:00
Code Issues Projects Releases Wiki Activity

Including occupied username and renaming DB field

Browse Source 
Now it shows the username of who is using an item.
Item db field 'usedBy' was renamed to 'used_by' to keep consistence.
This commit is contained in:
Bruno F. Fontes
2018-09-14 12:52:07 -03:00
parent 925c378d1e
commit ea3ffaad39
11 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/HomeController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use \App\User;
use Illuminate\Http\Request;
class HomeController extends Controller
@@ -23,7 +24,17 @@ class HomeController extends Controller
*/
public function index()
{
$items = \App\User::find(\Auth::id())->items()->get();
return view('home', compact('items'));
$items = User::find(\Auth::id())->items()->get();
foreach ($items as $item) {
if ($item->used_by) {
$users[$item->used_by] = User::find($item->used_by)->name;
if ($item->waiting_user_id) {
$users[$item->waiting_user_id] = User::find($item->waiting_user_id)->name;
}
}
}
return view('home', compact('items', 'users'));
}
}

2
app/Http/Controllers/ReturnController.php
View File

@@ -10,7 +10,7 @@ class ReturnController extends Controller
public function store(Request $request)
{
$item = User::find(\Auth::id())->items()->find(request('item'));
$item->usedBy = null;
$item->used_by = null;
$item->save();
return redirect('home');

2
app/Http/Controllers/TakeController.php
View File

@@ -11,7 +11,7 @@ class TakeController extends Controller
public function store(Request $request)
{
$item = User::find(\Auth::id())->items()->find(request('item'));
$item->usedBy = \Auth::id();
$item->used_by = \Auth::id();
$item->save();
return redirect('home');
}

2
app/Http/Controllers/UserController.php
View File

@@ -68,7 +68,7 @@ class UserController extends Controller
if ($item->product->user_id == \Auth::id()) {
$returnItem = User::findOrFail(request('user_id'))->items()->findOrFail(request('item_id'));
$returnItem->usedBy = null;
$returnItem->used_by = null;
$returnItem->save();
User::findOrFail(request('user_id'))->items()->detach([request('item_id')]);
} else {