diff --git a/composer.json b/composer.json index d72a02485b..1ed5fe51aa 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "snipe/snipe-it", "description": "Open source asset management system built on Laravel.", "keywords": ["assets", "asset-management", "laravel"], - "license": "AGPL-3", + "license": "AGPL-3.0-or-later", "type": "project", "require": { "php": ">=7.1.3", diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php index b0a83031c5..d5fef3942f 100644 --- a/resources/views/hardware/labels.blade.php +++ b/resources/views/hardware/labels.blade.php @@ -11,9 +11,9 @@ $settings->labels_width = $settings->labels_width - $settings->labels_display_sgutter; $settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter; // Leave space on bottom for 1D barcode if necessary - $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') ? $settings->labels_height - .3 : $settings->labels_height - .3; + $qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') ? $settings->labels_height - .3 : $settings->labels_height; // Leave space on left for QR code if necessary - $qr_txt_size = ($settings->qr_code=='1' ? $settings->labels_width - $qr_size - .1: $settings->labels_width); + $qr_txt_size = ($settings->qr_code=='1' ? $settings->labels_width - $qr_size - .1 : $settings->labels_width); ?>