MC-37321: Quote customer_is_guest = false

Author: victor-v-rad

app/code/Magento/Checkout/Model/Session.php

@@ -291,6 +291,7 @@ public function getQuote()
                     }
                 } else {
                     $quote->setIsCheckoutCart(true);
+                    $quote->setCustomerIsGuest(true);
                     $this->_eventManager->dispatch('checkout_quote_init', ['quote' => $quote]);
                 }
             }
@@ -382,8 +383,9 @@ public function loadCustomerQuote()
 
         if ($customerQuote->getId() && $this->getQuoteId() != $customerQuote->getId()) {
             if ($this->getQuoteId()) {
+                $quote = $this->getQuote()->setCustomerIsGuest(false);
                 $this->quoteRepository->save(
-                    $customerQuote->merge($this->getQuote())->collectTotals()
+                    $customerQuote->merge($quote)->collectTotals()
                 );
                 $newQuote = $this->quoteRepository->get($customerQuote->getId());
                 $this->quoteRepository->save(
@@ -402,6 +404,7 @@ public function loadCustomerQuote()
             $this->getQuote()->getBillingAddress();
             $this->getQuote()->getShippingAddress();
             $this->getQuote()->setCustomer($this->_customerSession->getCustomerDataObject())
+                ->setCustomerIsGuest(false)
                 ->setTotalsCollectedFlag(false)
                 ->collectTotals();
             $this->quoteRepository->save($this->getQuote());

dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php

@@ -199,6 +199,10 @@ public function testLoadCustomerQuoteCustomerWithoutQuote(): void
             $this->quote->getCustomerEmail(),
             'Precondition failed: Customer data must not be set to quote'
         );
+        $this->assertTrue(
+            $this->quote->getCustomerIsGuest(),
+            'Precondition failed: Customer must be as guest in quote'
+        );
         $customer = $this->customerRepository->getById(1);
         $this->customerSession->setCustomerDataObject($customer);
         $this->quote = $this->checkoutSession->getQuote();
@@ -244,6 +248,17 @@ public function testGetQuoteWithProductWithTierPrice(): void
         $this->assertEquals($tierPriceValue, $quoteProduct->getTierPrice(1));
     }
 
+    /**
+     * Test covers case when quote is not yet initialized and customer is guest
+     *
+     * Expected result - quote object should be loaded with customer as guest
+     */
+    public function testGetQuoteNotInitializedGuest()
+    {
+        $quote = $this->checkoutSession->getQuote();
+        $this->assertTrue($quote->getCustomerIsGuest());
+    }
+
     /**
      * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
      * @magentoDataFixture Magento/Checkout/_files/quote_with_customer_without_address.php
@@ -288,5 +303,9 @@ private function validateCustomerDataInQuote(CartInterface $quote): void
             $quote->getCustomerFirstname(),
             'Customer first name was not set to Quote correctly.'
         );
+        $this->assertFalse(
+            $quote->getCustomerIsGuest(),
+            'Customer should not be as guest in Quote.'
+        );
     }
 }