From 96d39f5b3f4b2d641a04be76432b622be839b188 Mon Sep 17 00:00:00 2001
From: toandh <toandh@mageplaza.com>
Date: Tue, 20 Jul 2021 17:08:59 +0700
Subject: [PATCH 1/7] [Fix bug] Config products.

---
 Block/Adminhtml/Config/Field/Responsive.php | 4 ++--
 Block/Adminhtml/Slider/Edit/Tab/Design.php  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Block/Adminhtml/Config/Field/Responsive.php b/Block/Adminhtml/Config/Field/Responsive.php
index c4a2cb5..c7d4ced 100644
--- a/Block/Adminhtml/Config/Field/Responsive.php
+++ b/Block/Adminhtml/Config/Field/Responsive.php
@@ -34,8 +34,8 @@ class Responsive extends AbstractFieldArray
      */
     protected function _prepareToRender()
     {
-        $this->addColumn('size', ['label' => __('Screen size max'), 'renderer' => false]);
-        $this->addColumn('items', ['label' => __('Number of items'), 'renderer' => false]);
+        $this->addColumn('size', ['label' => __('Screen size max'), 'renderer' => false, 'class' => 'validate-number validate-greater-than-zero']);
+        $this->addColumn('items', ['label' => __('Number of items'), 'renderer' => false, 'class' => 'validate-number validate-greater-than-zero']);
 
         $this->_addAfter       = false;
         $this->_addButtonLabel = __('Add');
diff --git a/Block/Adminhtml/Slider/Edit/Tab/Design.php b/Block/Adminhtml/Slider/Edit/Tab/Design.php
index 9611f07..1c7ebe6 100644
--- a/Block/Adminhtml/Slider/Edit/Tab/Design.php
+++ b/Block/Adminhtml/Slider/Edit/Tab/Design.php
@@ -111,6 +111,7 @@ protected function _prepareForm()
             'name'  => 'limit_number',
             'label' => __('Limit the number of products'),
             'title' => __('Limit the number of products'),
+            'class'    => 'validate-number validate-greater-than-zero'
         ]);
 
         $fieldset->addField('display_additional', 'multiselect', [

From 7368ba0f73dbc63eeca31d031e651f97d178ed65 Mon Sep 17 00:00:00 2001
From: toandh <toandh@mageplaza.com>
Date: Tue, 20 Jul 2021 17:29:03 +0700
Subject: [PATCH 2/7] [Fix bug] Display button

---
 view/frontend/web/css/source/_module.less | 229 +++++++++++-----------
 1 file changed, 117 insertions(+), 112 deletions(-)

diff --git a/view/frontend/web/css/source/_module.less b/view/frontend/web/css/source/_module.less
index 64f5ea8..0dd9a3c 100644
--- a/view/frontend/web/css/source/_module.less
+++ b/view/frontend/web/css/source/_module.less
@@ -1,112 +1,117 @@
-/**
- * Mageplaza
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Mageplaza.com license that is
- * available through the world-wide-web at this URL:
- * https://www.mageplaza.com/LICENSE.txt
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade this extension to newer
- * version in the future.
- *
- * @category    Mageplaza
- * @package     Mageplaza_Productslider
- * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
- * @license     https://www.mageplaza.com/LICENSE.txt
- */
-.mp-product-slider-content .owl-nav{
-    font-size: 80px;
-}
-
-.mp-product-slider-content .owl-nav button span{
-    color: #D6D6D6;
-}
-
-.mp-product-slider-content .owl-nav button span:hover{
-    color: #869791;
-}
-
-.mp-product-slider-content .owl-nav .owl-prev{
-    position: absolute;
-    top: 40%;
-    left: 0;
-    z-index: 999;
-    text-shadow: none;
-    background: none;
-    border: none;
-}
-
-.mp-product-slider-content .owl-nav .owl-next{
-    position: absolute;
-    top: 40%;
-    right: 0;
-    z-index: 999;
-    text-shadow: none;
-    background: none;
-    border: none;
-}
-
-.owl-item li.product-slider {
-  width: 100% !important;
-}
-
-.mp-product-slider-title {
-  font-size: 3.8rem;
-  position: relative;
-  z-index: 1;
-  margin: 0 0 5px;
-  text-align: center;
-  display: block;
-  -webkit-margin-before: 0.83em;
-  -webkit-margin-after: 0.83em;
-  -webkit-margin-start: 0px;
-  -webkit-margin-end: 0px;
-}
-
-.mp-product-slider-block {
-  margin: 0 !important;
-}
-
-.mp-ps-info {
-  font-size: 1.8rem;
-  position: relative;
-  z-index: 1;
-  text-align: center;
-  display: block;
-  -webkit-margin-before: 1em;
-  -webkit-margin-after: 1em;
-  -webkit-margin-start: 0px;
-  -webkit-margin-end: 0px;
-
-}
-
-.slider-product-item-info {
-  width: 80% !important;
-}
-
-.slider-product-item-actions {
-  margin: 0px;
-}
-
-.product.details.slider-product-item-details {
-  margin-left: 10px
-}
-
-.mp-ps-info {
-  color: #bbbbbb;
-  margin: -15px 0px 10px 0px;
-}
-.mp-product-slider-block .owl-carousel .owl-nav button.owl-prev,
-.mp-product-slider-block .owl-carousel .owl-nav button.owl-next {
-  font-size: 20px;
-}
-
-
-
-
-
-
-
+/**
+ * Mageplaza
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Mageplaza.com license that is
+ * available through the world-wide-web at this URL:
+ * https://www.mageplaza.com/LICENSE.txt
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this extension to newer
+ * version in the future.
+ *
+ * @category    Mageplaza
+ * @package     Mageplaza_Productslider
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+
+.mp-product-slider-content .product-items .owl-stage .owl-item .product-slider .slider-product-item-info .product-item-actions{
+    margin-top: 20px;
+}
+
+.mp-product-slider-content .owl-nav{
+    font-size: 80px;
+}
+
+.mp-product-slider-content .owl-nav button span{
+    color: #D6D6D6;
+}
+
+.mp-product-slider-content .owl-nav button span:hover{
+    color: #869791;
+}
+
+.mp-product-slider-content .owl-nav .owl-prev{
+    position: absolute;
+    top: 40%;
+    left: 0;
+    z-index: 999;
+    text-shadow: none;
+    background: none;
+    border: none;
+}
+
+.mp-product-slider-content .owl-nav .owl-next{
+    position: absolute;
+    top: 40%;
+    right: 0;
+    z-index: 999;
+    text-shadow: none;
+    background: none;
+    border: none;
+}
+
+.owl-item li.product-slider {
+  width: 100% !important;
+}
+
+.mp-product-slider-title {
+  font-size: 3.8rem;
+  position: relative;
+  z-index: 1;
+  margin: 0 0 5px;
+  text-align: center;
+  display: block;
+  -webkit-margin-before: 0.83em;
+  -webkit-margin-after: 0.83em;
+  -webkit-margin-start: 0px;
+  -webkit-margin-end: 0px;
+}
+
+.mp-product-slider-block {
+  margin: 0 !important;
+}
+
+.mp-ps-info {
+  font-size: 1.8rem;
+  position: relative;
+  z-index: 1;
+  text-align: center;
+  display: block;
+  -webkit-margin-before: 1em;
+  -webkit-margin-after: 1em;
+  -webkit-margin-start: 0px;
+  -webkit-margin-end: 0px;
+
+}
+
+.slider-product-item-info {
+  width: 80% !important;
+}
+
+.slider-product-item-actions {
+  margin: 0px;
+}
+
+.product.details.slider-product-item-details {
+  margin-left: 10px
+}
+
+.mp-ps-info {
+  color: #bbbbbb;
+  margin: -15px 0px 10px 0px;
+}
+.mp-product-slider-block .owl-carousel .owl-nav button.owl-prev,
+.mp-product-slider-block .owl-carousel .owl-nav button.owl-next {
+  font-size: 20px;
+}
+
+
+
+
+
+
+

From f04df04ac291ed2b51b97d3836ccee67340eb6c3 Mon Sep 17 00:00:00 2001
From: toandh <toandh@mageplaza.com>
Date: Wed, 21 Jul 2021 10:24:10 +0700
Subject: [PATCH 3/7] [Fix bug] Lazy load

---
 view/frontend/templates/productslider.phtml   | 18 ++++++++++++++++--
 .../templates/widget/productslider.phtml      | 19 +++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/view/frontend/templates/productslider.phtml b/view/frontend/templates/productslider.phtml
index 0faadbf..781534c 100644
--- a/view/frontend/templates/productslider.phtml
+++ b/view/frontend/templates/productslider.phtml
@@ -23,12 +23,13 @@ use Mageplaza\Productslider\Block\AbstractSlider;
 use Magento\Framework\App\Action\Action;
 
 /** @var AbstractSlider $block */
+$helper = $this->helper(\Mageplaza\Productslider\Helper\Data::class);
 $mode = 'grid';
 $type = 'widget-product-grid';
 $title = $block->getTitle();
 $blockId = $block->getSliderId() . uniqid('-', false);
 $items = $block->getProductCollection();
-if ($items && $items->getSize()): ?>
+if ($helper->isEnabled() && $items && $items->getSize()): ?>
     <div class="mp-product-slider-block block widget block-products-list <?= /** @noEscape */ $mode ?>">
         <h2 class="mp-product-slider-title"><?= $block->escapeHtml($title) ?></h2>
         <p class="mp-ps-info"><?= $block->escapeHtml($block->getDescription()) ?></p>
@@ -115,6 +116,20 @@ if ($items && $items->getSize()): ?>
                 </div>
             </ol>
         </div>
+        <script type="text/javascript">
+            require([
+                'jquery'
+            ], function ($) {
+                var lazyLoad = <?= /** @noEscape */ $helper->getModuleConfig('slider_design')['lazyLoad']?>;
+                if (lazyLoad === 1) {
+                    $('.slider-product-item-info .photo .product-image-photo').each(function (){
+                        var el = $(this);
+                        el.addClass('owl-lazy');
+                        el.attr('data-src',el.attr('src'));
+                    })
+                }
+            });
+        </script>
         <?= $block->getPagerHtml() ?>
     </div>
     <script>
@@ -123,4 +138,3 @@ if ($items && $items->getSize()): ?>
         });
     </script>
 <?php endif; ?>
