MAGETWO-34068: Incorrect tax details and amounts in frontend and backend order

Manasa Potluri · manasa · commit e9d102ba20e8 · 2015-02-27T16:44:22.000-06:00
- CR changes
diff --git a/app/code/Magento/Tax/Model/Observer.php b/app/code/Magento/Tax/Model/Observer.php
@@ -161,7 +161,6 @@ public function salesEventOrderAfterSave(\Magento\Framework\Event\Observer $obse
                         'real_base_amount' => $rates['base_amount'],
                     ];
                 } else {
-                    $percentDelta = $rates['percent'];
                     $percentSum = 0;
                     foreach ($rates['rates'] as $rate) {
                         $real_amount = $rates['amount'] * $rate['percent'] / $rates['percent'];
diff --git a/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php b/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php
@@ -39,22 +39,21 @@ public function afterConvert(QuoteAddressToOrder $subject, OrderInterface $order
     {
         /** @var \Magento\Sales\Model\Order $order */
         $taxes = $this->quoteAddress->getAppliedTaxes();
-        $customAttributes = $order->getCustomAttributes();
         if (is_array($taxes)) {
             if (is_array($order->getAppliedTaxes())) {
                 $taxes = array_merge($order->getAppliedTaxes(), $taxes);
             }
-            $customAttributes = array_merge($customAttributes, ['applied_taxes' => $taxes], ['converting_from_quote' => true]);
+            $order->setCustomAttribute('applied_taxes', $taxes);
+            $order->setCustomAttribute('converting_from_quote', true);
         }
 
         $itemAppliedTaxes = $this->quoteAddress->getItemsAppliedTaxes();
         if (is_array($itemAppliedTaxes)) {
             if (is_array($order->getItemAppliedTaxes())) {
                 $itemAppliedTaxes = array_merge($order->getItemAppliedTaxes(), $itemAppliedTaxes);
             }
-            $customAttributes = array_merge($customAttributes, ['item_applied_taxes' => $itemAppliedTaxes]);
+            $order->setCustomAttribute('item_applied_taxes', $itemAppliedTaxes);
         }
-        $order->setData('custom_attributes', $customAttributes);
         return $order;
     }
 }
diff --git a/app/code/Magento/Tax/etc/fieldset.xml b/app/code/Magento/Tax/etc/fieldset.xml
@@ -8,15 +8,15 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Object/etc/fieldset.xsd">
     <scope id="global">
-        <fieldset id="sales_convert_quote_address">
+        <fieldset id="quote_convert_address">
             <field name="subtotal_incl_tax">
                 <aspect name="to_order" />
             </field>
             <field name="base_subtotal_incl_tax">
                 <aspect name="to_order" />
             </field>
         </fieldset>
-        <fieldset id="sales_convert_quote_item">
+        <fieldset id="quote_convert_item">
             <field name="price_incl_tax">
                 <aspect name="to_order_item" />
             </field>
@@ -42,27 +42,5 @@
                 <aspect name="to_cm_item" />
             </field>
         </fieldset>
-        <fieldset id="quote_convert_address">
-            <field name="subtotal_incl_tax">
-                <aspect name="to_order" />
-            </field>
-            <field name="base_subtotal_incl_tax">
-                <aspect name="to_order" />
-            </field>
-        </fieldset>
-        <fieldset id="quote_convert_item">
-            <field name="price_incl_tax">
-                <aspect name="to_order_item" />
-            </field>
-            <field name="base_price_incl_tax">
-                <aspect name="to_order_item" />
-            </field>
-            <field name="row_total_incl_tax">
-                <aspect name="to_order_item" />
-            </field>
-            <field name="base_row_total_incl_tax">
-                <aspect name="to_order_item" />
-            </field>
-        </fieldset>
     </scope>
 </config>

Original file line number	Diff line number	Diff line change
`@@ -39,22 +39,21 @@ public function afterConvert(QuoteAddressToOrder $subject, OrderInterface $order`
`39`	`39`	`{`
`40`	`40`	`/** @var \Magento\Sales\Model\Order $order */`
`41`	`41`	`$taxes = $this->quoteAddress->getAppliedTaxes();`
`42`		`- $customAttributes = $order->getCustomAttributes();`
`43`	`42`	`if (is_array($taxes)) {`
`44`	`43`	`if (is_array($order->getAppliedTaxes())) {`
`45`	`44`	`$taxes = array_merge($order->getAppliedTaxes(), $taxes);`
`46`	`45`	`}`
`47`		`- $customAttributes = array_merge($customAttributes, ['applied_taxes' => $taxes], ['converting_from_quote' => true]);`
	`46`	`+ $order->setCustomAttribute('applied_taxes', $taxes);`
	`47`	`+ $order->setCustomAttribute('converting_from_quote', true);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`$itemAppliedTaxes = $this->quoteAddress->getItemsAppliedTaxes();`
`51`	`51`	`if (is_array($itemAppliedTaxes)) {`
`52`	`52`	`if (is_array($order->getItemAppliedTaxes())) {`
`53`	`53`	`$itemAppliedTaxes = array_merge($order->getItemAppliedTaxes(), $itemAppliedTaxes);`
`54`	`54`	`}`
`55`		`- $customAttributes = array_merge($customAttributes, ['item_applied_taxes' => $itemAppliedTaxes]);`
	`55`	`+ $order->setCustomAttribute('item_applied_taxes', $itemAppliedTaxes);`
`56`	`56`	`}`
`57`		`- $order->setData('custom_attributes', $customAttributes);`
`58`	`57`	`return $order;`
`59`	`58`	`}`
`60`	`59`	`}`