From a716df90321a727554e12473dd31fbd9d3c405a5 Mon Sep 17 00:00:00 2001 From: Pieter Cappelle Date: Fri, 20 Oct 2017 20:28:44 +0200 Subject: [PATCH 1/2] Fix issue 10347 --- app/code/Magento/Tax/Model/Plugin/OrderSave.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Tax/Model/Plugin/OrderSave.php b/app/code/Magento/Tax/Model/Plugin/OrderSave.php index 2cbb2cd34746c..a5b726b135c11 100644 --- 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'], From 1a3d5d3c63f570e5cf128370aedeab086a3de105 Mon Sep 17 00:00:00 2001 From: Pieter Cappelle Date: Fri, 20 Oct 2017 20:35:04 +0200 Subject: [PATCH 2/2] Remove line. --- app/code/Magento/Tax/Model/Plugin/OrderSave.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Tax/Model/Plugin/OrderSave.php b/app/code/Magento/Tax/Model/Plugin/OrderSave.php index a5b726b135c11..85f70ce47fecd 100644 --- a/app/code/Magento/Tax/Model/Plugin/OrderSave.php +++ b/app/code/Magento/Tax/Model/Plugin/OrderSave.php @@ -114,7 +114,6 @@ protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order) 'real_amount' => $realAmount, 'real_base_amount' => $realBaseAmount, ]; - $percentSum += $rate['percent']; } } }