Merge pull request #15 from Ometria/2.0/feature/multi-currency

Add stock to Product API and fix multi currency bug

Author: chris-pook

app/code/Ometria/AbandonedCarts/etc/module.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd"><module name="Ometria_AbandonedCarts" setup_version="2.0.1"/></config>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd"><module name="Ometria_AbandonedCarts" setup_version="2.0.2"/></config>

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'];
@@ -402,69 +412,100 @@ protected function getProductListingsForStore(
                 'image_url' => $this->getBaseImageUrl() . $this->getCustomAttribute($item,$this->getImageUrlKey())
                 );
 
-            $tmp = $this->appendPricing($id, $tmp, $store_currency, $base_currency);
+            $tmp = $this->appendPricing($id, $tmp, $storeId, $base_currency, $store_currency);
 
             $store_listings[$id][$storeId] = $tmp;
         }
 
         return $store_listings;
     }
 
-    protected function appendPricing($product_id, $item, $store_currency=null, $base_currency=null){
-
+    protected function appendPricing($product_id, $item, $storeId = null, $base_currency = null, $store_currency = null)
+    {
         $store_price = $this->getProductPrice(
             $product_id,
-            $item,
+            $storeId,
             \Magento\Catalog\Pricing\Price\RegularPrice::PRICE_CODE,
-            $store_currency,
-            $base_currency);
+            $base_currency,
+            $store_currency
+        );
+
+        if ($store_price) {
+            $item['price'] = $store_price;
+        }
 
         $store_special_price = $this->getProductPrice(
             $product_id,
-            $item,
+            $storeId,
             \Magento\Catalog\Pricing\Price\SpecialPrice::PRICE_CODE,
-            $store_currency,
-            $base_currency);
+            $base_currency,
+            $store_currency
+        );
 
-        $item['price'] = $store_price;
+        if ($store_special_price) {
+            $item['special_price'] = $store_special_price;
+        }
 
         if($this->_request->getParam('final_price') === 'true') {
             $store_final_price = $this->getProductPrice(
                 $product_id,
-                $item,
+                $storeId,
                 \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
-                $store_currency,
-                $base_currency);
+                $base_currency,
+                $store_currency
+            );
 
-            $item['final_price'] = $store_final_price;
+            if ($store_final_price) {
+                $item['final_price'] = $store_final_price;
+            }
         }
 
-        if ($store_special_price) {
-            $item['special_price'] = $store_special_price;
-            //$item['special_price_dt_from'] = null;
-            //$item['special_price_dt_to'] = null;
+        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,
-        $item,
+        $storeId,
         $price_code,
-        $store_currency=null,
-        $base_currency=null
-    ){
-        $product = $this->productRepository->getById($product_id);
-        $price   = $product->getPriceInfo()->getPrice($price_code)->getValue();
+        $base_currency = null,
+        $store_currency = null
+    ) {
+        $product = $this->productRepository->getById($product_id, false, $storeId);
 
-        if ($store_currency && $base_currency){
-            $price = $this->directoryHelper->currencyConvert(
-                $price,
-                $base_currency,
-                $store_currency
+        $price = $product->getPriceInfo()->getPrice($price_code)->getValue();
+
+        if ($store_currency && $base_currency) {
+            try {
+                $price = $this->directoryHelper->currencyConvert(
+                    $price,
+                    $base_currency,
+                    $store_currency
                 );
+            } catch (\Exception $e) {
+                // Allow the "undefined rate" exception and return the price as is if no rate has been setup.
+            }
         }
 
         return $price;

app/code/Ometria/Api/etc/module.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd"><module name="Ometria_Api" setup_version="2.0.1"/></config>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd"><module name="Ometria_Api" setup_version="2.0.2"/></config>

app/code/Ometria/Core/etc/module.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd"><module name="Ometria_Core" setup_version="2.0.1"/></config>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd"><module name="Ometria_Core" setup_version="2.0.2"/></config>

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "ometria/magento2",
     "type": "magento2-module",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "description": "Dev composer package for Ometria Extension",
     "authors": [
         {