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

…eakwise
EmicoEcommerce · Jan 23, 2024 · 2f2d8bc · 2f2d8bc
2 parents f2990d5 + da6b091
commit 2f2d8bc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/Model/Catalog/Layer/Url/Strategy/QueryParameterStrategy.php b/Model/Catalog/Layer/Url/Strategy/QueryParameterStrategy.php
@@ -229,13 +229,12 @@ public function getCategoryFilterSelectUrl(MagentoHttpRequest $request, Item $it
                 sprintf(
                     '%s/',
                     trim($categoryUrlPath, '/'),
-                    [
-                        '_query' => $this->getAttributeFilters($request)
-                    ]
-                )
+                ),
+                [
+                    '_query' => $this->getAttributeFilters($request)
+                ]
             );
 
-
             /*
              We explode the url so that we can capture its parts and find the double values in order to remove them.
              This is needed because the categoryUrlPath contains the store code in some cases and the directUrl as well.
@@ -429,7 +428,7 @@ public function apply(MagentoHttpRequest $request, ProductNavigationRequest $nav
             $query = $request->getQuery();
             $query->set(SELF::PARAM_ORDER, $sortOrder);
             $request->setQuery($query);
-            
+
             $navigationRequest->setOrder($sortOrder);
         }
 

diff --git a/Model/Client/Request.php b/Model/Client/Request.php
@@ -233,6 +233,11 @@ public function addCategoryPathFilter(array $categoryIds)
         $categoryIds = array_map('intval', $categoryIds);
         $storeId = (int) $this->getStoreId();
         $tweakwiseIdMapper = function (int $categoryId) use ($storeId) {
+            //don't add prefix for root category 1.
+            if ($categoryId === 1) {
+                return '';
+            }
+
             return $this->helper->getTweakwiseId($storeId, $categoryId);
         };
         $tweakwiseIds = array_map($tweakwiseIdMapper, $categoryIds);

diff --git a/Model/Config/Source/CategoryView.php b/Model/Config/Source/CategoryView.php
@@ -31,8 +31,8 @@ class CategoryView implements OptionSourceInterface
     protected function buildOptions()
     {
         return [
-            ['value' => self::EXTENDED, 'label' => __('Extended')],
             ['value' => self::SIMPLE, 'label' => __('Simple (deprecated)')],
+            ['value' => self::EXTENDED, 'label' => __('Extended')],
         ];
     }
 

diff --git a/Model/Seo/FilterHelper.php b/Model/Seo/FilterHelper.php
@@ -80,8 +80,10 @@ public function shouldFilterBeIndexable(Item $item): bool
     public function shouldPageBeIndexable(): bool
     {
         foreach ($this->getActiveFilterItems() as $item) {
-            if (!$this->shouldFilterBeIndexable($item)) {
-                return false;
+            if ($item instanceof Item) {
+                if (!$this->shouldFilterBeIndexable($item)) {
+                    return false;
+                }
             }
         }