Merge branch '2.4-develop' into feature/36346-czechia-regions

Author: engcom-Alfa

app/code/Magento/Checkout/view/frontend/web/js/view/checkout/placeOrderCaptcha.js

@@ -20,7 +20,6 @@ function (defaultCaptcha, captchaList, _, placeOrderHooks) {
 
             this._super();
             currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
-
             if (currentCaptcha != null) {
                 currentCaptcha.setIsVisible(true);
                 this.setCurrentCaptcha(currentCaptcha);
@@ -29,9 +28,11 @@ function (defaultCaptcha, captchaList, _, placeOrderHooks) {
                         headers['X-Captcha'] = self.captchaValue()();
                     }
                 });
-                placeOrderHooks.afterRequestListeners.push(function () {
-                    self.refresh();
-                });
+                if (self.isRequired()) {
+                    placeOrderHooks.afterRequestListeners.push(function () {
+                        self.refresh();
+                    });
+                }
             }
         }
     });

app/code/Magento/Customer/Test/Fixture/Customer.php

@@ -8,11 +8,10 @@
 
 namespace Magento\Customer\Test\Fixture;
 
+use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Model\Customer as CustomerModel;
-use Magento\Customer\Model\CustomerFactory;
 use Magento\Customer\Model\CustomerRegistry;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
@@ -36,10 +35,10 @@ class Customer implements RevertibleDataFixtureInterface
         CustomerInterface::CREATED_IN => null,
         CustomerInterface::DOB => null,
         CustomerInterface::EMAIL => 'customer%uniqid%@mail.com',
-        CustomerInterface::FIRSTNAME => 'Firstname %uniqid%',
+        CustomerInterface::FIRSTNAME => 'Firstname%uniqid%',
         CustomerInterface::GENDER => null,
         CustomerInterface::GROUP_ID => null,
-        CustomerInterface::LASTNAME => 'Lastname %uniqid%',
+        CustomerInterface::LASTNAME => 'Lastname%uniqid%',
         CustomerInterface::MIDDLENAME => null,
         CustomerInterface::PREFIX => null,
         CustomerInterface::STORE_ID => null,
@@ -49,7 +48,9 @@ class Customer implements RevertibleDataFixtureInterface
         CustomerInterface::DEFAULT_BILLING => null,
         CustomerInterface::DEFAULT_SHIPPING => null,
         CustomerInterface::KEY_ADDRESSES => [],
-        CustomerInterface::DISABLE_AUTO_GROUP_CHANGE => null
+        CustomerInterface::DISABLE_AUTO_GROUP_CHANGE => null,
+        CustomerInterface::CUSTOM_ATTRIBUTES => [],
+        CustomerInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
 
     private const DEFAULT_DATA_ADDRESS = [
@@ -58,80 +59,68 @@ class Customer implements RevertibleDataFixtureInterface
         AddressInterface::REGION => 'Massachusetts',
         AddressInterface::REGION_ID => '32',
         AddressInterface::COUNTRY_ID => 'US',
-        AddressInterface::STREET => '123 Test Street',
+        AddressInterface::STREET => ['%street_number% Test Street%uniqid%'],
         AddressInterface::COMPANY => null,
         AddressInterface::TELEPHONE => '1234567890',
         AddressInterface::FAX => null,
         AddressInterface::POSTCODE => '02108',
         AddressInterface::CITY => 'Boston',
-        AddressInterface::FIRSTNAME => 'Firstname %uniqid%',
-        AddressInterface::LASTNAME => 'Lastname %uniqid%',
+        AddressInterface::FIRSTNAME => 'Firstname%uniqid%',
+        AddressInterface::LASTNAME => 'Lastname%uniqid%',
         AddressInterface::MIDDLENAME => null,
         AddressInterface::PREFIX => null,
         AddressInterface::SUFFIX => null,
         AddressInterface::VAT_ID => null,
         AddressInterface::DEFAULT_BILLING => true,
-        AddressInterface::DEFAULT_SHIPPING => true
+        AddressInterface::DEFAULT_SHIPPING => true,
+        AddressInterface::CUSTOM_ATTRIBUTES => [],
+        AddressInterface::EXTENSION_ATTRIBUTES_KEY => [],
     ];
 
     /**
      * @var ServiceFactory
      */
