diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 4f1716bd58..707668d6d6 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -244,6 +244,8 @@ class AssetsController extends Controller break; case 'location': $assets->OrderLocation($order); + case 'rtd_location': + $assets->OrderRtdLocation($order); break; case 'status_label': $assets->OrderStatus($order); diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 1c6ad8fcb8..56fd9fc605 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -1162,6 +1162,18 @@ class Asset extends Depreciable return $query->leftJoin('locations as asset_locations', 'asset_locations.id', '=', 'assets.location_id')->orderBy('asset_locations.name', $order); } + /** + * Query builder scope to order on default + * @param \Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return \Illuminate\Database\Query\Builder Modified query builder + */ + public function scopeOrderRtdLocation($query, $order) + { + return $query->leftJoin('locations as rtd_asset_locations', 'rtd_asset_locations.id', '=', 'assets.rtd_location_id')->orderBy('rtd_asset_locations.name', $order); + } + /** * Query builder scope to order on supplier name