Merge remote-tracking branch 'origin/MC-25098' into 2.4-develop-pr3

Author: serhii-balko

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

@@ -272,6 +272,10 @@ public function getQuote()
                          */
                         $quote = $this->quoteRepository->get($this->getQuoteId());
                     }
+
+                    if ($quote->getTotalsCollectedFlag() === false) {
+                        $quote->collectTotals();
+                    }
                 } catch (NoSuchEntityException $e) {
                     $this->setQuoteId(null);
                 }

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

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\Api\FilterBuilder;
@@ -17,7 +18,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * Class SessionTest
+ * Checkout Session model test.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -54,6 +55,35 @@ protected function setUp()
         $this->checkoutSession = $this->objectManager->create(Session::class);
     }
 
+    /**
+     * Tests that quote items and totals are correct when product becomes unavailable.
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoAppIsolation enabled
+     */
+    public function testGetQuoteWithUnavailableProduct()
+    {
+        $reservedOrderId = 'test01';
+        $quoteGrandTotal = 10;
+
+        $quote = $this->getQuote($reservedOrderId);
+        $this->assertEquals(1, $quote->getItemsCount());
+        $this->assertCount(1, $quote->getItems());
+        $this->assertEquals($quoteGrandTotal, $quote->getShippingAddress()->getBaseGrandTotal());
+
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple');
+        $product->setStatus(Status::STATUS_DISABLED);
+        $productRepository->save($product);
+        $this->checkoutSession->setQuoteId($quote->getId());
+        $quote = $this->checkoutSession->getQuote();
+
+        $this->assertEquals(0, $quote->getItemsCount());
+        $this->assertEmpty($quote->getItems());
+        $this->assertEquals(0, $quote->getShippingAddress()->getBaseGrandTotal());
+    }
+
     /**
      * Test covers case when quote is not yet initialized and customer data is set to checkout session model.
      *