diff --git a/application/libraries/Sale_lib.php b/application/libraries/Sale_lib.php index a3d04586a..82a303fda 100644 --- a/application/libraries/Sale_lib.php +++ b/application/libraries/Sale_lib.php @@ -3,7 +3,6 @@ class Sale_lib { private $CI; - private $line_sequence_options = array('0' => 'Standard', '1' => 'Entry', '2' => 'Group by Type', '3' => 'Group by Category'); public function __construct() { diff --git a/application/models/Sale.php b/application/models/Sale.php index ba7b229a9..d4150521d 100644 --- a/application/models/Sale.php +++ b/application/models/Sale.php @@ -688,19 +688,19 @@ class Sale extends CI_Model $this->db->where('sale_id', $sale_id); // Entry sequence (this will render kits in the expected sequence) - if($this->config->item('line_sequence') == '1') + if($this->config->item('line_sequence') == '0') { $this->db->order_by('line', 'asc'); } // Group by Stock Type (nonstock first - type 1, stock next - type 0) - elseif($this->config->item('line_sequence') == '2') + elseif($this->config->item('line_sequence') == '1') { $this->db->order_by('stock_type', 'desc'); $this->db->order_by('sales_items.description', 'asc'); $this->db->order_by('items.name', 'asc'); } // Group by Item Category - elseif($this->config->item('line_sequence') == '3') + elseif($this->config->item('line_sequence') == '2') { $this->db->order_by('category', 'asc'); $this->db->order_by('sales_items.description', 'asc'); diff --git a/application/views/configs/invoice_config.php b/application/views/configs/invoice_config.php index 98871c107..adf8b09dd 100644 --- a/application/views/configs/invoice_config.php +++ b/application/views/configs/invoice_config.php @@ -66,13 +66,6 @@ -