From 62cbdd898884c4924a68b1c5ea39316522eb248c Mon Sep 17 00:00:00 2001
From: Damien Couchez <damien.couchez@gmail.com>
Date: Tue, 13 Aug 2024 10:09:35 +0200
Subject: [PATCH 1/3] MAGE-928: Fix generated url for insights (4.13.6) (#1585)

---
 view/frontend/web/autocomplete.js     | 2 +-
 view/frontend/web/internals/common.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/frontend/web/autocomplete.js b/view/frontend/web/autocomplete.js
index a474be6b5..6f45c045a 100755
--- a/view/frontend/web/autocomplete.js
+++ b/view/frontend/web/autocomplete.js
@@ -152,7 +152,7 @@ define(
                         indexName: hit.__autocomplete_indexName
                     });
                     if (hit.url.indexOf('?') > -1) {
-                        hit.urlForInsights += insightsDataUrlString
+                        hit.urlForInsights += '&' + insightsDataUrlString;
                     } else {
                         hit.urlForInsights += '?' + insightsDataUrlString;
                     }
diff --git a/view/frontend/web/internals/common.js b/view/frontend/web/internals/common.js
index 7d42fbb0f..ea3625e28 100755
--- a/view/frontend/web/internals/common.js
+++ b/view/frontend/web/internals/common.js
@@ -237,7 +237,7 @@ define(['jquery', 'algoliaBundle'], function ($, algoliaBundle) {
                     indexName: hit.__indexName
                 });
                 if (hit.url.indexOf('?') > -1) {
-                    hit.urlForInsights += insightsDataUrlString
+                    hit.urlForInsights += '&' + insightsDataUrlString;
                 } else {
                     hit.urlForInsights += '?' + insightsDataUrlString;
                 }

From f657dc3c8922d1fc85f7c5b591a3a5241f51596e Mon Sep 17 00:00:00 2001
From: Damien Couchez <damien.couchez@gmail.com>
Date: Thu, 12 Sep 2024 15:31:05 +0200
Subject: [PATCH 2/3] Fixing get category collection when two root categories
 start with the same number (#1582) (#1615)

Co-authored-by: Igor Figueiredo <63747236+igorfigueiredogen@users.noreply.github.com>
---
 Helper/Entity/CategoryHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Helper/Entity/CategoryHelper.php b/Helper/Entity/CategoryHelper.php
index 264ad71b9..94c8f6524 100755
--- a/Helper/Entity/CategoryHelper.php
+++ b/Helper/Entity/CategoryHelper.php
@@ -180,7 +180,7 @@ public function getCategoryCollectionQuery($storeId, $categoryIds = null)
     {
         /** @var \Magento\Store\Model\Store $store */
         $store = $this->storeManager->getStore($storeId);
-        $storeRootCategoryPath = sprintf('%d/%d', $this->getRootCategoryId(), $store->getRootCategoryId());
+        $storeRootCategoryPath = sprintf('%d/%d/', $this->getRootCategoryId(), $store->getRootCategoryId());
 
         $unserializedCategorysAttrs = $this->getAdditionalAttributes($storeId);
         $additionalAttr = array_column($unserializedCategorysAttrs, 'attribute');

From 93b3a6249d3fd6fe16851829dec811acb3f27cb7 Mon Sep 17 00:00:00 2001
From: Eric Wright <eric.wright@algolia.com>
Date: Wed, 30 Oct 2024 09:32:55 -0400
Subject: [PATCH 3/3] MAGE-1092 Update extension for 3.13.6 release

---
 CHANGELOG.md   | 6 ++++++
 README.md      | 2 +-
 composer.json  | 2 +-
 etc/module.xml | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f88a18d5a..526585195 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGE LOG
 
+## 3.13.6
+
+### Bug Fixes
+- Improve handling of insights params for URLs that already have a query string 
+- Improve query method for alternate root categories - Thank you @igorfigueiredogen
+
 ## 3.13.5
 
 ### Updates
diff --git a/README.md b/README.md
index fd3672075..5d0624593 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Algolia Search & Discovery extension for Magento 2
 ==================================================
 
-![Latest version](https://img.shields.io/badge/latest-3.13.5-green)
+![Latest version](https://img.shields.io/badge/latest-3.13.6-green)
 ![Magento 2](https://img.shields.io/badge/Magento-2.4.x-orange)
 
 ![PHP](https://img.shields.io/badge/PHP-8.2%2C8.1%2C7.4-blue)
diff --git a/composer.json b/composer.json
index e39a0b106..e0b89bdbb 100755
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "Algolia Search & Discovery extension for Magento 2",
   "type": "magento2-module",
   "license": ["MIT"],
-  "version": "3.13.5",
+  "version": "3.13.6",
   "require": {
     "magento/framework": "~102.0|~103.0",
     "algolia/algoliasearch-client-php": "3.3.2",
diff --git a/etc/module.xml b/etc/module.xml
index 3253219c6..326de0ad2 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Algolia_AlgoliaSearch" setup_version="3.13.5">
+    <module name="Algolia_AlgoliaSearch" setup_version="3.13.6">
         <sequence>
             <module name="Magento_Theme"/>
             <module name="Magento_Backend"/>