mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-04 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix for display reports

Browse Source
This commit is contained in:
Joshua Fernandes
2017-03-04 17:38:03 +05:30
parent 3650b47d8b
commit af7d2f27aa
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/Reports.php
View File

@@ -753,7 +753,7 @@ class Reports extends Secure_Controller
if(isset($report_data['rewards'][$key])){
foreach($report_data['rewards'][$key] as $drow)
{
$details_data_rewards[$row['sale_id']][] = $this->xss_clean(array($drow['earned'], $drow['used']));
$details_data_rewards[$row['sale_id']][] = $this->xss_clean(array($drow['used'], $drow['earned']));
}
}
}
@@ -984,7 +984,7 @@ class Reports extends Secure_Controller
if(isset($report_data['rewards'][$key])){
foreach($report_data['rewards'][$key] as $drow)
{
$details_data_rewards[$row['sale_id']][] = $this->xss_clean(array($drow['earned'], $drow['used']));
$details_data_rewards[$row['sale_id']][] = $this->xss_clean(array($drow['used'], $drow['earned']));
}
}
}

2
application/models/reports/Detailed_sales.php
View File

@@ -102,7 +102,7 @@ class Detailed_sales extends Report
$this->db->from('sales_items_temp');
$this->db->where('sale_id', $value['sale_id']);
$data['details'][$key] = $this->db->get()->result_array();
$this->db->select('earned, used');
$this->db->select('used, earned');
$this->db->from('sales_reward_points');
$this->db->where('sale_id', $value['sale_id']);
$data['rewards'][$key] = $this->db->get()->result_array();

2
application/models/reports/Specific_customer.php
View File

@@ -76,7 +76,7 @@ class Specific_customer extends Report
$this->db->from('sales_items_temp');
$this->db->where('sale_id', $value['sale_id']);
$data['details'][$key] = $this->db->get()->result_array();
$this->db->select('earned, used');
$this->db->select('used, earned');
$this->db->from('sales_reward_points');
$this->db->where('sale_id', $value['sale_id']);
$data['rewards'][$key] = $this->db->get()->result_array();