Merge remote-tracking branch 'upstream/2.4-develop' into 2.4-develop-pr

Author: joanhe

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php

@@ -63,6 +63,13 @@ public function resolve(
         $product = $value['model'];
         $product->unsetData('minimal_price');
 
+        if ($context) {
+            $customerGroupId = $context->getExtensionAttributes()->getCustomerGroupId();
+            if ($customerGroupId !== null) {
+                $product->setCustomerGroupId($customerGroupId);
+            }
+        }
+
         $requestedFields = $info->getFieldSelection(10);
         $returnArray = [];
 

app/code/Magento/Customer/Model/Group/Resolver.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Group;
+
+use Magento\Customer\Model\ResourceModel\Group\Resolver as ResolverResource;
+
+/**
+ * Lightweight service for getting current customer group based on customer id
+ */
+class Resolver
+{
+    /**
+     * @var ResolverResource
+     */
+    private $resolverResource;
+
+    /**
+     * @param ResolverResource $resolverResource
+     */
+    public function __construct(ResolverResource $resolverResource)
+    {
+        $this->resolverResource = $resolverResource;
+    }
+
+    /**
+     * Return customer group id
+     *
+     * @param int $customerId
+     * @return int|null
+     */
+    public function resolve(int $customerId) : ?int
+    {
+        return $this->resolverResource->resolve($customerId);
+    }
+}

app/code/Magento/Customer/Model/ResourceModel/Group/Resolver.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\ResourceModel\Group;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Resource model for customer group resolver service
+ */
+class Resolver
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Resolve customer group from db
+     *
+     * @param int $customerId
+     * @return int|null
+     */
+    public function resolve(int $customerId) : ?int
+    {
+        $result = null;
+
+        $connection = $this->resourceConnection->getConnection();
+        $tableName = $this->resourceConnection->getTableName('customer_entity');
+
+        $query = $connection
+            ->select()
+            ->from(
+                ['main_table' => $tableName],
+                ['main_table.group_id']
+            )
+            ->where('main_table.entity_id = ?', $customerId);
+        $groupId = $connection->fetchOne($query);
+        if ($groupId) {
+            $result = (int) $groupId;
+        }
+
+        return $result;
+    }
+}

app/code/Magento/CustomerGraphQl/Model/Context/AddCustomerGroupToContext.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Context;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\GraphQl\Model\Query\ContextParametersInterface;
+use Magento\GraphQl\Model\Query\ContextParametersProcessorInterface;
+use Magento\Customer\Model\Group;
+use Magento\Customer\Model\Group\Resolver as CustomerGroupResolver;
+
+/**
+ * @inheritdoc
+ */
+class AddCustomerGroupToContext implements ContextParametersProcessorInterface
+{
+    /**
+     * @var CustomerGroupResolver
+     */
+    private $customerGroupResolver;
+
+    /**
+     * @param CustomerGroupResolver $customerGroupResolver
+     */
+    public function __construct(
+        CustomerGroupResolver $customerGroupResolver
+    ) {
+        $this->customerGroupResolver = $customerGroupResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(ContextParametersInterface $contextParameters): ContextParametersInterface
+    {
+        $customerGroupId = null;
+        $extensionAttributes = $contextParameters->getExtensionAttributesData();
+        if ($contextParameters->getUserType() === UserContextInterface::USER_TYPE_GUEST) {
+            $customerGroupId = Group::NOT_LOGGED_IN_ID;
+        } elseif (!empty($extensionAttributes) && $extensionAttributes['is_customer'] === true) {
+            $customerGroupId = $this->customerGroupResolver->resolve((int) $contextParameters->getUserId());
+        }
+        if ($customerGroupId !== null) {
+            $contextParameters->addExtensionAttribute('customer_group_id', (int) $customerGroupId);
+        }
+        return $contextParameters;
+    }
+}

app/code/Magento/CustomerGraphQl/etc/graphql/di.xml

@@ -17,6 +17,7 @@
         <arguments>
             <argument name="contextParametersProcessors" xsi:type="array">
                 <item name="add_user_info_to_context" xsi:type="object">Magento\CustomerGraphQl\Model\Context\AddUserInfoToContext</item>
+                <item name="add_customer_group_to_context" xsi:type="object">Magento\CustomerGraphQl\Model\Context\AddCustomerGroupToContext</item>
             </argument>
         </arguments>
     </type>

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

@@ -14,6 +14,11 @@
                     <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
                 </field>
+                <field id="new_user_notification_template" translate="label comment" type="select" sortOrder="50" showInDefault="1" canRestore="1">
+                    <label>New User Notification Template</label>
+                    <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
+                </field>
             </group>
             <group id="security">
                 <field id="lockout_failures" translate="label comment" sortOrder="100" showInDefault="1" canRestore="1">

app/code/Magento/User/view/adminhtml/email/new_user_notification.html

@@ -4,20 +4,20 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "New admin user '%user_name' created" user_name=$user.name}} @-->
+<!--@subject {{trans "New admin user '%user_name' created" user_name=$user.username}} @-->
 <!--@vars {
 "var store.frontend_name":"Store Name",
-"var user.name":"User Name",
-"var user.first_name":"User First Name",
-"var user.last_name":"User Last Name",
+"var user.username":"User Name",
+"var user.firstname":"User First Name",
+"var user.lastname":"User Last Name",
 "var user.email":"User Email",
 "var store_email":"Store Email",
 "var store_phone":"Store Phone"
 } @-->
 
 {{trans "Hello,"}}
 
-{{trans "A new admin account was created for %first_name, %last_name using %email." first_name=$user.first_name last_name=$user.last_name email=$user.email}}
+{{trans "A new admin account was created for %first_name, %last_name using %email." first_name=$user.firstname last_name=$user.lastname email=$user.email}}
 {{trans "If you have not authorized this action, please contact us immediately at %store_email" store_email=$store_email |escape}}{{depend store_phone}} {{trans "or call us at %store_phone" store_phone=$store_phone |escape}}{{/depend}}.
 
 {{trans "Thanks,"}}