From deba4d2b81cd67f1eb40a4c53460ad4e0fab7f37 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 5 Dec 2017 12:37:42 -0800 Subject: [PATCH] Added consumables tio printable output --- app/Http/Controllers/UsersController.php | 3 +- resources/views/users/print.blade.php | 36 ++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 5feddf2798..2252a154d0 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -1162,7 +1162,8 @@ class UsersController extends Controller $assets = Asset::where('assigned_to', $id)->where('assigned_type', User::class)->with('model', 'model.category')->get(); $licenses = $user->licenses()->get(); $accessories = $user->accessories()->get(); - return view('users/print')->with('assets', $assets)->with('licenses',$licenses)->with('accessories', $accessories); + $consumables = $user->consumables()->get(); + return view('users/print')->with('assets', $assets)->with('licenses',$licenses)->with('accessories', $accessories)->with('consumables', $consumables); } diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index 89b359fb54..ce5415b36f 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -138,6 +138,42 @@ @endforeach @endif + +@if ($consumables->count() > 0) +

+ + + + + + + + + + + + + + + @php + $ccounter = 1; + @endphp + + @foreach ($consumables as $consumable) + + + + + + + + @php + $ccounter++ + @endphp + @endforeach +
{{ trans('general.consumables') }}
NameCategoryChecked Out
{{ $ccounter }}{{ $consumable->manufacturer->name }} {{ $consumable->name }} {{ $consumable->model_number }}{{ $consumable->category->name }}{{ $consumable->assetlog->first()->created_at }}
+@endif +