DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Feature: Added serial number option to 2D barcode in label generation

Browse source
This commit is contained in:
NebelKreis 2024-10-29 13:49:05 +01:00
parent 6c17d7d732
commit e22296fd79
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/View/Label.php
View file

@ -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]);

7
resources/views/settings/labels.blade.php
View file

@ -205,9 +205,10 @@
</div>
<div class="col-md-9">
{{ 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', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
<p class="help-block">{{ trans('admin/settings/general.label2_2d_target_help') }}</p>