-
diff --git a/view/frontend/templates/widget/productslider.phtml b/view/frontend/templates/widget/productslider.phtml
index c851439..8695da4 100644
--- a/view/frontend/templates/widget/productslider.phtml
+++ b/view/frontend/templates/widget/productslider.phtml
@@ -23,12 +23,13 @@ use Magento\Framework\App\Action\Action;
 use Mageplaza\Productslider\Block\AbstractSlider;
 
 /** @var AbstractSlider $block */
-
+$helper = $this->helper(\Mageplaza\Productslider\Helper\Data::class);
 $mode = 'grid';
 $type = 'widget-product-grid';
 $title = $block->getTitle();
 $id = $block->getData('page_var_name') . uniqid('', false);
-if ($items = $block->getProductCollection()): ?>
+$items = $block->getProductCollection();
+if ($helper->isEnabled() && $items && $items->getSize()): ?>
     <div class="mp-product-slider-block widget block-products-list">
         <h2 class="mp-product-slider-title"><?= $block->escapeHtml($block->getTitle()) ?></h2>
         <p class="mp-ps-info"><?= $block->escapeHtml($block->getDescription()) ?></p>
@@ -114,6 +115,20 @@ if ($items = $block->getProductCollection()): ?>
                     </div>
                 </ol>
             </div>
