diff --git a/app/View/Label.php b/app/View/Label.php index 21c839fa11..eb030bc8b6 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -105,16 +105,15 @@ class Label implements View } } - if ($template->getSupport1DBarcode()) { - $barcode1DType = $settings->label2_1d_type; - $barcode1DType = ($barcode1DType == 'default') ? - (($settings->alt_barcode_enabled) ? $settings->alt_barcode : null) : - $barcode1DType; - if ($barcode1DType != 'none') { - $assetData->put('barcode1d', (object)[ - 'type' => $barcode1DType, - 'content' => $asset->asset_tag, - ]); + if ($settings->alt_barcode_enabled) { + if ($template->getSupport1DBarcode()) { + $barcode1DType = $settings->alt_barcode; + if ($barcode1DType != 'none') { + $assetData->put('barcode1d', (object)[ + 'type' => $barcode1DType, + 'content' => $asset->asset_tag, + ]); + } } }