Merge pull request #5873 from magento-tsg/MC-35765

[TSG] MC-35765 [2.4.0-beta1] Full Tax Details causes the Order Page to fail

Author: zakdma

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

@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Totals;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+
 /**
  * Adminhtml order tax totals block
  *
@@ -50,6 +53,7 @@ class Tax extends \Magento\Tax\Block\Sales\Order\Tax
      * @param \Magento\Tax\Model\Sales\Order\TaxFactory $taxOrderFactory
      * @param \Magento\Sales\Helper\Admin $salesAdminHelper
      * @param array $data
+     * @param Random $randomHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,13 +62,15 @@ public function __construct(
         \Magento\Tax\Model\Calculation $taxCalculation,
         \Magento\Tax\Model\Sales\Order\TaxFactory $taxOrderFactory,
         \Magento\Sales\Helper\Admin $salesAdminHelper,
-        array $data = []
+        array $data = [],
+        ?Random $randomHelper = null
     ) {
         $this->_taxHelper = $taxHelper;
         $this->_taxCalculation = $taxCalculation;
         $this->_taxOrderFactory = $taxOrderFactory;
         $this->_salesAdminHelper = $salesAdminHelper;
         $data['taxHelper'] = $this->_taxHelper;
+        $data['randomHelper'] = $randomHelper ?? ObjectManager::getInstance()->get(Random::class);
         parent::__construct($context, $taxConfig, $data);
     }
 

app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml

@@ -16,6 +16,8 @@ $_fullInfo  = $block->getFullTaxInfo();
 
 /** @var \Magento\Tax\Helper\Data $taxHelper */
 $taxHelper = $block->getData('taxHelper');
+/** @var \Magento\Framework\Math\Random $randomHelper */
+$randomHelper = $block->getData('randomHelper');
 ?>
 
 <?php if ($block->displayFullSummary() && $_fullInfo): ?>
@@ -86,8 +88,9 @@ $taxHelper = $block->getData('taxHelper');
             $amount     = $info['tax_amount'];
             $baseAmount = $info['base_tax_amount'];
             $isFirst    = 1;
+            $infoId = $randomHelper->getRandomString(20);
             ?>
-            <tr id="info-<?= /* @noEscape */ $info->getCode() ?>"
+            <tr id="info-<?= /* @noEscape */ $infoId ?>"
                 class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>">
                 <?php if ($info['percent'] !== null): ?>
                     <td class="admin__total-mark">
@@ -98,7 +101,7 @@ $taxHelper = $block->getData('taxHelper');
                 <?php endif; ?>
                     <td><?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?></td>
             </tr>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'tr#info-' . $info->getCode()) ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'tr#info-' . $infoId) ?>
             <?php
             $isFirst = 0;
             $isTop = 0;