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

// fix ecotax bug

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17794 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-10-08 09:41:20 +00:00
parent 952cf18e49
commit fc74fc6a4b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+3 -3
View File
@@ -443,7 +443,7 @@ class CartCore extends ObjectModel
// Build JOIN // Build JOIN
$sql->leftJoin('product', 'p', 'p.`id_product` = cp.`id_product`'); $sql->leftJoin('product', 'p', 'p.`id_product` = cp.`id_product`');
$sql->innerJoin('product_shop', 'product_shop', 'product_shop.id_shop='.$id_shop); $sql->innerJoin('product_shop', 'product_shop', '(product_shop.id_shop='.(int)$id_shop.' AND product_shop.id_product = p.id_product)');
$sql->leftJoin('product_lang', 'pl', ' $sql->leftJoin('product_lang', 'pl', '
p.`id_product` = pl.`id_product` p.`id_product` = pl.`id_product`
AND pl.`id_lang` = '.(int)$this->id_lang.Shop::addSqlRestrictionOnLang('pl', $id_shop) AND pl.`id_lang` = '.(int)$this->id_lang.Shop::addSqlRestrictionOnLang('pl', $id_shop)
@@ -504,7 +504,7 @@ class CartCore extends ObjectModel
'); ');
$sql->leftJoin('product_attribute', 'pa', 'pa.`id_product_attribute` = cp.`id_product_attribute`'); $sql->leftJoin('product_attribute', 'pa', 'pa.`id_product_attribute` = cp.`id_product_attribute`');
$sql->leftJoin('product_attribute_shop', 'product_attribute_shop', 'product_attribute_shop.id_shop='.$id_shop); $sql->leftJoin('product_attribute_shop', 'product_attribute_shop', '(product_attribute_shop.id_shop='.(int)$id_shop.' AND product_attribute_shop.id_product_attribute = pa.id_product_attribute)');
$sql->leftJoin('product_attribute_image', 'pai', 'pai.`id_product_attribute` = pa.`id_product_attribute`'); $sql->leftJoin('product_attribute_image', 'pai', 'pai.`id_product_attribute` = pa.`id_product_attribute`');
$sql->leftJoin('image_lang', 'il', 'il.id_image = pai.id_image AND il.id_lang = '.(int)$this->id_lang); $sql->leftJoin('image_lang', 'il', 'il.id_image = pai.id_image AND il.id_lang = '.(int)$this->id_lang);
} }
@@ -532,7 +532,7 @@ class CartCore extends ObjectModel
return array(); return array();
$cart_shop_context = Context::getContext()->cloneContext(); $cart_shop_context = Context::getContext()->cloneContext();
foreach ($result as $row) foreach ($result as &$row)
{ {
if (isset($row['ecotax_attr']) && $row['ecotax_attr'] > 0) if (isset($row['ecotax_attr']) && $row['ecotax_attr'] > 0)
$row['ecotax'] = (float)$row['ecotax_attr']; $row['ecotax'] = (float)$row['ecotax_attr'];