dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO: Fix ecotax product backoffice management && rounding issue

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17804 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-10-09 12:58:08 +00:00
parent 08ecd0d8ce
commit 01cd9ce3dd
6 changed files with 62 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+39 -25
View File
@@ -1415,32 +1415,46 @@ class CartCore extends ObjectModel
}
else
{
$price = Product::getPriceStatic(
(int)$product['id_product'],
true,
(int)$product['id_product_attribute'],
2,
null,
false,
true,
$product['cart_quantity'],
false,
((int)$this->id_customer ? (int)$this->id_customer : null),
(int)$this->id,
((int)$address_id ? (int)$address_id : null),
$null,
true,
true,
$virtual_context
);
if ($with_taxes)
$price = Product::getPriceStatic(
(int)$product['id_product'],
true,
(int)$product['id_product_attribute'],
2,
null,
false,
true,
$product['cart_quantity'],
false,
((int)$this->id_customer ? (int)$this->id_customer : null),
(int)$this->id,
((int)$address_id ? (int)$address_id : null),
$null,
true,
true,
$virtual_context
);
else
$price = Product::getPriceStatic(
(int)$product['id_product'],
false,
(int)$product['id_product_attribute'],
2,
null,
false,
true,
$product['cart_quantity'],
false,
((int)$this->id_customer ? (int)$this->id_customer : null),
(int)$this->id,
((int)$address_id ? (int)$address_id : null),
$null,
true,
true,
$virtual_context
);
$total_price = Tools::ps_round($price, 2) * (int)$product['cart_quantity'];
if (!$with_taxes)
{
$product_tax_rate = (float)Tax::getProductTaxRate((int)$product['id_product'], (int)$address_id, $virtual_context);
$total_price = Tools::ps_round($total_price / (1 + ($product_tax_rate / 100)), 2);
}
$total_price = Tools::ps_round($price * (int)$product['cart_quantity'], 2);
}
$order_total += $total_price;
}