DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Feature: Added asset tag option to barcode in label generation

Browse source
This commit is contained in:
NebelKreis 2024-10-28 15:39:04 +01:00
parent bcb4bd9eb4
commit 6f3fb47e4a
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/View/Label.php
View file

@ -124,9 +124,16 @@ class Label implements View
$barcode2DType; $barcode2DType;
if (($barcode2DType != 'none') && (!is_null($barcode2DType))) { if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
switch ($settings->label2_2d_target) { 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': 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)[ $assetData->put('barcode2d', (object)[
'type' => $barcode2DType, 'type' => $barcode2DType,

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

@ -153,7 +153,7 @@
'EAN13' => 'EAN13', 'EAN13' => 'EAN13',
'UPCA' => 'UPCA', 'UPCA' => 'UPCA',
'UPCE' => 'UPCE', 'UPCE' => 'UPCE',
'none' => trans('admin/settings/general.none'), 'none' => trans('admin/settings/general.none'),
]; ];
@endphp @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' ]) }} {{ 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::label('label2_2d_target', trans('admin/settings/general.label2_2d_target'), ['class'=>'control-label']) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{{ 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', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $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> <p class="help-block">{{ trans('admin/settings/general.label2_2d_target_help') }}</p>
</div> </div>