From 648da86eac1c048ee1c7576ea46c30f021b6348e Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Tue, 9 Apr 2013 14:59:15 +0200 Subject: [PATCH] [-] FO - fixed bug #PSCFV-8612 - Payment module: Bug in country restriction in multi store --- classes/Hook.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Hook.php b/classes/Hook.php index a5fbbd35d..994c452f5 100644 --- a/classes/Hook.php +++ b/classes/Hook.php @@ -276,7 +276,7 @@ class HookCore extends ObjectModel { $sql->where(Module::getPaypalIgnore()); 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.')'); + $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.' AND id_shop = '.(int)$context->shop->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 IN ('.(int)$context->currency->id.', -2) LIMIT 1) IN ('.(int)$context->currency->id.', -2))'); }