From 3a5a2c9bbee7a0160d8ff5d5fc1550d7b25ebaed Mon Sep 17 00:00:00 2001 From: Francois Gaillard Date: Mon, 26 Mar 2012 15:13:01 +0000 Subject: [PATCH] [-] MO : #PNM-73 : Mail alerts redirect url on logout corrected --- modules/mailalerts/MailAlert.php | 1 - modules/mailalerts/controllers/front/account.php | 3 ++- modules/mailalerts/mailalerts.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/mailalerts/MailAlert.php b/modules/mailalerts/MailAlert.php index 01b31ea19..f5cbc5843 100644 --- a/modules/mailalerts/MailAlert.php +++ b/modules/mailalerts/MailAlert.php @@ -96,7 +96,6 @@ class MailAlert extends ObjectModel $shop = Context::getContext()->shop; $customer = new Customer($id_customer); - $customer_email = $customer->email; $products = MailAlert::getProducts($customer, $id_lang); $products_number = count($products); diff --git a/modules/mailalerts/controllers/front/account.php b/modules/mailalerts/controllers/front/account.php index 44c2b4fde..f66ba7b85 100644 --- a/modules/mailalerts/controllers/front/account.php +++ b/modules/mailalerts/controllers/front/account.php @@ -42,7 +42,8 @@ class MailalertsAccountModuleFrontController extends ModuleFrontController parent::initContent(); if (!Context::getContext()->customer->isLogged()) - Tools::redirect('index.php?controller=auth&redirect=account&module=mailalerts&fc=module'); + //Tools::redirect('index.php?controller=auth&redirect=account&module=mailalerts&fc=module'); + Tools::redirect('index.php?controller=auth&redirect=module&module=mailalerts&action=account'); if (Context::getContext()->customer->id) { diff --git a/modules/mailalerts/mailalerts.php b/modules/mailalerts/mailalerts.php index ddea51052..1b66d16a4 100644 --- a/modules/mailalerts/mailalerts.php +++ b/modules/mailalerts/mailalerts.php @@ -49,6 +49,7 @@ class MailAlerts extends Module $this->tab = 'administration'; $this->version = '2.4'; $this->author = 'PrestaShop'; + $this->need_instance = 0; parent::__construct(); @@ -286,7 +287,6 @@ class MailAlerts extends Module foreach ($products as $key => $product) { $unit_price = $product['product_price_wt']; - $price = $product['total_price']; $customization_text = ''; if (isset($customized_datas[$product['product_id']][$product['product_attribute_id']]))