Merge pull request #885 from magento-east/MAGETWO-65207

East Bugfixes

Author: Volodymyr Klymenko

app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php

@@ -9,6 +9,7 @@
 
 use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\CatalogInventory\Api\StockStateInterface;
+use Magento\CatalogInventory\Model\Stock;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Helper\Data;
@@ -99,41 +100,43 @@ public function validate(Observer $observer)
     {
         /* @var $quoteItem \Magento\Quote\Model\Quote\Item */
         $quoteItem = $observer->getEvent()->getItem();
-
         if (!$quoteItem ||
             !$quoteItem->getProductId() ||
             !$quoteItem->getQuote() ||
             $quoteItem->getQuote()->getIsSuperMode()
         ) {
             return;
         }
-
+        $product = $quoteItem->getProduct();
         $qty = $quoteItem->getQty();
 
-        /** @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
-        $stockItem = $this->stockRegistry->getStockItem(
-            $quoteItem->getProduct()->getId(),
-            $quoteItem->getProduct()->getStore()->getWebsiteId()
-        );
+        /* @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
+        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
         if (!$stockItem instanceof StockItemInterface) {
             throw new LocalizedException(__('The stock item for Product is not valid.'));
         }
 
-        $parentStockItem = false;
+        /* @var \Magento\CatalogInventory\Api\Data\StockStatusInterface $stockStatus */
+        $stockStatus = $this->stockRegistry->getStockStatus($product->getId(), $product->getStore()->getWebsiteId());
+
+        /* @var \Magento\CatalogInventory\Api\Data\StockStatusInterface $parentStockStatus */
+        $parentStockStatus = false;
 
         /**
          * Check if product in stock. For composite products check base (parent) item stock status
          */
         if ($quoteItem->getParentItem()) {
             $product = $quoteItem->getParentItem()->getProduct();
-            $parentStockItem = $this->stockRegistry->getStockItem(
+            $parentStockStatus = $this->stockRegistry->getStockStatus(
                 $product->getId(),
                 $product->getStore()->getWebsiteId()
             );
         }
 
-        if ($stockItem) {
-            if (!$stockItem->getIsInStock() || $parentStockItem && !$parentStockItem->getIsInStock()) {
+        if ($stockStatus) {
+            if ($stockStatus->getStockStatus() == Stock::STOCK_OUT_OF_STOCK
+                    || $parentStockStatus && $parentStockStatus->getStockStatus() == Stock::STOCK_OUT_OF_STOCK
+            ) {
                 $quoteItem->addErrorInfo(
                     'cataloginventory',
                     Data::ERROR_QTY,
@@ -156,13 +159,13 @@ public function validate(Observer $observer)
          * Check item for options
          */
         if (($options = $quoteItem->getQtyOptions()) && $qty > 0) {
-            $qty = $quoteItem->getProduct()->getTypeInstance()->prepareQuoteItemQty($qty, $quoteItem->getProduct());
+            $qty = $product->getTypeInstance()->prepareQuoteItemQty($qty, $product);
             $quoteItem->setData('qty', $qty);
-            if ($stockItem) {
+            if ($stockStatus) {
                 $result = $this->stockState->checkQtyIncrements(
-                    $quoteItem->getProduct()->getId(),
+                    $product->getId(),
                     $qty,
-                    $quoteItem->getProduct()->getStore()->getWebsiteId()
+                    $product->getStore()->getWebsiteId()
                 );
                 if ($result->getHasError()) {
                     $quoteItem->addErrorInfo(

app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php

@@ -6,6 +6,8 @@
 
 namespace Magento\CatalogInventory\Test\Unit\Model\Quote\Item\QuantityValidator\Initializer;
 
+use Magento\CatalogInventory\Api\Data\StockStatusInterface;
+use Magento\CatalogInventory\Model\Stock\Status;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\Option;
@@ -112,10 +114,25 @@ class QuantityValidatorTest extends \PHPUnit_Framework_TestCase
      */
     private $stockItemInitializer;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|StockStatusInterface
+     */
+    private $stockStatusMock;
+
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManager($this);
-        $this->stockRegistryMock = $this->getMock(StockRegistry::class, ['getStockItem'], [], '', false);
+
+        $this->stockRegistryMock = $this->getMock(
+            StockRegistry::class,
+            [],
+            [],
+            '',
+            false
+        );
+
+        $this->stockStatusMock = $this->getMock(Status::class, [], [], '', false);
+
         $this->optionInitializer = $this->getMock(Option::class, [], [], '', false);
         $this->stockItemInitializer = $this->getMock(StockItem::class, [], [], '', false);
         $this->stockState = $this->getMock(StockState::class, [], [], '', false);
@@ -149,8 +166,10 @@ protected function setUp()
         );
         $this->productMock = $this->getMock(Product::class, [], [], '', false);
         $this->stockItemMock = $this->getMock(StockMock::class, [], [], '', false);
-        $this->parentStockItemMock = $this->getMock(StockMock::class, [], [], '', false);
+        $this->parentStockItemMock = $this->getMock(StockMock::class, ['getStockStatus'], [], '', false);
+
         $this->typeInstanceMock = $this->getMock(Type::class, [], [], '', false);
+
         $this->resultMock = $this->getMock(
             DataObject::class,
             ['checkQtyIncrements', 'getMessage', 'getQuoteMessage', 'getHasError'],
@@ -171,9 +190,11 @@ public function testValidateOutOfStock()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
-            ->willReturn(false);
+
+        $this->stockRegistryMock->expects($this->atLeastOnce())
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
+
         $this->quoteItemMock->expects($this->once())
             ->method('addErrorInfo')
             ->with(
@@ -203,21 +224,27 @@ public function testValidateInStock()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
+
         $this->stockRegistryMock->expects($this->at(1))
-            ->method('getStockItem')
-            ->willReturn($this->parentStockItemMock);
-        $this->parentStockItemMock->expects($this->once())
-            ->method('getIsInStock')
-            ->willReturn(false);
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
+
         $this->quoteItemMock->expects($this->any())
             ->method('getParentItem')
             ->willReturn($this->parentItemMock);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
+
+        $this->stockRegistryMock->expects($this->at(2))
+            ->method('getStockStatus')
+            ->willReturn($this->parentStockItemMock);
+
+        $this->parentStockItemMock->expects($this->once())
+            ->method('getStockStatus')
+            ->willReturn(false);
+
+        $this->stockStatusMock->expects($this->atLeastOnce())
+            ->method('getStockStatus')
             ->willReturn(true);
-        $this->stockRegistryMock->expects($this->at(0))
-            ->method('getStockItem')
-            ->willReturn($this->stockItemMock);
+
         $this->quoteItemMock->expects($this->once())
             ->method('addErrorInfo')
             ->with(
@@ -250,15 +277,18 @@ public function testValidateWithOptions()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
+        $this->stockRegistryMock->expects($this->at(1))
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
         $options = [$optionMock];
         $this->createInitialStub(1);
         $this->setUpStubForQuantity(1, true);
         $this->setUpStubForRemoveError();
         $this->parentStockItemMock->expects($this->any())
-            ->method('getIsInStock')
+            ->method('getStockStatus')
             ->willReturn(true);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
+        $this->stockStatusMock->expects($this->once())
+            ->method('getStockStatus')
             ->willReturn(true);
         $this->quoteItemMock->expects($this->any())
             ->method('getQtyOptions')
@@ -285,15 +315,18 @@ public function testValidateWithOptionsAndError()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
+        $this->stockRegistryMock->expects($this->at(1))
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
         $options = [$optionMock];
         $this->createInitialStub(1);
         $this->setUpStubForQuantity(1, true);
         $this->setUpStubForRemoveError();
         $this->parentStockItemMock->expects($this->any())
-            ->method('getIsInStock')
+            ->method('getStockStatus')
             ->willReturn(true);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
+        $this->stockStatusMock->expects($this->once())
+            ->method('getStockStatus')
             ->willReturn(true);
         $this->quoteItemMock->expects($this->any())
             ->method('getQtyOptions')
@@ -321,11 +354,14 @@ public function testRemoveError()
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
+        $this->stockRegistryMock->expects($this->at(1))
+            ->method('getStockStatus')
+            ->willReturn($this->stockStatusMock);
         $this->quoteItemMock->expects($this->any())
             ->method('getParentItem')
             ->willReturn($this->parentItemMock);
-        $this->stockItemMock->expects($this->once())
-            ->method('getIsInStock')
+        $this->stockStatusMock->expects($this->once())
+            ->method('getStockStatus')
             ->willReturn(true);
         $this->quoteItemMock->expects($this->never())
             ->method('addErrorInfo');

app/code/Magento/GoogleAnalytics/Block/Ga.php

@@ -112,12 +112,6 @@ public function getOrdersTrackingCode()
         $result[] = "ga('require', 'ec', 'ec.js');";
 
         foreach ($collection as $order) {
-            if ($order->getIsVirtual()) {
-                $address = $order->getBillingAddress();
-            } else {
-                $address = $order->getShippingAddress();
-            }
-
             foreach ($order->getAllVisibleItems() as $item) {
                 $result[] = sprintf(
                     "ga('ec:addProduct', {