magento · adrian-martinez-interactiv4 · Oct 13, 2017
diff --git a/app/code/Magento/Tax/Api/Data/AppliedTaxRateInterface.php b/app/code/Magento/Tax/Api/Data/AppliedTaxRateInterface.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Tax\Api\Data;
 
 /**
@@ -21,34 +20,41 @@ interface AppliedTaxRateInterface extends \Magento\Framework\Api\ExtensibleDataI
     public function getCode();
 
     /**
-     * Set code
+     * Get Title
      *
-     * @param string $code
-     * @return $this
+     * @return string|null
      */
-    public function setCode($code);
+    public function getTitle();
 
     /**
-     * Get Title
+     * Get Tax Percent
      *
-     * @return string|null
+     * @return float|null
      */
-    public function getTitle();
+    public function getPercent();
 
     /**
-     * Set Title
+     * Get tax amount value
      *
-     * @param string $title
+     * @return float|string
+     */
+    public function getAmount();
+
+    /**
+     * Set code
+     *
+     * @param string $code
      * @return $this
      */
-    public function setTitle($title);
+    public function setCode($code);
 
     /**
-     * Get Tax Percent
+     * Set Title
      *
-     * @return float|null
+     * @param string $title
+     * @return $this
      */
-    public function getPercent();
+    public function setTitle($title);
 
     /**
      * Set Tax Percent
@@ -58,6 +64,12 @@ public function getPercent();
      */
     public function setPercent($percent);
 
+    /**
+     * @param string|float $amount
+     * @return $this
+     */
+    public function setAmount($amount);
+
     /**
      * Retrieve existing extension attributes object or create a new one.
      *

diff --git a/app/code/Magento/Tax/Api/Data/GrandTotalRatesInterface.php b/app/code/Magento/Tax/Api/Data/GrandTotalRatesInterface.php
@@ -10,31 +10,61 @@
  * @api
  * @since 100.0.2
  */
-interface GrandTotalRatesInterface
+interface GrandTotalRatesInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
+    /**
+     * Tax rate title
+     *
+     * @return string
+     */
+    public function getTitle();
+
     /**
      * Get tax percentage value
      *
      * @return string
      */
     public function getPercent();
 
+    /**
+     * Get tax amount value
+     *
+     * @return float|string
+     */
+    public function getAmount();
+
+    /**
+     * @param string $title
+     * @return $this
+     */
+    public function setTitle($title);
+
     /**
      * @param float $percent
      * @return $this
      */
     public function setPercent($percent);
 
     /**
-     * Tax rate title
+     * @param string|float $amount
+     * @return $this
+     */
+    public function setAmount($amount);
+
+    /**
+     * Retrieve existing extension attributes object or create a new one.
      *
-     * @return string
+     * @return \Magento\Tax\Api\Data\GrandTotalRatesExtensionInterface|null
      */
-    public function getTitle();
+    public function getExtensionAttributes();
 
     /**
-     * @param string $title
+     * Set an extension attributes object.
+     *
+     * @param \Magento\Tax\Api\Data\GrandTotalRatesExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setTitle($title);
+    public function setExtensionAttributes(
+        \Magento\Tax\Api\Data\GrandTotalRatesExtensionInterface $extensionAttributes
+    );
 }
diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
@@ -18,7 +18,7 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
             $this->taxClassManagement->getTaxClassId($item->getTaxClassKey())
         );
         $rate = $this->calculationTool->getRate($taxRateRequest);
-        $storeRate = $storeRate = $this->calculationTool->getStoreRate($taxRateRequest, $this->storeId);
+        $storeRate = $this->calculationTool->getStoreRate($taxRateRequest, $this->storeId);
 
         $discountTaxCompensationAmount = 0;
         $applyTaxAfterDiscount = $this->config->applyTaxAfterDiscount($this->storeId);
@@ -70,6 +70,7 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
         /** @var  \Magento\Tax\Api\Data\AppliedTaxInterface[] $appliedTaxes */
         $appliedRates = $this->calculationTool->getAppliedRates($taxRateRequest);
         $appliedTaxes = $this->getAppliedTaxes($rowTax, $rate, $appliedRates);
+        $appliedTaxes = $this->calculateAppliedTaxesRateAmounts($appliedTaxes);
 
         return $this->taxDetailsItemDataObjectFactory->create()
             ->setCode($item->getCode())
@@ -145,6 +146,7 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
             $rowTaxes[] = $rowTaxAfterDiscount;
             $rowTaxesBeforeDiscount[] = $rowTaxPerRate;
         }
+        $appliedTaxes = $this->calculateAppliedTaxesRateAmounts($appliedTaxes);
         $rowTax = array_sum($rowTaxes);
         $rowTaxBeforeDiscount = array_sum($rowTaxesBeforeDiscount);
         $rowTotalInclTax = $rowTotal + $rowTaxBeforeDiscount;

diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
@@ -6,7 +6,9 @@
 namespace Magento\Tax\Model\Calculation;
 
 use Magento\Customer\Api\Data\AddressInterface as CustomerAddress;
+use Magento\Tax\Api\Data\AppliedTaxInterface;
 use Magento\Tax\Api\Data\AppliedTaxInterfaceFactory;
