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

// merge 1.4 => 1.5 (bug #PSCFI-4954)

Browse Source
This commit is contained in:
fBrignoli
2012-02-20 10:01:37 +00:00
parent 85f3df042f
commit e0ea561402
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminOrdersController.php
+2 -2
View File
@@ -429,7 +429,7 @@ class AdminOrdersControllerCore extends AdminController
foreach ($customizationList as $key => $id_order_detail) foreach ($customizationList as $key => $id_order_detail)
{ {
$full_product_list[$id_order_detail] = $id_order_detail; $full_product_list[$id_order_detail] = $id_order_detail;
$full_quantity_list[$id_order_detail] = $customizationQtyList[$key]; $full_quantity_list[$id_order_detail] += $customizationQtyList[$key];
} }
if ($productList || $customizationList) if ($productList || $customizationList)
@@ -975,7 +975,7 @@ class AdminOrdersControllerCore extends AdminController
else else
break; break;
} }
if ($res) if ($res)
{ {
foreach ($cart_rules as $id_order_invoice => $cart_rule) foreach ($cart_rules as $id_order_invoice => $cart_rule)