Disable searchbanners when disabeling search (#104)

EmicoEcommerce · Dec 8, 2023 · f5f5f9a · f5f5f9a
1 parent e778ed4
commit f5f5f9a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/Block/Catalog/Product/ProductList/Toolbar/Plugin.php b/Block/Catalog/Product/ProductList/Toolbar/Plugin.php
@@ -19,6 +19,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
 use Tweakwise\Magento2Tweakwise\Model\Catalog\Layer\NavigationContext\CurrentContext;
+use Tweakwise\Magento2Tweakwise\Model\Client\Request\ProductSearchRequest;
 use Tweakwise\Magento2Tweakwise\Model\Client\Type\SortFieldType;
 use Tweakwise\Magento2Tweakwise\Model\Config;
 use Magento\Catalog\Block\Product\ProductList\Toolbar;
@@ -73,6 +74,13 @@ public function __construct(
     public function aroundGetAvailableOrders(Toolbar $subject, Closure $proceed)
     {
         if (!$this->config->isLayeredEnabled()) {
+            if (!$this->config->isSearchEnabled() || !($this->context->getRequest() instanceof ProductSearchRequest)) {
+                return $proceed();
+            }
+        }
+
+        //page is search and search is not enabled
+        if ((!$this->config->isSearchEnabled()) && ($this->context->getRequest() instanceof ProductSearchRequest)) {
             return $proceed();
         }
 

diff --git a/Model/Catalog/Layer/FilterList/Plugin.php b/Model/Catalog/Layer/FilterList/Plugin.php
@@ -61,7 +61,12 @@ public function aroundGetFilters(FilterList $subject, Closure $proceed, Layer $l
             }
         }
 
-        //no api responseA
+        //page is search and search is not enabled
+        if (!$this->config->isSearchEnabled() && ($layer instanceof Layer\Search)) {
+            return $proceed($layer);
+        }
+
+        //no api response
         if($this->config->getTweakwiseExceptionTrown()) {
             return $proceed($layer);
         }

diff --git a/Model/Catalog/Layer/ItemCollectionProvider.php b/Model/Catalog/Layer/ItemCollectionProvider.php
@@ -76,6 +76,9 @@ public function getCollection(Category $category)
                 return $this->originalProvider->getCollection($category);
             }
         }
+        if (!$this->config->isSearchEnabled() && ($this->navigationContext->getRequest() instanceof ProductSearchRequest)) {
+            return $this->originalProvider->getCollection($category);
+        }
 
         //no api response
         if($this->config->getTweakwiseExceptionTrown()) {

diff --git a/Model/Config.php b/Model/Config.php
@@ -380,7 +380,8 @@ public function isPersonalMerchandisingActive(Store $store = null)
      */
     public function isSearchBannersActive(Store $store = null)
     {
-        return (bool) $this->getStoreConfig('tweakwise/search/searchbanner', $store);
+        return (bool) $this->getStoreConfig('tweakwise/search/searchbanner', $store)
+            && $this->isSearchEnabled();
     }
 
     /**