Fixed frontend tax sorting issue and on order email.

Author: mahesh-rajawat

app/code/Magento/Tax/Block/Sales/Order/Tax.php

@@ -106,7 +106,7 @@ protected function _addTax($after = 'discount')
     {
         $taxTotal = new \Magento\Framework\DataObject(['code' => 'tax', 'block_name' => $this->getNameInLayout()]);
         $totals = $this->getParentBlock()->getTotals();
-        if ($totals['grand_total']) {
+        if (isset($totals['grand_total_incl'])) {
             $this->getParentBlock()->addTotal($taxTotal, 'grand_total');
         }
         $this->getParentBlock()->addTotal($taxTotal, $after);
@@ -319,8 +319,8 @@ protected function _initGrandTotal()
                     'label' => __('Grand Total (Incl.Tax)'),
                 ]
             );
-            $parent->addTotal($totalExcl, 'grand_total');
             $parent->addTotal($totalIncl, 'grand_total');
+            $parent->addTotal($totalExcl, 'tax');
             $this->_addTax('grand_total');
         }
         return $this;

app/code/Magento/Weee/Block/Sales/Order/Totals.php

@@ -54,6 +54,8 @@ public function initTotals()
         $weeeTotal = $this->weeeData->getTotalAmounts($items, $store);
         $weeeBaseTotal = $this->weeeData->getBaseTotalAmounts($items, $store);
         if ($weeeTotal) {
+            $totals = $this->getParentBlock()->getTotals();
+
             // Add our total information to the set of other totals
             $total = new \Magento\Framework\DataObject(
                 [
@@ -63,10 +65,10 @@ public function initTotals()
                     'base_value' => $weeeBaseTotal
                 ]
             );
-            if ($this->getBeforeCondition()) {
-                $this->getParentBlock()->addTotalBefore($total, $this->getBeforeCondition());
+            if (isset($totals['grand_total_incl'])) {
+                $this->getParentBlock()->addTotalBefore($total, 'grand_total');
             } else {
-                $this->getParentBlock()->addTotal($total, $this->getAfterCondition());
+                $this->getParentBlock()->addTotalBefore($total, $this->getBeforeCondition());
             }
         }
         return $this;

app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_new.xml

@@ -10,7 +10,7 @@
         <referenceBlock name="creditmemo_totals">
             <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals">
                 <action method="setBeforeCondition">
-                    <argument name="condition" xsi:type="string">grand_total</argument>
+                    <argument name="condition" xsi:type="string">tax</argument>
                 </action>
             </block>
         </referenceBlock>

app/code/Magento/Weee/view/adminhtml/layout/sales_order_creditmemo_view.xml

@@ -10,7 +10,7 @@
         <referenceBlock name="creditmemo_totals">
             <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_cm_totals">
                 <action method="setBeforeCondition">
-                    <argument name="condition" xsi:type="string">grand_total</argument>
+                    <argument name="condition" xsi:type="string">tax</argument>
                 </action>
             </block>
         </referenceBlock>

app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_new.xml

@@ -10,7 +10,7 @@
         <referenceBlock name="invoice_totals">
             <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals">
                 <action method="setBeforeCondition">
-                    <argument name="condition" xsi:type="string">grand_total</argument>
+                    <argument name="condition" xsi:type="string">tax</argument>
                 </action>
             </block>
         </referenceBlock>

app/code/Magento/Weee/view/adminhtml/layout/sales_order_invoice_view.xml

@@ -10,7 +10,7 @@
         <referenceBlock name="invoice_totals">
             <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_inv_totals">
                 <action method="setBeforeCondition">
-                    <argument name="condition" xsi:type="string">grand_total</argument>
+                    <argument name="condition" xsi:type="string">tax</argument>
                 </action>
             </block>
         </referenceBlock>

app/code/Magento/Weee/view/adminhtml/layout/sales_order_view.xml

@@ -10,7 +10,7 @@
         <referenceBlock name="order_totals">
             <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_ord_totals">
                 <action method="setBeforeCondition">
-                    <argument name="condition" xsi:type="string">grand_total</argument>
+                    <argument name="condition" xsi:type="string">tax</argument>
                 </action>
             </block>
         </referenceBlock>

app/code/Magento/Weee/view/frontend/layout/sales_email_order_items.xml

@@ -10,7 +10,7 @@
         <referenceBlock name="order_totals">
             <block class="Magento\Weee\Block\Sales\Order\Totals" name="weee_ord_totals">
                 <action method="setBeforeCondition">
-                    <argument name="condition" xsi:type="string">tax</argument>
+                    <argument name="condition" xsi:type="string">grand_total</argument>
                 </action>
             </block>
         </referenceBlock>