diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index 3e41b13d9..807ce314e 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -1262,8 +1262,8 @@ class Reports extends Secure_Controller to_currency($drow['total']), to_currency($drow['cost']), to_currency($drow['profit']), - ($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount']), - explode('|', (isset($drow['attribute_values'])) ? $drow['attribute_values'] : "")))); + ($drow['discount_type'] == PERCENT)? $drow['discount'].'%':to_currency($drow['discount'])), + explode('|', (isset($drow['attribute_values'])) ? $drow['attribute_values'] : ""))); } if(isset($report_data['rewards'][$key])) diff --git a/application/models/reports/Detailed_receivings.php b/application/models/reports/Detailed_receivings.php index b5eb1bdd7..748d88042 100644 --- a/application/models/reports/Detailed_receivings.php +++ b/application/models/reports/Detailed_receivings.php @@ -106,6 +106,7 @@ class Detailed_receivings extends Report $this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id = receivings_items_temp.receiving_id AND definition_id IN (' . implode(',', $inputs['definition_ids']) . ')', 'left'); $this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left'); $this->db->order_by('definition_id'); + $this->db->group_by('receivings_items_temp.receiving_id'); } $this->db->where('receivings_items_temp.receiving_id', $value['receiving_id']); $data['details'][$key] = $this->db->get()->result_array(); diff --git a/application/models/reports/Detailed_sales.php b/application/models/reports/Detailed_sales.php index 209cca4f8..3c929b46f 100644 --- a/application/models/reports/Detailed_sales.php +++ b/application/models/reports/Detailed_sales.php @@ -152,9 +152,11 @@ class Detailed_sales extends Report $this->db->join('attribute_links', 'attribute_links.item_id = sales_items_temp.item_id AND attribute_links.sale_id = sales_items_temp.sale_id AND definition_id IN (' . implode(',', $inputs['definition_ids']) . ')', 'left'); $this->db->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left'); $this->db->order_by('definition_id'); + $this->db->group_by('sales_items_temp.sale_id'); } $this->db->where('sales_items_temp.sale_id', $value['sale_id']); $data['details'][$key] = $this->db->get()->result_array(); + $this->db->select('used, earned'); $this->db->from('sales_reward_points'); $this->db->where('sale_id', $value['sale_id']);