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

Fix discount calculation

Browse Source
This commit is contained in:
jekkos
2018-09-29 16:47:28 +02:00
parent 511f21931c
commit c57f063dc1
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/models/reports/Summary_discounts.php
View File

@@ -21,7 +21,7 @@ class Summary_discounts extends Summary_report
}
elseif($inputs['discount_type'] == PERCENT)
{
$this->db->select('SUM(payment_amount) * sales_items.discount / 100.0 AS total, MAX(CONCAT(sales_items.discount, "%")) AS discount, count(*) AS count');
$this->db->select('SUM(item_unit_price) * sales_items.discount / 100.0 AS total, MAX(CONCAT(sales_items.discount, "%")) AS discount, count(*) AS count');
$this->db->where('discount_type',PERCENT);
}
@@ -31,7 +31,6 @@ class Summary_discounts extends Summary_report
$this->db->from('sales_items AS sales_items');
$this->db->join('sales_payments', 'sales_payments.sale_id = sales_items.sale_id');
$this->db->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
$this->_where($inputs);