From e56628499c3544db7a8115bf6c4b524140e97314 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 24 Aug 2023 11:45:23 -0700 Subject: [PATCH] fixed lost changes --- app/Helpers/Helper.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 1eecb474af..266fa4edbd 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -710,22 +710,22 @@ class Helper // dd($asset_models); foreach ($asset_models as $asset_model){ - $used= new Asset(); - $count =$used->where('model_id', '==', $asset_model->id)->count(); - $avail = Asset::withCount('model as model_count'); - if ($avail < ($asset_model->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) { - if ($asset_model->qty > 0) { - $percent = number_format((($avail / $asset_model->qty) * 100), 0); + $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(); + + if ($avail < ($asset_model->min_amt)+ \App\Models\Setting::getSettings()->alert_threshold) { + if ($avail > 0) { + $percent = number_format((($avail / $total_owned) * 100), 0); } else { $percent = 100; } - - $items_array[$all_count]['id'] = $accessory->id; - $items_array[$all_count]['name'] = $accessory->name; - $items_array[$all_count]['type'] = 'accessories'; + $items_array[$all_count]['id'] = $asset_model->id; + $items_array[$all_count]['name'] = $asset_model->name; + $items_array[$all_count]['type'] = 'models'; $items_array[$all_count]['percent'] = $percent; $items_array[$all_count]['remaining'] = $avail; - $items_array[$all_count]['min_amt'] = $accessory->min_amt; + $items_array[$all_count]['min_amt'] = $asset_model->min_amt; $all_count++; } }