From 9b3a8c046c09eab98334f4474e712792b004dfc9 Mon Sep 17 00:00:00 2001
From: ajsy <35658596+ajsy@users.noreply.github.com>
Date: Fri, 3 May 2019 15:21:57 +0300
Subject: [PATCH] Update LocationsController.php

---
 app/Http/Controllers/LocationsController.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index c51dfd28b1..abe7ee43ad 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -265,26 +265,28 @@ class LocationsController extends Controller
         return redirect()->route('locations.index')->with('error', trans('admin/locations/message.does_not_exist', compact('id')));
     }
     
-    public function print_assigned($id)
+public function print_assigned($id)
     {
 
-        $show_location = Location::where('id',$id)->withTrashed()->first();
-	$manager = User::where('id',$show_location->manager_id)->withTrashed()->first();
+        $location = Location::where('id',$id)->first();
+        $parent = Location::where('id',$location->parent_id)->first();
+	$manager = User::where('id',$location->manager_id)->first();
 	$users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
         $assets = Asset::where('assigned_to', $id)->where('assigned_type', Location::class)->with('model', 'model.category')->get();
-        return view('locations/print')->with('assets', $assets)->with('users',$users)->with('show_location', $show_location)->with('manager', $manager);
+        return view('locations/print')->with('assets', $assets)->with('users',$users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
 
     }
     
     public function print_all_assigned($id)
     {
 
-        $show_location = Location::where('id',$id)->withTrashed()->first();
-        $manager = User::where('id',$show_location->manager_id)->withTrashed()->first();
-	$users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
+        $location = Location::where('id',$id)->first();
+        $parent = Location::where('id',$location->parent_id)->first();
+        $manager = User::where('id',$location->manager_id)->first();
+        $users = User::where('location_id', $id)->with('company', 'department', 'location')->get();
         $assets = Asset::where('location_id', $id)->with('model', 'model.category')->get();
-        return view('locations/print')->with('assets', $assets)->with('users',$users)->with('show_location', $show_location)->with('manager', $manager);
+        return view('locations/print')->with('assets', $assets)->with('users',$users)->with('location', $location)->with('parent', $parent)->with('manager', $manager);
 
     }
 
-}
+}
\ No newline at end of file