-    private $serviceFactory;
+    private ServiceFactory $serviceFactory;
 
     /**
-     * @var CustomerRepositoryInterface
+     * @var AccountManagementInterface
      */
-    private $customerRepository;
-
-    /**
-     * @var CustomerFactory
-     */
-    private $customerFactory;
+    private AccountManagementInterface $accountManagement;
 
     /**
      * @var CustomerRegistry
      */
-    private $customerRegistry;
+    private CustomerRegistry $customerRegistry;
 
     /**
      * @var ProcessorInterface
      */
-    private $dataProcessor;
+    private ProcessorInterface $dataProcessor;
 
     /**
      * @var DataMerger
      */
-    private $dataMerger;
-
-    /**
-     * @var CustomerModel|null
-     */
-    private $customer;
+    private DataMerger $dataMerger;
 
     /**
      * @param ServiceFactory $serviceFactory
-     * @param CustomerRepositoryInterface $customerRepository
-     * @param CustomerFactory $customerFactory
+     * @param AccountManagementInterface $accountManagement
      * @param CustomerRegistry $customerRegistry
      * @param ProcessorInterface $dataProcessor
      * @param DataMerger $dataMerger
      */
     public function __construct(
         ServiceFactory $serviceFactory,
-        CustomerRepositoryInterface $customerRepository,
-        CustomerFactory $customerFactory,
+        AccountManagementInterface $accountManagement,
         CustomerRegistry $customerRegistry,
         ProcessorInterface $dataProcessor,
-        DataMerger $dataMerger,
+        DataMerger $dataMerger
     ) {
         $this->serviceFactory = $serviceFactory;
-        $this->customerRepository = $customerRepository;
-        $this->customerFactory = $customerFactory;
+        $this->accountManagement = $accountManagement;
         $this->customerRegistry = $customerRegistry;
         $this->dataProcessor = $dataProcessor;
         $this->dataMerger = $dataMerger;
-        $this->customer = null;
     }
 
     /**
@@ -145,14 +134,12 @@ public function apply(array $data = []): ?DataObject
     {
         $customerSaveService = $this->serviceFactory->create(CustomerRepositoryInterface::class, 'save');
         $data = $this->prepareData($data);
-        if (count($data[CustomerInterface::KEY_ADDRESSES])) {
-            $addresses = $this->prepareCustomerAddress($data[CustomerInterface::KEY_ADDRESSES]);
-            $data[CustomerInterface::KEY_ADDRESSES] = $addresses;
-        }
+        $passwordHash = $this->accountManagement->getPasswordHash($data['password']);
+        unset($data['password']);
         $customerSaveService->execute(
             [
                 'customer' => $data,
-                'passwordHash' => $this->customer->getPasswordHash()
+                'passwordHash' => $passwordHash
             ]
         );
         return $this->customerRegistry->retrieveByEmail($data['email'], $data['website_id']);
@@ -180,29 +167,33 @@ public function revert(DataObject $data): void
      */
     private function prepareData(array $data): array
     {
-        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data, false);
-
-        $this->customer = $this->customerFactory->create(['data' => $data]);
-        $this->customer->setPassword($data['password']);
-        if (isset($data['password'])) {
-            unset($data['password']);
-        }
+        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data);
+        $data[CustomerInterface::KEY_ADDRESSES] = $this->prepareAddresses($data[CustomerInterface::KEY_ADDRESSES]);
 
         return $this->dataProcessor->process($this, $data);
     }
 
     /**
-     * Prepare customer address
+     * Prepare customer addresses
      *
      * @param array $data
      * @return array
      */
