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

// Context part 11

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7644 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-07-18 15:50:58 +00:00
parent 0452f08f64
commit 2c493137c3
60 changed files with 378 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockcart/blockcart-ajax.php
+2 -8
View File
@@ -24,13 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
global $cookie;
include(dirname(__FILE__).'/blockcart.php');
$cart = new Cart((int)($cookie->id_cart));
$cart->id_lang = (int)($cookie->id_lang);
$context = Context::getContext();
$blockCart = new BlockCart();
echo $blockCart->hookAjaxCall(array('cookie' => $cookie, 'cart' => $cart));
echo $blockCart->hookAjaxCall(array('cookie' => $context->cookie, 'cart' => $context->cart));
modules/blockcart/blockcart.php
+8 -7
View File
@@ -46,7 +46,8 @@ class BlockCart extends Module
public function smartyAssigns(&$smarty, &$params)
{
global $errors, $cookie;
global $errors;
$context = Context::getContext();
// Set currency
if (!(int)($params['cart']->id_currency))
@@ -99,7 +100,7 @@ class BlockCart extends Module
));
if (sizeof($errors))
$smarty->assign('errors', $errors);
if(isset($cookie->ajax_blockcart_display))
if(isset($context->cookie->ajax_blockcart_display))
$smarty->assign('colapseExpandStatus', $cookie->ajax_blockcart_display);
}
@@ -159,9 +160,9 @@ class BlockCart extends Module
if (Configuration::get('PS_CATALOG_MODE'))
return;
global $smarty;
$smarty->assign('order_page', strpos($_SERVER['PHP_SELF'], 'order') !== false);
$this->smartyAssigns($smarty, $params);
$context = Context::getContext();
$context->controller->smarty->assign('order_page', strpos($_SERVER['PHP_SELF'], 'order') !== false);
$this->smartyAssigns($context->controller->smarty, $params);
return $this->display(__FILE__, 'blockcart.tpl');
}
@@ -175,8 +176,8 @@ class BlockCart extends Module
if (Configuration::get('PS_CATALOG_MODE'))
return;
global $smarty;
$this->smartyAssigns($smarty, $params);
$context = Context::getContext();
$this->smartyAssigns($context->controller->smarty, $params);
$res = $this->display(__FILE__, 'blockcart-json.tpl');
return $res;
}