Merge pull request #98 from mageplaza/2.4-develop

thaimageplaza · web-flow · commit 514bec7109e6 · 2025-04-26T17:21:05.000+07:00
Release v4.0.5
diff --git a/Block/AbstractSlider.php b/Block/AbstractSlider.php
@@ -51,6 +51,8 @@
  */
 abstract class AbstractSlider extends AbstractProduct implements BlockInterface, IdentityInterface
 {
+    protected $_template = "Mageplaza_Productslider::productslider.phtml";
+
     /**
      * @var DateTime
      */
@@ -161,12 +163,14 @@ 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');
+        if ($this->_helperData->isHyvaTheme()) {
+            $this->_template = 'Mageplaza_Productslider::hyva/productslider.phtml';
+        } else {
+            $this->addData([
+                'cache_lifetime' => $this->getSlider() ? $this->getSlider()->getTimeCache() : 86400,
+                'cache_tags'     => [Product::CACHE_TAG]
+            ]);
+        }
     }
 
     /**
@@ -407,12 +411,12 @@ public function getResponsiveConfig()
             $responsiveOptions = '';
             foreach ($responsiveConfig as $config) {
                 if (!empty($config['size']) && !empty($config['items'])) {
-                    $responsiveOptions .= $config['size'] . ':{items:' . $config['items'] . '},';
+                    $responsiveOptions .= $config['size'] . ':{'. ($this->_helperData->isHyvaTheme() ? 'perView' : 'items') . ':' . $config['items'] . '},';
                 }
             }
             $responsiveOptions = rtrim($responsiveOptions, ',');
 
-            return 'responsive:{' . $responsiveOptions . '}';
+            return ($this->_helperData->isHyvaTheme() ? 'breakpoints' : 'responsive') . ':{' . $responsiveOptions . '}';
         }
 
         return '';
diff --git a/Block/Adminhtml/Slider/Edit/Tab/Design.php b/Block/Adminhtml/Slider/Edit/Tab/Design.php
@@ -31,6 +31,7 @@
 use Mageplaza\Productslider\Helper\Data;
 use Mageplaza\Productslider\Model\Config\Source\Additional;
 use Mageplaza\Productslider\Model\Slider;
+use function Ramsey\Uuid\v1;
 
 /**
  * Class Design
@@ -98,49 +99,59 @@ protected function _prepareForm()
         );
 
         $fieldset->addField('title', 'text', [
-            'name' => 'title',
+            'name'  => 'title',
             'label' => __('Title'),
             'title' => __('Title'),
         ]);
         $fieldset->addField('description', 'textarea', [
-            'name' => 'description',
+            'name'  => 'description',
             'label' => __('Description'),
             'title' => __('Description'),
         ]);
         $fieldset->addField('limit_number', 'text', [
-            'name' => 'limit_number',
+            'name'  => 'limit_number',
             'label' => __('Limit the number of products'),
             'title' => __('Limit the number of products'),
             'class' => 'validate-digits'
         ]);
 
         $fieldset->addField('display_additional', 'multiselect', [
-            'name' => 'display_additional',
-            'label' => __('Display additional information'),
-            'title' => __('Display additional information'),
+            'name'   => 'display_additional',
+            'label'  => __('Display additional information'),
+            'title'  => __('Display additional information'),
             'values' => $this->_additional->toOptionArray(),
-            'note' => __('Select information or button(s) to display with products.')
+            'note'   => __('Select information or button(s) to display with products.')
         ]);
 
         $isResponsive = $fieldset->addField('is_responsive', 'select', [
-            'name' => 'is_responsive',
-            'label' => __('Is Responsive'),
-            'title' => __('Is Responsive'),
+            'name'    => 'is_responsive',
+            'label'   => __('Is Responsive'),
+            'title'   => __('Is Responsive'),
             'options' => [
                 '1' => __('Yes'),
                 '0' => __('No'),
                 '2' => __('Use Config')
             ]
         ]);
 
+        $isHyvaThemeAdmin = $this->_helperData->isHyvaThemeAdmin();
+        if ($isHyvaThemeAdmin) {
+            $note = 'When the screen size is smaller than <strong>Screen size max</strong>, the number of products on the slider will change according to <strong>Number of items</strong>. 
+                  Default: 3 items.';
+                    
+        } else {
+            $note = 'When the screen size is larger than <strong>Screen size max</strong>, the number of products on the slider will change according to <strong>Number of items</strong>
+                 Default: 3 items.';
+        }
+
         $responsiveItem = $fieldset->addField(
             'responsive_items',
             'Mageplaza\Productslider\Block\Adminhtml\Slider\Edit\Tab\Renderer\Responsive',
             [
                 'name' => 'responsive_items',
                 'label' => __('Max Items slider'),
                 'title' => __('Max Items slider'),
-                'note' => __('Default: 3 items.')
+                'note' => __($note)
             ]
         );
 
diff --git a/Block/Widget/Slider.php b/Block/Widget/Slider.php
@@ -105,7 +105,9 @@ public function _construct()
     {
         parent::_construct();
 
-        $this->setTemplate('Mageplaza_Productslider::widget/productslider.phtml');
+        if ($this->_helperData->isHyvaTheme()) {
+            $this->_template = 'Mageplaza_Productslider::hyva/widget/productslider.phtml';
+        }
     }
 
     /**
@@ -221,4 +223,12 @@ public function getAllOptions()
     {
         return $this->_helperData->getAllOptions();
     }
+
+    /**
+     * @return string
+     */
+    public function getResponseValue()
+    {
+        return $this->_helperData->getResponseValue();
+    }
 }
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -26,6 +26,8 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\View\DesignInterface;
+use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Mageplaza\Core\Helper\AbstractData;
 use Mageplaza\Productslider\Model\ResourceModel\Slider\Collection;
