Merge branch 'master' of https://github.com/Mondido/magento2

Andreas Karlsson · Andreas Karlsson · commit cedd5ea3627a · 2017-06-22T15:51:49.000+02:00
diff --git a/Model/Api/Transaction.php b/Model/Api/Transaction.php
@@ -360,7 +360,7 @@ protected function getItems($quote)
             $baseShippingAmount = $shippingAddress->getBaseShippingAmount();
 
             if ($baseShippingAmount > 0) {
-                $shippingVat = $baseShippingAmount / ($baseShippingAmount - $shippingAddress->getBaseShippingTaxAmount());
+                $shippingVat = (1 - ($baseShippingAmount - $shippingAddress->getBaseShippingTaxAmount()) / $baseShippingAmount) * 100;
             } else {
                 $shippingVat = 0;
             }

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ protected function getItems($quote)`
`360`	`360`	`$baseShippingAmount = $shippingAddress->getBaseShippingAmount();`
`361`	`361`
`362`	`362`	`if ($baseShippingAmount > 0) {`
`363`		`- $shippingVat = $baseShippingAmount / ($baseShippingAmount - $shippingAddress->getBaseShippingTaxAmount());`
	`363`	`+ $shippingVat = (1 - ($baseShippingAmount - $shippingAddress->getBaseShippingTaxAmount()) / $baseShippingAmount) * 100;`
`364`	`364`	`} else {`
`365`	`365`	`$shippingVat = 0;`
`366`	`366`	`}`