diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 3a61bb724..26cfee789 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -1427,14 +1427,13 @@ class Sales extends Secure_Controller */ public function suspended() { - $customer_id = $this->sale_lib->get_customer(); $data = array(); + $customer_id = $this->sale_lib->get_customer(); $data['suspended_sales'] = $this->xss_clean($this->Sale->get_all_suspended($customer_id)); - $data['dinner_table_enable'] = $this->config->item('dinner_table_enable'); $this->load->view('sales/suspended', $data); } - /* + /** * Unsuspended sales are now left in the tables and are only removed * when they are intentionally cancelled. */ diff --git a/application/models/Sale.php b/application/models/Sale.php index fa91d1c07..991583796 100644 --- a/application/models/Sale.php +++ b/application/models/Sale.php @@ -1228,17 +1228,16 @@ class Sale extends CI_Model { if($customer_id == -1) { - $query = $this->db->query("select sale_id, case when sale_type = '".SALE_TYPE_QUOTE."' then quote_number when sale_type = '".SALE_TYPE_WORK_ORDER."' then work_order_number else sale_id end as doc_id, sale_id as suspended_sale_id, sale_status, sale_time, dinner_table_id, customer_id, comment from " + $query = $this->db->query("SELECT sale_id, case when sale_type = '".SALE_TYPE_QUOTE."' THEN quote_number WHEN sale_type = '".SALE_TYPE_WORK_ORDER."' THEN work_order_number else sale_id end as doc_id, sale_id as suspended_sale_id, sale_status, sale_time, dinner_table_id, customer_id, employee_id, comment FROM " . $this->db->dbprefix('sales') . ' where sale_status = ' . SUSPENDED); } else { - $query = $this->db->query("select sale_id, case when sale_type = '".SALE_TYPE_QUOTE."' then quote_number when sale_type = '".SALE_TYPE_WORK_ORDER."' then work_order_number else sale_id end as doc_id, sale_status, sale_time, dinner_table_id, customer_id, comment from " + $query = $this->db->query("SELECT sale_id, case when sale_type = '".SALE_TYPE_QUOTE."' THEN quote_number WHEN sale_type = '".SALE_TYPE_WORK_ORDER."' THEN work_order_number else sale_id end as doc_id, sale_status, sale_time, dinner_table_id, customer_id, employee_id, comment FROM " . $this->db->dbprefix('sales') . ' where sale_status = '. SUSPENDED .' AND customer_id = ' . $customer_id); } return $query->result_array(); - } /** @@ -1250,6 +1249,7 @@ class Sale extends CI_Model { return NULL; } + $this->db->from('sales'); $this->db->where('sale_id', $sale_id); diff --git a/application/views/sales/quote.php b/application/views/sales/quote.php index b54a8423f..5f202afb0 100644 --- a/application/views/sales/quote.php +++ b/application/views/sales/quote.php @@ -50,7 +50,7 @@ if (isset($error_message)) + ?> 0) { $quote_columns = $quote_columns + 1; - ?> + ?>
| lang->line('sales_customer'); ?> | +lang->line('sales_employee'); ?> | lang->line('sales_comments'); ?> | lang->line('sales_unsuspend_and_delete'); ?> | |||||||
|---|---|---|---|---|---|---|---|---|---|---|
| - | config->item('dateformat'), strtotime($suspended_sale['sale_time']));?> | ++ | config->item('dateformat'), strtotime($suspended_sale['sale_time'])); ?> | config->item('dinner_table_enable') == TRUE) { ?> -Dinner_table->get_name($suspended_sale['dinner_table_id']);?> | +Dinner_table->get_name($suspended_sale['dinner_table_id']); ?> | Customer->get_info($suspended_sale['customer_id']); echo $customer->first_name . ' ' . $customer->last_name; @@ -47,11 +57,25 @@ } ?> | -- Employee->get_info($suspended_sale['employee_id']); + echo $employee->first_name . ' ' . $employee->last_name; + } + else + { ?> + + + | ++ | + + |