Merge remote-tracking branch 'origin/ACP2E-544' into L3_Arrows_PR_20220314

Author: nishant04412

app/code/Magento/Tax/etc/adminhtml/system.xml

@@ -118,7 +118,7 @@
                     <backend_model>Magento\Tax\Model\Config\Notification</backend_model>
                 </field>
                 <field id="grandtotal" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Include Tax In Order Total</label>
+                    <label>Additionally Show Order Total Without Tax</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="full_summary" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -148,7 +148,7 @@
                     <backend_model>Magento\Tax\Model\Config\Notification</backend_model>
                 </field>
                 <field id="grandtotal" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Include Tax In Order Total</label>
+                    <label>Additionally Show Order Total Without Tax</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="full_summary" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">

app/code/Magento/Tax/i18n/en_US.csv

@@ -163,7 +163,7 @@ Taxes,Taxes
 "Display Prices","Display Prices"
 "Display Subtotal","Display Subtotal"
 "Display Shipping Amount","Display Shipping Amount"
-"Include Tax In Order Total","Include Tax In Order Total"
+"Additionally Show Order Total Without Tax","Additionally Show Order Total Without Tax"
 "Display Full Tax Summary","Display Full Tax Summary"
 "Display Zero Tax Subtotal","Display Zero Tax Subtotal"
 "Orders, Invoices, Credit Memos Display Settings","Orders, Invoices, Credit Memos Display Settings"

dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/System/ConfigTest.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Tax\Controller\Adminhtml\System;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class ConfigTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * Check Additionally Show Order Total Without Tax Label
+     */
+    public function testAdditionallyShowOrderTotalWithoutTax()
+    {
+        $this->dispatch('backend/admin/system_config/edit/section/tax/');
+        $body = $this->getResponse()->getBody();
+        $this->assertStringContainsString('id="tax_cart_display_grandtotal"', $body);
+        $this->assertStringContainsString('id="tax_sales_display_grandtotal"', $body);
+        $this->assertStringContainsString('Additionally Show Order Total Without Tax', $body);
+    }
+}