Fix opengento#122

elisei · Apr 29, 2022 · f325aff · f325aff
1 parent 0872942
commit f325aff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/view/frontend/web/js/view/popup.js b/view/frontend/web/js/view/popup.js
@@ -21,7 +21,7 @@ define([
     "use strict";
 
     return Component.extend({
-        showPopUp: ko.observable(null),
+        showPopUp: ko.observable(false),
         popupText: ko.observable(null),
         popupLink: ko.observable(null),
 
@@ -33,16 +33,27 @@ define([
          * Initialize component
          */
         initialize() {
+            var self = this,
+                isBot = navigator.userAgent.toLowerCase().match( /.+?(?:bot|lighthouse)/ );
+
             this._super();
 
-            this.showPopUp(!$.cookie(this.cookieName));
-            this.popupText(this.notificationText);
-            this.popupLink(this.learnMore);
+            if (!window.localStorage.getItem(self.cookieName) && !isBot) {
+                self.showPopUp(true);
+            }
+
+            self.popupText(self.notificationText);
+            self.popupLink(self.learnMore);
+        },
+
+        /**
+         * Accept All Cookies
+         */
+        acceptAllCookies() {
+            var self = this;
 
-            $(document).on("click", "#enhanced-privacy-popup-agree", function () {
-                this.showPopUp(false);
-                $.cookie(this.cookieName, 1);
-            }.bind(this));
+            window.localStorage.setItem(self.cookieName, true, {});
+            self.showPopUp(false);
         }
     });
 });
diff --git a/view/frontend/web/template/message.html b/view/frontend/web/template/message.html
@@ -24,7 +24,7 @@
                     <a class="action" data-bind="attr: {href: learnMore}, i18n: 'Read More'"></a>
                 </div>
                 <div class="primary">
-                    <button type="button" class="action primary" id="enhanced-privacy-popup-agree" data-bind="i18n: 'Accept'"></button>
+                    <button type="button" class="action primary" id="enhanced-privacy-popup-agree" data-bind="i18n: 'Accept', click: acceptAllCookies"></button>
                 </div>
             </div>
         </div>