diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 5e954a24c5..ba7e6fe9b4 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -748,7 +748,7 @@ class Helper $consumables = Consumable::withCount('consumableAssignments as consumable_assignments_count')->whereNotNull('min_amt')->get(); $accessories = Accessory::withCount('checkouts as checkouts_count')->whereNotNull('min_amt')->get(); $components = Component::whereNotNull('min_amt')->get(); - $asset_models = AssetModel::where('min_amt', '>', 0)->get(); + $asset_models = AssetModel::where('min_amt', '>', 0)->with('assets')->get(); $licenses = License::where('min_amt', '>', 0)->get(); $items_array = []; @@ -811,11 +811,13 @@ class Helper } } - foreach ($asset_models as $asset_model){ - $asset = new Asset(); - $total_owned = $asset->where('model_id', '=', $asset_model->id)->count(); - $avail = $asset->where('model_id', '=', $asset_model->id)->whereNull('assigned_to')->count(); + + + foreach ($asset_models as $asset_model) { + + $total_owned = $asset_model->assets->count(); + $avail = $asset_model->assets->whereNull('assets.assigned_to')->count(); if ($avail < ($asset_model->min_amt) + $alert_threshold) { if ($avail > 0) {