Merge branch 'ticket/r15788-discount-use' into develop
This commit is contained in:
commit
8b49b143ac
@ -66,7 +66,7 @@ SELECT
|
||||
l.id_order
|
||||
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
|
||||
WHERE d.active=1 AND d.`quantity` != 0 AND d.id_discount=l.id_discount
|
||||
AND d.date_to > '".$dateSqlStart."' AND d.date_to < '".$dateSqlEnd."'";
|
||||
$result = Db::getInstance()->ExecuteS($sql);
|
||||
if ($result === false) {
|
||||
|
Loading…
Reference in New Issue
Block a user