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

// Fix #PSCFV-4615

Browse Source
This commit is contained in:
rGaillard committed 2012-10-02 13:43:31 +00:00
1 parent 7f67403be1
commit c02ed6091a
2 files changed
+2 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/Cart.php
+1 -1
View File
@@ -588,7 +588,7 @@ class CartCore extends ObjectModel
((int)$this->id_customer ? (int)$this->id_customer : null), ((int)$this->id_customer ? (int)$this->id_customer : null),
(int)$this->id, (int)$this->id,
((int)$address_id ? (int)$address_id : null), ((int)$address_id ? (int)$address_id : null),
null, $null,
true, true,
true, true,
$cart_shop_context $cart_shop_context
classes/Product.php
+1 -3
View File
@@ -487,10 +487,8 @@ class ProductCore extends ObjectModel
die(Tools::displayError()); die(Tools::displayError());
self::$_taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group); self::$_taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group);
} }
else if (Validate::isLoadedObject(Context::getContext()->customer))
self::$_taxCalculationMethod = Group::getPriceDisplayMethod(Context::getContext()->customer->id_default_group);
else else
self::$_taxCalculationMethod = Group::getDefaultPriceDisplayMethod(); self::$_taxCalculationMethod = Group::getPriceDisplayMethod(Group::getCurrent()->id);
} }
public static function getTaxCalculationMethod($id_customer = null) public static function getTaxCalculationMethod($id_customer = null)