Merge pull request #4617 from nikolayandreev/master

Fix getMaximamPrice returning Special price, and add capability to filter products via ?category_id=1,2,3 instead of ?category_id=1 while using getAll()

packages/Webkul/Product/src/Repositories/ProductRepository.php

@@ -129,7 +129,7 @@ class ProductRepository extends Repository
     }
 
     /**
-     * @param int $categoryId
+     * @param string $categoryId
      *
      * @return \Illuminate\Support\Collection
      */
@@ -162,7 +162,7 @@ class ProductRepository extends Repository
                 ->whereNotNull('product_flat.url_key');
 
             if ($categoryId) {
-                $qb->where('product_categories.category_id', $categoryId);
+                $qb->whereIn('product_categories.category_id', explode(',', $categoryId));
             }
 
             if (! core()->getConfigData('catalog.products.homepage.out_of_stock_items')) {

packages/Webkul/Product/src/Type/Downloadable.php

@@ -288,4 +288,14 @@ class Downloadable extends AbstractType
 
         return $result;
     }
+
+    /**
+     * Get product maximam price
+     *
+     * @return float
+     */
+    public function getMaximamPrice()
+    {
+        return $this->product->price;
+    }
 }

packages/Webkul/Product/src/Type/Simple.php

@@ -63,4 +63,14 @@ class Simple extends AbstractType
 
         return $qty <= $this->totalQuantity() ? true : $backorders;
     }
-}
+
+    /**
+     * Get product maximam price
+     *
+     * @return float
+     */
+    public function getMaximamPrice()
+    {
+        return $this->product->price;
+    }
+}

packages/Webkul/Product/src/Type/Virtual.php

@@ -71,4 +71,14 @@ class Virtual extends AbstractType
     {
         return $qty <= $this->totalQuantity() ? true : false;
     }
-}
+
+    /**
+     * Get product maximam price
+     *
+     * @return float
+     */
+    public function getMaximamPrice()
+    {
+        return $this->product->price;
+    }
+}