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

Merge pull request #484 from axome/module_followup_guests

Browse Source 
[-] MO : Followup : Don't send followup vouchers to guest accounts
This commit is contained in:
Gregory Roussac committed 2013-07-11 09:13:39 -07:00
2 parents 27a72f9b2c e65f68107f
commit 293d1afbc7
1 file changed
+14 -7
Download Patch File Download Diff File Expand all files Collapse all files
modules/followup/followup.php
+14 -7
View File
@@ -281,7 +281,10 @@ class Followup extends Module
FROM '._DB_PREFIX_.'cart c FROM '._DB_PREFIX_.'cart c
LEFT JOIN '._DB_PREFIX_.'orders o ON (o.id_cart = c.id_cart) LEFT JOIN '._DB_PREFIX_.'orders o ON (o.id_cart = c.id_cart)
LEFT JOIN '._DB_PREFIX_.'customer cu ON (cu.id_customer = c.id_customer) LEFT JOIN '._DB_PREFIX_.'customer cu ON (cu.id_customer = c.id_customer)
WHERE DATE_SUB(CURDATE(),INTERVAL 7 DAY) <= c.date_add AND cu.id_customer IS NOT NULL AND o.id_order IS NULL'; WHERE DATE_SUB(CURDATE(),INTERVAL 7 DAY) <= c.date_add
AND cu.id_customer IS NOT NULL
AND cu.is_guest = 0
AND o.id_order IS NULL';
if(!empty($emailLogs)) if(!empty($emailLogs))
$sql .= ' AND c.id_cart NOT IN ('.join(',', $emailLogs).')'; $sql .= ' AND c.id_cart NOT IN ('.join(',', $emailLogs).')';
@@ -352,10 +355,12 @@ class Followup extends Module
FROM '._DB_PREFIX_.'orders o FROM '._DB_PREFIX_.'orders o
LEFT JOIN '._DB_PREFIX_.'customer cu ON (cu.id_customer = o.id_customer) LEFT JOIN '._DB_PREFIX_.'customer cu ON (cu.id_customer = o.id_customer)
LEFT JOIN '._DB_PREFIX_.'cart c ON (c.id_cart = o.id_cart) LEFT JOIN '._DB_PREFIX_.'cart c ON (c.id_cart = o.id_cart)
WHERE o.valid = 1 AND c.date_add >= DATE_SUB(CURDATE(),INTERVAL 7 DAY) AND o.id_cart'; WHERE o.valid = 1
AND c.date_add >= DATE_SUB(CURDATE(),INTERVAL 7 DAY)
AND cu.is_guest = 0 ';
if(!empty($emailLogs)) if(!empty($emailLogs))
$sql .= ' NOT IN ('.join(',', $emailLogs).')'; $sql .= ' AND o.id_cart NOT IN ('.join(',', $emailLogs).')';
$emails = Db::getInstance()->executeS($sql); $emails = Db::getInstance()->executeS($sql);
@@ -385,10 +390,12 @@ class Followup extends Module
FROM '._DB_PREFIX_.'orders o FROM '._DB_PREFIX_.'orders o
LEFT JOIN '._DB_PREFIX_.'customer cu ON (cu.id_customer = o.id_customer) LEFT JOIN '._DB_PREFIX_.'customer cu ON (cu.id_customer = o.id_customer)
LEFT JOIN '._DB_PREFIX_.'cart c ON (c.id_cart = o.id_cart) LEFT JOIN '._DB_PREFIX_.'cart c ON (c.id_cart = o.id_cart)
WHERE o.valid = 1 AND DATE_SUB(CURDATE(),INTERVAL 90 DAY) <= o.date_add AND cu.id_customer'; WHERE o.valid = 1
AND DATE_SUB(CURDATE(),INTERVAL 90 DAY) <= o.date_add
AND cu.is_guest = 0 ';
if(!empty($emailLogs)) if(!empty($emailLogs))
$sql .= ' NOT IN ('.join(',', $emailLogs).')'; $sql .= ' AND cu.id_customer NOT IN ('.join(',', $emailLogs).') ';
$sql .= ' $sql .= '
GROUP BY o.id_customer GROUP BY o.id_customer
@@ -429,8 +436,8 @@ class Followup extends Module
FROM '._DB_PREFIX_.'customer cu FROM '._DB_PREFIX_.'customer cu
LEFT JOIN '._DB_PREFIX_.'orders o ON (o.id_customer = cu.id_customer) LEFT JOIN '._DB_PREFIX_.'orders o ON (o.id_customer = cu.id_customer)
LEFT JOIN '._DB_PREFIX_.'cart c ON (c.id_cart = o.id_cart) LEFT JOIN '._DB_PREFIX_.'cart c ON (c.id_cart = o.id_cart)
WHERE cu.id_customer NOT IN WHERE cu.id_customer NOT IN (SELECT o.id_customer FROM '._DB_PREFIX_.'orders o WHERE DATE_SUB(CURDATE(),INTERVAL '.(int)(Configuration::get('PS_FOLLOW_UP_DAYS_THRESHOLD_4')).' DAY) <= o.date_add)
(SELECT o.id_customer FROM '._DB_PREFIX_.'orders o WHERE DATE_SUB(CURDATE(),INTERVAL '.(int)(Configuration::get('PS_FOLLOW_UP_DAYS_THRESHOLD_4')).' DAY) <= o.date_add)'; AND cu.is_guest = 0 ';
if(!empty($emailLogs)) if(!empty($emailLogs))
$sql .= ' AND cu.id_customer NOT IN ('.join(',', $emailLogs).') '; $sql .= ' AND cu.id_customer NOT IN ('.join(',', $emailLogs).') ';