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

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7605 b9a71923-0436-4b27-9f14-aed3839534dd

Browse Source
This commit is contained in:
rMalie committed 2011-07-12 16:28:33 +00:00
1 parent 10dd3db8d4
commit a6c08c7340
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
classes/Module.php
+3 -3
View File
@@ -825,8 +825,8 @@ abstract class ModuleCore
LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook` LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
WHERE h.`name` = \'payment\' WHERE h.`name` = \'payment\'
AND mc.id_country = '.(int)($billing->id_country).' AND mc.id_country = '.(int)($billing->id_country).'
AND mc.id_shop = '.(int)Shop::getCurrentShop().' AND mc.id_shop = '.$context->shop->getID().'
AND mg.id_shop = '.(int)Shop::getCurrentShop().' AND mg.id_shop = '.$context->shop->getID().'
AND (SELECT COUNT(*) FROM '._DB_PREFIX_.'module_shop ms WHERE ms.id_module = m.id_module AND ms.id_shop IN('.implode(', ', $list).')) = '.count($list).' AND (SELECT COUNT(*) FROM '._DB_PREFIX_.'module_shop ms WHERE ms.id_module = m.id_module AND ms.id_shop IN('.implode(', ', $list).')) = '.count($list).'
AND hm.id_shop IN('.implode(', ', $list).') AND hm.id_shop IN('.implode(', ', $list).')
GROUP BY hm.id_hook, hm.id_module GROUP BY hm.id_hook, hm.id_module
@@ -835,7 +835,7 @@ abstract class ModuleCore
if ($result) if ($result)
foreach ($result AS $k => $module) foreach ($result AS $k => $module)
if (($moduleInstance = Module::getInstanceByName($module['name'])) AND is_callable(array($moduleInstance, 'hookpayment'))) if (($moduleInstance = Module::getInstanceByName($module['name'])) AND is_callable(array($moduleInstance, 'hookpayment')))
if (!$moduleInstance->currencies OR ($moduleInstance->currencies AND sizeof(Currency::checkPaymentCurrencies($moduleInstance->id, (int)Shop::getCurrentShop())))) if (!$moduleInstance->currencies OR ($moduleInstance->currencies AND sizeof(Currency::checkPaymentCurrencies($moduleInstance->id))))
$output .= call_user_func(array($moduleInstance, 'hookpayment'), $hookArgs); $output .= call_user_func(array($moduleInstance, 'hookpayment'), $hookArgs);
return $output; return $output;
} }