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

// FO : fix multiple instances of Cart and Address

Browse Source
This commit is contained in:
tDidierjean
2012-01-03 09:49:58 +00:00
parent a933e4d4c8
commit cdbf42f9f4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+4 -1
View File
@@ -150,7 +150,10 @@ class CartCore extends ObjectModel
parent::__construct($id, $id_lang); parent::__construct($id, $id_lang);
if ($this->id_customer) if ($this->id_customer)
{ {
$customer = new Customer((int)$this->id_customer); if (isset(Context::getContext()->customer) && Context::getContext()->customer->id == $this->id_customer)
$customer = Context::getContext()->customer;
else
$customer = new Customer((int)$this->id_customer);
$this->_taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group); $this->_taxCalculationMethod = Group::getPriceDisplayMethod((int)$customer->id_default_group);
if ((!$this->secure_key || $this->secure_key == '-1') && $customer->secure_key) if ((!$this->secure_key || $this->secure_key == '-1') && $customer->secure_key)
classes/Product.php
+3 -2
View File
@@ -2216,8 +2216,9 @@ class ProductCore extends ObjectModel
die(Tools::displayError()); die(Tools::displayError());
// Initializations // Initializations
$id_group = (isset($context->customer) ? $context->customer->id_default_group : _PS_DEFAULT_CUSTOMER_GROUP_); $id_group = (isset($context->customer) ? $context->customer->id_default_group : _PS_DEFAULT_CUSTOMER_GROUP_);
//var_dump($id_group);
if (!is_object($cur_cart) || (Validate::isUnsignedInt($id_cart) && $id_cart)) // If there is cart in context or if the specified id_cart is different from the context cart id
if (!is_object($cur_cart) || (Validate::isUnsignedInt($id_cart) && $id_cart && $cur_cart->id != $id_cart))
{ {
/* /*
* When a user (e.g., guest, customer, Google...) is on PrestaShop, he has already its cart as the global (see /init.php) * When a user (e.g., guest, customer, Google...) is on PrestaShop, he has already its cart as the global (see /init.php)