From bd5e5b0b943ef00761ae8df7eaac4caa2a0e0613 Mon Sep 17 00:00:00 2001
From: jekkos-t520 <jeroen.peelaerts@gmail.com>
Date: Mon, 9 Feb 2015 17:03:52 +0100
Subject: [PATCH] Remove item code as barcode parameter Always show barcode
 itself as a second row

---
 application/libraries/Barcode_lib.php        | 19 ++++++++-----------
 application/views/configs/barcode_config.php |  3 ---
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/application/libraries/Barcode_lib.php b/application/libraries/Barcode_lib.php
index 718fa8e8d..9d7f83190 100644
--- a/application/libraries/Barcode_lib.php
+++ b/application/libraries/Barcode_lib.php
@@ -34,6 +34,13 @@ class Barcode_lib
     {
         $display_table = "<table>";
         $display_table .= "<tr><td align='center'>". $this->manage_display_layout($barcode_config['barcode_first_row'], $item, $barcode_config)."</td></tr>";
+        $display_table .= "<tr><td align='center'><img src='".site_url()."/barcode?".
+                                   "&width=".$barcode_config['barcode_width'].
+                                   "&height=".$barcode_config['barcode_height'].
+                                   "&barcode=".($this->CI->Appconfig->get('barcode_content') === "id" ? $item['item_id'] : $item['item_number']).
+                                   "&quality=".$barcode_config['barcode_quality'].
+                                   "&type=".$this->CI->Appconfig->get('barcode_type').
+                                   "' onerror=\"(function(pThis){pThis.onerror = null;  pThis.src = pThis.src;})(this)\" /></td></tr>";
         $display_table .= "<tr><td align='center'>". $this->manage_display_layout($barcode_config['barcode_second_row'], $item, $barcode_config)."</td></tr>";
         $display_table .= "<tr><td align='center'>". $this->manage_display_layout($barcode_config['barcode_third_row'], $item, $barcode_config)."</td></tr>";
         $display_table .= "</table>";
@@ -44,17 +51,7 @@ class Barcode_lib
     {
         $result = '';
         
-        if($layout_type == 'item_code')
-        {
-            $result = "<img src='".site_url()."/barcode?".
-                                   "&width=".$barcode_config['barcode_width'].
-                                   "&height=".$barcode_config['barcode_height'].
-                                   "&barcode=".($this->CI->Appconfig->get('barcode_content') === "id" ? $item['item_id'] : $item['item_number']).
-                                   "&quality=".$barcode_config['barcode_quality'].
-                                   "&type=".$this->CI->Appconfig->get('barcode_type').
-                                   "' onerror=\"(function(pThis){pThis.onerror = null;  pThis.src = pThis.src;})(this)\" />";
-        }
-        else if($layout_type == 'name')
+        if($layout_type == 'name')
         {
             $result = $this->CI->lang->line('items_name') . " " . $item['name'];
         }
diff --git a/application/views/configs/barcode_config.php b/application/views/configs/barcode_config.php
index 341f204de..1c019b1ca 100644
--- a/application/views/configs/barcode_config.php
+++ b/application/views/configs/barcode_config.php
@@ -97,7 +97,6 @@ echo form_open('config/save_barcode/',array('id'=>'barcode_config_form'));
                         'not_show'        => 'Not show',
                         'name'        => 'Name',
                         'category'   => 'Category',
-                        'item_code'           => 'Item code',
                         'cost_price'           => 'Cost price',
                         'unit_price'           => 'Unit price',
                 		'company_name'         => 'Company Name'	
@@ -109,7 +108,6 @@ echo form_open('config/save_barcode/',array('id'=>'barcode_config_form'));
                         'not_show'        => 'Not show',
                         'name'        => 'Name',
                         'category'   => 'Category',
-                        'item_code'           => 'Item code',
                         'cost_price'           => 'Cost price',
                         'unit_price'           => 'Unit price',
                 		'company_name'         => 'Company Name'
@@ -121,7 +119,6 @@ echo form_open('config/save_barcode/',array('id'=>'barcode_config_form'));
                         'not_show'        => 'Not show',
                         'name'        => 'Name',
                         'category'   => 'Category',
-                        'item_code'           => 'Item code',
                         'cost_price'           => 'Cost price',
                         'unit_price'           => 'Unit price',
                 		'company_name'         => 'Company Name'