DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed #4444 - Added EOL back into asset lsiting and custom report

Browse source
This commit is contained in:
snipe 2017-12-05 13:03:11 -08:00
parent e490185533
commit 76fe2af0af
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Transformers/AssetsTransformer.php
View file

@ -31,6 +31,7 @@ class AssetsTransformer
'name'=> e($asset->model->name) 'name'=> e($asset->model->name)
] : null, ] : null,
'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : 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) ? [ 'status_label' => ($asset->assetstatus) ? [
'id' => (int) $asset->assetstatus->id, 'id' => (int) $asset->assetstatus->id,
'name'=> e($asset->present()->statusText), 'name'=> e($asset->present()->statusText),

7
app/Presenters/AssetPresenter.php
View file

@ -147,6 +147,13 @@ class AssetPresenter extends Presenter
"visible" => false, "visible" => false,
"title" => trans('general.order_number'), "title" => trans('general.order_number'),
'formatter' => "orderNumberObjFilterFormatter" 'formatter' => "orderNumberObjFilterFormatter"
], [
"field" => "eol",
"searchable" => false,
"sortable" => false,
"visible" => false,
"title" => trans('general.eol'),
"formatter" => "dateDisplayFormatter"
], [ ], [
"field" => "warranty_months", "field" => "warranty_months",
"searchable" => true, "searchable" => true,