DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added warranty and expiration to list view

Browse source
This commit is contained in:
snipe 2017-10-31 07:05:15 -07:00
parent 32b2f77ad9
commit 37868cd70e
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Api/AssetsController.php
View file

@ -70,7 +70,8 @@ class AssetsController extends Controller
'created_at', 'created_at',
'updated_at', 'updated_at',
'purchase_date', 'purchase_date',
'purchase_cost' 'purchase_cost',
'warranty_months',
]; ];
$filter = array(); $filter = array();

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

@ -64,7 +64,7 @@ class AssetsTransformer
] : null, ] : null,
'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null, 'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
'assigned_to' => $this->transformAssignedTo($asset), 'assigned_to' => $this->transformAssignedTo($asset),
'warranty' => ($asset->warranty_months > 0) ? e($asset->warranty_months . ' ' . trans('admin/hardware/form.months')) : null, 'warranty_months' => ($asset->warranty_months > 0) ? e($asset->warranty_months . ' ' . trans('admin/hardware/form.months')) : null,
'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null, 'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null,
'created_at' => Helper::getFormattedDateObject($asset->created_at, 'datetime'), 'created_at' => Helper::getFormattedDateObject($asset->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($asset->updated_at, 'datetime'), 'updated_at' => Helper::getFormattedDateObject($asset->updated_at, 'datetime'),

13
app/Presenters/AssetPresenter.php
View file

@ -148,6 +148,19 @@ class AssetPresenter extends Presenter
"title" => trans('general.order_number'), "title" => trans('general.order_number'),
'formatter' => "orderNumberObjFilterFormatter" 'formatter' => "orderNumberObjFilterFormatter"
], [ ], [
"field" => "warranty_months",
"searchable" => true,
"sortable" => true,
"visible" => false,
"title" => trans('admin/hardware/form.warranty')
],[
"field" => "warranty_expires",
"searchable" => false,
"sortable" => false,
"visible" => false,
"title" => 'Warranty Expires',
"formatter" => "dateDisplayFormatter"
],[
"field" => "notes", "field" => "notes",
"searchable" => true, "searchable" => true,
"sortable" => true, "sortable" => true,