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

This commit is contained in:
Christophe Latour 2017-09-26 17:55:01 +02:00
commit 49289b80b0

View File

@ -15,11 +15,10 @@ class AdminAntDropshippingtracking extends AdminTab
SELECT c.`name`, c.`id_lang`
FROM `'._DB_PREFIX_.'privatesale` p
LEFT JOIN `'._DB_PREFIX_.'category_lang` c ON (c.`id_category` = p.`id_category`)
WHERE `id_sale` = '.(int)$id_sale.'
WHERE p.`id_sale` = '.(int)$id_sale.'
') as $key => $row) {
$sale_names[(int)$row['id_lang']] = (int)$row['name'];
$sale_names[(int)$row['id_lang']] = $row['name'];
}
$sale_products = array();
foreach(Db::getInstance()->ExecuteS('
SELECT DISTINCT `id_product`