Merge branch '2.0/feature/product-stock' into 2.0/feature/multi-currency

Author: chris-pook

app/code/Ometria/Api/Controller/V1/Products.php

@@ -1,7 +1,11 @@
 <?php
 namespace Ometria\Api\Controller\V1;
+
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Ometria\Api\Helper\Format\V1\Products as Helper;
-use \Ometria\Api\Controller\V1\Base;
+use Ometria\Api\Controller\V1\Base;
+
 class Products extends Base
 {
     const PRODUCT_TYPE_IDX = 'magento_product_type';
@@ -28,6 +32,9 @@ class Products extends Base
     protected $directoryHelper;
     protected $storeUrlHelper;
 
+    /** @var StockRegistryInterface */
+    private $stockRegistry;
+
     protected $storeIdCache=false;
     protected $productTypeFactory;
 
@@ -64,7 +71,8 @@ public function __construct(
         \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Directory\Helper\Data $directoryHelper,
         \Ometria\Api\Helper\StoreUrl $storeUrlHelper,
-        \Magento\Catalog\Model\Product\TypeFactory $productTypeFactory
+        \Magento\Catalog\Model\Product\TypeFactory $productTypeFactory,
+        StockRegistryInterface $stockRegistry
 	) {
 		parent::__construct($context);
 		$this->searchCriteriaBuilder      = $searchCriteriaBuilder;
@@ -86,6 +94,7 @@ public function __construct(
 		$this->directoryHelper            = $directoryHelper;
 		$this->storeUrlHelper             = $storeUrlHelper;
         $this->productTypeFactory         = $productTypeFactory;
+        $this->stockRegistry              = $stockRegistry;
 	}
 
 	protected function getArrayKey($array, $key)
@@ -159,6 +168,7 @@ protected function serializeItem($item)
         }
 
         $tmp = $this->appendPricing($tmp['id'], $tmp);
+        $tmp = $this->appendStock($tmp['id'], $tmp);
 
         if (isset($item['store_listings'])) {
             $tmp['store_listings'] = $item['store_listings'];
@@ -453,6 +463,27 @@ protected function appendPricing($product_id, $item, $storeId = null, $base_curr
         return $item;
     }
 
+    /**
+     * @param $productId
+     * @param $item
+     * @return mixed
+     * @throws LocalizedException
+     */
+    private function appendStock($productId, $item)
+    {
+        $websiteId = $this->storeManager->getWebsite()->getId();
+        $stockItem = $this->stockRegistry->getStockItem($productId, $websiteId);
+
+        if (isset($stockItem['is_in_stock'])) {
+            $item['is_in_stock'] = $stockItem['is_in_stock'];
+        }
+
+        if (isset($stockItem['qty'])) {
+            $item['qty'] = (float) $stockItem['qty'];
+        }
+
+        return $item;
+    }
 
     protected function getProductPrice(
         $product_id,