dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix multi shop share order in order invoices

Browse Source
This commit is contained in:
rMalie
2012-03-23 09:31:04 +00:00
parent ab2cfdf2c7
commit ad045b55c0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/order/OrderInvoice.php
+3 -3
View File
@@ -367,7 +367,7 @@ class OrderInvoiceCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`) LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
WHERE DATE_ADD(oi.date_add, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\' WHERE DATE_ADD(oi.date_add, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\'
AND oi.date_add >= \''.pSQL($date_from).'\' AND oi.date_add >= \''.pSQL($date_from).'\'
'.Shop::addSqlRestriction().' '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
ORDER BY oi.date_add ASC ORDER BY oi.date_add ASC
'); ');
@@ -393,7 +393,7 @@ class OrderInvoiceCore extends ObjectModel
ORDER BY date_add DESC, id_order_history DESC ORDER BY date_add DESC, id_order_history DESC
LIMIT 1 LIMIT 1
) )
'.Shop::addSqlRestriction(false, 'o').' '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
ORDER BY oi.`date_add` ASC ORDER BY oi.`date_add` ASC
'); ');
@@ -415,7 +415,7 @@ class OrderInvoiceCore extends ObjectModel
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`) LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_order` = oi.`id_order`)
WHERE DATE_ADD(oi.delivery_date, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\' WHERE DATE_ADD(oi.delivery_date, INTERVAL -1 DAY) <= \''.pSQL($date_to).'\'
AND oi.date_add >= \''.pSQL($date_from).'\' AND oi.date_add >= \''.pSQL($date_from).'\'
'.Shop::addSqlRestriction().' '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
ORDER BY oi.delivery_date ASC ORDER BY oi.delivery_date ASC
'); ');