mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-23 00:34:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update totals calculation

Browse Source 
Update tax inclusive calculation
This commit is contained in:
jekkos-t520 committed 2015-03-06 00:58:44 +01:00
1 parent 0e357f14f6
commit 4ac1a943eb
6 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

application/libraries/Sale_lib.php
+5 -5
View File
@@ -575,10 +575,10 @@ class Sale_lib
return to_currency_no_money($subtotal);
}
function get_item_total_tax_exclusive($item_id, $quantity, $price, $discount_percentage, $include_discounts=TRUE)
function get_item_total_tax_exclusive($item_id, $quantity, $price, $discount_percentage, $include_discount=FALSE)
{
$tax_info = $this->CI->Item_taxes->get_info($item_id);
$item_price = $this->get_item_total($quantity, $price, $discount_percentage);
$item_price = $this->get_item_total($quantity, $price, $discount_percentage, $include_discount);
// only additive tax here
foreach($tax_info as $tax)
{
@@ -609,7 +609,7 @@ class Sale_lib
function get_item_tax($quantity, $price, $discount_percentage, $tax_percentage)
{
$price = $this->get_item_total($quantity, $price, $discount_percentage);
$price = $this->get_item_total($quantity, $price, $discount_percentage, TRUE);
$tax_fraction = bcdiv($tax_percentage, 100, PRECISION);
if ($this->CI->config->config['tax_included'])
@@ -639,9 +639,9 @@ class Sale_lib
return $subtotal;
}
function get_total($discount_included=TRUE)
function get_total($discount_included=FALSE)
{
$total = $this->calculate_subtotal();
$total = $this->calculate_subtotal($discount_included);
foreach($this->get_taxes() as $tax)
{