Skip to content

A free open source IT asset/license management system

adds first checkout to asset view and index

Godfrey Ma3a79a696f1d
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index bf59aa2fa8..e1144aaffd 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -2,6 +2,7 @@
namespace App\Helpers;
use App\Models\Accessory;
+use App\Models\Actionlog;
use App\Models\Asset;
use App\Models\AssetModel;
use App\Models\Component;
@@ -1569,6 +1570,19 @@ class Helper
'he-IL'
]) ? 'rtl' : 'ltr';
}
+ public static function getAssetFirstCheckout($assetId) {
+
+ if (!$assetId) {
+ return null;
+ }
+ $first_checkout = Actionlog::where('item_id', $assetId)
+ ->where('item_type', Asset::class)
+ ->where('action_type', 'checkout')
+ ->oldest('created_at')
+ ->first();
+
+ return self::getFormattedDateObject($first_checkout?->created_at, 'datetime');
+ }
static public function getRedirectOption($request, $id, $table, $item_id = null) : RedirectResponse
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index 2d2d5f5f81..15278380d9 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -104,6 +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::getAssetFirstCheckout($asset->id),
'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.php
index bf3b5ab73f..1453920bee 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -151,6 +151,13 @@ 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' => 'age',
'searchable' => false,
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 37ac6eba5e..c789dbd957 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -138,13 +138,13 @@ return [
'exclude_archived' => 'Exclude Archived Assets',
'exclude_deleted' => 'Exclude Deleted Assets',
'example' => 'Example: ',
-
'files' => 'Files',
'file_name' => 'File Name',
'file_type' => 'File Type',
'filesize' => 'File Size',
'file_uploads' => 'File Uploads',
'file_upload' => 'File Upload',
+ 'first_checkout' => '1<sup>st</sup> Checkout',
'generate' => 'Generate',
'generate_labels' => 'Generate Labels',
'github_markdown' => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index adb97ab5c4..7f035c18ec 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -1105,6 +1105,18 @@
</div>
@endif
+ <div class="row">
+ <div class="col-md-3">
+ <strong>
+ {!! trans('general.first_checkout') !!}
+ </strong>
+ </div>
+ <div class="col-md-9">
+ {{ Helper::getAssetFirstCheckout($asset->id)['formatted'] ?? '' }}
+ </div>
+ </div>
+
+
@if ($asset->last_checkin!='')
<div class="row">
<div class="col-md-3">