Skip to content

A free open source IT asset/license management system

Make available_assets_count sortable

snipeeeea69d8f26f
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index bfa15c91e3..f3236a9758 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -46,6 +46,7 @@ class AssetModelsController extends Controller
'manufacturer',
'requestable',
'assets_count',
+ 'available_assets_count',
'category',
'fieldset',
'deleted_at',
diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php
index 901fcbd9a3..bc99209184 100644
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -48,7 +48,7 @@ class AssetModelsTransformer
'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null,
'model_number' => ($assetmodel->model_number ? e($assetmodel->model_number): null),
'min_amt' => ($assetmodel->min_amt) ? (int) $assetmodel->min_amt : null,
- 'remaining' => (int) $assetmodel->available_assets_count,
+ 'available_assets_count' => (int) $assetmodel->available_assets_count,
'depreciation' => ($assetmodel->depreciation) ? [
'id' => (int) $assetmodel->depreciation->id,
'name'=> e($assetmodel->depreciation->name),
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index 04ea717f94..b89f4f5770 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -91,9 +91,9 @@ class AssetModelPresenter extends Presenter
],
[
- 'field' => 'remaining',
+ 'field' => 'available_assets_count',
'searchable' => false,
- 'sortable' => false,
+ 'sortable' => true,
'switchable' => true,
'title' => trans('general.remaining'),
'visible' => true,