From 76fe2af0af69fcf4d5bcf3b6fe58cf10487d778b Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 5 Dec 2017 13:03:11 -0800 Subject: [PATCH] Fixed #4444 - Added EOL back into asset lsiting and custom report --- app/Http/Transformers/AssetsTransformer.php | 1 + app/Presenters/AssetPresenter.php | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index b3435df54e..0f8109dc1c 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -31,6 +31,7 @@ class AssetsTransformer 'name'=> e($asset->model->name) ] : null, 'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null, + 'eol' => ($asset->purchase_date!='') ? Helper::getFormattedDateObject($asset->present()->eol_date(), 'date') : null , 'status_label' => ($asset->assetstatus) ? [ 'id' => (int) $asset->assetstatus->id, 'name'=> e($asset->present()->statusText), diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index f24d922531..d5b87b8e0d 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -147,6 +147,13 @@ class AssetPresenter extends Presenter "visible" => false, "title" => trans('general.order_number'), 'formatter' => "orderNumberObjFilterFormatter" + ], [ + "field" => "eol", + "searchable" => false, + "sortable" => false, + "visible" => false, + "title" => trans('general.eol'), + "formatter" => "dateDisplayFormatter" ], [ "field" => "warranty_months", "searchable" => true,