Merge remote-tracking branch 'magento-l3/ACP2E-2247' into AUG102023_PR_pradeep

Author: pradeep1819

app/code/Magento/Tax/Test/Mftf/Test/AdminCheckTaxForDetailsTagExpandCollapseTest.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminCheckTaxForDetailsTagExpandCollapseTest">
+        <annotations>
+            <features value="Tax"/>
+            <stories value="Additional settings"/>
+            <title value="Additional settings expand collapse icon visible"/>
+            <description value="Checking expand and collapse icon for additional settings"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="AC-9376"/>
+            <useCaseId value="ACP2E-2247"/>
+            <group value="tax"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <!--Login as admin-->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Logout-->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+        <!-- Go to the tax rule page -->
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
+        <!-- Click new tax rule -->
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAddNewTaxRuleButton"/>
+        <!-- Click expand icon -->
+        <conditionalClick selector="{{AdminTaxRuleFormSection.additionalSettings}}" dependentSelector="{{AdminTaxRuleFormSection.additionalSettingsOpened}}" visible="false" stepKey="openAdditionalSettings"/>
+        <!-- Check class in selector -->
+        <seeElement selector="details#detailsbase_fieldset ._show" stepKey="seeBox"/>
+    </test>
+</tests>

app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml

@@ -318,6 +318,18 @@ $scriptString.= <<<script
 
     window.TaxRateEditableMultiselect = TaxRateEditableMultiselect;
 });
+
+require(['jquery'], function($) {
+      jQuery('.admin__collapsible-block-wrapper').on('click', function () {
+            if(!this.hasAttribute('open')) {
+                jQuery(this).addClass('_show');
+                jQuery(this).children().addClass('_show');
+            } else {
+                jQuery(this).removeClass('_show');
+                jQuery(this).children().removeClass('_show');
+            }
+      });
+});
 script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module.less

@@ -3,6 +3,9 @@
 //  * See COPYING.txt for license details.
 //  */
 
+/**
+ * @codingStandardsIgnoreStart
+ */
 .block-footer .action-add {
     -webkit-appearance: none;
     &:extend(.action-default, button all);
@@ -25,3 +28,16 @@
         font-size: 1.3rem;
     }
 }
+
+.admin__collapsible-block-wrapper {
+    .admin__collapsible-title._show {
+        &:before {
+            content: @icon-expand-close__content;
+            font-size: @collapsible-title-icon__size;
+            position: absolute;
+            right: @data-grid__font-size;
+            top: 2.3rem;
+        }
+    }
+}
+//@codingStandardsIgnoreEnd