fix asset model query

Author: Godmartinz

app/Http/Controllers/ViewAssetsController.php

@@ -155,7 +155,30 @@ public function getIndex(Request $request) : View | RedirectResponse
     public function getRequestableIndex() : View
     {
         $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets();
-        $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
+            $onlyUnassignedDeployable = Setting::getSettings()->request_unassigned_deployable;
+        $models = AssetModel::with([
+            'category',
+            'requests',
+            'assets' => function ($q) use ($onlyUnassignedDeployable) {
+                if ($onlyUnassignedDeployable) {
+                    // Unassigned + deployable (not archived)
+                    $q->whereNull('assets.assigned_to')
+                        ->whereHas('assetstatus', function ($s) {
+                            $s->where('deployable', 1);
+                        });
+                } else {
+                    // Requestable + (deployable OR pending) but never archived
+                    $q->where('requestable', 1)
+                        ->whereHas('assetstatus', function ($s) {
+                            $s->where('archived', 0)
+                                ->where(function ($s) {
+                                    $s->where('deployable', 1)
+                                        ->orWhere('pending', 1);
+                                });
+                        });
+                }
+            },
+        ])->RequestableModels()->get();
 
         return view('account/requestable-assets', compact('assets', 'models'));
     }

resources/views/account/requestable-assets.blade.php

@@ -135,7 +135,7 @@ class="table table-striped snipe-table"
                                                     @endcan
                                                 </td>
 
-                                                <td>{{$requestableModel->assets->where('requestable', '1')->count()}}</td>
+                                                <td>{{'requestable '.$requestableModel->assets->where('requestable', '1')->count()}} {{'Unrequestable '.$requestableModel->assets->where('requestable', '0')->count()}}</td>
 
                                                 <td>
                                                     <form  action="{{ route('account/request-item', ['itemType' => 'asset_model', 'itemId' => $requestableModel->id])}}" method="POST" accept-charset="utf-8">