A free open source IT asset/license management system
add warranty and warranty expiration date as label field options
Godfrey M144144032d1f
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.phpindex 08fbda94ef..e28e795615 100755--- a/app/Http/Controllers/LabelsController.php+++ b/app/Http/Controllers/LabelsController.php@@ -34,6 +34,7 @@ class LabelsController extends Controller$exampleAsset->asset_tag = '100001';$exampleAsset->serial = 'SN9876543210';$exampleAsset->asset_eol_date = '2025-01-01';+ $exampleAsset->warranty_months = '24';$exampleAsset->order_number = '12345';$exampleAsset->purchase_date = '2023-01-01';$exampleAsset->status_id = 1;diff --git a/app/Models/Labels/FieldOption.php b/app/Models/Labels/FieldOption.phpindex a1c1284404..9661b686ca 100644--- a/app/Models/Labels/FieldOption.php+++ b/app/Models/Labels/FieldOption.php@@ -4,6 +4,7 @@ namespace App\Models\Labels;use App\Models\Asset;use App\Models\User;+use App\Helpers\Helper;class FieldOption{@@ -47,7 +48,13 @@ class FieldOptionif ($dataPath[0] === 'purchase_date') {return $asset->purchase_date ? $asset->purchase_date->format('Y-m-d') : null;}+ if ($dataPath[0] === 'warranty_months') {+ return ($asset->warranty_months > 0) ? e($asset->warranty_months . ' ' . trans('admin/hardware/form.months')) : null;+ }+ if ($dataPath[0] === 'warranty_expires') {+ return ($asset->warranty_months > 0) ? $asset->warranty_expires->toDateString() : null;+ }return $dataPath->reduce(function ($myValue, $path) {try {diff --git a/resources/lang/en-US/admin/hardware/form.php b/resources/lang/en-US/admin/hardware/form.phpindex 1a025c71d9..fca53b1bb4 100644--- a/resources/lang/en-US/admin/hardware/form.php+++ b/resources/lang/en-US/admin/hardware/form.php@@ -50,6 +50,7 @@ return ['tag' => 'Asset Tag','update' => 'Asset Update','warranty' => 'Warranty',+ 'warranty_months' => 'Warranty Months','warranty_expires' => 'Warranty Expires','years' => 'years','asset_location' => 'Update Asset Location',diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.phpindex a74543a418..3b3849953c 100644--- a/resources/views/partials/label2-field-definitions.blade.php+++ b/resources/views/partials/label2-field-definitions.blade.php@@ -320,6 +320,8 @@<option value="name">{{trans('admin/hardware/form.name')}}</option><option value="serial">{{trans('admin/hardware/table.serial')}}</option><option value="asset_eol_date">{{trans('admin/hardware/form.eol_date')}}</option>+ <option value="warranty_months">{{trans('admin/hardware/form.warranty_months')}}</option>+ <option value="warranty_expires">{{trans('admin/hardware/form.warranty_expires')}}</option><option value="order_number">{{trans('admin/hardware/form.order')}}</option><option value="purchase_date">{{trans('admin/hardware/table.purchase_date')}}</option><option value="assignedTo">{{trans('admin/hardware/table.assigned_to')}}</option>