+            <script type="text/javascript">
+                require([
+                    'jquery'
+                ], function ($) {
+                    var lazyLoad = <?= /** @noEscape */ $helper->getModuleConfig('slider_design')['lazyLoad']?>;
+                    if (lazyLoad === 1) {
+                        $('.slider-product-item-info .photo .product-image-photo').each(function (){
+                            var el = $(this);
+                            el.addClass('owl-lazy');
+                            el.attr('data-src',el.attr('src'));
+                        })
+                    }
+                });
+            </script>
             <?= $block->getPagerHtml() ?>
         </div>
     <script>

From 46eb83d99544aaf4343ad0f367ae7997c02fbed9 Mon Sep 17 00:00:00 2001
From: toandh <toandh@mageplaza.com>
Date: Wed, 21 Jul 2021 11:47:48 +0700
Subject: [PATCH 4/7] [Fix bug] Show swatches of config products

---
 Block/AbstractSlider.php     | 198 ++++++++++++++++++++++++-----------
 Block/BestSellerProducts.php |  18 +++-
 Block/CategoryId.php         |  41 ++++++--
 Block/CustomProducts.php     |  74 ++++++++++++-
 Block/MostViewedProducts.php |  23 +++-
 Block/OnSaleProduct.php      |  88 +++++++---------
 Block/RecentProducts.php     |  12 +++
 Block/Widget/Slider.php      |  91 ++++++++--------
 Block/WishlistProducts.php   |  22 ++--
 9 files changed, 393 insertions(+), 174 deletions(-)

diff --git a/Block/AbstractSlider.php b/Block/AbstractSlider.php
index ce24e3d..ed2e47a 100644
--- a/Block/AbstractSlider.php
+++ b/Block/AbstractSlider.php
@@ -28,6 +28,7 @@
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\App\ObjectManager;
@@ -38,6 +39,8 @@
 use Magento\Framework\Pricing\Render;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
 use Magento\Widget\Block\BlockInterface;
 use Mageplaza\Productslider\Helper\Data;
 use Mageplaza\Productslider\Model\Config\Source\Additional;
