Merge remote-tracking branch 'origin/magento2-login-as-customer#150V3' into login-as-customer-150

# Conflicts:
#	app/code/Magento/LoginAsCustomerAssistance/composer.json

Author: naydav

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

@@ -9,6 +9,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\LoginAsCustomerAssistance\Api\ConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @inheritdoc
@@ -42,14 +43,20 @@ public function __construct(
      */
     public function getShoppingAssistanceCheckboxTitle(): string
     {
-        return (string)$this->scopeConfig->getValue(self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TITLE);
+        return (string)$this->scopeConfig->getValue(
+            self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TITLE,
+            ScopeInterface::SCOPE_WEBSITE
+        );
     }
 
     /**
      * @inheritdoc
      */
     public function getShoppingAssistanceCheckboxTooltip(): string
     {
-        return (string)$this->scopeConfig->getValue(self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TOOLTIP);
+        return (string)$this->scopeConfig->getValue(
+            self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TOOLTIP,
+            ScopeInterface::SCOPE_WEBSITE
+        );
     }
 }

app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php

@@ -57,8 +57,8 @@ public function beforeExtractData(
         $scope = null,
         $scopeOnly = true
     ): void {
-        if (!$this->authorization->isAllowed('Magento_LoginAsCustomer::opt_in_preference')
-            && $this->isSetAssistanceAllowedParam($request)
+        if ($this->isSetAssistanceAllowedParam($request)
+            && !$this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance')
         ) {
             $customerId = $request->getParam('customer_id');
             $assistanceAllowedParam =

app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php

@@ -89,7 +89,7 @@ public function afterGetMeta(
     ): array {
         if (!$this->config->isEnabled()) {
             $assistanceAllowedConfig = ['visible' => false];
-        } elseif (!$this->authorization->isAllowed('Magento_LoginAsCustomer::opt_in_preference')) {
+        } elseif (!$this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance')) {
             $assistanceAllowedConfig = [
                 'disabled' => true,
                 'notice' => __('You have no permission to change Opt-In preference.'),

app/code/Magento/LoginAsCustomerAssistance/composer.json

@@ -6,11 +6,12 @@
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-customer": "*",
+        "magento/module-store": "*",
+        "magento/module-login-as-customer": "*",
         "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
-        "magento/module-login-as-customer-admin-ui": "*",
-        "magento/module-login-as-customer": "*"
+        "magento/module-login-as-customer-admin-ui": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml

@@ -11,7 +11,7 @@
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Customer::customer">
                     <resource id="Magento_LoginAsCustomer::login">
-                        <resource id="Magento_LoginAsCustomer::opt_in_preference" title="Change Customer Opt-In Preference" sortOrder="20" />
+                        <resource id="Magento_LoginAsCustomer::allow_shopping_assistance" title="Allow remote shopping assistance" sortOrder="20" />
                     </resource>
                 </resource>
             </resource>