+use Magento\Tax\Api\Data\AppliedTaxRateInterface;
 use Magento\Tax\Api\Data\AppliedTaxRateInterfaceFactory;
 use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
 use Magento\Tax\Api\Data\TaxDetailsItemInterface;
@@ -444,4 +446,35 @@ protected function calculatePriceInclTax($storePriceInclTax, $storeRate, $custom
         }
         return $customerPriceInclTax;
     }
+
+    /**
+     * Calculate applied taxes rates amounts
+     *
+     * @param array $appliedTaxes
+     * @return array
+     */
+    protected function calculateAppliedTaxesRateAmounts($appliedTaxes)
+    {
+        /** @var AppliedTaxInterface $appliedTax */
+        foreach ($appliedTaxes as $appliedTax) {
+            if ($appliedTax->getRates()) {
+                $totalNominalPercent = 0;
+                /** @var AppliedTaxRateInterface $rateObject */
+                foreach ($appliedTax->getRates() as $rateObject) {
+                    $totalNominalPercent += $rateObject->getPercent();
+                }
+
+                foreach ($appliedTax->getRates() as $rateObject) {
+                    $amount = $this->calculationTool->round(
+                        $appliedTax->getAmount() * (
+                            $rateObject->getPercent() / $totalNominalPercent
+                        )
+                    );
+                    $rateObject->setAmount($amount);
+                }
+            }
+        }
+
+        return $appliedTaxes;
+    }
 }
diff --git a/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php b/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php
@@ -6,43 +6,53 @@
 
 namespace Magento\Tax\Model\Calculation;
 
+use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Tax\Api\Data\GrandTotalRatesInterface;
-use Magento\Framework\Api\AbstractSimpleObject;
 
 /**
  * Grand Total Tax Details Model
  */
-class GrandTotalRates extends AbstractSimpleObject implements GrandTotalRatesInterface
+class GrandTotalRates extends AbstractExtensibleModel implements GrandTotalRatesInterface
 {
+
     /**#@+
      * Constants defined for keys of array, makes typos less likely
      */
+    const TITLE = 'title';
     const PERCENT = 'percent';
-    const TITLE   = 'title';
+    const AMOUNT = 'amount';
     /**#@-*/
 
     /**
      * {@inheritdoc}
      */
     public function getTitle()
     {
-        return $this->_get(self::TITLE);
+        return $this->getData(self::TITLE);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function setTitle($title)
+    public function getPercent()
     {
-        return $this->setData(self::TITLE, $title);
+        return $this->getData(self::PERCENT);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getPercent()
+    public function getAmount()
     {
-        return $this->_get(self::PERCENT);
+        return $this->getData(self::AMOUNT);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setTitle($title)
+    {
+        return $this->setData(self::TITLE, $title);
     }
 
     /**
@@ -52,4 +62,29 @@ public function setPercent($percent)
     {
         return $this->setData(self::PERCENT, $percent);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setAmount($amount)
+    {
+        return $this->setData(self::AMOUNT, $amount);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->_getExtensionAttributes();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setExtensionAttributes(
+        \Magento\Tax\Api\Data\GrandTotalRatesExtensionInterface $extensionAttributes
+    ) {
+        return $this->_setExtensionAttributes($extensionAttributes);
+    }
 }
diff --git a/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php b/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php
@@ -88,6 +88,7 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
         /** @var  \Magento\Tax\Api\Data\AppliedTaxInterface[] $appliedTaxes */
         $appliedRates = $this->calculationTool->getAppliedRates($taxRateRequest);
         $appliedTaxes = $this->getAppliedTaxes($rowTax, $rate, $appliedRates);
+        $appliedTaxes = $this->calculateAppliedTaxesRateAmounts($appliedTaxes);
 
         return $this->taxDetailsItemDataObjectFactory->create()
             ->setCode($item->getCode())
@@ -163,6 +164,7 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
             $unitTaxes[] = $unitTaxAfterDiscount;
             $unitTaxesBeforeDiscount[] = $unitTaxPerRate;
         }
+        $appliedTaxes = $this->calculateAppliedTaxesRateAmounts($appliedTaxes);
         $unitTax = array_sum($unitTaxes);
         $unitTaxBeforeDiscount = array_sum($unitTaxesBeforeDiscount);
 

diff --git a/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php b/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Tax\Model\Quote;
 
-use Magento\Quote\Api\Data\TotalSegmentExtensionFactory;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\App\ObjectManager;
+use Magento\Quote\Api\Data\TotalSegmentExtensionFactory;
 
 class GrandTotalDetailsPlugin
 {
@@ -73,9 +72,11 @@ protected function getRatesData($rates)
     {
         $taxRates = [];
         foreach ($rates as $rate) {
+            /** @var \Magento\Tax\Api\Data\GrandTotalRatesInterface $taxRate */
             $taxRate = $this->ratesFactory->create([]);
             $taxRate->setPercent($rate['percent']);
             $taxRate->setTitle($rate['title']);
+            $taxRate->setAmount($rate['amount']);
             $taxRates[] = $taxRate;
         }
         return $taxRates;
@@ -94,7 +95,6 @@ public function afterProcess(
         array $totalSegments,
         array $addressTotals = []
     ) {
-
         if (!array_key_exists($this->code, $addressTotals)) {
             return $totalSegments;
         }