Merge branch 'develop'

Author: snipe

app/Http/Controllers/Api/AccessoriesController.php

@@ -7,6 +7,7 @@
 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 @@ public function accessory_detail($id)
     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);
     }
 
 

app/Http/Transformers/AccessoriesTransformer.php

@@ -59,14 +59,12 @@ public function transformAccessory (Accessory $accessory)
     }
 
 
-    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,