diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index f3236a9758..7c29d5e4c8 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -46,7 +46,7 @@ class AssetModelsController extends Controller 'manufacturer', 'requestable', 'assets_count', - 'available_assets_count', + 'remaining', 'category', 'fieldset', 'deleted_at', @@ -75,7 +75,7 @@ class AssetModelsController extends Controller ]) ->with('category', 'depreciation', 'manufacturer', 'fieldset.fields.defaultValues', 'adminuser') ->withCount('assets as assets_count') - ->withCount('availableAssets as available_assets_count'); + ->withCount('availableAssets as remaining'); if ($request->input('status')=='deleted') { $assetmodels->onlyTrashed(); diff --git a/app/Http/Transformers/AssetModelsTransformer.php b/app/Http/Transformers/AssetModelsTransformer.php index bc99209184..901fcbd9a3 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, - 'available_assets_count' => (int) $assetmodel->available_assets_count, + 'remaining' => (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 b89f4f5770..8992e22e55 100644 --- a/app/Presenters/AssetModelPresenter.php +++ b/app/Presenters/AssetModelPresenter.php @@ -91,7 +91,7 @@ class AssetModelPresenter extends Presenter ], [ - 'field' => 'available_assets_count', + 'field' => 'remaining', 'searchable' => false, 'sortable' => true, 'switchable' => true,