Merge pull request #9 from mageplaza/develop

Develop

Author: brianmageplaza

Plugin/Controller/Category/View.php

@@ -21,7 +21,6 @@
 
 namespace Mageplaza\AjaxLayer\Plugin\Controller\Category;
 
-use Magento\Framework\Json\Helper\Data;
 use Mageplaza\AjaxLayer\Helper\Data as LayerData;
 
 /**
@@ -30,11 +29,6 @@
  */
 class View
 {
-    /**
-     * @var Data
-     */
-    protected $_jsonHelper;
-
     /**
      * @var LayerData
      */
@@ -43,14 +37,11 @@ class View
     /**
      * View constructor.
      *
-     * @param Data $jsonHelper
      * @param LayerData $moduleHelper
      */
     public function __construct(
-        Data $jsonHelper,
         LayerData $moduleHelper
     ) {
-        $this->_jsonHelper   = $jsonHelper;
         $this->_moduleHelper = $moduleHelper;
     }
 
@@ -65,17 +56,12 @@ public function afterExecute(\Magento\Catalog\Controller\Category\View $action,
         if ($this->_moduleHelper->ajaxEnabled() && $action->getRequest()->isAjax()) {
             $navigation = $page->getLayout()->getBlock('catalog.leftnav');
             $products   = $page->getLayout()->getBlock('category.products');
+            $result     = ['products' => $products->toHtml(), 'navigation' => $navigation->toHtml()];
             if ($this->_moduleHelper->getConfigValue('mpquickview/general/enabled')) {
-                $quickView = $page->getLayout()->getBlock('mpquickview.quickview');
-                $result    = [
-                    'products'   => $products->toHtml(),
-                    'navigation' => $navigation->toHtml(),
-                    'quickview'  => $quickView->toHtml()
-                ];
-            } else {
-                $result = ['products' => $products->toHtml(), 'navigation' => $navigation->toHtml()];
+                $quickView           = $page->getLayout()->getBlock('mpquickview.quickview');
+                $result['quickview'] = $quickView->toHtml();
             }
-            $action->getResponse()->representJson($this->_jsonHelper->jsonEncode($result));
+            $action->getResponse()->representJson(LayerData::jsonEncode($result));
         } else {
             return $page;
         }

composer.json

@@ -2,10 +2,10 @@
   "name": "mageplaza/module-ajax-layered-navigation",
   "description": "Magento 2 Ajax Layered Navigation Extension",
   "require": {
-    "mageplaza/module-core": "^1.4.4"
+    "mageplaza/module-core": "^1.4.5"
   },
   "type": "magento2-module",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "license": "proprietary",
   "authors": [
     {

view/frontend/templates/layer/view.phtml

@@ -21,8 +21,9 @@
 ?>
 <?php if ($block->canShowBlock()) : ?>
     <?php
+    $helper = $this->helper(\Mageplaza\AjaxLayer\Helper\Data::class);
     $filters = $block->getFilters();
-    $layerConfig = $this->helper(\Mageplaza\AjaxLayer\Helper\Data::class)->getLayerConfiguration($filters);
+    $layerConfig = $helper->getLayerConfiguration($filters);
     $filtered = count($block->getLayer()->getState()->getFilters());
     ?>
     <div class="block filter" id="layered-filter-block"
@@ -74,13 +75,15 @@
                 });
             </script>
             <?php endif; ?>
+            <?php if ($helper->ajaxEnabled()) : ?>
             <script type="text/x-magento-init">
                 {
                      ".block-content.filter-content":{
                          "mpAjax": <?= /** @noEscape */ $layerConfig ?>
                      }
                 }
             </script>
+            <?php endif; ?>
         </div>
     </div>
 <?php endif; ?>

view/frontend/web/js/action/submit-filter.js

@@ -34,7 +34,8 @@ define(
 
         return function (submitUrl, isChangeUrl) {
             /** save active state */
-            var actives = [];
+            var actives = [],
+                data;
             $('.filter-options-item').each(function (index) {
                 if ($(this).hasClass('active')) {
                     actives.push($(this).attr('attribute'));
@@ -50,7 +51,13 @@ define(
                 window.history.pushState({url: submitUrl}, '', submitUrl);
             }
 
-            return storage.post(submitUrl, JSON.stringify({'mp_layer': 1})).done(
+            if (isChangeUrl){
+                data = '{}';
+            }else{
+                data = JSON.stringify({'mp_layer': 1});
+            }
+
+            return storage.post(submitUrl, data).done(
                 function (response) {
                     if (response.backUrl) {
                         window.location = response.backUrl;