diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php index 07fbc21971..97aaf2c4bf 100644 --- a/app/Http/Controllers/Api/AccessoriesController.php +++ b/app/Http/Controllers/Api/AccessoriesController.php @@ -7,6 +7,7 @@ use App\Http\Controllers\Controller; use App\Helpers\Helper; use App\Models\Accessory; use App\Http\Transformers\AccessoriesTransformer; +use App\Models\Company; class AccessoriesController extends Controller @@ -128,9 +129,15 @@ class AccessoriesController extends Controller public function checkedout($id) { $this->authorize('view', Accessory::class); - $accessory = Accessory::findOrFail($id)->with('users')->first(); - $total = $accessory->users->count(); - return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory, $total); + + $accessory = Accessory::findOrFail($id); + if (!Company::isCurrentUserHasAccess($accessory)) { + return ['total' => 0, 'rows' => []]; + } + $accessory_users = $accessory->users; + $total = $accessory_users->count(); + + return (new AccessoriesTransformer)->transformCheckedoutAccessory($accessory_users, $total); } diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php index ffab0d7cf5..cdf89cf544 100644 --- a/app/Http/Transformers/AccessoriesTransformer.php +++ b/app/Http/Transformers/AccessoriesTransformer.php @@ -59,14 +59,12 @@ class AccessoriesTransformer } - public function transformCheckedoutAccessory (Accessory $accessory, $total) + public function transformCheckedoutAccessory ($accessory_users, $total) { - - $array = array(); - foreach ($accessory->users as $user) { + foreach ($accessory_users as $user) { $array[] = [ 'assigned_pivot_id' => $user->pivot->id, 'id' => (int) $user->id,