Merge pull request #16166 from Godmartinz/rollbar_none-qr-code

snipe · Feb 4, 2025 · 5e363f7 · 5e363f7
2 parents d906f3c + 9a75131
commit 5e363f7
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/app/View/Label.php b/app/View/Label.php
@@ -116,12 +116,9 @@ public function render(callable $callback = null)
                         }
                     }
 
-                if ($template->getSupport2DBarcode()) {
+            if ($template->getSupport2DBarcode()) {
                     $barcode2DType = $settings->label2_2d_type;
-                    $barcode2DType = ($barcode2DType == 'default') ? 
-                        $settings->barcode_type :
-                        $barcode2DType;
-                    if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
+                if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
                         switch ($settings->label2_2d_target) {
                             case 'ht_tag': 
                                 $barcode2DTarget = route('ht/assetTag', $asset->asset_tag);