Merge pull request #78 from mageplaza/2.4-develop

v4.0.1
mageplaza · May 31, 2021 · d992ae0 · d992ae0
2 parents f47ba4f + 9682cef
commit d992ae0
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 33 deletions.
diff --git a/Block/Adminhtml/Banner/Edit/Tab/Banner.php b/Block/Adminhtml/Banner/Edit/Tab/Banner.php
@@ -228,6 +228,7 @@ protected function _prepareForm()
             'name' => 'url_banner',
             'label' => __('Url'),
             'title' => __('Url'),
+            'class' => 'validate-url validate-no-html-tags'
         ]);
 
         $newTab = $fieldset->addField('newtab', 'select', [

diff --git a/Block/Adminhtml/Slider/Edit/Form.php b/Block/Adminhtml/Slider/Edit/Form.php
@@ -41,7 +41,7 @@ protected function _prepareForm()
             [
                 'data' => [
                     'id' => 'edit_form',
-                    'action' => $this->getUrl('*/*/save', ['id' => $this->getRequest()->getParam('id')]),
+                    'action' => $this->getUrl('*/*/save', ['slider_id' => $this->getRequest()->getParam('slider_id')]),
                     'method' => 'post',
                     'enctype' => 'multipart/form-data'
                 ]

diff --git a/Block/Slider.php b/Block/Slider.php
@@ -149,6 +149,6 @@ public function getBannerOptions()
      */
     public function isLazyLoad()
     {
-        return $this->helperData->getModuleConfig('mpbannerslider_design/lazyLoad');
+        return $this->helperData->getModuleConfig('mpbannerslider_design/lazyLoad') || $this->getSlider()->getData('lazyLoad');
     }
 }
diff --git a/Controller/Adminhtml/Banner/Edit.php b/Controller/Adminhtml/Banner/Edit.php
@@ -81,7 +81,7 @@ public function execute()
                 $resultRedirect->setPath(
                     'mpbannerslider/*/edit',
                     [
-                        'banner_id' => $banner->getId(),
+                        'banner_id' => $id,
                         '_current' => true
                     ]
                 );

diff --git a/Controller/Adminhtml/Slider.php b/Controller/Adminhtml/Slider.php
@@ -23,6 +23,7 @@
 
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
 use Mageplaza\BannerSlider\Model\SliderFactory;
 
@@ -68,6 +69,7 @@ public function __construct(
      * Init Slider
      *
      * @return \Mageplaza\BannerSlider\Model\Slider
+     * @throws LocalizedException
      */
     protected function initSlider()
     {
@@ -76,6 +78,9 @@ protected function initSlider()
         $slider = $this->sliderFactory->create();
         if ($sliderId) {
             $slider->load($sliderId);
+            if (!$slider->getId()) {
+                throw new LocalizedException(__('The wrong slider is specified.'));
+            }
         }
         $this->coreRegistry->register('mpbannerslider_slider', $slider);
 

diff --git a/Controller/Adminhtml/Slider/Edit.php b/Controller/Adminhtml/Slider/Edit.php
@@ -82,7 +82,7 @@ public function execute()
                 $resultRedirect->setPath(
                     'mpbannerslider/*/edit',
                     [
-                        'slider_id' => $slider->getId(),
+                        'slider_id' => $id,
                         '_current' => true
                     ]
                 );

diff --git a/Controller/Adminhtml/Slider/Save.php b/Controller/Adminhtml/Slider/Save.php
@@ -150,8 +150,16 @@ public function execute()
                 return $resultRedirect;
             } catch (RuntimeException $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
+                if ($slider->getId()) {
+                    $this->_redirect('mpbannerslider/*/edit', ['slider_id' => $slider->getId()]);
+                } else {
+                    $this->_redirect('mpbannerslider/*/new');
+                }
             } catch (Exception $e) {
                 $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the Slider.'));
+                $this->_redirect('mpbannerslider/*/edit', [
+                    'slider_id' => $slider->getId()
+                ]);
             }
 
             $this->_getSession()->setMageplazaBannerSliderSliderData($data);

diff --git a/Model/Banner.php b/Model/Banner.php
@@ -151,7 +151,7 @@ public function getIdentities()
      */
     public function getDefaultValues()
     {
-        return ['status => 1', 'type' => '0'];
+        return ['status' => '1', 'type' => '0'];
     }
 
     /**

diff --git a/Observer/AddBlock.php b/Observer/AddBlock.php
@@ -75,7 +75,7 @@ public function execute(Observer $observer)
         $type = array_search($observer->getEvent()->getElementName(), [
             'header' => 'header',
             'content' => 'content',
-            'page-top' => 'main.content',
+            'page-top' => 'page.wrapper',
             'footer-container' => 'footer-container',
             'sidebar' => 'catalog.leftnav'
         ], true);

diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
@@ -137,7 +137,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                     ],
                     'Slider ID'
                 )
-                ->addColumn('name', Table::TYPE_TEXT, 255, ['nullable => false'], 'Slider Name')
+                ->addColumn('name', Table::TYPE_TEXT, 255, ['nullable' => false], 'Slider Name')
                 ->addColumn('status', Table::TYPE_SMALLINT, null, ['nullable' => false, 'default' => '1'], 'Status')
                 ->addColumn('location', Table::TYPE_TEXT, 1000, [], 'Location')
                 ->addColumn('store_ids', Table::TYPE_TEXT, 255, [])

diff --git a/composer.json b/composer.json
@@ -1,26 +1,26 @@
-{
-  "name": "mageplaza/module-banner-slider",
-  "description": "Magento 2 Banner Slider extension",
-  "require": {
-    "mageplaza/module-core": "^1.4.5"
-  },
-  "type": "magento2-module",
-  "version": "4.0.0",
-  "license": "proprietary",
-  "authors": [
-    {
-      "name": "Mageplaza",
-      "email": "[email protected]",
-      "homepage": "https://www.mageplaza.com",
-      "role": "Technical Support"
-    }
-  ],
-  "autoload": {
-    "files": [
-      "registration.php"
-    ],
-    "psr-4": {
-      "Mageplaza\\BannerSlider\\": ""
-    }
-  }
-}
+{
+  "name": "mageplaza/module-banner-slider",
+  "description": "Magento 2 Banner Slider extension",
+  "require": {
+    "mageplaza/module-core": "^1.4.5"
+  },
+  "type": "magento2-module",
+  "version": "4.0.1",
+  "license": "proprietary",
+  "authors": [
+    {
+      "name": "Mageplaza",
+      "email": "[email protected]",
+      "homepage": "https://www.mageplaza.com",
+      "role": "Technical Support"
+    }
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Mageplaza\\BannerSlider\\": ""
+    }
+  }
+}