diff --git a/application/controllers/Item_kits.php b/application/controllers/Item_kits.php index 8793bde90..3349a14f7 100644 --- a/application/controllers/Item_kits.php +++ b/application/controllers/Item_kits.php @@ -117,7 +117,6 @@ class Item_kits extends Secure_Controller $item['item_id'] = $this->xss_clean($item_kit_item['item_id']); $item['quantity'] = $this->xss_clean($item_kit_item['quantity']); - $items[] = $item; } diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 49c7b08be..6ee02063f 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -412,7 +412,7 @@ class Sales extends Secure_Controller // Add kit item to order if one is assigned $pieces = explode(' ', $item_id_or_number_or_item_kit_or_receipt); - $item_kit_id = (count($pieces) > 1) ? $pieces[1] : $item_id_or_number_or_item_kit_or_receipt; + $item_kit_id = (count($pieces) > 1) ? $pieces[1] : $item_id_or_number_or_item_kit_or_receipt; $item_kit_info = $this->Item_kit->get_info($item_kit_id); $kit_item_id = $item_kit_info->kit_item_id; $kit_price_option = $item_kit_info->price_option; diff --git a/application/models/Item_kit.php b/application/models/Item_kit.php index 32faad32c..41bfdcabd 100644 --- a/application/models/Item_kit.php +++ b/application/models/Item_kit.php @@ -50,16 +50,15 @@ class Item_kit extends CI_Model return FALSE; } - $this->db->from('item_kits'); $this->db->where('item_kit_number', (string) $item_kit_number); // check if $item_id is a number and not a string starting with 0 // because cases like 00012345 will be seen as a number where it is a barcode - if(ctype_digit($item_kit_id) && substr($item_kit_id, 0, 1) != '0') + if(ctype_digit($item_kit_id) && substr($item_kit_id, 0, 1) !== '0') { $this->db->where('item_kit_id !=', (int) $item_kit_id); } - return ($this->db->get()->num_rows() >= 1); + return ($this->db->get('item_kits')->num_rows() >= 1); } /* diff --git a/application/views/item_kits/form.php b/application/views/item_kits/form.php index 3a2d827f3..93aac9e0c 100644 --- a/application/views/item_kits/form.php +++ b/application/views/item_kits/form.php @@ -133,7 +133,6 @@ 'name'=>'print_option', 'type'=>'radio', 'value'=>1, - 'value'=>1, 'checked'=>$item_kit_info->print_option == PRINT_PRICED) ); ?> lang->line('item_kits_priced_only'); ?> @@ -296,7 +295,7 @@ $(document).ready(function() name: "lang->line('items_name_required'); ?>", category: "lang->line('items_category_required'); ?>", item_kit_number: "lang->line('item_kits_item_number_duplicate'); ?>" - } + } }, form_support.error)); });