Add fix for channel when Findo is inactive

findologic · Mar 11, 2024 · 1bc3f27 · 1bc3f27
1 parent eb6b8f8
commit 1bc3f27
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/Core/Content/Product/SalesChannel/Search/ProductSearchRoute.php b/src/Core/Content/Product/SalesChannel/Search/ProductSearchRoute.php
@@ -85,12 +85,15 @@ public function load(
         );
 
         if (!$shouldHandleRequest) {
-            return $this->decorated->load($request, $context, $criteria);
+            $result = $this->decorated->load($request, $context, $criteria)->getListingResult();
         }
 
         $query = $request->query->get('search');
-        $result = $this->doSearch($criteria, $context, $query);
-        $result = ProductListingResult::createFrom($result);
+
+        if (!isset($result)) {
+            $result = $this->doSearch($criteria, $context, $query);
+            $result = ProductListingResult::createFrom($result);
+        }
         $result->addCurrentFilter('search', $query);
 
         $this->eventDispatcher->dispatch(

diff --git a/src/Storefront/Controller/SearchController.php b/src/Storefront/Controller/SearchController.php
@@ -67,6 +67,18 @@ private function buildSearchPageLoader(?SearchPageLoader $searchPageLoader): Sea
      */
     public function search(SalesChannelContext $context, Request $request): Response
     {
+        $this->config->initializeBySalesChannel($context);
+        if (
+            !Utils::shouldHandleRequest(
+                $request,
+                $context->getContext(),
+                $this->serviceConfigResource,
+                $this->config
+            )
+        ) {
+            return $this->decorated->search($context, $request);
+        }
+
         if ($redirectResponse = $this->handleFindologicSearchParams($request)) {
             return $redirectResponse;
         }