MAGETWO-28380: Totals taxes sorting is different on order/invoice/refund create and view pages

 - updated per code review

Author: Mike Weis

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

@@ -682,23 +682,17 @@ public function getCalculatedTaxes($source)
      *      'tax_amount'        => $taxAmount,
      *      'base_tax_amount'   => $baseTaxAmount,
      *      'title'             => $title,
-     *      'percent'           => $percent,
-     *      'type'              => $type
+     *      'percent'           => $percent
      *  )
      * )
      *
      * @param  array                        $taxClassAmount
      * @param  OrderTaxDetailsItemInterface $itemTaxDetail
      * @param  float                        $ratio
-     * @param  string                       $type
      * @return array
      */
-    private function _aggregateTaxes(
-        $taxClassAmount,
-        OrderTaxDetailsItemInterface $itemTaxDetail,
-        $ratio,
-        $type = 'product'
-    ) {
+    private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
+    {
         $itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
         foreach ($itemAppliedTaxes as $itemAppliedTax) {
             $taxAmount = $itemAppliedTax->getAmount() * $ratio;
@@ -711,7 +705,6 @@ private function _aggregateTaxes(
             if (!isset($taxClassAmount[$taxCode])) {
                 $taxClassAmount[$taxCode]['title'] = $itemAppliedTax->getTitle();
                 $taxClassAmount[$taxCode]['percent'] = $itemAppliedTax->getPercent();
-                $taxClassAmount[$taxCode]['type'] = $type;
                 $taxClassAmount[$taxCode]['tax_amount'] = $taxAmount;
                 $taxClassAmount[$taxCode]['base_tax_amount'] = $baseTaxAmount;
             } else {
@@ -835,7 +828,6 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
         }
 
         // Apply any taxes for shipping
-        $shippingType = \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING;
         $shippingTaxAmount = $salesItem->getShippingTaxAmount();
         $originalShippingTaxAmount = $order->getShippingTaxAmount();
         if ($shippingTaxAmount && $originalShippingTaxAmount &&
@@ -846,9 +838,9 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
             $itemTaxDetails = $orderTaxDetails->getItems();
             foreach ($itemTaxDetails as $itemTaxDetail) {
                 //Aggregate taxable items associated with shipping
-                if ($itemTaxDetail->getType() == $shippingType) {
+                if ($itemTaxDetail->getType() == \Magento\Sales\Model\Quote\Address::TYPE_SHIPPING) {
                     $taxClassAmount =
-                        $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio, $shippingType);
+                        $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
                 }
             }
         }

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

@@ -301,7 +301,6 @@ public function getCalculatedTaxesForOrderItemsDataProvider()
                         'percent' => 20.0,
                         'tax_amount' => 2.5,
                         'base_tax_amount' => 2.5,
-                        'type' => 'product',
                     ],
                 ],
             ],
@@ -363,11 +362,11 @@ public function getCalculatedTaxesForOrderItemsDataProvider()
                         'percent' => 20.0,
                         'tax_amount' => 6.5,
                         'base_tax_amount' => 6.5,
-                        'type' => 'product',
                     ],
                 ],
             ],
             //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,
@@ -418,20 +417,19 @@ public function getCalculatedTaxesForOrderItemsDataProvider()
                         ),
                     ],
                 ],
+                // 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,
-                        'type' => 'product',
                     ],
                     [
                         'title' => 'US-CA-Sales-Tax-Ship',
                         'percent' => 10.0,
                         'tax_amount' => 2.00,
                         'base_tax_amount' => 2.00,
-                        'type' => 'shipping',
                     ],
                 ],
             ],