Merge pull request #16260 from snipe/fix_for_qr_on_old_label_engine

snipe · web-flow · commit 02a8e17704eb · 2025-02-17T10:45:51.000Z
Fix for QR code on old label engine
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
@@ -535,7 +535,7 @@ public function getQrCode($assetId = null) : Response | BinaryFileResponse | str
     {
         $settings = Setting::getSettings();
 
-        if (($settings->qr_code === '1') && ($settings->label2_2d_type !== 'none')) {
+        if (($settings->qr_code == '1') && ($settings->label2_2d_type !== 'none')) {
             $asset = Asset::withTrashed()->find($assetId);
             if ($asset) {
                 $size = Helper::barcodeDimensions($settings->label2_2d_type);

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ public function getQrCode($assetId = null) : Response \| BinaryFileResponse \| str`
`535`	`535`	`{`
`536`	`536`	`$settings = Setting::getSettings();`
`537`	`537`
`538`		`- if (($settings->qr_code === '1') && ($settings->label2_2d_type !== 'none')) {`
	`538`	`+ if (($settings->qr_code == '1') && ($settings->label2_2d_type !== 'none')) {`
`539`	`539`	`$asset = Asset::withTrashed()->find($assetId);`
`540`	`540`	`if ($asset) {`
`541`	`541`	`$size = Helper::barcodeDimensions($settings->label2_2d_type);`