-    private function prepareCustomerAddress(array $data): array
+    private function prepareAddresses(array $data): array
     {
         $addresses = [];
+        $default = self::DEFAULT_DATA_ADDRESS;
+        $streetNumber = 123;
         foreach ($data as $dataAddress) {
-            $dataAddress = $this->dataMerger->merge(self::DEFAULT_DATA_ADDRESS, $dataAddress, false);
-            $addresses[] = $this->dataProcessor->process($this, $dataAddress);
+            $dataAddress = $this->dataMerger->merge($default, $dataAddress);
+            $placeholders = ['%street_number%' => $streetNumber++];
+            $dataAddress[AddressInterface::STREET] = array_map(
+                fn ($str) => strtr($str, $placeholders),
+                $dataAddress[AddressInterface::STREET]
+            );
+            $addresses[] = $dataAddress;
+            $default[AddressInterface::DEFAULT_BILLING] = false;
+            $default[AddressInterface::DEFAULT_SHIPPING] = false;
         }
 
         return $addresses;

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -24,6 +24,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Framework\Validator\Exception as ValidatorException;
 use Magento\Payment\Model\Method\AbstractMethod;
@@ -51,6 +52,10 @@
  */
 class QuoteManagement implements CartManagementInterface
 {
+    private const LOCK_PREFIX = 'PLACE_ORDER_';
+
+    private const LOCK_TIMEOUT = 10;
+
     /**
      * @var EventManager
      */
@@ -151,6 +156,11 @@ class QuoteManagement implements CartManagementInterface
      */
     protected $quoteFactory;
 
+    /**
+     * @var LockManagerInterface
+     */
+    private $lockManager;
+
     /**
      * @var QuoteIdMaskFactory
      */
@@ -201,6 +211,7 @@ class QuoteManagement implements CartManagementInterface
      * @param AddressRepositoryInterface|null $addressRepository
      * @param RequestInterface|null $request
      * @param RemoteAddress $remoteAddress
+     * @param LockManagerInterface $lockManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -227,7 +238,8 @@ public function __construct(
         QuoteIdMaskFactory $quoteIdMaskFactory = null,
         AddressRepositoryInterface $addressRepository = null,
         RequestInterface $request = null,
-        RemoteAddress $remoteAddress = null
+        RemoteAddress $remoteAddress = null,
+        LockManagerInterface $lockManager = null
     ) {
         $this->eventManager = $eventManager;
         $this->submitQuoteValidator = $submitQuoteValidator;
@@ -257,6 +269,8 @@ public function __construct(
             ->get(RequestInterface::class);
         $this->remoteAddress = $remoteAddress ?: ObjectManager::getInstance()
             ->get(RemoteAddress::class);
+        $this->lockManager = $lockManager ?: ObjectManager::getInstance()
+            ->get(LockManagerInterface::class);
     }
 
     /**
@@ -584,25 +598,29 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
         $order->setCustomerFirstname($quote->getCustomerFirstname());
         $order->setCustomerMiddlename($quote->getCustomerMiddlename());
         $order->setCustomerLastname($quote->getCustomerLastname());
-
         if ($quote->getOrigOrderId()) {
             $order->setEntityId($quote->getOrigOrderId());
         }
-
         if ($quote->getReservedOrderId()) {
             $order->setIncrementId($quote->getReservedOrderId());
         }
-
         $this->submitQuoteValidator->validateOrder($order);
-
         $this->eventManager->dispatch(
             'sales_model_service_quote_submit_before',
             [
                 'order' => $order,
                 'quote' => $quote
             ]
         );
+
+        $lockedName = self::LOCK_PREFIX . $quote->getId();
+        if ($this->lockManager->isLocked($lockedName)) {
+            throw new LocalizedException(__(
+                'A server error stopped your order from being placed. Please try to place your order again.'
+            ));
+        }
         try {
+            $this->lockManager->lock($lockedName, self::LOCK_TIMEOUT);
             $order = $this->orderManagement->place($order);
             $quote->setIsActive(false);
             $this->eventManager->dispatch(
@@ -613,7 +631,9 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
                 ]
             );
             $this->quoteRepository->save($quote);
+            $this->lockManager->unlock($lockedName);
         } catch (\Exception $e) {
+            $this->lockManager->unlock($lockedName);
             $this->rollbackAddresses($quote, $order, $e);
             throw $e;
         }