Merge branch 'MAGETWO-28380-tax-sorting' into develop

Author: Mike Weis

app/code/Magento/Tax/Helper/Data.php

@@ -796,23 +796,6 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
 
         $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getId());
 
-        // Apply any taxes for shipping
-        $shippingTaxAmount = $salesItem->getShippingTaxAmount();
-        $originalShippingTaxAmount = $order->getShippingTaxAmount();
-        if ($shippingTaxAmount && $originalShippingTaxAmount &&
-            $shippingTaxAmount != 0 && floatval($originalShippingTaxAmount)
-        ) {
-            //An invoice or credit memo can have a different qty than its order
-            $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
-            $itemTaxDetails = $orderTaxDetails->getItems();
-            foreach ($itemTaxDetails as $itemTaxDetail) {
-                //Aggregate taxable items associated with shipping
-                if ($itemTaxDetail->getType() == \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING) {
-                    $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
-                }
-            }
-        }
-
         // Apply any taxes for the items
         /** @var $item \Magento\Sales\Model\Order\Invoice\Item|\Magento\Sales\Model\Order\Creditmemo\Item */
         foreach ($salesItem->getItems() as $item) {
@@ -844,6 +827,24 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
             }
         }
 
+        // Apply any taxes for shipping
+        $shippingTaxAmount = $salesItem->getShippingTaxAmount();
+        $originalShippingTaxAmount = $order->getShippingTaxAmount();
+        if ($shippingTaxAmount && $originalShippingTaxAmount &&
+            $shippingTaxAmount != 0 && floatval($originalShippingTaxAmount)
+        ) {
+            //An invoice or credit memo can have a different qty than its order
+            $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
+            $itemTaxDetails = $orderTaxDetails->getItems();
+            foreach ($itemTaxDetails as $itemTaxDetail) {
+                //Aggregate taxable items associated with shipping
+                if ($itemTaxDetail->getType() == \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING) {
+                    $taxClassAmount =
+                        $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
+                }
+            }
+        }
+
         return $taxClassAmount;
     }
 }

dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php

@@ -365,6 +365,74 @@ public function getCalculatedTaxesForOrderItemsDataProvider()
                     ],
                 ],
             ],
+            //Scenario 3: one item, with both shipping and product taxes
+            // note that 'shipping tax' is listed before 'product tax'
+            'one_item_with_both_shipping_and_product_taxes' => [
+                'order' => [
+                    'order_id' => 1,
+                    'shipping_tax_amount' => 2,
+                    'order_tax_details' => [
+                        'items' => [
+                            'shippingTax1' => [
+                                'item_id' => null,
+                                'type' => 'shipping',
+                                'applied_taxes' => [
+                                    [
+                                        'amount' => 2.0,
+                                        'base_amount' => 2.0,
+                                        'code' => 'US-CA-Ship',
+                                        'title' => 'US-CA-Sales-Tax-Ship',
+                                        'percent' => 10.0,
+                                    ],
+                                ],
+                            ],
+                            'itemTax1' => [
+                                'item_id' => 1,
+                                'applied_taxes' => [
+                                    [
+                                        'amount' => 5.0,
+                                        'base_amount' => 5.0,
+                                        'code' => 'US-CA',
+                                        'title' => 'US-CA-Sales-Tax',
+                                        'percent' => 20.0,
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                'invoice' => [
+                    'shipping_tax_amount' => 2,
+                    'invoice_items' => [
+                        'item1' => new MagentoObject(
+                            [
+                                'order_item' => new MagentoObject(
+                                    [
+                                        'id' => 1,
+                                        'tax_amount' => 5.00,
+                                    ]
+                                ),
+                                'tax_amount' => 5.00,
+                            ]
+                        ),
+                    ],
+                ],
+                // note that 'shipping tax' is now listed after 'product tax'
+                'expected_results' => [
+                    [
+                        'title' => 'US-CA-Sales-Tax',
+                        'percent' => 20.0,
+                        'tax_amount' => 5.00,
+                        'base_tax_amount' => 5.00,
+                    ],
+                    [
+                        'title' => 'US-CA-Sales-Tax-Ship',
+                        'percent' => 10.0,
+                        'tax_amount' => 2.00,
+                        'base_tax_amount' => 2.00,
+                    ],
+                ],
+            ],
         ];
 
         return $data;