Merge branch 'ticket-14805-creditexpiration' into develop

This commit is contained in:
Michael RICOIS 2017-12-06 09:57:49 +01:00
commit d37b795021

View File

@ -64,7 +64,7 @@ SELECT
d.date_from,
d.date_to,
l.id_order
FROM `"._DB_PREFIX_."discount` d, "._DB_PREFIX_."loyalty l, "._DB_PREFIX_."order_discount
FROM `"._DB_PREFIX_."discount` d, `"._DB_PREFIX_."loyalty` l
LEFT OUTER JOIN `"._DB_PREFIX_."order_discount` od ON (od.id_discount IS NULL)
WHERE d.active=1 AND d.id_discount=l.id_discount
AND d.date_to > '".$dateSqlStart."' AND d.date_to < '".$dateSqlEnd."'";