Merge pull request #18192 from Godmartinz/fix-requestable-asset-model-query

Fixes FD51910 requestable asset model available quantity count
2025-11-13 15:37:24 +00:00
parent d2ab3071a6 5e48dd45b2
commit bd742aec9c
1 changed files with 13 additions and 1 deletions
@@ -156,7 +156,19 @@ class ViewAssetsController extends Controller
    public function getRequestableIndex() : View
    {
        $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets();
-        $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
+        $models = AssetModel::with([
+            'category',
+            'requests',
+            'assets' => function ($q) {
+                $q->where('requestable', 1)
+                    ->whereHas('assetstatus', fn ($s) =>
+                    $s->where('archived', 0)
+                        ->where(fn ($s) =>
+                        $s->where('deployable', 1)->orWhere('pending', 1)
+                        )
+                    );
+            },
+        ])->RequestableModels()->get();

        return view('account/requestable-assets', compact('assets', 'models'));
    }