DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-08-05 18:16:20 -07:00
parent 88db2d9e18 bc4032c2cd
commit 51f7298720
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Helpers/Helper.php
View file

@ -623,7 +623,7 @@ class Helper
{ {
$consumables = Consumable::withCount('consumableAssignments as consumable_assignments_count')->whereNotNull('min_amt')->get(); $consumables = Consumable::withCount('consumableAssignments as consumable_assignments_count')->whereNotNull('min_amt')->get();
$accessories = Accessory::withCount('users as users_count')->whereNotNull('min_amt')->get(); $accessories = Accessory::withCount('users as users_count')->whereNotNull('min_amt')->get();
$components = Component::withCount('assets as assets_count')->whereNotNull('min_amt')->get(); $components = Component::whereNotNull('min_amt')->get();
$avail_consumables = 0; $avail_consumables = 0;
$items_array = []; $items_array = [];
@ -668,7 +668,7 @@ class Helper
} }
foreach ($components as $component) { foreach ($components as $component) {
$avail = $component->qty - $component->assets_count; $avail = $component->numRemaining();
if ($avail < ($component->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) { if ($avail < ($component->min_amt) + \App\Models\Setting::getSettings()->alert_threshold) {
if ($component->qty > 0) { if ($component->qty > 0) {
$percent = number_format((($avail / $component->qty) * 100), 0); $percent = number_format((($avail / $component->qty) * 100), 0);