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

untangled code visibility from each label engine

Browse source
This commit is contained in:
Godfrey M 2025-01-07 10:37:59 -08:00
parent 94f44d1b77
commit 83ee0e0fb6
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/View/Label.php
View file

@ -105,7 +105,7 @@ class Label implements View
} }
} }
if ($settings->alt_barcode_enabled) {
if ($template->getSupport1DBarcode()) { if ($template->getSupport1DBarcode()) {
$barcode1DType = $settings->label2_1d_type; $barcode1DType = $settings->label2_1d_type;
if ($barcode1DType != 'none') { if ($barcode1DType != 'none') {
@ -115,21 +115,25 @@ class Label implements View
]); ]);
} }
} }
}
if ($template->getSupport2DBarcode()) { if ($template->getSupport2DBarcode()) {
$barcode2DType = $settings->label2_2d_type; $barcode2DType = $settings->label2_2d_type;
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':
case 'hardware_id': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag);
break;
case 'hardware_id':
default:
$barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]);
break;
}
$assetData->put('barcode2d', (object)[
'type' => $barcode2DType,
'content' => $barcode2DTarget,
]);
} }
$assetData->put('barcode2d', (object)[
'type' => $barcode2DType,
'content' => $barcode2DTarget,
]);
} }
}
$fields = $fieldDefinitions $fields = $fieldDefinitions
->map(fn($field) => $field->toArray($asset)) ->map(fn($field) => $field->toArray($asset))