Merge branch '2.4-develop' into PR_2025_04_25

Author: magento-devops-queue-mgr-svc

app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php

@@ -1,17 +1,21 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
+use Exception;
+use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface as ResolverContext;
 use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
@@ -37,31 +41,40 @@ class UpdateCustomerEmail implements ResolverInterface
      */
     private $extractCustomerData;
 
+    /**
+     * @var EmailNotificationInterface
+     */
+    private $emailNotification;
+
     /**
      * @param GetCustomer $getCustomer
      * @param UpdateCustomerAccount $updateCustomerAccount
      * @param ExtractCustomerData $extractCustomerData
+     * @param EmailNotificationInterface|null $emailNotification
      */
     public function __construct(
         GetCustomer $getCustomer,
         UpdateCustomerAccount $updateCustomerAccount,
-        ExtractCustomerData $extractCustomerData
+        ExtractCustomerData $extractCustomerData,
+        ?EmailNotificationInterface $emailNotification = null
     ) {
         $this->getCustomer = $getCustomer;
         $this->updateCustomerAccount = $updateCustomerAccount;
         $this->extractCustomerData = $extractCustomerData;
+        $this->emailNotification = $emailNotification
+            ?? ObjectManager::getInstance()->get(EmailNotificationInterface::class);
     }
 
     /**
      * Resolve customer email update mutation
      *
-     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context
+     * @param Field $field
+     * @param ResolverContext $context
      * @param ResolveInfo $info
      * @param array|null $value
      * @param array|null $args
      * @return array|Value
-     * @throws \Exception
+     * @throws Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function resolve(
@@ -77,6 +90,7 @@ public function resolve(
         }
 
         $customer = $this->getCustomer->execute($context);
+        $customerOriginalEmail = $customer->getEmail();
         $customer->setData('ignore_validation_flag', true);
         $this->updateCustomerAccount->execute(
             $customer,
@@ -86,7 +100,11 @@ public function resolve(
             ],
             $context->getExtensionAttributes()->getStore()
         );
-
+        $this->emailNotification->credentialsChanged(
+            $customer,
+            $customerOriginalEmail,
+            false
+        );
         return ['customer' => $this->extractCustomerData->execute($customer)];
     }
 }

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -15,7 +15,6 @@
  * Adminhtml sales order create sidebar cart block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Cart extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
@@ -59,16 +58,6 @@ public function getItemCollection()
         $collection = $this->getData('item_collection');
         if ($collection === null) {
             $collection = $this->getCreateOrderModel()->getCustomerCart()->getAllVisibleItems();
-            $transferredItems = $this->getCreateOrderModel()->getSession()->getTransferredItems() ?? [];
-            $transferredItems = $transferredItems[$this->getDataId()] ?? [];
-            if (!empty($transferredItems)) {
-                foreach ($collection as $key => $item) {
-                    if (in_array($item->getId(), $transferredItems)) {
-                        unset($collection[$key]);
-                    }
-                }
-            }
-
             $this->setData('item_collection', $collection);
         }
         return $collection;

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -2359,25 +2359,22 @@ private function formattedOptions(\Magento\Catalog\Model\Product $product, $buyR
     }
 
     /**
-     * Remove cart from transferred items and update the qty.
+     * Remove cart from transferred items
      *
      * @param int|null|Item $cartItem
      * @param int $itemId
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @see AC-14442
      */
     private function removeCartTransferredItemsAndUpdateQty(int|null|Item $cartItem, int $itemId)
     {
         $removeCartTransferredItems = $this->getSession()->getTransferredItems() ?? [];
         if (isset($removeCartTransferredItems['cart'])) {
             $removeTransferredItemKey = array_search($cartItem->getId(), $removeCartTransferredItems['cart']);
-            if ($removeCartTransferredItems['cart'][$removeTransferredItemKey]) {
+            if ($removeTransferredItemKey !== false && $removeCartTransferredItems['cart'][$removeTransferredItemKey]) {
                 $cartItem->clearMessage();
                 $cartItem->setHasError(false);
-                if (isset($this->request->get('item')[$itemId]['qty'])) {
-                    $qty = $this->request->get('item')[$itemId]['qty'];
-                    $cartItem->setQty($qty);
-                }
-
                 if ($cartItem->getHasError()) {
                     throw new LocalizedException(__($cartItem->getMessage()));
                 }

app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml

@@ -182,8 +182,10 @@
         <actionGroup ref="AdminClickUpdateChangesOnCreateOrderPageActionGroup" stepKey="clickOnUpdateButton1"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForAdminCreateOrderShoppingCartSectionPageLoad1"/>
 
-        <dontSee selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct.name$$" stepKey="donSeeProductInShoppingCart"/>
-        <dontSee selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct1.name$$" stepKey="dontSeeSecondProductInShoppingCart"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="donSeeProductInShoppingCart"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="dontSeeSecondProductInShoppingCart"/>
+        <see selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct.name$$" stepKey="seeProductInShoppingCart2"/>
+        <see selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct1.name$$" stepKey="seeSecondProductInShoppingCart2"/>
 
         <dontSee selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$$simpleProduct.name$$" stepKey="seeSimpleProductInWishList1"/>
         <dontSee selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProductInWishList1"/>

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

@@ -528,6 +528,7 @@ Subtotal:,Subtotal:
 Refresh,Refresh
 Item,Item
 "Add To Order","Add To Order"
+"Add to the new order", "Add to the new order"
 "Configure and Add to Order","Configure and Add to Order"
 "No items","No items"
 "Append Comments","Append Comments"

app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2013 Adobe
  * All Rights Reserved.
  */
 
@@ -64,9 +64,9 @@ $sideBarPermissionCheck = $block->getData('sideBarPermissionCheck');
                     <?php endif; ?>
 
                     <th class="col-add">
-                        <span title="<?= $escaper->escapeHtml(__('Add To Order')) ?>"
+                        <span title="<?= $escaper->escapeHtml(__('Add to the new order')) ?>"
                               class="icon icon-add">
-                            <span><?= $escaper->escapeHtml(__('Add To Order')) ?></span>
+                            <span><?= $escaper->escapeHtml(__('Add to the new order')) ?></span>
                         </span>
                     </th>
                 </tr>
@@ -145,7 +145,7 @@ $sideBarPermissionCheck = $block->getData('sideBarPermissionCheck');
                                            name="sidebar[<?= $escaper->escapeHtmlAttr($block->getSidebarStorageAction())
                                             ?>][<?= (int) $block->getIdentifierId($_item) ?>]"
                                            value="<?= $block->canDisplayItemQty() ? (float) $_item->getQty() : 1 ?>"
-                                           title="<?= $escaper->escapeHtml(__('Add To Order')) ?>"/>
+                                           title="<?= $escaper->escapeHtml(__('Add to the new order')) ?>"/>
                                     <label class="admin__field-label"
                                            for="sidebar-<?= $escaper->escapeHtmlAttr($block->getSidebarStorageAction())
                                             ?>-<?= (int) $block->getIdentifierId($_item) ?>">

app/code/Magento/SalesGraphQl/Model/Resolver/Reorder.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);
 
@@ -11,6 +11,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Lock\LockManagerInterface;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Sales\Model\Reorder\Data\Error;
 use Magento\Sales\Model\OrderFactory;
@@ -26,6 +27,10 @@ class Reorder implements ResolverInterface
      */
     private const ARGUMENT_ORDER_NUMBER = 'orderNumber';
 
+    private const LOCK_PREFIX = 'reorder_lock_';
+
+    private const LOCK_TIMEOUT = 60;
+
     /**
      * @var OrderFactory
      */
@@ -36,16 +41,24 @@ class Reorder implements ResolverInterface
      */
     private $reorder;
 
+    /**
+     * @var LockManagerInterface
+     */
+    private $lockManager;
+
     /**
      * @param \Magento\Sales\Model\Reorder\Reorder $reorder
      * @param OrderFactory $orderFactory
+     * @param LockManagerInterface $lockManager
      */
     public function __construct(
         \Magento\Sales\Model\Reorder\Reorder $reorder,
-        OrderFactory $orderFactory
+        OrderFactory $orderFactory,
+        LockManagerInterface $lockManager
     ) {
         $this->orderFactory = $orderFactory;
         $this->reorder = $reorder;
+        $this->lockManager = $lockManager;
     }
 
     /**
@@ -74,7 +87,18 @@ public function resolve(
             );
         }
 
-        $reorderOutput = $this->reorder->execute($orderNumber, $storeId);
+        $lockName = hash('sha256', $orderNumber);
+        if ($this->lockManager->lock(self::LOCK_PREFIX . $lockName, self::LOCK_TIMEOUT)) {
+            try {
+                $reorderOutput = $this->reorder->execute($orderNumber, $storeId);
+            } finally {
+                $this->lockManager->unlock(self::LOCK_PREFIX . $lockName);
+            }
+        } else {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Sorry, there has been an error processing your request. Please try again later.')
+            );
+        }
 
         return [
             'cart' => [