From ae304427cf8f2f9ddbeecab4a5f2b44c2c6c2103 Mon Sep 17 00:00:00 2001 From: fGaillard Date: Mon, 8 Oct 2012 11:43:19 +0000 Subject: [PATCH] [-] Classes : Hook - Display payment method & shop default currency bug fix git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17796 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Hook.php | 2 +- classes/module/Module.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Hook.php b/classes/Hook.php index 139869f24..d3b53d18a 100644 --- a/classes/Hook.php +++ b/classes/Hook.php @@ -278,7 +278,7 @@ class HookCore extends ObjectModel if (Validate::isLoadedObject($context->country)) $sql->where('(h.name = "displayPayment" AND (SELECT id_country FROM '._DB_PREFIX_.'module_country mc WHERE mc.id_module = m.id_module AND id_country = '.(int)$context->country->id.' LIMIT 1) = '.(int)$context->country->id.')'); if (Validate::isLoadedObject($context->currency)) - $sql->where('(h.name = "displayPayment" AND (SELECT id_currency FROM '._DB_PREFIX_.'module_currency mcr WHERE mcr.id_module = m.id_module AND id_currency = '.(int)$context->currency->id.' LIMIT 1) = '.(int)$context->currency->id.')'); + $sql->where('(h.name = "displayPayment" AND (SELECT id_currency FROM '._DB_PREFIX_.'module_currency mcr WHERE mcr.id_module = m.id_module AND id_currency IN ('.(int)$context->currency->id.', -2) LIMIT 1) IN ('.(int)$context->currency->id.', -2))'); } if (Validate::isLoadedObject($context->shop)) $sql->where('hm.id_shop = '.(int)$context->shop->id); diff --git a/classes/module/Module.php b/classes/module/Module.php index 1632b82de..8353c59a9 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -1311,6 +1311,7 @@ abstract class ModuleCore $paypal_condition = ' AND m.`name` = \'paypal\''; $list = Shop::getContextListShopID(); + return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT DISTINCT m.`id_module`, h.`id_hook`, m.`name`, hm.`position` FROM `'._DB_PREFIX_.'module` m '.($frontend ? 'LEFT JOIN `'._DB_PREFIX_.'module_country` mc ON (m.`id_module` = mc.`id_module` AND mc.id_shop = '.(int)$context->shop->id.')' : '').'