Merge pull request #941 from magento-east/MAGETWO-66366

Volodymyr Klymenko · web-flow · commit 24024fb63122 · 2017-03-21T19:34:51.000+02:00
East 2.1.6 MAGETWO-66366
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
@@ -78,6 +78,7 @@ protected function _construct()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * @return int
      */
@@ -99,7 +100,7 @@ public function getWebsiteId()
      */
     public function getStockId()
     {
-        return $this->getData(self::KEY_WEBSITE_ID);
+        return $this->getData(self::KEY_STOCK_ID);
     }
 
     /**
@@ -128,6 +129,7 @@ public function getStockItem()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * @param int $productId
      * @return $this

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ protected function _construct()`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`//@codeCoverageIgnoreStart`
	`81`	`+`
`81`	`82`	`/**`
`82`	`83`	`* @return int`
`83`	`84`	`*/`
`@@ -99,7 +100,7 @@ public function getWebsiteId()`
`99`	`100`	`*/`
`100`	`101`	`public function getStockId()`
`101`	`102`	`{`
`102`		`- return $this->getData(self::KEY_WEBSITE_ID);`
	`103`	`+ return $this->getData(self::KEY_STOCK_ID);`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`/**`
`@@ -128,6 +129,7 @@ public function getStockItem()`
`128`	`129`	`}`
`129`	`130`
`130`	`131`	`//@codeCoverageIgnoreStart`
	`132`	`+`
`131`	`133`	`/**`
`132`	`134`	`* @param int $productId`
`133`	`135`	`* @return $this`