Merge branch 'ticket-14526-LoyaltyPaymentError' into develop

This commit is contained in:
Marion Muszynski 2017-10-19 17:16:13 +02:00
commit 5c7c20a708

View File

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