Merge branch 'master' of https://github.com/EmicoEcommerce/Magento2Tw…

…eakwise
EmicoEcommerce · Jan 15, 2021 · 7d71c86 · 7d71c86
2 parents 5214dda + f841f23
commit 7d71c86
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/Model/Catalog/Layer/NavigationContext.php b/Model/Catalog/Layer/NavigationContext.php
@@ -241,7 +241,7 @@ public function addVisibilityFilter(ProductNavigationRequest $request)
         }
 
         foreach ($visibilityValues as $visibilityValue) {
-            $request->addAttributeFilter(self::VISIBILITY_ATTRIBUTE, $visibilityValue);
+            $request->addHiddenParameter(self::VISIBILITY_ATTRIBUTE, $visibilityValue);
         }
     }
 }
diff --git a/Model/Client/Request/ProductNavigationRequest.php b/Model/Client/Request/ProductNavigationRequest.php
@@ -29,6 +29,11 @@ class ProductNavigationRequest extends Request
      */
     protected $path = 'navigation';
 
+    /**
+     * @var array
+     */
+    protected $hiddenParameters = [];
+
     /**
      * {@inheritdoc}
      */
@@ -42,12 +47,22 @@ public function getResponseType()
      * @param string $value
      * @return $this
      */
-    public function addAttributeFilter($attribute, $value)
+    public function addAttributeFilter(string $attribute, $value)
     {
         $this->addParameter('tn_fk_' . $attribute, $value);
         return $this;
     }
 
+    /**
+     * @param string $attribute
+     * @param $value
+     */
+    public function addHiddenParameter(string $attribute, $value)
+    {
+        $this->hiddenParameters[] = sprintf('%s=%s', $attribute, $value);
+        $this->setParameter('tn_parameters', implode('&', $this->hiddenParameters));
+    }
+
     /**
      * @param string $sort
      * @return $this
@@ -104,4 +119,4 @@ public function setSortTemplateId($templateId)
         $this->setParameter('tn_st', $templateId);
         return $this;
     }
-}
+}
diff --git a/view/frontend/layout/tweakwise_ajax_category.xml b/view/frontend/layout/tweakwise_ajax_category.xml
@@ -9,6 +9,7 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <update handle="empty"/>
+    <update handle="formkey"/>
     <container name="root">
         <container name="content"/>
         <container name="sidebar.main"/>

diff --git a/view/frontend/layout/tweakwise_ajax_search.xml b/view/frontend/layout/tweakwise_ajax_search.xml
@@ -9,6 +9,7 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <update handle="empty"/>
+    <update handle="formkey"/>
     <container name="root">
         <container name="content"/>
         <container name="sidebar.main"/>

diff --git a/view/frontend/web/js/navigation-form.js b/view/frontend/web/js/navigation-form.js
@@ -266,9 +266,16 @@ define([
                     .replaceWith(newToolbarFirst.outerHTML);
             }
             if (newToolbarLast) {
+                var scripts = '';
+                $(newToolbarLast).siblings('script[type="text/x-magento-init"]').map(
+                    function (index, element) {
+                        scripts += element.outerHTML;
+                    }
+                );
+
                 toolbar
                     .last()
-                    .replaceWith(newToolbarLast.outerHTML);
+                    .replaceWith(newToolbarLast.outerHTML + scripts);
             }
 
             $('body').trigger('contentUpdated');