From 6f3fb47e4a6b26319ce1cae2c07982ab363a8e80 Mon Sep 17 00:00:00 2001 From: NebelKreis Date: Mon, 28 Oct 2024 15:39:04 +0100 Subject: [PATCH 1/5] Feature: Added asset tag option to barcode in label generation --- app/View/Label.php | 11 +++++++++-- resources/views/settings/labels.blade.php | 8 ++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/View/Label.php b/app/View/Label.php index 886830659..80036cf11 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -124,9 +124,16 @@ class Label implements View $barcode2DType; if (($barcode2DType != 'none') && (!is_null($barcode2DType))) { switch ($settings->label2_2d_target) { - case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break; + case 'ht_tag': + $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); + break; + case 'plain_asset_tag': + $barcode2DTarget = $asset->asset_tag; + break; case 'hardware_id': - default: $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); break; + default: + $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); + break; } $assetData->put('barcode2d', (object)[ 'type' => $barcode2DType, diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 33640edbf..495592062 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -153,7 +153,7 @@ 'EAN13' => 'EAN13', 'UPCA' => 'UPCA', 'UPCE' => 'UPCE', - 'none' => trans('admin/settings/general.none'), + 'none' => trans('admin/settings/general.none'), ]; @endphp {{ Form::select('label2_1d_type', $select1DValues, old('label2_1d_type', $setting->label2_1d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_1d_type' ]) }} @@ -204,7 +204,11 @@ {{ Form::label('label2_2d_target', trans('admin/settings/general.label2_2d_target'), ['class'=>'control-label']) }}
- {{ Form::select('label2_2d_target', ['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}'], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }} + {{ Form::select('label2_2d_target', [ + 'hardware_id' => '/hardware/{id} ('.trans('admin/settings/general.default').')', + 'ht_tag' => '/ht/{asset_tag}', + 'plain_asset_tag' => trans('admin/settings/general.asset_tag'), + ], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }} {!! $errors->first('label2_2d_target', '') !!}

{{ trans('admin/settings/general.label2_2d_target_help') }}

From 6c17d7d732241f33af8b86b2fee22afffdbe3ff3 Mon Sep 17 00:00:00 2001 From: NebelKreis Date: Tue, 29 Oct 2024 11:45:29 +0100 Subject: [PATCH 2/5] Fix: Corrected path in translation function Updated the translation function to use the correct path, ensuring that instead of displaying the translation path as plain text, the appropriate translation is now shown as intended. --- resources/views/settings/labels.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 495592062..3d32a9243 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -207,7 +207,7 @@ {{ Form::select('label2_2d_target', [ 'hardware_id' => '/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag' => '/ht/{asset_tag}', - 'plain_asset_tag' => trans('admin/settings/general.asset_tag'), + 'plain_asset_tag' => trans('general.asset_tag'), ], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }} {!! $errors->first('label2_2d_target', '') !!}

{{ trans('admin/settings/general.label2_2d_target_help') }}

From e22296fd793dacefd60c734d305508aa7e9c63b8 Mon Sep 17 00:00:00 2001 From: NebelKreis Date: Tue, 29 Oct 2024 13:49:05 +0100 Subject: [PATCH 3/5] Feature: Added serial number option to 2D barcode in label generation --- app/View/Label.php | 3 +++ resources/views/settings/labels.blade.php | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/View/Label.php b/app/View/Label.php index 80036cf11..f68552006 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -130,6 +130,9 @@ class Label implements View case 'plain_asset_tag': $barcode2DTarget = $asset->asset_tag; break; + case 'plain_serial_number': + $barcode2DTarget = $asset->serial; + break; case 'hardware_id': default: $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 3d32a9243..47f429703 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -205,9 +205,10 @@
{{ Form::select('label2_2d_target', [ - 'hardware_id' => '/hardware/{id} ('.trans('admin/settings/general.default').')', - 'ht_tag' => '/ht/{asset_tag}', - 'plain_asset_tag' => trans('general.asset_tag'), + 'hardware_id' => '/hardware/{id} ('.trans('admin/settings/general.default').')', + 'ht_tag' => '/ht/{asset_tag}', + 'plain_asset_tag' => trans('general.asset_tag'), + 'plain_serial_number' => trans('general.serial_number'), ], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }} {!! $errors->first('label2_2d_target', '') !!}

{{ trans('admin/settings/general.label2_2d_target_help') }}

From f96b7c505686f9eba332d7d58417f9d6ae32fcd3 Mon Sep 17 00:00:00 2001 From: NebelKreis Date: Tue, 5 Nov 2024 13:40:33 +0100 Subject: [PATCH 4/5] Feature: Added data type context for select options with "URL:" and "Data:" labels, including translations --- resources/lang/en-US/admin/settings/general.php | 3 ++- resources/views/settings/labels.blade.php | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index d656391ed..c5987576f 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -360,12 +360,13 @@ return [ 'label2_2d_type' => '2D Barcode Type', 'label2_2d_type_help' => 'Format for 2D barcodes', 'label2_2d_target' => '2D Barcode Target', - 'label2_2d_target_help' => 'The URL the 2D barcode points to when scanned', + 'label2_2d_target_help' => 'The data that will be contained in the 2D barcode', 'label2_fields' => 'Field Definitions', 'label2_fields_help' => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.', 'help_asterisk_bold' => 'Text entered as **text** will be displayed as bold', 'help_blank_to_use' => 'Leave blank to use the value from :setting_name', 'help_default_will_use' => ':default will use the value from :setting_name.
Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see the documentation for more details. ', + 'data' => 'Data', 'default' => 'Default', 'none' => 'None', 'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization's Google developer console .', diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 47f429703..9a323e723 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -205,11 +205,11 @@
{{ Form::select('label2_2d_target', [ - 'hardware_id' => '/hardware/{id} ('.trans('admin/settings/general.default').')', - 'ht_tag' => '/ht/{asset_tag}', - 'plain_asset_tag' => trans('general.asset_tag'), - 'plain_serial_number' => trans('general.serial_number'), - ], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }} + 'hardware_id' => trans('general.url') .': /hardware/{id} ('.trans('admin/settings/general.default').')', + 'ht_tag' => trans('general.url') .': /ht/{asset_tag}', + 'plain_asset_tag' => trans('admin/settings/general.data') .': '. trans('general.asset_tag') .' {asset_tag}', + 'plain_serial_number' => trans('admin/settings/general.data') .': '. trans('general.serial_number') .' {serial}', + ], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }} {!! $errors->first('label2_2d_target', '') !!}

{{ trans('admin/settings/general.label2_2d_target_help') }}

From 52e4414bc5362645d12b30dccabcaaacfdcbf8ad Mon Sep 17 00:00:00 2001 From: NebelKreis Date: Tue, 5 Nov 2024 13:41:34 +0100 Subject: [PATCH 5/5] Feature: Added asset ID option to 2D barcode in label generation --- app/View/Label.php | 3 +++ resources/lang/en-US/admin/settings/general.php | 1 + resources/views/settings/labels.blade.php | 1 + 3 files changed, 5 insertions(+) diff --git a/app/View/Label.php b/app/View/Label.php index f68552006..8a192543b 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -127,6 +127,9 @@ class Label implements View case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break; + case 'plain_asset_id': + $barcode2DTarget = (string) $asset->id; + break; case 'plain_asset_tag': $barcode2DTarget = $asset->asset_tag; break; diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index c5987576f..3876faa53 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -366,6 +366,7 @@ return [ 'help_asterisk_bold' => 'Text entered as **text** will be displayed as bold', 'help_blank_to_use' => 'Leave blank to use the value from :setting_name', 'help_default_will_use' => ':default will use the value from :setting_name.
Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see the documentation for more details. ', + 'asset_id' => 'Asset ID', 'data' => 'Data', 'default' => 'Default', 'none' => 'None', diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 9a323e723..1f56bc52b 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -207,6 +207,7 @@ {{ Form::select('label2_2d_target', [ 'hardware_id' => trans('general.url') .': /hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag' => trans('general.url') .': /ht/{asset_tag}', + 'plain_asset_id' => trans('admin/settings/general.data') .': '. trans('admin/settings/general.asset_id') .' {id}', 'plain_asset_tag' => trans('admin/settings/general.data') .': '. trans('general.asset_tag') .' {asset_tag}', 'plain_serial_number' => trans('admin/settings/general.data') .': '. trans('general.serial_number') .' {serial}', ], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }}