antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

Browse Source
This commit is contained in:
Christophe Latour 2017-10-19 17:16:24 +02:00
commit 45258c7e10
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/loyalty/LoyaltyModule.php
View File

@ -241,8 +241,7 @@ class LoyaltyModule extends ObjectModel
} elseif ($onlyDefault){ } elseif ($onlyDefault){
$query .= ' AND f.id_loyalty_state = '.(int)LoyaltyStateModule::getDefaultId(); $query .= ' AND f.id_loyalty_state = '.(int)LoyaltyStateModule::getDefaultId();
} }
$query .= 'AND oc.`id_order_state` != 8 $query .= ' AND oc.`id_order_state` != 8 GROUP BY f.id_loyalty '.
GROUP BY f.id_loyalty '.
($pagination ? 'LIMIT '.(((int)($page) - 1) * (int)($nb)).', '.(int)($nb) : ''); ($pagination ? 'LIMIT '.(((int)($page) - 1) * (int)($nb)).', '.(int)($nb) : '');
return Db::getInstance()->ExecuteS($query); return Db::getInstance()->ExecuteS($query);