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

[*] MODULE : Multi-shop compatibility in newsletter module tanks @axometeam

Browse Source
This commit is contained in:
gRoussac
2013-07-12 14:17:49 +02:00
parent b880bc3a18
commit 24d124f190
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/newsletter/newsletter.php
+9 -3
View File
@@ -144,6 +144,8 @@ class Newsletter extends Module
AND a.`id_customer` = c.`id_customer` AND a.`id_customer` = c.`id_customer`
AND a.`id_country` = '.(int)Tools::getValue('COUNTRY').') >= 1'); AND a.`id_country` = '.(int)Tools::getValue('COUNTRY').') >= 1');
if (Context::getContext()->cookie->shopContext)
$dbquery->where('c.id_shop = '.(int)Context::getContext()->shop->id);
$rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($dbquery->build()); $rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($dbquery->build());
@@ -154,10 +156,14 @@ class Newsletter extends Module
private function _getBlockNewsletter() private function _getBlockNewsletter()
{ {
$rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' $rqSql = 'SELECT `id`, `email`, `newsletter_date_add`, `ip_registration_newsletter`
SELECT `id`, `email`, `newsletter_date_add`, `ip_registration_newsletter`
FROM `'._DB_PREFIX_.'newsletter` FROM `'._DB_PREFIX_.'newsletter`
WHERE `active` = 1'); WHERE `active` = 1';
if (Context::getContext()->cookie->shopContext)
$rqSql .= ' AND `id_shop` = '.(int)Context::getContext()->shop->id;
$rq = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($rqSql);
$header = array('id_customer', 'email', 'newsletter_date_add', 'ip_address', 'http_referer'); $header = array('id_customer', 'email', 'newsletter_date_add', 'ip_address', 'http_referer');
$result = (is_array($rq) ? array_merge(array($header), $rq) : $header); $result = (is_array($rq) ? array_merge(array($header), $rq) : $header);