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

Merge branch 'ticket-13973-OrderInWaiting' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-08-28 15:38:06 +02:00
commit 579306aecc
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/logistics/AdminLogisticsPending.php
View File

@ -260,15 +260,20 @@ class AdminLogisticsPending extends AdminTab {
$_orders = array();
foreach(Db::getInstance()->ExecuteS('
SELECT d.`id_order`, p.`id_product`, c.`id_sale`, GREATEST(d.`product_quantity` - d.`product_quantity_return`, 0) AS `product_quantity`,
d.`product_reference`, COUNT(d.id_order_detail) as `nb_p`
d.`product_reference`, COUNT(d.id_order_detail) as `nb_p`,
CASE
WHEN SUBSTRING(ca.`name`, 1,1) = "T" THEN 1
WHEN SUBSTRING(ca.name`, 1,1) = "C" THEN 1
ELSE '2'
END as `carrier_name`
FROM `'._DB_PREFIX_.'privatesale_category` c
LEFT JOIN `'._DB_PREFIX_.'product` p
ON c.`id_category` = p.`id_category_default`
LEFT JOIN `'._DB_PREFIX_.'order_detail` d
ON d.`product_id` = p.`id_product`
LEFT JOIN `'._DB_PREFIX_.'product` p ON c.`id_category` = p.`id_category_default`
LEFT JOIN `'._DB_PREFIX_.'order_detail` d ON d.`product_id` = p.`id_product`
LEFT JOIN `'._DB_PREFIX_.'orders` o ON o.`id_order` = d.`id_order`
LEFT JOIN `'._DB_PREFIX_.'carrier` ca ON ca.id_carrier = o.id_carrier
WHERE d.`id_order` IN ('.implode(', ', $orders).')
GROUP BY d.`id_order`
ORDER BY `nb_p` ASC, d.`product_reference`
ORDER BY `carrier_name` ASC, `nb_p` ASC, d.`product_reference`
') as $row) {
if(!isset($_orders[(int)$row['id_order']])) {
$_orders[(int)$row['id_order']] = (int)$row['id_order'];