ENGCOM-5533: Tax in sales order email is displayed after grand total row #23406

Author: VladimirZaets

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

@@ -12,6 +12,8 @@
 use Magento\Sales\Model\Order;
 
 /**
+ *  Tax totals modification block.
+ *
  * @api
  * @since 100.0.2
  */
@@ -103,6 +105,10 @@ public function initTotals()
     protected function _addTax($after = 'discount')
     {
         $taxTotal = new \Magento\Framework\DataObject(['code' => 'tax', 'block_name' => $this->getNameInLayout()]);
+        $totals = $this->getParentBlock()->getTotals();
+        if ($totals['grand_total']) {
+            $this->getParentBlock()->addTotalBefore($taxTotal, 'grand_total');
+        }
         $this->getParentBlock()->addTotal($taxTotal, $after);
         return $this;
     }
@@ -118,6 +124,8 @@ public function getStore()
     }
 
     /**
+     * Initialization grand total.
+     *
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -199,6 +207,8 @@ protected function _initSubtotal()
     }
 
     /**
+     * Init shipping.
+     *
      * @return $this
      */
     protected function _initShipping()
@@ -260,13 +270,19 @@ protected function _initShipping()
     }
 
     /**
+     * Init discount.
+     *
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
+     *
      * @return void
      */
     protected function _initDiscount()
     {
     }
-
+    //phpcs:enable
     /**
+     * Init grand total.
+     *
      * @return $this
      */
     protected function _initGrandTotal()
@@ -304,13 +320,15 @@ protected function _initGrandTotal()
                 ]
             );
             $parent->addTotal($totalExcl, 'grand_total');
-            $this->_addTax('grand_total');
             $parent->addTotal($totalIncl, 'tax');
+            $this->_addTax('grand_total');
         }
         return $this;
     }
 
     /**
+     * Return order.
+     *
      * @return Order
      */
     public function getOrder()
@@ -319,6 +337,8 @@ public function getOrder()
     }
 
     /**
+     * Return label properties.
+     *
      * @return array
      */
     public function getLabelProperties()
@@ -327,6 +347,8 @@ public function getLabelProperties()
     }
 
     /**
+     * Retuen value properties.
+     *
      * @return array
      */
     public function getValueProperties()