ACP2E-3080: Admin Ordered Products Report date range visibility issue.

Author: glanujnehra

app/code/Magento/Reports/view/adminhtml/templates/grid.phtml

@@ -12,16 +12,16 @@
 ?>
 <?php if ($block->getCollection()): ?>
     <?php if ($block->canDisplayContainer()): ?>
-        <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>">
-    <?php else: ?>
-        <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
-    <?php endif; ?>
-    <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()): ?>
-        <div class="admin__data-grid-header admin__data-grid-toolbar">
-            <div class="admin__data-grid-header-row">
-                <?php if ($block->getDateFilterVisibility()): ?>
-                    <div class="admin__filter-actions" data-role="filter-form"
-                         id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_range')) ?>">
+    <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>">
+        <?php else: ?>
+            <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+        <?php endif; ?>
+        <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()): ?>
+            <div class="admin__data-grid-header admin__data-grid-toolbar">
+                <div class="admin__data-grid-header-row">
+                    <?php if ($block->getDateFilterVisibility()): ?>
+                        <div class="admin__filter-actions" data-role="filter-form"
+                             id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_range')) ?>">
                             <span class="field-row">
                                 <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from')) ?>"
                                        class="admin__control-support-text">
@@ -36,7 +36,7 @@
                                 </span>
                             </span>
 
-                        <span class="field-row">
+                            <span class="field-row">
                                 <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to')) ?>"
                                        class="admin__control-support-text">
                                     <span><?= $block->escapeHtml(__('To')) ?>:</span>
@@ -50,7 +50,7 @@
                                 </span>
                             </span>
 
-                        <span class="field-row admin__control-filter">
+                            <span class="field-row admin__control-filter">
                                  <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('report_period')) ?>"
                                         class="admin__control-support-text">
                                      <span><?= $block->escapeHtml(__('Show By')) ?>:</span>
@@ -67,7 +67,7 @@
                                 </select>
                                 <?= $block->getRefreshButtonHtml() ?>
                             </span>
-                        <?php $scriptString = <<<script
+                            <?php $scriptString = <<<script
 
                                 require([
                                     "jquery",
@@ -87,21 +87,21 @@
                                 });
 
 script;
-                        ?>
-                        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
-                    </div>
-                <?php endif; ?>
-                <?php if ($block->getChildBlock('grid.export')): ?>
-                    <?= $block->getChildHtml('grid.export') ?>
-                <?php endif; ?>
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+                        </div>
+                    <?php endif; ?>
+                    <?php if ($block->getChildBlock('grid.export')): ?>
+                        <?= $block->getChildHtml('grid.export') ?>
+                    <?php endif; ?>
+                </div>
             </div>
+        <?php endif; ?>
+        <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
+            <table class="data-grid" id="<?= $block->escapeHtmlAttr($block->getId()) ?>_table">
+                <?= $block->getChildHtml('grid.columnSet') ?>
+            </table>
         </div>
-    <?php endif; ?>
-    <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
-        <table class="data-grid" id="<?= $block->escapeHtmlAttr($block->getId()) ?>_table">
-            <?= $block->getChildHtml('grid.columnSet') ?>
-        </table>
-    </div>
     </div>
     <?php if ($block->canDisplayContainer()): ?>
         <?php $useAjax = '';
@@ -126,8 +126,8 @@ script;
 
 script;
         ?>
-        <?php if ($block->getDateFilterVisibility()): ?>
-            <?php $scriptString .= <<<script
+                <?php if ($block->getDateFilterVisibility()): ?>
+                    <?php $scriptString .= <<<script
 
                     {$block->escapeJs($block->getJsObjectName())}.doFilterCallback = validateFilterDate;
                     var period_date_from = $('{$block->escapeJs($block->getSuffixId('period_date_from'))}');
@@ -151,10 +151,10 @@ script;
                     }
 
 script;
-            ?>
-        <?php endif;?>
-        <?php if ($block->getStoreSwitcherVisibility()): ?>
-            <?php $scriptString .= <<<script
+                    ?>
+                <?php endif;?>
+                <?php if ($block->getStoreSwitcherVisibility()): ?>
+                    <?php $scriptString .= <<<script
 
                 /* Overwrite function from switcher.phtml widget*/
                 switchStore = function(obj) {
@@ -185,8 +185,8 @@ script;
                 }
 
 script;
-            ?>
-        <?php endif; ?>
+                    ?>
+                <?php endif; ?>
         <?php $scriptString .= <<<script
 
                 //]]>