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

// Autoassignation of the cart rule when log out

Browse Source
This commit is contained in:
dMetzger
2012-05-22 10:20:36 +00:00
parent d6507099d4
commit beb198b3d5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+1 -1
View File
@@ -969,7 +969,7 @@ class CartRuleCore extends ObjectModel
public static function autoRemoveFromCart($context = null) public static function autoRemoveFromCart($context = null)
{ {
if (!CartRule::isFeatureActive()) if (!CartRule::isFeatureActive() || !Validate::isLoadedObject($context->cart))
return array(); return array();
$errors = array(); $errors = array();
classes/controller/FrontController.php
+4 -4
View File
@@ -177,10 +177,6 @@ class FrontControllerCore extends Controller
{ {
$this->context->customer->logout(); $this->context->customer->logout();
// Login information have changed, so we check if the cart rules still apply
CartRule::autoRemoveFromCart($this->context);
CartRule::autoAddToCart($this->context);
Tools::redirect(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null); Tools::redirect(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null);
} }
elseif (isset($_GET['mylogout'])) elseif (isset($_GET['mylogout']))
@@ -249,6 +245,10 @@ class FrontControllerCore extends Controller
$cart->id_address_delivery = 0; $cart->id_address_delivery = 0;
$cart->id_address_invoice = 0; $cart->id_address_invoice = 0;
} }
// Needed if the merchant want to give a free product to every visitors
$this->context->cart = $cart;
CartRule::autoAddToCart($this->context);
} }
$locale = strtolower(Configuration::get('PS_LOCALE_LANGUAGE')).'_'.strtoupper(Configuration::get('PS_LOCALE_COUNTRY').'.UTF-8'); $locale = strtolower(Configuration::get('PS_LOCALE_LANGUAGE')).'_'.strtoupper(Configuration::get('PS_LOCALE_COUNTRY').'.UTF-8');