mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-04-02 14:01:08 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #18512 temporarily

Browse Source
This commit is contained in:
snipe
2026-02-17 14:11:14 +00:00
parent 28f19689ec
commit 33a104f142
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Api/AssetsController.php
View File

@ -154,15 +154,15 @@ class AssetsController extends Controller
}
$assets = Asset::select('assets.*')
->addSelect([
'first_checkout_at' => Actionlog::query()
->select('created_at')
->whereColumn('item_id', 'assets.id')
->where('item_type', Asset::class)
->where('action_type', 'checkout')
->orderBy('created_at')
->limit(1),
])
// ->addSelect([
// 'first_checkout_at' => Actionlog::query()
// ->select('created_at')
// ->whereColumn('item_id', 'assets.id')
// ->where('item_type', Asset::class)
// ->where('action_type', 'checkout')
// ->orderBy('created_at')
// ->limit(1),
// ])
->with(
'model',
'location',

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

@ -104,7 +104,7 @@ class AssetsTransformer
'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date, 'date'),
'deleted_at' => Helper::getFormattedDateObject($asset->deleted_at, 'datetime'),
'purchase_date' => Helper::getFormattedDateObject($asset->purchase_date, 'date'),
'first_checkout' => Helper::getFormattedDateObject($asset->first_checkout_at, 'datetime'),
// 'first_checkout' => Helper::getFormattedDateObject($asset->first_checkout_at, 'datetime'),
'age' => $asset->purchase_date ? $asset->purchase_date->locale(app()->getLocale())->diffForHumans() : '',
'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'),
'last_checkin' => Helper::getFormattedDateObject($asset->last_checkin, 'datetime'),

15
app/Presenters/AssetPresenter.php
View File

@ -151,14 +151,15 @@ class AssetPresenter extends Presenter
'visible' => false,
'title' => trans('general.purchase_date'),
'formatter' => 'dateDisplayFormatter',
], [
'field' => 'first_checkout',
'searchable' => true,
'sortable' => true,
'visible' => false,
'title' => trans('general.first_checkout'),
'formatter' => 'dateDisplayFormatter',
],
// [
// 'field' => 'first_checkout',
// 'searchable' => true,
// 'sortable' => true,
// 'visible' => false,
// 'title' => trans('general.first_checkout'),
// 'formatter' => 'dateDisplayFormatter',
// ],
[
'field' => 'age',
'searchable' => false,

20
resources/views/hardware/view.blade.php
View File

@ -1105,16 +1105,16 @@
</div>
@endif
<div class="row">
<div class="col-md-3">
<strong>
{!! trans('general.first_checkout') !!}
</strong>
</div>
<div class="col-md-9">
{{ Helper::getFormattedDateObject($asset->first_checkout_at, 'datetime')['formatted'] ?? '' }}
</div>
</div>
{{-- <div class="row">--}}
{{-- <div class="col-md-3">--}}
{{-- <strong>--}}
{{-- {!! trans('general.first_checkout') !!}--}}
{{-- </strong>--}}
{{-- </div>--}}
{{-- <div class="col-md-9">--}}
{{-- {{ Helper::getFormattedDateObject($asset->first_checkout_at, 'datetime')['formatted'] ?? '' }}--}}
{{-- </div>--}}
{{-- </div>--}}
@if ($asset->last_checkin!='')