DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 18:14:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-03-07 10:17:05 +00:00
parent bd566324ed 58bf036f52
commit 6156d67e4a
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/View/Label.php
View file

@ -105,11 +105,9 @@ class Label implements View
} }
} }
if ($settings->alt_barcode_enabled) {
if ($template->getSupport1DBarcode()) { if ($template->getSupport1DBarcode()) {
$barcode1DType = $settings->label2_1d_type; $barcode1DType = $settings->alt_barcode;
$barcode1DType = ($barcode1DType == 'default') ?
(($settings->alt_barcode_enabled) ? $settings->alt_barcode : null) :
$barcode1DType;
if ($barcode1DType != 'none') { if ($barcode1DType != 'none') {
$assetData->put('barcode1d', (object)[ $assetData->put('barcode1d', (object)[
'type' => $barcode1DType, 'type' => $barcode1DType,
@ -117,6 +115,7 @@ class Label implements View
]); ]);
} }
} }
}
if ($template->getSupport2DBarcode()) { if ($template->getSupport2DBarcode()) {
$barcode2DType = $settings->label2_2d_type; $barcode2DType = $settings->label2_2d_type;