@@ -48,37 +51,50 @@
  */
 abstract class AbstractSlider extends AbstractProduct implements BlockInterface, IdentityInterface
 {
-    private $priceCurrency;
-
     /**
      * @var DateTime
      */
     protected $_date;
-
     /**
      * @var Data
      */
     protected $_helperData;
-
     /**
      * @var CollectionFactory
      */
     protected $_productCollectionFactory;
-
     /**
      * @var Visibility
      */
     protected $_catalogProductVisibility;
-
     /**
      * @var HttpContext
      */
     protected $httpContext;
-
     /**
      * @var EncoderInterface|null
      */
     protected $urlEncoder;
+    /**
+     * @var Grouped
+     */
+    protected $grouped;
+    /**
+     * @var Configurable
+     */
+    protected $configurable;
+    /**
+     * @var
+     */
+    protected $rendererListBlock;
+    /**
+     * @var
+     */
+    private $priceCurrency;
+    /**
+     * @var LayoutFactory
+     */
+    private $layoutFactory;
 
     /**
      * AbstractSlider constructor.
@@ -90,6 +106,9 @@ abstract class AbstractSlider extends AbstractProduct implements BlockInterface,
      * @param Data $helperData
      * @param HttpContext $httpContext
      * @param EncoderInterface $urlEncoder
+     * @param Grouped $grouped
+     * @param Configurable $configurable
+     * @param LayoutFactory $layoutFactory
      * @param array $data
      */
     public function __construct(
@@ -100,6 +119,9 @@ public function __construct(
         Data $helperData,
         HttpContext $httpContext,
         EncoderInterface $urlEncoder,
+        Grouped $grouped,
+        Configurable $configurable,
+        LayoutFactory $layoutFactory,
         array $data = []
     ) {
         $this->_productCollectionFactory = $productCollectionFactory;
@@ -108,30 +130,13 @@ public function __construct(
         $this->_helperData               = $helperData;
         $this->httpContext               = $httpContext;
         $this->urlEncoder                = $urlEncoder;
+        $this->grouped                   = $grouped;
+        $this->configurable              = $configurable;
+        $this->layoutFactory             = $layoutFactory;
 
         parent::__construct($context, $data);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _construct()
-    {
-        parent::_construct();
-
-        $this->addData([
-            'cache_lifetime' => $this->getSlider() ? $this->getSlider()->getTimeCache() : 86400,
-            'cache_tags'     => [Product::CACHE_TAG]
-        ]);
-
-        $this->setTemplate('Mageplaza_Productslider::productslider.phtml');
-    }
-
-    /**
-     * @return mixed
-     */
-    abstract public function getProductCollection();
-
     /**
      * Get Key pieces for caching block content
      *
@@ -150,34 +155,31 @@ public function getCacheKeyInfo()
     }
 
     /**
-     * @return array|mixed
+     * {@inheritdoc}
      */
-    public function getDisplayAdditional()
+    protected function _construct()
     {
-        if ($this->getSlider()) {
-            $display = $this->getSlider()->getDisplayAdditional();
-        } else {
-            $display = $this->_helperData->getModuleConfig('general/display_information');
-        }
+        parent::_construct();
 
-        if (!is_array($display)) {
-            $display = explode(',', $display);
-        }
+        $this->addData([
+            'cache_lifetime' => $this->getSlider() ? $this->getSlider()->getTimeCache() : 86400,
+            'cache_tags'     => [Product::CACHE_TAG]
+        ]);
 
-        return $display;
+        $this->setTemplate('Mageplaza_Productslider::productslider.phtml');
     }
 
     /**
-     * @return mixed
+     * Get Slider Id
+     * @return string
      */
-    private function getPriceCurrency()
+    public function getSliderId()
     {
-        if ($this->priceCurrency === null) {
-            $this->priceCurrency = ObjectManager::getInstance()
-                ->get(PriceCurrencyInterface::class);
+        if ($this->getSlider()) {
+            return $this->getSlider()->getSliderId();
         }
 
-        return $this->priceCurrency;
+        return uniqid('-', false);
     }
 
     /**
@@ -209,12 +211,21 @@ public function canShowPrice()
     }
 
     /**
-     * @return bool|\Magento\Framework\View\Element\BlockInterface
-     * @throws LocalizedException
+     * @return array|mixed
      */
-    protected function getPriceRender()
+    public function getDisplayAdditional()
     {
-        return $this->getLayout()->getBlock('product.price.render.default');
+        if ($this->getSlider()) {
+            $display = $this->getSlider()->getDisplayAdditional();
+        } else {
+            $display = $this->_helperData->getModuleConfig('general/display_information');
+        }
+
+        if (!is_array($display)) {
+            $display = explode(',', $display);
+        }
+
+        return $display;
     }
 
     /**
@@ -246,7 +257,7 @@ public function getProductPriceHtml(
             : true;
 
         /** @var Render $priceRender */
-        $priceRender = $this->getLayout()->getBlock('product.price.render.default');
+        $priceRender = $this->getPriceRender();
         if (!$priceRender) {
             $priceRender = $this->getLayout()->createBlock(
                 Render::class,
@@ -263,32 +274,41 @@ public function getProductPriceHtml(
     }
 
     /**
-     * @return bool
+     * @return bool|\Magento\Framework\View\Element\BlockInterface
+     * @throws LocalizedException
      */
-    public function canShowReview()
+    protected function getPriceRender()
     {
-        return in_array(Additional::SHOW_REVIEW, $this->getDisplayAdditional(), true);
+        return $this->getLayout()->getBlock('product.price.render.default');
     }
 
     /**
-     * @return bool
+     * @return mixed
      */
-    public function canShowAddToCart()
+    private function getPriceCurrency()
     {
-        return in_array(Additional::SHOW_CART, $this->getDisplayAdditional(), true);
+        if ($this->priceCurrency === null) {
+            $this->priceCurrency = ObjectManager::getInstance()
+                ->get(PriceCurrencyInterface::class);
+        }
+
+        return $this->priceCurrency;
     }
 
     /**
-     * Get Slider Id
-     * @return string
+     * @return bool
      */
-    public function getSliderId()
+    public function canShowReview()
     {
-        if ($this->getSlider()) {
-            return $this->getSlider()->getSliderId();
-        }
+        return in_array(Additional::SHOW_REVIEW, $this->getDisplayAdditional(), true);
+    }
 
-        return uniqid('-', false);
+    /**
+     * @return bool
+     */
+    public function canShowAddToCart()
+    {
+        return in_array(Additional::SHOW_CART, $this->getDisplayAdditional(), true);
     }
 
     /**
@@ -437,6 +457,11 @@ public function getIdentities()
         return $identities ?: [Product::CACHE_TAG];
     }
 
+    /**
+     * @return mixed
+     */
+    abstract public function getProductCollection();
+
     /**
      * Get Product Count is displayed
      *
@@ -454,4 +479,53 @@ public function getProductsCount()
 
         return 5;
     }
+
+    /**
+     * @param $collection
+     *
+     * @return array
+     */
+    public function getProductParentIds($collection)
+    {
+        $productIds = [];
+
+        foreach ($collection as $product) {
+            if (isset($product->getData()['entity_id'])) {
+                $productId = $product->getData()['entity_id'];
+            } else {
+                $productId = $product->getProductId();
+            }
+
+            $parentIdsGroup  = $this->grouped->getParentIdsByChild($productId);
+            $parentIdsConfig = $this->configurable->getParentIdsByChild($productId);
+
+            if (!empty($parentIdsGroup)) {
+                $productIds[] = $parentIdsGroup;
+            } elseif (!empty($parentIdsConfig)) {
+                $productIds[] = $parentIdsConfig[0];
+            } else {
+                $productIds[] = $productId;
+            }
+        }
+
+        return $productIds;
+    }
+
+    /**
+     * @return bool|\Magento\Framework\View\Element\BlockInterface|\Magento\Framework\View\Element\RendererList
+     * @throws LocalizedException
+     */
+    protected function getDetailsRendererList()
+    {
+        if (empty($this->rendererListBlock)) {
+            $layout = $this->layoutFactory->create(['cacheable' => false]);
+            $layout->getUpdate()->addHandle('catalog_widget_product_list')->load();
+            $layout->generateXml();
+            $layout->generateElements();
+
+            $this->rendererListBlock = $layout->getBlock('category.product.type.widget.details.renderers');
+        }
+
+        return $this->rendererListBlock;
+    }
 }
diff --git a/Block/BestSellerProducts.php b/Block/BestSellerProducts.php
index c6bb509..cbe3320 100644
--- a/Block/BestSellerProducts.php
+++ b/Block/BestSellerProducts.php
@@ -24,9 +24,12 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
 use Magento\Sales\Model\ResourceModel\Report\Bestsellers\CollectionFactory as BestSellersCollectionFactory;
 use Mageplaza\Productslider\Helper\Data;
 
@@ -52,6 +55,9 @@ class BestSellerProducts extends AbstractSlider
      * @param HttpContext $httpContext
      * @param EncoderInterface $urlEncoder
      * @param BestSellersCollectionFactory $bestSellersCollectionFactory
+     * @param Grouped $grouped
+     * @param Configurable $configurable
+     * @param LayoutFactory $layoutFactory
      * @param array $data
      */
     public function __construct(
@@ -63,6 +69,9 @@ public function __construct(
         HttpContext $httpContext,
         EncoderInterface $urlEncoder,
         BestSellersCollectionFactory $bestSellersCollectionFactory,
+        Grouped $grouped,
+        Configurable $configurable,
+        LayoutFactory $layoutFactory,
         array $data = []
     ) {
         $this->_bestSellersCollectionFactory = $bestSellersCollectionFactory;
@@ -75,6 +84,9 @@ public function __construct(
             $helperData,
             $httpContext,
             $urlEncoder,
+            $grouped,
+            $configurable,
+            $layoutFactory,
             $data
         );
     }
@@ -85,14 +97,14 @@ public function __construct(
      */
     public function getProductCollection()
     {
-        $productIds  = [];
         $bestSellers = $this->_bestSellersCollectionFactory->create()
             ->setModel('Magento\Catalog\Model\Product')
             ->addStoreFilter($this->getStoreId())
             ->setPeriod('month');
 
-        foreach ($bestSellers as $product) {
-            $productIds[] = $product->getProductId();
+        $productIds = $this->getProductParentIds($bestSellers);
+        if (empty($productIds)) {
+            return null;
         }
 
         $collection = $this->_productCollectionFactory->create()->addIdFilter($productIds);
diff --git a/Block/CategoryId.php b/Block/CategoryId.php
index a311a7a..dc0527f 100644
--- a/Block/CategoryId.php
+++ b/Block/CategoryId.php
@@ -25,9 +25,12 @@
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
 use Mageplaza\Productslider\Helper\Data;
 
 /**
@@ -52,6 +55,9 @@ class CategoryId extends AbstractSlider
      * @param HttpContext $httpContext
      * @param EncoderInterface $urlEncoder
      * @param CategoryFactory $categoryFactory
+     * @param Grouped $grouped
+     * @param Configurable $configurable
+     * @param LayoutFactory $layoutFactory
      * @param array $data
      */
     public function __construct(
@@ -63,6 +69,9 @@ public function __construct(
         HttpContext $httpContext,
         EncoderInterface $urlEncoder,
         CategoryFactory $categoryFactory,
+        Grouped $grouped,
+        Configurable $configurable,
+        LayoutFactory $layoutFactory,
         array $data = []
     ) {
         $this->_categoryFactory = $categoryFactory;
@@ -75,6 +84,9 @@ public function __construct(
             $helperData,
             $httpContext,
             $urlEncoder,
+            $grouped,
+            $configurable,
+            $layoutFactory,
             $data
         );
     }
@@ -106,16 +118,30 @@ public function getProductIdsByCategory()
     {
         $productIds = [];
         $catIds     = $this->getSliderCategoryIds();
-        $collection = $this->_productCollectionFactory->create();
+
         if (is_array($catIds)) {
-            $collection->addAttributeToSelect('*')->addCategoriesFilter(array('in' => $catIds));
-        } else {
+            $productId = [];
+
+            foreach($catIds as $cat)
+            {
+                $collection = $this->_productCollectionFactory->create();
+                $category = $this->_categoryFactory->create()->load($cat);
+                $collection->addAttributeToSelect('*')->addCategoryFilter($category);
+
+                foreach ($collection as $item) {
+                    $productId[] = $item->getData('entity_id');
+                }
+
+                $productIds = array_merge($productIds, $productId);
+            }
+        }else {
+            $collection = $this->_productCollectionFactory->create();
             $category = $this->_categoryFactory->create()->load($catIds);
             $collection->addAttributeToSelect('*')->addCategoryFilter($category);
-        }
 
-        foreach ($collection as $item) {
-            $productIds[] = $item->getData('entity_id');
+            foreach ($collection as $item) {
+                $productIds[] = $item->getData('entity_id');
+            }
         }
 
         $keys = array_keys($productIds);
@@ -123,7 +149,8 @@ public function getProductIdsByCategory()
         $productIdsRandom = [];
 
         foreach ($keys as $key => $value) {
-            $productIdsRandom[$value] = $productIds[$value];
+            $productIdsRandom[] = $productIds[$value];
+
             if ($key >= ($this->getProductsCount() - 1)) {
                 break;
             }
diff --git a/Block/CustomProducts.php b/Block/CustomProducts.php
index 83d4e4b..cfd9a89 100644
--- a/Block/CustomProducts.php
+++ b/Block/CustomProducts.php
@@ -21,26 +21,96 @@
 
 namespace Mageplaza\Productslider\Block;
 
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
+use Mageplaza\Productslider\Helper\Data;
+
+
 /**
  * Class CustomProducts
  * @package Mageplaza\Productslider\Block
  */
 class CustomProducts extends AbstractSlider
 {
+
+    /**
+     * CustomProducts constructor.
+     *
+     * @param Context $context
+     * @param CollectionFactory $productCollectionFactory
+     * @param Visibility $catalogProductVisibility
+     * @param DateTime $dateTime
+     * @param Data $helperData
+     * @param HttpContext $httpContext
+     * @param EncoderInterface $urlEncoder
+     * @param Grouped $grouped
+     * @param Configurable $configurable
+     * @param LayoutFactory $layoutFactory
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        CollectionFactory $productCollectionFactory,
+        Visibility $catalogProductVisibility,
+        DateTime $dateTime,
+        Data $helperData,
+        HttpContext $httpContext,
+        EncoderInterface $urlEncoder,
+        Grouped $grouped,
+        Configurable $configurable,
+        LayoutFactory $layoutFactory,
+        array $data = []
+    ) {
+
+        parent::__construct(
+            $context,
+            $productCollectionFactory,
+            $catalogProductVisibility,
+            $dateTime,
+            $helperData,
+            $httpContext,
+            $urlEncoder,
+            $grouped,
+            $configurable,
+            $layoutFactory,
+            $data
+        );
+    }
+
     /**
-     * @return $this|mixed
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection|mixed|null
      */
     public function getProductCollection()
     {
         $productIds = $this->getSlider()->getProductIds();
+        $visibleProducts = $this->_catalogProductVisibility->getVisibleInCatalogIds();
         if (!is_array($productIds)) {
             $productIds = explode('&', $productIds);
         }
 
+        if (empty($productIds)) {
+            return null;
+        }
+
         $collection = $this->_productCollectionFactory->create()
             ->addIdFilter($productIds)
             ->setPageSize($this->getProductsCount());
-        $this->_addProductAttributesAndPrices($collection);
+
+        $mpProductIds = $this->getProductParentIds($collection);
+
+        $collection = $this->_productCollectionFactory->create()->addIdFilter($mpProductIds)->setVisibility($visibleProducts);
+        $collection->addMinimalPrice()
+            ->addFinalPrice()
+            ->addTaxPercents()
+            ->addAttributeToSelect('*')
+            ->addStoreFilter($this->getStoreId())->setPageSize($this->getProductsCount());
 
         return $collection;
     }
diff --git a/Block/MostViewedProducts.php b/Block/MostViewedProducts.php
index 2c30c57..1726d80 100644
--- a/Block/MostViewedProducts.php
+++ b/Block/MostViewedProducts.php
@@ -24,9 +24,12 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
 use Mageplaza\Productslider\Helper\Data;
 use Mageplaza\Productslider\Model\ResourceModel\Report\Product\CollectionFactory as MostViewedCollectionFactory;
 
@@ -50,7 +53,11 @@ class MostViewedProducts extends AbstractSlider
      * @param DateTime $dateTime
      * @param Data $helperData
      * @param HttpContext $httpContext
+     * @param EncoderInterface $urlEncoder
      * @param MostViewedCollectionFactory $mostViewedProductsFactory
+     * @param Grouped $grouped
+     * @param Configurable $configurable
+     * @param LayoutFactory $layoutFactory
      * @param array $data
      */
     public function __construct(
@@ -62,6 +69,9 @@ public function __construct(
         HttpContext $httpContext,
         EncoderInterface $urlEncoder,
         MostViewedCollectionFactory $mostViewedProductsFactory,
+        Grouped $grouped,
+        Configurable $configurable,
+        LayoutFactory $layoutFactory,
         array $data = []
     ) {
         $this->_mostViewedProductsFactory = $mostViewedProductsFactory;
@@ -74,6 +84,9 @@ public function __construct(
             $helperData,
             $httpContext,
             $urlEncoder,
+            $grouped,
+            $configurable,
+            $layoutFactory,
             $data
         );
     }
@@ -88,7 +101,15 @@ public function getProductCollection()
             ->setStoreId($this->getStoreId())->addViewsCount()
             ->addStoreFilter($this->getStoreId())
             ->setPageSize($this->getProductsCount());
-        $this->_addProductAttributesAndPrices($collection);
+
+        $productIds = $this->getProductParentIds($collection);
+
+        $collection = $this->_productCollectionFactory->create()->addIdFilter($productIds);
+        $collection->addMinimalPrice()
+            ->addFinalPrice()
+            ->addTaxPercents()
+            ->addAttributeToSelect('*')
+            ->addStoreFilter($this->getStoreId());
 
         return $collection;
     }
diff --git a/Block/OnSaleProduct.php b/Block/OnSaleProduct.php
index 512df2d..36a3aa4 100644
--- a/Block/OnSaleProduct.php
+++ b/Block/OnSaleProduct.php
@@ -24,9 +24,12 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
 use Mageplaza\Productslider\Helper\Data;
 
 /**
@@ -50,6 +53,9 @@ class OnSaleProduct extends AbstractSlider
      * @param Data $helperData
      * @param HttpContext $httpContext
      * @param EncoderInterface $urlEncoder
+     * @param Grouped $grouped
+     * @param Configurable $configurable
+     * @param LayoutFactory $layoutFactory
      * @param array $data
      */
     public function __construct(
@@ -60,6 +66,9 @@ public function __construct(
         Data $helperData,
         HttpContext $httpContext,
         EncoderInterface $urlEncoder,
+        Grouped $grouped,
+        Configurable $configurable,
+        LayoutFactory $layoutFactory,
         array $data = []
     ) {
         $this->_dateTimeStore = $dateTime;
@@ -71,6 +80,9 @@ public function __construct(
             $helperData,
             $httpContext,
             $urlEncoder,
+            $grouped,
+            $configurable,
+            $layoutFactory,
             $data
         );
     }
@@ -80,58 +92,34 @@ public function __construct(
      */
     public function getProductCollection()
     {
-        $date       = strtotime($this->_dateTimeStore->gmtDate());
-        $collection = $this->_productCollectionFactory->create()->addAttributeToSelect('*');
-        $productIds = [];
-
-        foreach ($collection as $product) {
-            if ($product->getTypeId() === 'configurable' && $product->getVisibility() != 1) {
-                $_children = $product->getTypeInstance()->getUsedProducts($product);
-                foreach ($_children as $child) {
-                    $specialPrice = (float) $child->getSpecialPrice();
-                    if ($specialPrice) {
-                        if ($specialPrice < ((float) $child->getPrice())) {
-                            $fromDate = strtotime($child->getSpecialFromDate());
-                            if (!is_null($child->getSpecialToDate())) {
-                                $toDate = strtotime($child->getSpecialToDate());
-                                if ($toDate > $date) {
-                                    $productIds[] = $product->getId();
-                                }
-                            } else {
-                                if ($fromDate < $date) {
-                                    $productIds[] = $product->getId();
-                                }
-                            }
-                        }
-                    }
-                }
-            } elseif ($product->getTypeId() === 'simple' && $product->getVisibility() != 1) {
-                $specialPriceSp = (float) $product->getData('special_price');
-                if ($specialPriceSp) {
-                    if ($specialPriceSp < ((float) $product->getPrice())) {
-                        $fromDateSp = strtotime($product->getSpecialFromDate());
-                        if (!is_null($product->getSpecialToDate())) {
-                            $toDateSp = strtotime($product->getSpecialToDate());
-                            if ($toDateSp > $date) {
-                                $productIds[] = $product->getId();
-                            }
-                        } else {
-                            if ($fromDateSp < $date) {
-                                $productIds[] = $product->getId();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        $collectionClone = $this->_productCollectionFactory->create()->addIdFilter($productIds);
-        $collectionClone->addMinimalPrice()
+        $productCollection = $this->_productCollectionFactory->create();
+        $productCollection
+            ->addMinimalPrice()
             ->addFinalPrice()
             ->addTaxPercents()
-            ->addAttributeToSelect('*')
-            ->addStoreFilter($this->getStoreId())->setPageSize($this->getProductsCount());
+            ->addStoreFilter($this->getStoreId())
+            ->addAttributeToSelect('special_from_date')
+            ->addAttributeToSelect('special_to_date')
+            ->addAttributeToFilter('special_price', ['gt' => 0])
+            ->addAttributeToSort(
+                'minimal_price',
+                'asc'
+            )
+            ->setPageSize($this->getProductsCount());
+
+        $productCollection->getSelect()->where(
+            'price_index.final_price < price_index.price'
+        );
+
+        $productIds        = $this->getProductParentIds($productCollection);
+        $productCollection = $this->_productCollectionFactory->create()->addIdFilter($productIds);
+
+        $productCollection->addAttributeToFilter('visibility', ['neq' => 1])
+            ->addAttributeToFilter('status', 1)
+            ->addStoreFilter($this->getStoreId())
+            ->setPageSize($this->getProductsCount());
+        $this->_addProductAttributesAndPrices($productCollection);
 
-        return $collectionClone;
+        return $productCollection;
     }
 }
diff --git a/Block/RecentProducts.php b/Block/RecentProducts.php
index 3fff255..c855738 100644
--- a/Block/RecentProducts.php
+++ b/Block/RecentProducts.php
@@ -24,9 +24,12 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
 use Magento\Reports\Block\Product\Viewed as ReportProductViewed;
 use Mageplaza\Productslider\Helper\Data;
 
@@ -52,6 +55,9 @@ class RecentProducts extends AbstractSlider
      * @param HttpContext $httpContext
      * @param EncoderInterface $urlEncoder
      * @param ReportProductViewed $reportProductViewed
+     * @param Grouped $grouped
+     * @param Configurable $configurable
+     * @param LayoutFactory $layoutFactory
      * @param array $data
      */
     public function __construct(
@@ -63,6 +69,9 @@ public function __construct(
         HttpContext $httpContext,
         EncoderInterface $urlEncoder,
         ReportProductViewed $reportProductViewed,
+        Grouped $grouped,
+        Configurable $configurable,
+        LayoutFactory $layoutFactory,
         array $data = []
     ) {
         $this->reportProductViewed = $reportProductViewed;
@@ -75,6 +84,9 @@ public function __construct(
             $helperData,
             $httpContext,
             $urlEncoder,
+            $grouped,
+            $configurable,
+            $layoutFactory,
             $data
         );
     }
diff --git a/Block/Widget/Slider.php b/Block/Widget/Slider.php
index e86c85d..8cf340a 100644
--- a/Block/Widget/Slider.php
+++ b/Block/Widget/Slider.php
@@ -24,11 +24,13 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\EncoderInterface;
-use Magento\Widget\Block\BlockInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
 use Mageplaza\Productslider\Block\AbstractSlider;
 use Mageplaza\Productslider\Helper\Data;
 use Mageplaza\Productslider\Model\Config\Source\ProductType;
@@ -37,7 +39,7 @@
  * Class Slider
  * @package Mageplaza\Productslider\Block\Widget
  */
-class Slider extends AbstractSlider implements BlockInterface
+class Slider extends AbstractSlider
 {
     /**
      * Display products type - new products
@@ -53,7 +55,6 @@ class Slider extends AbstractSlider implements BlockInterface
 
     /**
      * Slider constructor.
-     *
      * @param Context $context
      * @param CollectionFactory $productCollectionFactory
      * @param Visibility $catalogProductVisibility
@@ -62,6 +63,9 @@ class Slider extends AbstractSlider implements BlockInterface
      * @param HttpContext $httpContext
      * @param EncoderInterface $urlEncoder
      * @param ProductType $productType
+     * @param Grouped $grouped
+     * @param Configurable $configurable
+     * @param LayoutFactory $layoutFactory
      * @param array $data
      */
     public function __construct(
@@ -73,8 +77,12 @@ public function __construct(
         HttpContext $httpContext,
         EncoderInterface $urlEncoder,
         ProductType $productType,
+        Grouped $grouped,
+        Configurable $configurable,
+        LayoutFactory $layoutFactory,
         array $data = []
-    ) {
+    )
+    {
         parent::__construct(
             $context,
             $productCollectionFactory,
@@ -83,6 +91,9 @@ public function __construct(
             $helperData,
             $httpContext,
             $urlEncoder,
+            $grouped,
+            $configurable,
+            $layoutFactory,
             $data
         );
         $this->productType = $productType;
@@ -111,12 +122,43 @@ public function getProductCollection()
 
             $collection = $this->getLayout()->createBlock($this->productType->getBlockMap($productType))
                 ->getProductCollection();
-            $collection->setPageSize($this->getPageSize())->setCurPage($this->getCurrentPage());
+            if ($collection && $collection->getSize()) {
+                $collection->setPageSize($this->getPageSize())->setCurPage($this->getCurrentPage());
+            }
         }
 
         return $collection;
     }
 
+    /**
+     * Retrieve how many products should be displayed on page
+     *
+     * @return int
+     */
+    protected function getPageSize()
+    {
+        return $this->getProductsCount();
+    }
+
+    /**
+     * Get limited number
+     * @return int|mixed
+     */
+    public function getProductsCount()
+    {
+        return $this->getData('products_count') ?: 10;
+    }
+
+    /**
+     * Get number of current page based on query value
+     *
+     * @return int
+     */
+    public function getCurrentPage()
+    {
+        return abs((int)$this->getRequest()->getParam($this->getData('page_var_name')));
+    }
+
     /**
      * Get key pieces for caching block content
      *
@@ -130,7 +172,7 @@ public function getCacheKeyInfo()
             parent::getCacheKeyInfo(),
             [
                 $this->getData('page_var_name'),
-                (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),
+                (int)$this->getRequest()->getParam($this->getData('page_var_name'), 1),
                 $params
             ]
         );
@@ -149,14 +191,6 @@ public function getDisplayAdditional()
         return $display;
     }
 
-    /**
-     * @return Data
-     */
-    public function getHelperData()
-    {
-        return $this->_helperData;
-    }
-
     /**
      * Retrieve display type for products
      *
@@ -171,35 +205,6 @@ public function getDisplayType()
         return $this->getData('product_type');
     }
 
-    /**
-     * Get number of current page based on query value
-     *
-     * @return int
-     */
-    public function getCurrentPage()
-    {
-        return abs((int) $this->getRequest()->getParam($this->getData('page_var_name')));
-    }
-
-    /**
-     * Retrieve how many products should be displayed on page
-     *
-     * @return int
-     */
-    protected function getPageSize()
-    {
-        return $this->getProductsCount();
-    }
-
-    /**
-     * Get limited number
-     * @return int|mixed
-     */
-    public function getProductsCount()
-    {
-        return $this->getData('products_count') ?: 10;
-    }
-
     /**
      * @return mixed
      */
diff --git a/Block/WishlistProducts.php b/Block/WishlistProducts.php
index e0fbf17..a647f17 100644
--- a/Block/WishlistProducts.php
+++ b/Block/WishlistProducts.php
@@ -24,10 +24,13 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Url\EncoderInterface;
+use Magento\Framework\View\LayoutFactory;
+use Magento\GroupedProduct\Model\Product\Type\Grouped;
 use Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory as WishlistCollectionFactory;
 use Mageplaza\Productslider\Helper\Data;
 
@@ -59,6 +62,9 @@ class WishlistProducts extends AbstractSlider
      * @param EncoderInterface $urlEncoder
      * @param WishlistCollectionFactory $wishlistCollectionFactory
      * @param CustomerSession $_customerSession
+     * @param Grouped $grouped
+     * @param Configurable $configurable
+     * @param LayoutFactory $layoutFactory
      * @param array $data
      */
     public function __construct(
@@ -71,6 +77,9 @@ public function __construct(
         EncoderInterface $urlEncoder,
         WishlistCollectionFactory $wishlistCollectionFactory,
         CustomerSession $_customerSession,
+        Grouped $grouped,
+        Configurable $configurable,
+        LayoutFactory $layoutFactory,
         array $data = []
     ) {
         $this->_wishlistCollectionFactory = $wishlistCollectionFactory;
@@ -84,6 +93,9 @@ public function __construct(
             $helperData,
             $httpContext,
             $urlEncoder,
+            $grouped,
+            $configurable,
+            $layoutFactory,
             $data
         );
     }
@@ -96,14 +108,12 @@ public function getProductCollection()
         $collection = [];
 
         if ($this->_customerSession->isLoggedIn()) {
-            $wishlist   = $this->_wishlistCollectionFactory->create()
+            $wishlist = $this->_wishlistCollectionFactory->create()
                 ->addCustomerIdFilter($this->_customerSession->getCustomerId());
-            $productIds = null;
 
-            foreach ($wishlist as $product) {
-                $productIds[] = $product->getProductId();
-            }
-            $collection = $this->_productCollectionFactory->create()->addIdFilter($productIds);
+            $mpProductIds = $this->getProductParentIds($wishlist);
+
+            $collection = $this->_productCollectionFactory->create()->addIdFilter($mpProductIds);
             $collection = $this->_addProductAttributesAndPrices($collection)
                 ->addStoreFilter($this->getStoreId())
                 ->setPageSize($this->getProductsCount());

From ba528bc393ac54cf8e0df77d9a29c48c485a0a49 Mon Sep 17 00:00:00 2001
From: toandh <toandh@mageplaza.com>
Date: Wed, 21 Jul 2021 17:25:12 +0700
Subject: [PATCH 5/7] [Fix bug] Validate field

---
 Block/Adminhtml/Slider/Edit/Tab/Design.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Block/Adminhtml/Slider/Edit/Tab/Design.php b/Block/Adminhtml/Slider/Edit/Tab/Design.php
index 1c7ebe6..67f470f 100644
--- a/Block/Adminhtml/Slider/Edit/Tab/Design.php
+++ b/Block/Adminhtml/Slider/Edit/Tab/Design.php
@@ -111,7 +111,7 @@ protected function _prepareForm()
             'name'  => 'limit_number',
             'label' => __('Limit the number of products'),
             'title' => __('Limit the number of products'),
-            'class'    => 'validate-number validate-greater-than-zero'
+            'class'    => 'validate-number validate-zero-or-greater'
         ]);
 
         $fieldset->addField('display_additional', 'multiselect', [

From 00f02b9d74946457bfabd7d916dd5f99a9d3ffd2 Mon Sep 17 00:00:00 2001
From: toandh <toandh@mageplaza.com>
Date: Thu, 22 Jul 2021 10:53:37 +0700
Subject: [PATCH 6/7] [Fix bug] Validate field

---
 Block/Adminhtml/Config/Field/Responsive.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Block/Adminhtml/Config/Field/Responsive.php b/Block/Adminhtml/Config/Field/Responsive.php
index c7d4ced..3336a9c 100644
--- a/Block/Adminhtml/Config/Field/Responsive.php
+++ b/Block/Adminhtml/Config/Field/Responsive.php
@@ -34,8 +34,8 @@ class Responsive extends AbstractFieldArray
      */
     protected function _prepareToRender()
     {
-        $this->addColumn('size', ['label' => __('Screen size max'), 'renderer' => false, 'class' => 'validate-number validate-greater-than-zero']);
-        $this->addColumn('items', ['label' => __('Number of items'), 'renderer' => false, 'class' => 'validate-number validate-greater-than-zero']);
+        $this->addColumn('size', ['label' => __('Screen size max'), 'renderer' => false, 'class' => 'required-entry validate-number validate-greater-than-zero']);
+        $this->addColumn('items', ['label' => __('Number of items'), 'renderer' => false, 'class' => 'required-entry validate-number validate-greater-than-zero']);
 
         $this->_addAfter       = false;
         $this->_addButtonLabel = __('Add');

From f5169e9c1c166697d8e30d64a423badeac65e242 Mon Sep 17 00:00:00 2001
From: toandh <toandh@mageplaza.com>
Date: Sat, 24 Jul 2021 18:18:36 +0700
Subject: [PATCH 7/7] Clean code

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b8f0b76..8938ab5 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "mageplaza/module-core": "^1.4.5"
   },
   "type": "magento2-module",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "license": "proprietary",
   "authors": [
     {