A free open source IT asset/license management system
Fixes #18512 temporarily
snipe33a104f14207
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.phpindex 932af1c270..7386807a2b 100644--- a/app/Http/Controllers/Api/AssetsController.php+++ b/app/Http/Controllers/Api/AssetsController.php@@ -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',diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.phpindex d971aff00c..2d97fda0de 100644--- a/app/Http/Transformers/AssetsTransformer.php+++ b/app/Http/Transformers/AssetsTransformer.php@@ -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'),diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.phpindex 9eff9cceee..9dddfb419f 100644--- a/app/Presenters/AssetPresenter.php+++ b/app/Presenters/AssetPresenter.php@@ -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,diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.phpindex f82d2e09b1..a5d3355123 100755--- a/resources/views/hardware/view.blade.php+++ b/resources/views/hardware/view.blade.php@@ -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!='')