Merge branch 'ticket-12462-fixReturn'
This commit is contained in:
commit
6bedf15606
@ -18,6 +18,10 @@ class OrderReturn extends OrderReturnCore {
|
|||||||
SELECT SUM(`quantity`)
|
SELECT SUM(`quantity`)
|
||||||
FROM `'._DB_PREFIX_.'mondialrelay_parcel`
|
FROM `'._DB_PREFIX_.'mondialrelay_parcel`
|
||||||
WHERE `id_order_detail` = '.(int) $product['id_order_detail'].'
|
WHERE `id_order_detail` = '.(int) $product['id_order_detail'].'
|
||||||
|
') + (int) Db::getInstance()->getValue('
|
||||||
|
SELECT SUM(`quantity`)
|
||||||
|
FROM `'._DB_PREFIX_.'philea_parcel`
|
||||||
|
WHERE `id_order_detail` = '.(int) $product['id_order_detail'].'
|
||||||
') - max($product['product_quantity_return'], $product['product_quantity_refunded']);
|
') - max($product['product_quantity_return'], $product['product_quantity_refunded']);
|
||||||
}
|
}
|
||||||
$qty -= (int) Db::getInstance()->getValue('
|
$qty -= (int) Db::getInstance()->getValue('
|
||||||
|
Loading…
Reference in New Issue
Block a user