Skip to content

A free open source IT asset/license management system

Normalize $order across different touchpoints (was sometimes $direction)

sniped7fdc67820d9
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index 5142c60850..a821007298 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -582,9 +582,9 @@ class Accessory extends SnipeModel
*/
public function scopeOrderPercentRemaining($query, $order)
{
- $direction = strtolower($order) === 'asc' ? 'asc' : 'desc';
+ $order = strtolower($order) === 'asc' ? 'asc' : 'desc';
- return $query->orderByRaw('CASE WHEN accessories.qty = 0 THEN 0 ELSE ((accessories.qty - checkouts_count) * 100.0 / accessories.qty) END '.$direction);
+ return $query->orderByRaw('CASE WHEN accessories.qty = 0 THEN 0 ELSE ((accessories.qty - checkouts_count) * 100.0 / accessories.qty) END '.$order);
}
/**
@@ -597,8 +597,8 @@ class Accessory extends SnipeModel
*/
public function scopeOrderRemaining($query, $order)
{
- $direction = strtolower($order) === 'asc' ? 'asc' : 'desc';
+ $order = strtolower($order) === 'asc' ? 'asc' : 'desc';
- return $query->orderByRaw('(accessories.qty - checkouts_count) '.$direction);
+ return $query->orderByRaw('(accessories.qty - checkouts_count) '.$order);
}
}
diff --git a/app/Models/AssetModel.php b/app/Models/AssetModel.php
index 16f6887b29..0d3d447ea9 100755
--- a/app/Models/AssetModel.php
+++ b/app/Models/AssetModel.php
@@ -466,8 +466,8 @@ class AssetModel extends SnipeModel
*/
public function scopeOrderPercentRemaining($query, $order)
{
- $direction = strtolower($order) === 'asc' ? 'asc' : 'desc';
+ $order = strtolower($order) === 'asc' ? 'asc' : 'desc';
- return $query->orderByRaw('CASE WHEN assets_count = 0 THEN 0 ELSE (remaining * 100.0 / assets_count) END '.$direction);
+ return $query->orderByRaw('CASE WHEN assets_count = 0 THEN 0 ELSE (remaining * 100.0 / assets_count) END '.$order);
}
}
diff --git a/app/Models/Component.php b/app/Models/Component.php
index 5097bb5f85..6e89ccb1ed 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -562,9 +562,9 @@ class Component extends SnipeModel
*/
public function scopeOrderPercentRemaining($query, $order)
{
- $direction = strtolower($order) === 'asc' ? 'asc' : 'desc';
+ $order = strtolower($order) === 'asc' ? 'asc' : 'desc';
- return $query->orderByRaw('CASE WHEN components.qty = 0 THEN 0 ELSE ((components.qty - COALESCE(sum_unconstrained_assets, 0)) * 100.0 / components.qty) END '.$direction);
+ return $query->orderByRaw('CASE WHEN components.qty = 0 THEN 0 ELSE ((components.qty - COALESCE(sum_unconstrained_assets, 0)) * 100.0 / components.qty) END '.$order);
}
/**
@@ -577,8 +577,8 @@ class Component extends SnipeModel
*/
public function scopeOrderRemaining($query, $order)
{
- $direction = strtolower($order) === 'asc' ? 'asc' : 'desc';
+ $order = strtolower($order) === 'asc' ? 'asc' : 'desc';
- return $query->orderByRaw('(components.qty - COALESCE(sum_unconstrained_assets, 0)) '.$direction);
+ return $query->orderByRaw('(components.qty - COALESCE(sum_unconstrained_assets, 0)) '.$order);
}
}
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
index ff2a74a34f..204379d1b4 100644
--- a/app/Models/Consumable.php
+++ b/app/Models/Consumable.php
@@ -538,8 +538,8 @@ class Consumable extends SnipeModel
*/
public function scopeOrderPercentRemaining($query, $order)
{
- $direction = strtolower($order) === 'asc' ? 'asc' : 'desc';
+ $order = strtolower($order) === 'asc' ? 'asc' : 'desc';
- return $query->orderByRaw('CASE WHEN consumables.qty = 0 THEN 0 ELSE ((consumables.qty - consumables_users_count) * 100.0 / consumables.qty) END '.$direction);
+ return $query->orderByRaw('CASE WHEN consumables.qty = 0 THEN 0 ELSE ((consumables.qty - consumables_users_count) * 100.0 / consumables.qty) END '.$order);
}
}
diff --git a/app/Models/License.php b/app/Models/License.php
index bce850516f..89e38ff3b1 100755
--- a/app/Models/License.php
+++ b/app/Models/License.php
@@ -499,7 +499,6 @@ class License extends Depreciable
return $this->belongsTo(Manufacturer::class, 'manufacturer_id')->withTrashed();
}
-
public function depreciation(): BelongsTo
{
return $this->belongsTo(Depreciation::class, 'depreciation_id');
@@ -1063,8 +1062,8 @@ class License extends Depreciable
*/
public function scopeOrderPercentRemaining($query, $order)
{
- $direction = strtolower($order) === 'asc' ? 'asc' : 'desc';
+ $order = strtolower($order) === 'asc' ? 'asc' : 'desc';
- return $query->orderByRaw('CASE WHEN licenses.seats = 0 THEN 0 ELSE (free_seats_count * 100.0 / licenses.seats) END '.$direction);
+ return $query->orderByRaw('CASE WHEN licenses.seats = 0 THEN 0 ELSE (free_seats_count * 100.0 / licenses.seats) END '.$order);
}
}