Merge pull request #217 from collabpl/bugfix/GH-216-Cookie_Restrictio…

…n_Fixes GH-216
yireo · Feb 27, 2024 · d505505 · d505505
2 parents cfac4c2 + e8b1b43
commit d505505
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/Config/Config.php b/Config/Config.php
@@ -167,6 +167,14 @@ public function getCookieRestrictionModeName(): string
         return '';
     }
 
+    /**
+     * @return int
+     */
+    public function getCurrentWebsiteId(): int
+    {
+        return (int)$this->storeManager->getStore()->getWebsiteId();
+    }
+
     /**
      * @return string
      */

diff --git a/ViewModel/Commons.php b/ViewModel/Commons.php
@@ -49,6 +49,7 @@ public function getConfiguration(): array
     {
         $configuration = [];
         $configuration['cookie_restriction_mode'] = $this->config->getCookieRestrictionModeName();
+        $configuration['website_id'] = $this->config->getCurrentWebsiteId();
         $configuration['data_layer'] = $this->dataLayer->getDataLayer();
         $configuration['id'] = $this->config->getId();
         $configuration['debug'] = $this->config->isDebug();

diff --git a/view/frontend/web/js/generic.js b/view/frontend/web/js/generic.js
@@ -40,7 +40,9 @@ define([
             return true;
         }
 
-        return $.cookie(moduleConfig.cookie_restriction_mode);
+        const parsedCookie = JSON.parse($.cookie(moduleConfig.cookie_restriction_mode) || '{}');
+
+        return parsedCookie[moduleConfig.website_id] || false;
     };
 
     var isLoggedIn = function () {