ENGCOM-5919: Issue #24225 fixed: FPT / Tax Totals Sorting Not Correct #24663

Author: VladimirZaets

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

@@ -106,8 +106,8 @@ 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');
+        if (isset($totals['grand_total_incl'])) {
+            $this->getParentBlock()->addTotal($taxTotal, 'grand_total');
         }
         $this->getParentBlock()->addTotal($taxTotal, $after);
         return $this;
@@ -322,8 +322,8 @@ protected function _initGrandTotal()
                     'label' => __('Grand Total (Incl.Tax)'),
                 ]
             );
-            $parent->addTotal($totalExcl, 'grand_total');
-            $parent->addTotal($totalIncl, 'tax');
+            $parent->addTotal($totalIncl, 'grand_total');
+            $parent->addTotal($totalExcl, 'tax');
             $this->_addTax('grand_total');
         }
         return $this;

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

@@ -6,6 +6,8 @@
 namespace Magento\Weee\Block\Sales\Order;
 
 /**
+ * Wee tax total column block
+ *
  * @api
  * @since 100.0.2
  */
@@ -54,6 +56,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 +67,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;