Merge remote-tracking branch '32359/patch-4' into novcommpr-3

Author: engcom-Dash

app/code/Magento/LoginAsCustomerAssistance/Model/Config.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -42,7 +42,7 @@ public function getShoppingAssistanceCheckboxTitle(): string
     {
         return (string)$this->scopeConfig->getValue(
             self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TITLE,
-            ScopeInterface::SCOPE_WEBSITE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -53,7 +53,7 @@ public function getShoppingAssistanceCheckboxTooltip(): string
     {
         return (string)$this->scopeConfig->getValue(
             self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TOOLTIP,
-            ScopeInterface::SCOPE_WEBSITE
+            ScopeInterface::SCOPE_STORE
         );
     }
 }

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

@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="login_as_customer" showInWebsite="1">
-            <group id="general" showInWebsite="1">
-                <field id="shopping_assistance_checkbox_title" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" canRestore="1">
+        <section id="login_as_customer" showInWebsite="1" showInStore="1">
+            <group id="general" showInWebsite="1" showInStore="1">
+                <field id="shopping_assistance_checkbox_title" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Title for Login as Customer opt-in checkbox</label>
                 </field>
-                <field id="shopping_assistance_checkbox_tooltip" translate="label" type="textarea" sortOrder="60" showInDefault="1" showInWebsite="1" canRestore="1">
+                <field id="shopping_assistance_checkbox_tooltip" translate="label" type="textarea" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Login as Customer checkbox tooltip</label>
                 </field>
             </group>