MAGETWO-61095: When attempting to place a reorder after a product is disabled, product still gets added to the cart

Author: vzabaznov

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

@@ -1572,6 +1572,12 @@ public function addProduct(
             );
         }
 
+        if (!$product->isSalable()) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Product that you are trying to add is not available.')
+            );
+        }
+
         $cartCandidates = $product->getTypeInstance()->prepareForCartAdvanced($request, $product, $processMode);
 
         /**

app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php

@@ -854,6 +854,10 @@ public function testAddProductNoCandidates()
             ->with($this->equalTo(['qty' => 1]))
             ->will($this->returnValue($requestMock));
 
+        $this->productMock->expects($this->once())
+            ->method('isSalable')
+            ->willReturn(true);
+
         $typeInstanceMock = $this->getMock(
             \Magento\Catalog\Model\Product\Type\Simple::class,
             [
@@ -936,6 +940,10 @@ public function testAddProductItemPreparation()
             ->method('create')
             ->will($this->returnValue($collectionMock));
 
+        $this->productMock->expects($this->once())
+            ->method('isSalable')
+            ->willReturn(true);
+
         $typeInstanceMock->expects($this->once())
             ->method('prepareForCartAdvanced')
             ->will($this->returnValue([$productMock]));

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

@@ -7,6 +7,8 @@
 
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Catalog\Model\ProductRepository;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -32,7 +34,7 @@ public function testCollectTotalsWithVirtual()
         $productRepository = Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Api\ProductRepositoryInterface::class
         );
-        $product = $productRepository->get('virtual-product');
+        $product = $productRepository->get('virtual-product', false, null, true);
         $quote->addProduct($product);
         $quote->collectTotals();
 
@@ -46,9 +48,9 @@ public function testSetCustomerData()
     {
         /** @var \Magento\Quote\Model\Quote $quote */
         $quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
-        /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory */
+        /** @var CustomerInterfaceFactory $customerFactory */
         $customerFactory = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Api\Data\CustomerInterfaceFactory::class
+            CustomerInterfaceFactory::class
         );
         /** @var \Magento\Framework\Api\DataObjectHelper $dataObjectHelper */
         $dataObjectHelper = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\DataObjectHelper::class);
@@ -73,7 +75,7 @@ public function testUpdateCustomerData()
         /** @var \Magento\Quote\Model\Quote $quote */
         $quote = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
         $customerFactory = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Api\Data\CustomerInterfaceFactory::class
+            CustomerInterfaceFactory::class
         );
         /** @var \Magento\Framework\Api\DataObjectHelper $dataObjectHelper */
         $dataObjectHelper = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\DataObjectHelper::class);
@@ -118,9 +120,9 @@ public function testUpdateCustomerData()
     public function testGetCustomerGroupFromCustomer()
     {
         /** Preconditions */
-        /** @var \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory */
+        /** @var CustomerInterfaceFactory $customerFactory */
         $customerFactory = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Api\Data\CustomerInterfaceFactory::class
+            CustomerInterfaceFactory::class
         );
         $customerGroupId = 3;
         $customerData = $customerFactory->create()->setId(1)->setGroupId($customerGroupId);
@@ -302,7 +304,7 @@ public function testAddProductUpdateItem()
         $productRepository = Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Api\ProductRepositoryInterface::class
         );
-        $product = $productRepository->get('simple-1');
+        $product = $productRepository->get('simple-1', false, null, true);
 
         $quote->addProduct($product, 50);
         $quote->setTotalsCollectedFlag(false)->collectTotals();
@@ -423,4 +425,29 @@ public function testReserveOrderId()
         $quote->reserveOrderId();
         $this->assertNotEquals('100000001', $quote->getReservedOrderId());
     }
+
+    /**
+     * Test to verify that disabled product cannot be added to cart
+     * @magentoDataFixture Magento/Quote/_files/disabled_product.php
+     * @magentoAppIsolation enabled
+     */
+    public function testAddedProductToQuoteIsSalable()
+    {
+        $productId = 1;
+        $objectManager = Bootstrap::getObjectManager();
+
+        /** @var ProductRepository $productRepository */
+        $productRepository = $objectManager->get(ProductRepository::class);
+
+        /** @var \Magento\Quote\Model\Quote  $quote */
+        $product = $productRepository->getById($productId, false, null, true);
+
+        $this->setExpectedException(
+            LocalizedException::class,
+            'Product that you are trying to add is not available.'
+        );
+
+        $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+        $quote->addProduct($product);
+    }
 }

dev/tests/integration/testsuite/Magento/Quote/_files/disabled_product.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+    ->setId(1)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED)
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'qty'                       => 100,
+            'is_qty_decimal'            => 0,
+            'is_in_stock'               => 1,
+        ]
+    )
+    ->setCanSaveCustomOptions(true)
+    ->setHasOptions(true);