Merge branch 'ACP2E-2470-2' of https://github.com/adobe-commerce-tier-4/magento2ce into 04-29-24-Tier4-Bugfix-Delivery

Author: thiaramus

app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php

@@ -7,60 +7,43 @@
 namespace Magento\Persistent\Model\Checkout;
 
 use Magento\Checkout\Model\GuestPaymentInformationManagement;
-use Magento\Checkout\Model\Session;
 
 /**
- * Plugin to convert shopping cart from persistent cart to guest cart before order save when customer not logged in
- *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class GuestPaymentInformationManagementPlugin
 {
     /**
-     * Persistence Session Helper
-     *
      * @var \Magento\Persistent\Helper\Session
      */
     private $persistenceSessionHelper;
 
     /**
-     * Persistence Data Helper
-     *
      * @var \Magento\Persistent\Helper\Data
      */
     private $persistenceDataHelper;
 
     /**
-     * Customer Session
-     *
      * @var \Magento\Customer\Model\Session
      */
     private $customerSession;
 
     /**
-     * Checkout Session
-     *
      * @var \Magento\Checkout\Model\Session
      */
     private $checkoutSession;
 
     /**
-     * Quote Manager
-     *
      * @var \Magento\Persistent\Model\QuoteManager
      */
     private $quoteManager;
 
     /**
-     * Cart Repository
-     *
      * @var \Magento\Quote\Api\CartRepositoryInterface
      */
     private $cartRepository;
 
     /**
-     * Initialize dependencies
-     *
      * @param \Magento\Persistent\Helper\Data $persistenceDataHelper
      * @param \Magento\Persistent\Helper\Session $persistenceSessionHelper
      * @param \Magento\Customer\Model\Session $customerSession
@@ -85,7 +68,7 @@ public function __construct(
     }
 
     /**
-     * Convert customer cart to guest cart before order is placed if customer is not logged in
+     * Update customer email with the provided one
      *
      * @param GuestPaymentInformationManagement $subject
      * @param string $cartId
@@ -107,12 +90,9 @@ public function beforeSavePaymentInformation(
             && $this->persistenceDataHelper->isShoppingCartPersist()
             && $this->quoteManager->isPersistent()
         ) {
-            $this->customerSession->setCustomerId(null);
-            $this->customerSession->setCustomerGroupId(null);
-            $this->quoteManager->convertCustomerCartToGuest();
             $quoteId = $this->checkoutSession->getQuoteId();
             $quote = $this->cartRepository->get($quoteId);
-            $quote->setCustomerEmail($email);
+            $quote->setCustomerIsGuest(true);
             $quote->getAddressesCollection()->walk('setEmail', ['email' => $email]);
             $this->cartRepository->save($quote);
         }

app/code/Magento/Persistent/Model/Checkout/GuestShippingInformationManagementPlugin.php

@@ -0,0 +1,62 @@
+<?php
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * **********************************************************************
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\Model\Plugin;
+
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Persistent\Helper\Session as PersistentSession;
+use Magento\Persistent\Model\QuoteManager;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteManagement;
+
+/**
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class ConvertCustomerCartToGuest
+{
+    /**
+     * @param CustomerSession $customerSession
+     * @param PersistentSession $persistentSession
+     * @param QuoteManager $quoteManager
+     */
+    public function __construct(
+        private readonly CustomerSession $customerSession,
+        private readonly PersistentSession $persistentSession,
+        private readonly QuoteManager $quoteManager
+    ) {
+    }
+
+    /**
+     * Convert customer cart to guest cart before order is placed if customer is not logged in
+     *
+     * @param QuoteManagement $subject
+     * @param Quote $quote
+     * @param array $orderData
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSubmit(QuoteManagement $subject, Quote $quote, array $orderData = []): void
+    {
+        if ($quote->getIsPersistent() && $quote->getCustomerId() && $quote->getCustomerIsGuest()) {
+            $this->customerSession->setCustomerId(null);
+            $this->customerSession->setCustomerGroupId(null);
+            $this->persistentSession->getSession()->removePersistentCookie();
+            $this->persistentSession->setSession(null);
+            $this->quoteManager->convertCustomerCartToGuest($quote);
+        }
+    }
+}

app/code/Magento/Persistent/Model/Plugin/ConvertCustomerCartToGuest.php

@@ -23,22 +23,16 @@
 class QuoteManager
 {
     /**
-     * Persistent session
-     *
      * @var \Magento\Persistent\Helper\Session
      */
     protected $persistentSession;
 
     /**
-     * Checkout session
-     *
      * @var \Magento\Checkout\Model\Session
      */
     protected $checkoutSession;
 
     /**
-     * Persistent data
-     *
      * @var Data
      */
     protected $persistentData;
@@ -163,30 +157,24 @@ private function cleanCustomerData($quote)
      * Converts persistent cart tied to logged out customer to a guest cart, retaining customer information required for
      * checkout
      *
+     * @param Quote $quote
      * @return void
      */
-    public function convertCustomerCartToGuest()
+    public function convertCustomerCartToGuest(Quote $quote)
     {
-        $quoteId = $this->checkoutSession->getQuoteId();
-        /** @var $quote Quote */
-        $quote = $this->quoteRepository->get($quoteId);
-        if ($quote && $quote->getId()) {
-            $this->_setQuotePersistent = false;
-            $quote->setIsActive(true)
-                ->setCustomerId(null)
-                ->setCustomerEmail(null)
-                ->setCustomerFirstname(null)
-                ->setCustomerLastname(null)
-                ->setIsPersistent(false);
-            $quote->getAddressesCollection()->walk('setCustomerAddressId', ['customerAddressId' => null]);
-            $quote->getAddressesCollection()->walk('setCustomerId', ['customerId' => null]);
-            $quote->getAddressesCollection()->walk('setEmail', ['email' => null]);
-            $quote->collectTotals();
-            $quote->getCustomer()->setId(null);
-            $this->persistentSession->getSession()->removePersistentCookie();
-            $this->persistentSession->setSession(null);
-            $this->quoteRepository->save($quote);
-        }
+        $this->_setQuotePersistent = false;
+        $billingAddress = $quote->getBillingAddress();
+        $quote->setCustomerId(null)
+            ->setCustomerGroupId(GroupInterface::NOT_LOGGED_IN_ID)
+            ->setCustomerEmail($billingAddress->getEmail())
+            ->setCustomerFirstname($billingAddress->getFirstname())
+            ->setCustomerLastname($billingAddress->getLastname())
+            ->setIsPersistent(false);
+        $quote->getAddressesCollection()->walk('setCustomerAddressId', ['customerAddressId' => null]);
+        $quote->getAddressesCollection()->walk('setCustomerId', ['customerId' => null]);
+        $quote->collectTotals();
+        $quote->getCustomer()->setId(null);
+        $this->quoteRepository->save($quote);
     }
 
     /**