Merge pull request #1746 from magento-engcom/2.2-develop-prs

Public Pull Requests #11592 Fix issue #10347 - Wrong order tax amounts displayed when using specific tax configuration (2.2-develop) by @PieterCappelle Fixed Public Issues #10347 Wrong order tax amounts displayed when using specific tax configuration
magento · Nov 21, 2017 · 9fc1138 · 9fc1138
2 parents 8797e4d + d91671c
commit 9fc1138
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/app/code/Magento/Tax/Model/Plugin/OrderSave.php b/app/code/Magento/Tax/Model/Plugin/OrderSave.php
@@ -97,8 +97,12 @@ protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
                         } else {
                             $percentSum = 0;
                             foreach ($taxRates as $rate) {
-                                $realAmount = $rates['amount'] * $rate['percent'] / $rates['percent'];
-                                $realBaseAmount = $rates['base_amount'] * $rate['percent'] / $rates['percent'];
+                                $percentSum += $rate['percent'];
+                            }
+
+                            foreach ($taxRates as $rate) {
+                                $realAmount = $rates['amount'] * $rate['percent'] / $percentSum;
+                                $realBaseAmount = $rates['base_amount'] * $rate['percent'] / $percentSum;
                                 $ratesIdQuoteItemId[$rates['id']][] = [
                                     'id' => $taxesArray['item_id'],
                                     'percent' => $rate['percent'],
@@ -110,7 +114,6 @@ protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
                                     'real_amount' => $realAmount,
                                     'real_base_amount' => $realBaseAmount,
                                 ];
-                                $percentSum += $rate['percent'];
                             }
                         }
                     }