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

[-] MO : display_column_left not assigned to smarty in modules initContent() + ssl on loyalty front controller

Browse Source
This commit is contained in:
gRoussac
2013-11-27 12:32:01 +01:00
parent 6959e71bec
commit ef6dd3bfed
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/bankwire/controllers/front/payment.php
+1 -1
View File
@@ -30,13 +30,13 @@
class BankwirePaymentModuleFrontController extends ModuleFrontController class BankwirePaymentModuleFrontController extends ModuleFrontController
{ {
public $ssl = true; public $ssl = true;
public $display_column_left = false;
/** /**
* @see FrontController::initContent() * @see FrontController::initContent()
*/ */
public function initContent() public function initContent()
{ {
$this->display_column_left = false;
parent::initContent(); parent::initContent();
$cart = $this->context->cart; $cart = $this->context->cart;
modules/blockwishlist/controllers/front/mywishlist.php
+3 -5
View File
@@ -29,13 +29,13 @@
*/ */
class BlockWishListMyWishListModuleFrontController extends ModuleFrontController class BlockWishListMyWishListModuleFrontController extends ModuleFrontController
{ {
public $ssl = true;
public $display_column_left = false;
public function __construct() public function __construct()
{ {
parent::__construct(); parent::__construct();
$this->context = Context::getContext(); $this->context = Context::getContext();
$this->ssl = true;
include_once($this->module->getLocalPath().'WishList.php'); include_once($this->module->getLocalPath().'WishList.php');
} }
@@ -44,9 +44,7 @@ class BlockWishListMyWishListModuleFrontController extends ModuleFrontController
*/ */
public function initContent() public function initContent()
{ {
$this->display_column_left = false;
parent::initContent(); parent::initContent();
$this->assign(); $this->assign();
} }
modules/cashondelivery/controllers/front/validation.php
+1 -1
View File
@@ -30,6 +30,7 @@
class CashondeliveryValidationModuleFrontController extends ModuleFrontController class CashondeliveryValidationModuleFrontController extends ModuleFrontController
{ {
public $ssl = true; public $ssl = true;
public $display_column_left = false;
public function postProcess() public function postProcess()
{ {
@@ -65,7 +66,6 @@ class CashondeliveryValidationModuleFrontController extends ModuleFrontControlle
*/ */
public function initContent() public function initContent()
{ {
$this->display_column_left = false;
parent::initContent(); parent::initContent();
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
modules/cheque/controllers/front/payment.php
+1 -1
View File
@@ -30,13 +30,13 @@
class ChequePaymentModuleFrontController extends ModuleFrontController class ChequePaymentModuleFrontController extends ModuleFrontController
{ {
public $ssl = true; public $ssl = true;
public $display_column_left = false;
/** /**
* @see FrontController::initContent() * @see FrontController::initContent()
*/ */
public function initContent() public function initContent()
{ {
$this->display_column_left = false;
parent::initContent(); parent::initContent();
$cart = $this->context->cart; $cart = $this->context->cart;
modules/loyalty/controllers/front/default.php
+3 -1
View File
@@ -29,6 +29,9 @@
*/ */
class LoyaltyDefaultModuleFrontController extends ModuleFrontController class LoyaltyDefaultModuleFrontController extends ModuleFrontController
{ {
public $ssl = true;
public $display_column_left = false;
public function __construct() public function __construct()
{ {
$this->auth = true; $this->auth = true;
@@ -154,7 +157,6 @@ class LoyaltyDefaultModuleFrontController extends ModuleFrontController
*/ */
public function initContent() public function initContent()
{ {
$this->display_column_left = false;
parent::initContent(); parent::initContent();
$this->context->controller->addJqueryPlugin(array('dimensions', 'cluetip')); $this->context->controller->addJqueryPlugin(array('dimensions', 'cluetip'));
modules/loyalty/views/templates/hook/my-account.tpl
+1 -1
View File
@@ -25,7 +25,7 @@
<!-- MODULE Loyalty --> <!-- MODULE Loyalty -->
<li class="loyalty"> <li class="loyalty">
<a href="{$link->getModuleLink('loyalty', 'default', ['process' => 'summary'])|escape:'html'}" title="{l s='My loyalty points' mod='loyalty'}" rel="nofollow"> <a href="{$link->getModuleLink('loyalty', 'default', ['process' => 'summary'], true)|escape:'html'}" title="{l s='My loyalty points' mod='loyalty'}" rel="nofollow">
<img src="{$module_template_dir}images/loyalty.gif" alt="{l s='My loyalty points' mod='loyalty'}" class="icon" /> {l s='My loyalty points' mod='loyalty'} <img src="{$module_template_dir}images/loyalty.gif" alt="{l s='My loyalty points' mod='loyalty'}" class="icon" /> {l s='My loyalty points' mod='loyalty'}
</a> </a>
</li> </li>
themes/default-bootstrap/modules/loyalty/views/templates/hook/my-account.tpl
+1 -1
View File
@@ -25,6 +25,6 @@
<!-- MODULE Loyalty --> <!-- MODULE Loyalty -->
<li class="loyalty"> <li class="loyalty">
<a href="{$link->getModuleLink('loyalty', 'default', ['process' => 'summary'])|escape:'html'}" title="{l s='My loyalty points' mod='loyalty'}" rel="nofollow"><i class="icon-flag"></i><span>{l s='My loyalty points' mod='loyalty'}</span></a> <a href="{$link->getModuleLink('loyalty', 'default', ['process' => 'summary'], true)|escape:'html'}" title="{l s='My loyalty points' mod='loyalty'}" rel="nofollow"><i class="icon-flag"></i><span>{l s='My loyalty points' mod='loyalty'}</span></a>
</li> </li>
<!-- END : MODULE Loyalty --> <!-- END : MODULE Loyalty -->