From 34246ee8855f83ca115fb4d0b06973a7cfcbb569 Mon Sep 17 00:00:00 2001 From: objecttothis Date: Mon, 1 Apr 2024 19:31:41 +0400 Subject: [PATCH] Prepped barcode for being able to be set by width. --- app/Libraries/Barcode_lib.php | 4 ++-- app/Views/barcodes/barcode_sheet.php | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Libraries/Barcode_lib.php b/app/Libraries/Barcode_lib.php index 8c7dec635..0ee41ec35 100644 --- a/app/Libraries/Barcode_lib.php +++ b/app/Libraries/Barcode_lib.php @@ -151,10 +151,10 @@ class Barcode_lib { if((isset($item['item_number']) || isset($item['name'])) && isset($item['item_id'])) { + $barcode = $this->generate_barcode($item, $barcode_config); $display_table = ''; $display_table .= ''; - $barcode = $this->generate_barcode($item, $barcode_config); - $display_table .= '"; + $display_table .= ""; $display_table .= ''; $display_table .= ''; $display_table .= '
' . $this->manage_display_layout($barcode_config['barcode_first_row'], $item, $barcode_config) . '
$barcode
$barcode
' . $this->manage_display_layout($barcode_config['barcode_second_row'], $item, $barcode_config) . '
' . $this->manage_display_layout($barcode_config['barcode_third_row'], $item, $barcode_config) . '
'; diff --git a/app/Views/barcodes/barcode_sheet.php b/app/Views/barcodes/barcode_sheet.php index 0b5e9ead4..457a87320 100644 --- a/app/Views/barcodes/barcode_sheet.php +++ b/app/Views/barcodes/barcode_sheet.php @@ -17,6 +17,12 @@ $barcode_lib = new Barcode_lib(); <?= lang('Items.generate_barcodes') ?> + get_font_name($barcode_config['barcode_font']) ?>