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 2 Packages Projects Releases Wiki Activity

Merge pull request #13197 from akemidx/current_value_for_assets

Browse source 
Current value added to asset index page
This commit is contained in:
snipe 2023-07-19 19:06:15 +01:00 committed by GitHub
parent 1e1aea2eb0 9e2987e680
commit a19a508a80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/ReportsController.php
View file

@ -501,7 +501,6 @@ class ReportsController extends Controller
$header[] = trans('general.zip'); $header[] = trans('general.zip');
} }
if ($request->filled('assigned_to')) { if ($request->filled('assigned_to')) {
$header[] = trans('admin/hardware/table.checkoutto'); $header[] = trans('admin/hardware/table.checkoutto');
$header[] = trans('general.type'); $header[] = trans('general.type');
@ -532,13 +531,14 @@ class ReportsController extends Controller
} }
if ($request->filled('warranty')) { if ($request->filled('warranty')) {
$header[] = 'Warranty'; $header[] = trans('admin/hardware/form.warranty');
$header[] = 'Warranty Expires'; $header[] = trans('admin/hardware/form.warranty_expires');
} }
if ($request->filled('depreciation')) { if ($request->filled('depreciation')) {
$header[] = 'Value'; $header[] = trans('admin/hardware/table.book_value');
$header[] = 'Diff'; $header[] = trans('admin/hardware/table.diff');
$header[] = 'Fully Depreciated'; $header[] = trans('admin/hardware/form.fully_depreciated');
} }
if ($request->filled('checkout_date')) { if ($request->filled('checkout_date')) {

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

@ -92,6 +92,7 @@ class AssetsTransformer
'checkout_counter' => (int) $asset->checkout_counter, 'checkout_counter' => (int) $asset->checkout_counter,
'requests_counter' => (int) $asset->requests_counter, 'requests_counter' => (int) $asset->requests_counter,
'user_can_checkout' => (bool) $asset->availableForCheckout(), 'user_can_checkout' => (bool) $asset->availableForCheckout(),
'book_value' => Helper::formatCurrencyOutput($asset->getLinearDepreciatedValue()),
]; ];

7
app/Presenters/AssetPresenter.php
View file

@ -154,6 +154,13 @@ class AssetPresenter extends Presenter
'footerFormatter' => 'sumFormatter', 'footerFormatter' => 'sumFormatter',
'class' => 'text-right', 'class' => 'text-right',
], [ ], [
"field" => "book_value",
"searchable" => false,
"sortable" => false,
"title" => trans('admin/hardware/table.book_value'),
"footerFormatter" => 'sumFormatter',
"class" => "text-right",
],[
'field' => 'order_number', 'field' => 'order_number',
'searchable' => true, 'searchable' => true,
'sortable' => true, 'sortable' => true,