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

Merge branch 'ticket/r15587-refund-paypal' into develop

Browse Source
This commit is contained in:
Michael RICOIS 2018-02-22 15:54:47 +01:00
commit b5307d448a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
adm/tabs/AdminOrders.php
View File

@ -813,10 +813,10 @@ class AdminOrders extends AdminTab
$orderProducts = $order->getProductsDetail();
// Check line
$refundIsFull = false;
if (count($orderProducts) == count($orderSlipDetail)) {
if (count($orderProducts) == count($refundDetail)) {
$refundIsFull = true;
foreach($orderProducts as $k => $line) {
if ($line['product_quantity'] != $orderSlipDetail[$line['id_order_detail']]['product_quantity']) {
if ($line['product_quantity'] != $refundDetail[$line['id_order_detail']]['product_quantity']) {
$refundIsFull = false;
break;
}
@ -860,9 +860,7 @@ class AdminOrders extends AdminTab
$product_ids[] = (int) $row['product_id'];
}
/**
* @Override Philea
*/
// @Override Philea
if (Db::getInstance()->getRow('
SELECT *
FROM `'._DB_PREFIX_.'philea_parcel`