From eee7f137ef6bed6a7c9bec47cc73fdff6e49f721 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Fri, 18 Sep 2015 08:37:05 +0100 Subject: [PATCH] Fix to rebase/merge mistake with Barcode_lib --- application/libraries/Barcode_lib.php | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/application/libraries/Barcode_lib.php b/application/libraries/Barcode_lib.php index 0b01e43ae..ed8494a29 100644 --- a/application/libraries/Barcode_lib.php +++ b/application/libraries/Barcode_lib.php @@ -75,32 +75,7 @@ class Barcode_lib $barcode->setData($barcode_content); $barcode->setQuality($barcode_config['barcode_quality']); $barcode->setDimensions($barcode_config['barcode_width'], $barcode_config['barcode_height']); - $barcode->draw(); - return $barcode->base64(); - } - catch(Exception $e) - { - echo 'Caught exception: ', $e->getMessage(), "\n"; - } - } - public function generate_receipt_barcode($barcode_content) - { - try - { - // Code128 is used for the receipts - $barcode = $this->get_barcode_instance(2); - - // set the receipt number to generate the barcode for - $barcode->setData($barcode_content); - - // image quality 100 - $barcode->setQuality(100); - - // width: 200, height: 30 - $barcode->setDimensions(200, 30); - - // draw the image $barcode->draw(); return $barcode->base64(); @@ -116,7 +91,6 @@ class Barcode_lib try { // Code128 is used for the receipts - $barcode = $this->get_barcode_instance(2); // set the receipt number to generate the barcode for