From 821f8bde4c0d01b67c2f5046d6decbc037eec22c Mon Sep 17 00:00:00 2001
From: nghiatt <nghiatt@mageplaza.com>
Date: Mon, 27 Feb 2023 11:23:16 +0700
Subject: [PATCH 1/7] Compatible php 8.1

---
 Observer/AddBlock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Observer/AddBlock.php b/Observer/AddBlock.php
index 53b1e9a..4feda37 100644
--- a/Observer/AddBlock.php
+++ b/Observer/AddBlock.php
@@ -87,7 +87,7 @@ public function execute(Observer $observer)
             $output = $observer->getTransport()->getOutput();
 
             foreach ($this->helperData->getActiveSliders() as $slider) {
-                $locations = array_filter(explode(',', $slider->getLocation()));
+                $locations = array_filter(explode(',', $slider->getLocation() ?: ''));
                 foreach ($locations as $value) {
                     if ($value === Location::USING_SNIPPET_CODE) {
                         continue;

From 94ac5630687e483df19cb7529a1a42904f143c45 Mon Sep 17 00:00:00 2001
From: Onesh <phutx@mageplaza.com>
Date: Thu, 13 Apr 2023 11:15:50 +0700
Subject: [PATCH 2/7] Replace Zend lib

---
 Controller/Adminhtml/Slider/Save.php      | 4 ++--
 Model/ResourceModel/Banner/Collection.php | 3 +--
 Model/ResourceModel/Slider/Collection.php | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Controller/Adminhtml/Slider/Save.php b/Controller/Adminhtml/Slider/Save.php
index f047e5f..a907b86 100644
--- a/Controller/Adminhtml/Slider/Save.php
+++ b/Controller/Adminhtml/Slider/Save.php
@@ -34,7 +34,7 @@
 use Mageplaza\BannerSlider\Controller\Adminhtml\Slider;
 use Mageplaza\BannerSlider\Model\SliderFactory;
 use RuntimeException;
-use Zend_Filter_Input;
+use Magento\Framework\Filter\FilterInput;
 
 /**
  * Class Save
@@ -188,7 +188,7 @@ public function execute()
      */
     protected function _filterData($data)
     {
-        $inputFilter = new Zend_Filter_Input(['from_date' => $this->_dateFilter,], [], $data);
+        $inputFilter = new FilterInput(['from_date' => $this->_dateFilter,], [], $data);
         $data = $inputFilter->getUnescaped();
 
         if (isset($data['responsive_items'])) {
diff --git a/Model/ResourceModel/Banner/Collection.php b/Model/ResourceModel/Banner/Collection.php
index 1ea3cdf..d5999d3 100644
--- a/Model/ResourceModel/Banner/Collection.php
+++ b/Model/ResourceModel/Banner/Collection.php
@@ -23,7 +23,6 @@
 
 use Magento\Framework\DB\Select;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Zend_Db_Select;
 
 /**
  * Class Collection
@@ -71,7 +70,7 @@ protected function _construct()
     public function getSelectCountSql()
     {
         $countSelect = parent::getSelectCountSql();
-        $countSelect->reset(Zend_Db_Select::GROUP);
+        $countSelect->reset(Select::GROUP);
 
         return $countSelect;
     }
diff --git a/Model/ResourceModel/Slider/Collection.php b/Model/ResourceModel/Slider/Collection.php
index d4efb08..7b5b275 100644
--- a/Model/ResourceModel/Slider/Collection.php
+++ b/Model/ResourceModel/Slider/Collection.php
@@ -23,7 +23,6 @@
 
 use Magento\Framework\DB\Select;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Zend_Db_Select;
 
 /**
  * Class Collection
@@ -71,7 +70,7 @@ protected function _construct()
     public function getSelectCountSql()
     {
         $countSelect = parent::getSelectCountSql();
-        $countSelect->reset(Zend_Db_Select::GROUP);
+        $countSelect->reset(Select::GROUP);
 
         return $countSelect;
     }

From fe61bc8a4b46f9b38aa8181fd9b83f2b759218df Mon Sep 17 00:00:00 2001
From: Ryan <sonnb@mageplaza.com>
Date: Thu, 25 May 2023 09:47:56 +0700
Subject: [PATCH 3/7] [2.4.6] - Show advanced Image, Tab banners sort by id,

---
 .../Adminhtml/Banner/Edit/Tab/Render/GridImage.php | 14 +++++++++++++-
 Block/Adminhtml/Slider/Edit/Tab/Banner.php         |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Block/Adminhtml/Banner/Edit/Tab/Render/GridImage.php b/Block/Adminhtml/Banner/Edit/Tab/Render/GridImage.php
index 082504b..7b35265 100644
--- a/Block/Adminhtml/Banner/Edit/Tab/Render/GridImage.php
+++ b/Block/Adminhtml/Banner/Edit/Tab/Render/GridImage.php
@@ -23,8 +23,10 @@
 
 use Magento\Backend\Block\Context;
 use Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer;
+use Magento\Cms\Model\Template\FilterProvider;
 use Magento\Framework\DataObject;
 use Mageplaza\BannerSlider\Model\Config\Source\Image as ImageModel;
+use Mageplaza\BannerSlider\Model\Config\Source\Type;
 
 /**
  * Class GridImage
@@ -37,19 +39,27 @@ class GridImage extends AbstractRenderer
      */
     protected $imageModel;
 
+    /**
+     * @var FilterProvider
+     */
+    protected $filterProvider;
+
     /**
      * GridImage constructor.
      *
      * @param Context $context
      * @param ImageModel $imageModel
+     * @param FilterProvider $filterProvider
      * @param array $data
      */
     public function __construct(
         Context $context,
         ImageModel $imageModel,
+        FilterProvider $filterProvider,
         array $data = []
     ) {
-        $this->imageModel = $imageModel;
+        $this->imageModel     = $imageModel;
+        $this->filterProvider = $filterProvider;
 
         parent::__construct($context, $data);
     }
@@ -67,6 +77,8 @@ public function render(DataObject $row)
             $imageUrl = $this->imageModel->getBaseUrl() . $row->getData($this->getColumn()->getIndex());
 
             return '<img src="' . $imageUrl . '" width=\'150\' class="admin__control-thumbnail"/>';
+        } elseif ($row->getType() === Type::CONTENT) {
+            return $this->filterProvider->getPageFilter()->filter($row->getContent());
         }
 
         return '';
diff --git a/Block/Adminhtml/Slider/Edit/Tab/Banner.php b/Block/Adminhtml/Slider/Edit/Tab/Banner.php
index ec4eb3d..176294d 100644
--- a/Block/Adminhtml/Slider/Edit/Tab/Banner.php
+++ b/Block/Adminhtml/Slider/Edit/Tab/Banner.php
@@ -148,7 +148,7 @@ protected function _prepareColumns()
             'align' => 'center',
             'index' => 'banner_id'
         ]);
-        $this->addColumn('banner_id', [
+        $this->addColumn('banner_ids', [
             'header' => __('ID'),
             'sortable' => true,
             'index' => 'banner_id',

From e02fb56946dc556c5d329311e2d439f5239b1d04 Mon Sep 17 00:00:00 2001
From: Ryan <sonnb@mageplaza.com>
Date: Thu, 25 May 2023 09:55:56 +0700
Subject: [PATCH 4/7] [2.4.6] - Add grid filter, fix `Snippet Code` when Custom
 location is not selected

---
 Block/Widget.php                              |  5 +-
 .../ResourceModel/Slider/Grid/Collection.php  | 99 +++++++++++++++++++
 .../Listing/Column/CustomerGroup/Options.php  | 80 +++++++++++++++
 .../Listing/Column/SliderLocation.php         | 36 +------
 .../mpbannerslider_slider_listing.xml         | 26 ++++-
 5 files changed, 212 insertions(+), 34 deletions(-)
 create mode 100644 Model/ResourceModel/Slider/Grid/Collection.php
 create mode 100755 Ui/Component/Listing/Column/CustomerGroup/Options.php

diff --git a/Block/Widget.php b/Block/Widget.php
index fbcae07..bcef1be 100644
--- a/Block/Widget.php
+++ b/Block/Widget.php
@@ -24,6 +24,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Widget\Block\BlockInterface;
+use Mageplaza\BannerSlider\Model\Config\Source\Location;
 
 /**
  * Class Widget
@@ -43,7 +44,9 @@ public function getBannerCollection()
         }
 
         $sliderCollection = $this->helperData->getActiveSliders();
-        $slider = $sliderCollection->addFieldToFilter('slider_id', $sliderId)->getFirstItem();
+        $slider           = $sliderCollection->addFieldToFilter('slider_id', $sliderId)
+            ->addFieldToFilter('location', ['finset' => Location::USING_SNIPPET_CODE])->getFirstItem();
+        
         $this->setSlider($slider);
 
         return parent::getBannerCollection();
diff --git a/Model/ResourceModel/Slider/Grid/Collection.php b/Model/ResourceModel/Slider/Grid/Collection.php
new file mode 100644
index 0000000..092c885
--- /dev/null
+++ b/Model/ResourceModel/Slider/Grid/Collection.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * 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_BannerSlider
+ * @copyright Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license   https://www.mageplaza.com/LICENSE.txt
+ */
+
+namespace Mageplaza\BannerSlider\Model\ResourceModel\Slider\Grid;
+
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\Data\Collection\EntityFactoryInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
+use Mageplaza\BannerSlider\Model\ResourceModel\Slider;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Collection
+ * @package Mageplaza\BannerSlider\Model\ResourceModel\Slider\Grid
+ */
+class Collection extends SearchResult
+{
+    /**
+     * ID Field Name
+     *
+     * @var string
+     */
+    protected $_idFieldName = 'slider_id';
+
+    /**
+     * Event prefix
+     *
+     * @var string
+     */
+    protected $_eventPrefix = 'mageplaza_bannerslider_slider_collection';
+
+    /**
+     * Event object
+     *
+     * @var string
+     */
+    protected $_eventObject = 'slider_collection';
+
+    /**
+     * Collection constructor.
+     *
+     * @param EntityFactoryInterface $entityFactory
+     * @param LoggerInterface $logger
+     * @param FetchStrategyInterface $fetchStrategy
+     * @param ManagerInterface $eventManager
+     * @param string $mainTable
+     * @param string $resourceModel
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function __construct(
+        EntityFactoryInterface $entityFactory,
+        LoggerInterface $logger,
+        FetchStrategyInterface $fetchStrategy,
+        ManagerInterface $eventManager,
+        $mainTable = 'mageplaza_bannerslider_slider',
+        $resourceModel = Slider::class
+    ) {
+        parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
+    }
+
+    /**
+     * @param array|string $field
+     * @param null $condition
+     *
+     * @return Collection
+     */
+    public function addFieldToFilter($field, $condition = null)
+    {
+        switch ($field) {
+            case 'banners':
+                $field = 'main_table.name';
+                break;
+            case 'customer_group_filter':
+                return parent::addFieldToFilter('customer_group_ids', ['finset' => $condition['eq']]);
+        }
+
+        return parent::addFieldToFilter($field, $condition);
+    }
+}
diff --git a/Ui/Component/Listing/Column/CustomerGroup/Options.php b/Ui/Component/Listing/Column/CustomerGroup/Options.php
new file mode 100755
index 0000000..3de0d73
--- /dev/null
+++ b/Ui/Component/Listing/Column/CustomerGroup/Options.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * 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_BannerSlider
+ * @copyright   Copyright (c) Mageplaza (https://www.mageplaza.com/)
+ * @license     https://www.mageplaza.com/LICENSE.txt
+ */
+
+namespace Mageplaza\BannerSlider\Ui\Component\Listing\Column\CustomerGroup;
+
+use Magento\Customer\Model\ResourceModel\Group\Collection;
+use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Class Options
+ * @package Mageplaza\BannerSlider\Ui\Component\Listing\Column\CustomerGroup
+ */
+class Options implements OptionSourceInterface
+{
+    /**
+     * @var CollectionFactory
+     */
+    protected $_customerGroupColFact;
+
+    /**
+     * Options constructor.
+     *
+     * @param CollectionFactory $customerGroupColFact
+     */
+    public function __construct(CollectionFactory $customerGroupColFact)
+    {
+        $this->_customerGroupColFact = $customerGroupColFact;
+    }
+
+    /**
+     * Get options
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return $this->_generateCustomerGroupOptions();
+    }
+
+    /**
+     * Get customer group options
+     *
+     * @return array
+     */
+    protected function _generateCustomerGroupOptions()
+    {
+        $options                 = [];
+        $customerGroupCollection = $this->_customerGroupColFact->create();
+
+        if (count($customerGroupCollection)) {
+            foreach ($customerGroupCollection as $item) {
+                $options[] = [
+                    'label' => $item->getCustomerGroupCode(),
+                    'value' => $item->getCustomerGroupId(),
+                ];
+            }
+        }
+
+        return $options;
+    }
+}
diff --git a/Ui/Component/Listing/Column/SliderLocation.php b/Ui/Component/Listing/Column/SliderLocation.php
index 31e317f..2b0f62d 100644
--- a/Ui/Component/Listing/Column/SliderLocation.php
+++ b/Ui/Component/Listing/Column/SliderLocation.php
@@ -42,8 +42,8 @@ public function prepareDataSource(array $dataSource)
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
                 if (isset($item[$this->getData('name')])) {
-                    $data = $this->getLocation($item[$this->getData('name')]);
-                    $type = array_unique($data['type']);
+                    $data                         = $this->getLocation($item[$this->getData('name')]);
+                    $type                         = array_unique($data['type']);
                     $item[$this->getData('name')] = '<b>' . implode(', ', $type) . '</b></br>';
                 }
             }
@@ -60,60 +60,32 @@ public function prepareDataSource(array $dataSource)
     public function getLocation($data)
     {
         $location = [];
-        $data = explode(',', $data);
+        $data     = explode(',', $data);
         foreach ($data as $item) {
             switch ($item) {
-                case Location::ALLPAGE_CONTENT_TOP:
-                    $location['type'][] = __('All Page');
-                    break;
                 case Location::ALLPAGE_CONTENT_BOTTOM:
-                    $location['type'][] = __('All Page');
-                    break;
                 case Location::ALLPAGE_PAGE_TOP:
-                    $location['type'][] = __('All Page');
-                    break;
                 case Location::ALLPAGE_PAGE_BOTTOM:
+                case Location::ALLPAGE_CONTENT_TOP:
                     $location['type'][] = __('All Page');
                     break;
                 case Location::HOMEPAGE_CONTENT_TOP:
-                    $location['type'][] = __('Home Page');
-                    break;
                 case Location::HOMEPAGE_CONTENT_BOTTOM:
-                    $location['type'][] = __('Home Page');
-                    break;
                 case Location::HOMEPAGE_PAGE_TOP:
-                    $location['type'][] = __('Home Page');
-                    break;
                 case Location::HOMEPAGE_PAGE_BOTTOM:
                     $location['type'][] = __('Home Page');
                     break;
                 case Location::CATEGORY_CONTENT_TOP:
-                    $location['type'][] = __('Category Page');
-                    break;
                 case Location::CATEGORY_CONTENT_BOTTOM:
-                    $location['type'][] = __('Category Page');
-                    break;
                 case Location::CATEGORY_PAGE_TOP:
-                    $location['type'][] = __('Category Page');
-                    break;
                 case Location::CATEGORY_PAGE_BOTTOM:
-                    $location['type'][] = __('Category Page');
-                    break;
                 case Location::CATEGORY_SIDEBAR_TOP:
-                    $location['type'][] = __('Category Page');
-                    break;
                 case Location::CATEGORY_SIDEBAR_BOTTOM:
                     $location['type'][] = __('Category Page');
                     break;
                 case Location::PRODUCT_CONTENT_TOP:
-                    $location['type'][] = __('Product Page');
-                    break;
                 case Location::PRODUCT_CONTENT_BOTTOM:
-                    $location['type'][] = __('Product Page');
-                    break;
                 case Location::PRODUCT_PAGE_TOP:
-                    $location['type'][] = __('Product Page');
-                    break;
                 case Location::PRODUCT_PAGE_BOTTOM:
                     $location['type'][] = __('Product Page');
                     break;
diff --git a/view/adminhtml/ui_component/mpbannerslider_slider_listing.xml b/view/adminhtml/ui_component/mpbannerslider_slider_listing.xml
index 6dcda7d..dbf8c79 100644
--- a/view/adminhtml/ui_component/mpbannerslider_slider_listing.xml
+++ b/view/adminhtml/ui_component/mpbannerslider_slider_listing.xml
@@ -66,7 +66,29 @@
         </argument>
         <bookmark name="bookmarks"/>
         <columnsControls name="columns_controls"/>
-        <filters name="listing_filters"/>
+        <filters name="listing_filters">
+            <filterSelect name="customer_group_filter" provider="${ $.parentName }">
+                <settings>
+                    <caption translate="true">All Customer Group</caption>
+                    <options class="Mageplaza\BannerSlider\Ui\Component\Listing\Column\CustomerGroup\Options"/>
+                    <label translate="true">Customer Group</label>
+                    <dataScope>customer_group_filter</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect name="store_ids">
+                <argument name="optionsProvider" xsi:type="configurableObject">
+                    <argument name="class" xsi:type="string">Magento\Store\Ui\Component\Listing\Column\Store\Options</argument>
+                </argument>
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="provider" xsi:type="string">${ $.parentName }</item>
+                        <item name="dataScope" xsi:type="string">store_ids</item>
+                        <item name="caption" xsi:type="string" translate="true">All Store Views</item>
+                        <item name="label" xsi:type="string" translate="true">Store View</item>
+                    </item>
+                </argument>
+            </filterSelect>
+        </filters>
         <massaction name="listing_massaction">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
@@ -248,6 +270,7 @@
                     <item name="label" xsi:type="string" translate="true">Start Date</item>
                     <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/date</item>
                     <item name="dataType" xsi:type="string">date</item>
+                    <item name="filter" xsi:type="string">dateRange</item>
                 </item>
             </argument>
         </column>
@@ -257,6 +280,7 @@
                     <item name="label" xsi:type="string" translate="true">End Date</item>
                     <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/date</item>
                     <item name="dataType" xsi:type="string">date</item>
+                    <item name="filter" xsi:type="string">dateRange</item>
                 </item>
             </argument>
         </column>

From 75417b823dc5eba175f0e9a1fbc641c8e2e9be71 Mon Sep 17 00:00:00 2001
From: Ryan <sonnb@mageplaza.com>
Date: Fri, 26 May 2023 18:28:26 +0700
Subject: [PATCH 5/7] [2.4.6] - Fix filter

---
 Model/ResourceModel/Slider/Grid/Collection.php  |  4 +++-
 .../mpbannerslider_slider_listing.xml           | 17 +++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Model/ResourceModel/Slider/Grid/Collection.php b/Model/ResourceModel/Slider/Grid/Collection.php
index 092c885..2fbbb0f 100644
--- a/Model/ResourceModel/Slider/Grid/Collection.php
+++ b/Model/ResourceModel/Slider/Grid/Collection.php
@@ -90,8 +90,10 @@ public function addFieldToFilter($field, $condition = null)
             case 'banners':
                 $field = 'main_table.name';
                 break;
-            case 'customer_group_filter':
+            case 'customer_group_ids':
                 return parent::addFieldToFilter('customer_group_ids', ['finset' => $condition['eq']]);
+            case 'store_ids':
+                return parent::addFieldToFilter('store_ids', [['finset' => $condition['eq']], ['finset' => 0]]);
         }
 
         return parent::addFieldToFilter($field, $condition);
diff --git a/view/adminhtml/ui_component/mpbannerslider_slider_listing.xml b/view/adminhtml/ui_component/mpbannerslider_slider_listing.xml
index dbf8c79..64a2954 100644
--- a/view/adminhtml/ui_component/mpbannerslider_slider_listing.xml
+++ b/view/adminhtml/ui_component/mpbannerslider_slider_listing.xml
@@ -67,14 +67,6 @@
         <bookmark name="bookmarks"/>
         <columnsControls name="columns_controls"/>
         <filters name="listing_filters">
-            <filterSelect name="customer_group_filter" provider="${ $.parentName }">
-                <settings>
-                    <caption translate="true">All Customer Group</caption>
-                    <options class="Mageplaza\BannerSlider\Ui\Component\Listing\Column\CustomerGroup\Options"/>
-                    <label translate="true">Customer Group</label>
-                    <dataScope>customer_group_filter</dataScope>
-                </settings>
-            </filterSelect>
             <filterSelect name="store_ids">
                 <argument name="optionsProvider" xsi:type="configurableObject">
                     <argument name="class" xsi:type="string">Magento\Store\Ui\Component\Listing\Column\Store\Options</argument>
@@ -244,13 +236,14 @@
                 </item>
             </argument>
         </column>
-        <column name="customer_group_ids" class="Mageplaza\BannerSlider\Ui\Component\Listing\Column\CustomerGroup">
+        <column name="customer_group_ids">
             <argument name="data" xsi:type="array">
+                <item name="options" xsi:type="object">Mageplaza\BannerSlider\Ui\Component\Listing\Column\CustomerGroup\Options</item>
                 <item name="config" xsi:type="array">
-                    <item name="bodyTmpl" xsi:type="string">ui/grid/cells/html</item>
-                    <item name="sortable" xsi:type="boolean">false</item>
+                    <item name="filter" xsi:type="string">select</item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
+                    <item name="dataType" xsi:type="string">select</item>
                     <item name="label" xsi:type="string" translate="true">Customer Groups</item>
-                    <item name="sortOrder" xsi:type="number">65</item>
                 </item>
             </argument>
         </column>

From 4146a27d94f10a35a32cf8a2e602a561030965b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Huy=20Ph=C3=BAc?= <phucnh@mageplaza.com>
Date: Wed, 31 May 2023 11:28:06 +0700
Subject: [PATCH 6/7] Update translate

---
 i18n/en_US.csv | 291 +++++++++++++++++++++++++------------------------
 1 file changed, 148 insertions(+), 143 deletions(-)

diff --git a/i18n/en_US.csv b/i18n/en_US.csv
index 964e0a4..116be25 100644
--- a/i18n/en_US.csv
+++ b/i18n/en_US.csv
@@ -1,143 +1,148 @@
-Banners,Banners
-"Create New Banner","Create New Banner"
-"Save Banner","Save Banner"
-"Save and Continue Edit","Save and Continue Edit"
-"Delete Banner","Delete Banner"
-"Edit Banner '%1'","Edit Banner '%1'"
-"New Banner","New Banner"
-General,General
-"Banner Information","Banner Information"
-Name,Name
-Status,Status
-Type,Type
-"Upload Image","Upload Image"
-"Banner title","Banner title"
-Url,Url
-"Open new tab after click","Open new tab after click"
-"Automatically open new tab after clicking on the banner","Automatically open new tab after clicking on the banner"
-"Demo template","Demo template"
-"Load Template","Load Template"
-Sliders,Sliders
-"Screen size from","Screen size from"
-"Number of items","Number of items"
-Add,Add
-"Create New Slider","Create New Slider"
-"Save Slider","Save Slider"
-"Delete Slider","Delete Slider"
-"Edit Slider '%1'","Edit Slider '%1'"
-"New Slider","New Slider"
-ID,ID
-Image,Image
-Position,Position
-Design,Design
-"Animation Effect","Animation Effect"
-"Manually Design","Manually Design"
-"Use Config","Use Config"
-Yes,Yes
-"Is Responsive","Is Responsive"
-"Max Items Slider","Max Items Slider"
-"Auto Width","Auto Width"
-"Auto Height","Auto Height"
-"Infinity Loop","Infinity Loop"
-"Show Next/Prev Buttons","Show Next/Prev Buttons"
-"Show Dots Navigation","Show Dots Navigation"
-"Lazy Loading Images","Lazy Loading Images"
-Autoplay,Autoplay
-"Autoplay Time-Out","Autoplay Time-Out"
-"Add Widget with name ""Banner Slider widget"" and set ""Slider Id"" for it.","Add Widget with name ""Banner Slider widget"" and set ""Slider Id"" for it."
-"CMS Page/Static Block","CMS Page/Static Block"
-"You can paste the above block of snippet into any page in Magento 2 and set SliderId for it.","You can paste the above block of snippet into any page in Magento 2 and set SliderId for it."
-"Template .phtml file","Template .phtml file"
-"Open a .phtml file and insert where you want to display Banner Slider.","Open a .phtml file and insert where you want to display Banner Slider."
-"Slider Information","Slider Information"
-"Store Views","Store Views"
-"Customer Groups","Customer Groups"
-"Select customer group(s) to display the slider to","Select customer group(s) to display the slider to"
-"Select the position to display block.","Select the position to display block."
-"Display from","Display from"
-"Display to","Display to"
-Priority,Priority
-"Enter a number to set priority for the slider. A lower number represents a higher priority.","Enter a number to set priority for the slider. A lower number represents a higher priority."
-"Another way to add sliders to your page","Another way to add sliders to your page"
-"How to use","How to use"
-"The Banner has been deleted.","The Banner has been deleted."
-"This Banner no longer exists.","This Banner no longer exists."
-"Manage Banners","Manage Banners"
-"Please correct the data sent.","Please correct the data sent."
-"Something went wrong while saving the Banner.","Something went wrong while saving the Banner."
-"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
-"Something went wrong while updating status for %1.","Something went wrong while updating status for %1."
-"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
-"The Banner has been saved.","The Banner has been saved."
-"The slider has been deleted.","The slider has been deleted."
-"This Slider no longer exists.","This Slider no longer exists."
-"Manage Sliders","Manage Sliders"
-"End Date must follow Start Date.","End Date must follow Start Date."
-"The Slider has been saved.","The Slider has been saved."
-"Something went wrong while saving the Slider.","Something went wrong while saving the Slider."
-No,No
-fadeOut,fadeOut
-rotateOut,rotateOut
-flipOut,flipOut
-rollOut,rollOut
-zoomOut,zoomOut
-slideOutLeft,slideOutLeft
-slideOutRight,slideOutRight
-lightSpeedOut,lightSpeedOut
-"All Page","All Page"
-"Top of content","Top of content"
-"Bottom of content","Bottom of content"
-"Top of page","Top of page"
-"Bottom of page","Bottom of page"
-"Home Page","Home Page"
-"Category page","Category page"
-"Top of sidebar","Top of sidebar"
-"Bottom of sidebar","Bottom of sidebar"
-"Product page","Product page"
-Custom,Custom
-"Using snippet code, widget","Using snippet code, widget"
-"Demo template 1","Demo template 1"
-"Demo template 2","Demo template 2"
-"Demo template 3","Demo template 3"
-"Demo template 4","Demo template 4"
-"Demo template 5","Demo template 5"
-Advanced,Advanced
-Edit,Edit
-"No banner added","No banner added"
-"All Customer Groups","All Customer Groups"
-"Category Page","Category Page"
-"Product Page","Product Page"
-"All Store Views","All Store Views"
-"Go to Details Page","Go to Details Page"
-"Banner Slider","Banner Slider"
-Enable,Enable
-"Select Yes to enable this module","Select Yes to enable this module"
-"Slider Design Configuration","Slider Design Configuration"
-Responsive,Responsive
-"Select Yes to use auto-width","Select Yes to use auto-width"
-"Select Yes to use auto-height","Select Yes to use auto-height"
-"Select Yes to re-display the slider after it shows the last item","Select Yes to re-display the slider after it shows the last item"
-"Select Yes to display the Next/Pre buttons in the slider","Select Yes to display the Next/Pre buttons in the slider"
-"Select Yes to display dots navigation of the slider","Select Yes to display dots navigation of the slider"
-"Select Yes to lazy loading images","Select Yes to lazy loading images"
-"Select Yes to allow auto-displaying the next products","Select Yes to allow auto-displaying the next products"
-"The time (ms) in which an item is auto-moved to the left","The time (ms) in which an item is auto-moved to the left"
-"Mageplaza Banner Slider","Mageplaza Banner Slider"
-"Banner Slider list","Banner Slider list"
-"Select Slider","Select Slider"
-"Add New Banner","Add New Banner"
-Delete,Delete
-"Are you sure you wan't to delete selected Banners?","Are you sure you wan't to delete selected Banners?"
-"Change status","Change status"
-Disable,Disable
-Banner,Banner
-Created,Created
-Modified,Modified
-"Add New Slider","Add New Slider"
-"Delete Sliders","Delete Sliders"
-"Are you sure you wan't to delete selected Sliders?","Are you sure you wan't to delete selected Sliders?"
-"Number of banner","Number of banner"
-"Slider Location","Slider Location"
-"Store View","Store View"
-"Start Date","Start Date"
-"End Date","End Date"
+Banners,Banners
+"Create New Banner","Create New Banner"
+"Save Banner","Save Banner"
+"Save and Continue Edit","Save and Continue Edit"
+"Delete Banner","Delete Banner"
+"Edit Banner '%1'","Edit Banner '%1'"
+"New Banner","New Banner"
+General,General
+"Banner Information","Banner Information"
+Name,Name
+Status,Status
+Type,Type
+"Upload Image","Upload Image"
+"Banner title","Banner title"
+Url,Url
+"Open new tab after click","Open new tab after click"
+"Automatically open new tab after clicking on the banner","Automatically open new tab after clicking on the banner"
+"Demo template","Demo template"
+"Load Template","Load Template"
+Sliders,Sliders
+"Screen size from","Screen size from"
+"Number of items","Number of items"
+Add,Add
+"Create New Slider","Create New Slider"
+"Save Slider","Save Slider"
+"Delete Slider","Delete Slider"
+"Edit Slider '%1'","Edit Slider '%1'"
+"New Slider","New Slider"
+ID,ID
+Image,Image
+Position,Position
+Design,Design
+"Animation Effect","Animation Effect"
+"Manually Design","Manually Design"
+"Use Config","Use Config"
+Yes,Yes
+"Is Responsive","Is Responsive"
+"Max Items Slider","Max Items Slider"
+"Auto Width","Auto Width"
+"Auto Height","Auto Height"
+"Infinity Loop","Infinity Loop"
+"Show Next/Prev Buttons","Show Next/Prev Buttons"
+"Show Dots Navigation","Show Dots Navigation"
+"Lazy Loading Images","Lazy Loading Images"
+Autoplay,Autoplay
+"Autoplay Time-Out","Autoplay Time-Out"
+"Add Widget with name ""Banner Slider widget"" and set ""Slider Id"" for it.","Add Widget with name ""Banner Slider widget"" and set ""Slider Id"" for it."
+"CMS Page/Static Block","CMS Page/Static Block"
+"You can paste the above block of snippet into any page in Magento 2 and set SliderId for it.","You can paste the above block of snippet into any page in Magento 2 and set SliderId for it."
+"Template .phtml file","Template .phtml file"
+"Open a .phtml file and insert where you want to display Banner Slider.","Open a .phtml file and insert where you want to display Banner Slider."
+"Slider Information","Slider Information"
+"Store Views","Store Views"
+"Customer Groups","Customer Groups"
+"Select customer group(s) to display the slider to","Select customer group(s) to display the slider to"
+"Select the position to display block.","Select the position to display block."
+"Display from","Display from"
+"Display to","Display to"
+Priority,Priority
+"Enter a number to set priority for the slider. A lower number represents a higher priority.","Enter a number to set priority for the slider. A lower number represents a higher priority."
+"Another way to add sliders to your page","Another way to add sliders to your page"
+"How to use","How to use"
+"The Banner has been deleted.","The Banner has been deleted."
+"This Banner no longer exists.","This Banner no longer exists."
+"Manage Banners","Manage Banners"
+"Please correct the data sent.","Please correct the data sent."
+"Something went wrong while saving the Banner.","Something went wrong while saving the Banner."
+"A total of %1 record(s) have been deleted.","A total of %1 record(s) have been deleted."
+"Something went wrong while updating status for %1.","Something went wrong while updating status for %1."
+"A total of %1 record(s) have been updated.","A total of %1 record(s) have been updated."
+"The Banner has been saved.","The Banner has been saved."
+"The wrong slider is specified.","The wrong slider is specified."
+"The slider has been deleted.","The slider has been deleted."
+"This Slider no longer exists.","This Slider no longer exists."
+"Manage Sliders","Manage Sliders"
+"End Date must follow Start Date.","End Date must follow Start Date."
+"The Slider has been saved.","The Slider has been saved."
+"Something went wrong while saving the Slider.","Something went wrong while saving the Slider."
+No,No
+fadeOut,fadeOut
+rotateOut,rotateOut
+flipOut,flipOut
+rollOut,rollOut
+zoomOut,zoomOut
+slideOutLeft,slideOutLeft
+slideOutRight,slideOutRight
+lightSpeedOut,lightSpeedOut
+"All Page","All Page"
+"Top of content","Top of content"
+"Bottom of content","Bottom of content"
+"Top of page","Top of page"
+"Bottom of page","Bottom of page"
+"Home Page","Home Page"
+"Category page","Category page"
+"Top of sidebar","Top of sidebar"
+"Bottom of sidebar","Bottom of sidebar"
+"Product page","Product page"
+Custom,Custom
+"Using snippet code, widget","Using snippet code, widget"
+"Demo template 1","Demo template 1"
+"Demo template 2","Demo template 2"
+"Demo template 3","Demo template 3"
+"Demo template 4","Demo template 4"
+"Demo template 5","Demo template 5"
+Advanced,Advanced
+Edit,Edit
+"No banner added","No banner added"
+"All Customer Groups","All Customer Groups"
+"Category Page","Category Page"
+"Product Page","Product Page"
+"All Store Views","All Store Views"
+"Go to Details Page","Go to Details Page"
+"Banner Slider","Banner Slider"
+Enable,Enable
+"Select <b>Yes</b> to enable this module.<br />
+                        1. It helps to reduce abandonment cart with <a href=""https://www.mageplaza.com/magento-2-one-step-checkout-extension/"" target=""_blank"">One Step Checkout</a>. <br />
+                        2. Magento stores see upwards of 30% revenue 💰 with AVADA. <a href=""https://go.avada.io/mageplaza"">Learn more</a>","Select <b>Yes</b> to enable this module.<br />
+                        1. It helps to reduce abandonment cart with <a href=""https://www.mageplaza.com/magento-2-one-step-checkout-extension/"" target=""_blank"">One Step Checkout</a>. <br />
+                        2. Magento stores see upwards of 30% revenue 💰 with AVADA. <a href=""https://go.avada.io/mageplaza"">Learn more</a>"
+"Slider Design Configuration","Slider Design Configuration"
+Responsive,Responsive
+"Select Yes to use auto-width","Select Yes to use auto-width"
+"Select Yes to use auto-height","Select Yes to use auto-height"
+"Select Yes to re-display the slider after it shows the last item","Select Yes to re-display the slider after it shows the last item"
+"Select Yes to display the Next/Pre buttons in the slider","Select Yes to display the Next/Pre buttons in the slider"
+"Select Yes to display dots navigation of the slider","Select Yes to display dots navigation of the slider"
+"Select Yes to lazy loading images","Select Yes to lazy loading images"
+"Select Yes to allow auto-displaying the next products","Select Yes to allow auto-displaying the next products"
+"The time (ms) in which an item is auto-moved to the left","The time (ms) in which an item is auto-moved to the left"
+"Mageplaza Banner Slider","Mageplaza Banner Slider"
+"Banner Slider list","Banner Slider list"
+"Select Slider","Select Slider"
+"Add New Banner","Add New Banner"
+Delete,Delete
+"Are you sure you wan't to delete selected Banners?","Are you sure you wan't to delete selected Banners?"
+"Change status","Change status"
+Disable,Disable
+Banner,Banner
+Created,Created
+Modified,Modified
+"Add New Slider","Add New Slider"
+"Store View","Store View"
+"Delete Sliders","Delete Sliders"
+"Are you sure you wan't to delete selected Sliders?","Are you sure you wan't to delete selected Sliders?"
+"Number of banner","Number of banner"
+"Slider Location","Slider Location"
+"Start Date","Start Date"
+"End Date","End Date"

From 7ee2dbcb234225348e56a06b62d89c2701614a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Huy=20Ph=C3=BAc?= <phucnh@mageplaza.com>
Date: Wed, 31 May 2023 11:28:19 +0700
Subject: [PATCH 7/7] Update composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index f4bf67d..a79320d 100644
--- a/composer.json
+++ b/composer.json
@@ -2,10 +2,10 @@
   "name": "mageplaza/module-banner-slider",
   "description": "Magento 2 Banner Slider extension",
   "require": {
-    "mageplaza/module-core": "^1.4.12"
+    "mageplaza/module-core": "^1.5.3"
   },
   "type": "magento2-module",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "license": "proprietary",
   "authors": [
     {