@@ -55,6 +57,11 @@ class Data extends AbstractData
      */
     protected $sliderFactory;
 
+    /**
+     * @var ThemeProviderInterface
+     */
+    protected $themeProvider;
+
     /**
      * Data constructor.
      *
@@ -64,18 +71,21 @@ class Data extends AbstractData
      * @param DateTime $date
      * @param HttpContext $httpContext
      * @param SliderFactory $sliderFactory
+     * @param ThemeProviderInterface $themeProvider
      */
     public function __construct(
         Context $context,
         ObjectManagerInterface $objectManager,
         StoreManagerInterface $storeManager,
         DateTime $date,
         HttpContext $httpContext,
-        SliderFactory $sliderFactory
+        SliderFactory $sliderFactory,
+        ThemeProviderInterface $themeProvider
     ) {
-        $this->date = $date;
-        $this->httpContext = $httpContext;
+        $this->date          = $date;
+        $this->httpContext   = $httpContext;
         $this->sliderFactory = $sliderFactory;
+        $this->themeProvider = $themeProvider;
 
         parent::__construct($context, $objectManager, $storeManager);
     }
@@ -143,12 +153,27 @@ public function getResponseValue()
 
         foreach ($responsiveConfig as $config) {
             if (!empty($config['size']) && !empty($config['items'])) {
-                $responsiveOptions .= $config['size'] . ':{items:' . $config['items'] . '},';
+                $responsiveOptions .= $config['size'] . ':{'. ($this->isHyvaTheme() ? 'perView' : 'items') . ':' . $config['items'] . '},';
             }
         }
 
         $responsiveOptions = rtrim($responsiveOptions, ',');
 
-        return 'responsive:{' . $responsiveOptions . '}';
+        return ($this->isHyvaTheme() ? 'breakpoints' : 'responsive') . ':{' . $responsiveOptions . '}';
+    }
+
+    /**
+     * @return bool
+     * @throws NoSuchEntityException
+     */
+    public function isHyvaThemeAdmin()
+    {
+        $store   = $this->storeManager->getStore();
+        $themeId = $store->getConfig(DesignInterface::XML_PATH_THEME_ID);
+        $theme   = $this->themeProvider->getThemeById($themeId);
+        $currentThemeCode = $theme->getCode();
+        $isHyvaThemeAdmin = (strpos($currentThemeCode, 'Hyva') !== false);
+
+        return $isHyvaThemeAdmin;
     }
 }
diff --git a/composer.json b/composer.json
@@ -2,10 +2,10 @@
   "name": "mageplaza/magento-2-product-slider",
   "description": "Magento 2 Product Slider",
   "require": {
-    "mageplaza/module-core": "^1.5.4"
+    "mageplaza/module-core": "^1.5.13"
   },
   "type": "magento2-module",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "license": "proprietary",
   "authors": [
     {
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -52,6 +52,9 @@
                     <label>Max Items slider</label>
                     <frontend_model>Mageplaza\Productslider\Block\Adminhtml\Config\Field\Responsive</frontend_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Serialized\ArraySerialized</backend_model>
+                    <comment>With Hyva theme: When the screen size is smaller than Screen size max, the number of products on the slider will change according to Number of items.
+                        With Luma theme: it will be larger than the Maximum Screen Size.
+                    </comment>
                     <depends>
                         <field id="responsive">1</field>
                     </depends>
diff --git a/etc/config.xml b/etc/config.xml
@@ -23,6 +23,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <productslider>
+            <module>
+                <user_guide>magento/magento-2-product-slider</user_guide>
+            </module>
             <general>
                 <enabled>1</enabled>
             </general>
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+<policies>
+    <policy id="script-src">
+        <values>
+            <value id="jsdelivr" type="host">https://cdn.jsdelivr.net</value>
+        </values>
+    </policy>
+</policies>
+</csp_whitelist>
diff --git a/view/frontend/layout/hyva_default.xml b/view/frontend/layout/hyva_default.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <update handle="hyva_mp_add_js_css" />
+    <body>
+        <referenceBlock name="mp_add_js_css">
+            <action method="setFiles">
+                <argument name="files" xsi:type="array">
+                    <item name="hyva_style_css" xsi:type="string">Mageplaza_Productslider::css/hyva_style.css</item>
+                </argument>
+            </action>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/frontend/templates/hyva/productslider.phtml b/view/frontend/templates/hyva/productslider.phtml
diff --git a/view/frontend/templates/hyva/widget/productslider.phtml b/view/frontend/templates/hyva/widget/productslider.phtml
diff --git a/view/frontend/web/css/hyva_style.css b/view/frontend/web/css/hyva_style.css

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,9 @@ public function _construct()`
`105`	`105`	`{`
`106`	`106`	`parent::_construct();`
`107`	`107`
`108`		`- $this->setTemplate('Mageplaza_Productslider::widget/productslider.phtml');`
	`108`	`+ if ($this->_helperData->isHyvaTheme()) {`
	`109`	`+ $this->_template = 'Mageplaza_Productslider::hyva/widget/productslider.phtml';`
	`110`	`+ }`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`/**`
`@@ -221,4 +223,12 @@ public function getAllOptions()`
`221`	`223`	`{`
`222`	`224`	`return $this->_helperData->getAllOptions();`
`223`	`225`	`}`
	`226`	`+`
	`227`	`+ /**`
	`228`	`+ * @return string`
	`229`	`+ */`
	`230`	`+ public function getResponseValue()`
	`231`	`+ {`
	`232`	`+ return $this->_helperData->getResponseValue();`
	`233`	`+ }`
`224`	`234`	`}`