DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix 2D barcode defaults

Browse source
This commit is contained in:
cram42 2023-02-01 17:48:39 +11:00
parent 17e81af4cd
commit b72c6b7afc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/View/Label.php
View file

@ -124,9 +124,9 @@ class Label implements View
if ($template->getSupport2DBarcode()) { if ($template->getSupport2DBarcode()) {
$barcode2DType = $settings->label2_2d_type; $barcode2DType = $settings->label2_2d_type;
$barcode2DType = ($barcode2DType == 'default') ? $barcode2DType = ($barcode2DType == 'default') ?
(($settings->qr_code) ? $settings->barcode_type : null) : $settings->barcode_type :
$barcode2DType; $barcode2DType;
if ($barcode2DType != 'none') { 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': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break;
case 'hardware_id': case 'hardware_id':