Merge pull request #184 from EmicoEcommerce/bug/pagination-issues-no-…

…ajax Bug/pagination issues no ajax
EmicoEcommerce · Oct 15, 2021 · c1b9cfe · c1b9cfe
2 parents 1c5208d + ec0fd7a
commit c1b9cfe
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/Model/Catalog/Layer/ItemCollectionProvider.php b/Model/Catalog/Layer/ItemCollectionProvider.php
@@ -75,7 +75,15 @@ public function getCollection(Category $category)
         }
 
         try {
-            return $this->collectionFactory->create(['navigationContext' => $this->navigationContext]);
+            $collection = $this->collectionFactory->create(['navigationContext' => $this->navigationContext]);
+
+            if (count($collection->getItems()) < 1) {
+                $collection = $this->collectionFactory
+                    ->create(['navigationContext' => $this->navigationContext->resetPagination()])
+                ;
+            }
+
+            return $collection;
         } catch (TweakwiseException $e) {
             $this->log->critical($e);
             $this->config->setTweakwiseExceptionThrown();

diff --git a/Model/Catalog/Layer/NavigationContext.php b/Model/Catalog/Layer/NavigationContext.php
@@ -36,7 +36,7 @@ class NavigationContext
     /**
      * @var ProductNavigationRequest
      */
-    protected $request;
+    protected $request = null;
 
     /**
      * @var RequestFactory
@@ -49,9 +49,9 @@ class NavigationContext
     protected $client;
 
     /**
-     * @var ProductNavigationResponse
+     * @var ProductNavigationResponse|null
      */
-    protected $response;
+    protected $response = null;
 
     /**
      * @var Url
@@ -150,6 +150,7 @@ public function getResponse(): ProductNavigationResponse
     {
         if (!$this->response) {
             $request = $this->getRequest();
+
             $this->initializeRequest($request);
 
             $this->response = $this->client->request($request);
@@ -168,6 +169,25 @@ public function hasResponse(): bool
         return $this->response !== null;
     }
 
+    /**
+     * @return $this
+     */
+    public function resetPagination(): self
+    {
+        $params = $this->request->getParameters();
+        $params['resetPagination'] = true;
+        $params['tn_fk_p'] = 1;
+        $params['tn_p'] = 1;
+
+        $this->request = null;
+
+        $request = $this->getRequest()->setParameters($params);
+
+        $this->response = null;
+
+        return $this->initializeRequest($request);
+    }
+
     /**
      * @param $attributeCodes
      * @return Attribute[]

diff --git a/Model/Catalog/Layer/Url/Strategy/QueryParameterStrategy.php b/Model/Catalog/Layer/Url/Strategy/QueryParameterStrategy.php
@@ -345,7 +345,8 @@ public function apply(MagentoHttpRequest $request, ProductNavigationRequest $nav
         }
 
         $page = $this->getPage($request);
-        if ($page) {
+
+        if ($page && (bool) $navigationRequest->getParameter('resetPagination') === false) {
             $navigationRequest->setPage($page);
         }