Merge pull request #43 from magefan/12327-cookie-consent-and-gtm-extension

12327-cookie-consent-and-gtm-extension

Author: magefan

Block/GtmCode.php

@@ -104,6 +104,16 @@ public function isCookieRestrictionModeEnabled()
         return $this->config->isCookieRestrictionModeEnabled();
     }
 
+    /**
+     * Retrieve true if mf cookie consent extension is enabled
+     *
+     * @return bool
+     */
+    public function isMfCookieConsentExtensionEnabled()
+    {
+        return $this->config->isMfCookieConsentExtensionEnabled();
+    }
+
     /**
      * Get current website ID
      *

Model/Config.php

@@ -11,6 +11,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Config\Model\Config\Backend\Admin\Custom;
+use Magento\Framework\Module\Manager as ModuleManager;
 
 class Config
 {
@@ -61,20 +62,33 @@ class Config
     public const XML_PATH_SPEED_OPTIMIZATION_ENABLED = 'mfgoogletagmanager/page_speed_optimization/enabled';
     public const XML_PATH_THIRD_PARTY_GA = 'mfgoogletagmanager/third_party_ga/enabled';
 
+    /**
+     * MF cookie consent extension enabled
+     */
+    public const XML_PATH_MF_COOKIE_CONSENT_EXTENSION_ENABLED = 'mf_cookie_consent/general/enabled';
+
     /**
      * @var ScopeConfigInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var ModuleManager
+     */
+    protected $moduleManager;
+
     /**
      * Config constructor.
      *
      * @param ScopeConfigInterface $scopeConfig
+     * @param ModuleManager $moduleManager
      */
     public function __construct(
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig,
+        ModuleManager $moduleManager
     ) {
         $this->scopeConfig = $scopeConfig;
+        $this->moduleManager = $moduleManager;
     }
 
     /**
@@ -259,6 +273,18 @@ public function isCookieRestrictionModeEnabled(string $storeId = null)
         return (bool)$this->getConfig(Custom::XML_PATH_WEB_COOKIE_RESTRICTION, $storeId);
     }
 
+    /**
+     * Retrieve true if mf cookie consent extension is enabled
+     *
+     * @param string|null $storeId
+     * @return bool
+     */
+    public function isMfCookieConsentExtensionEnabled(string $storeId = null)
+    {
+        return $this->moduleManager->isEnabled('Magefan_CookieConsent')
+            && $this->getConfig(self::XML_PATH_MF_COOKIE_CONSENT_EXTENSION_ENABLED , $storeId);
+    }
+
     /*
      * Retrieve Magento product categories
      *

view/frontend/templates/js_code.phtml

@@ -17,6 +17,9 @@ if (!isset($escaper)) {
 
 $script = '';
 ?>
+
+<?= $block->getLayout()->createBlock(\Magefan\Community\Block\JsScript::class)->setMethod('getCookie')->toHtml() ?>
+
 <!-- Google Tag Manager -->
 <?php if ($block->isSpeedOptimizationEnabled() && $block->getRequest()->getModuleName() !== 'checkout') { ?>
     <?php $script .= "
@@ -39,28 +42,35 @@ $script = '';
 <?php } ?>
 
 <?php if ($block->isProtectCustomerDataEnabled()) { ?>
-    <?php $script .= "
-        window.dataLayer = window.dataLayer || [];
-        function gtag() { dataLayer.push(arguments); }
-        gtag('consent', 'default', {
-            'ad_user_data': 'denied',
-            'ad_personalization': 'denied',
-            'ad_storage': 'denied',
-            'analytics_storage': 'denied',
-            /* cookieyes.com start */
-
-            'functionality_storage': 'denied',
-            'personalization_storage': 'denied',
-            'security_storage': 'granted',
-            /* cookieyes.com end */
-
-            'wait_for_update': 2000
-        });
-        /* cookieyes.com start */
-        gtag('set', 'ads_data_redaction', true);
-        gtag('set', 'url_passthrough', true);
-        /* cookieyes.com end */
-        "; ?>
+    <?php
+        $script .= "
+            window.dataLayer = window.dataLayer || [];
+            function gtag() { dataLayer.push(arguments); }
+        ";
+
+        if (!$block->isMfCookieConsentExtensionEnabled()) {
+            $script .= "
+                gtag('consent', 'default', {
+                'ad_user_data': 'denied',
+                'ad_personalization': 'denied',
+                'ad_storage': 'denied',
+                'analytics_storage': 'denied',
+                /* cookieyes.com start */
+    
+                'functionality_storage': 'denied',
+                'personalization_storage': 'denied',
+                'security_storage': 'granted',
+                /* cookieyes.com end */
+    
+                'wait_for_update': 2000
+                });
+                /* cookieyes.com start */
+                gtag('set', 'ads_data_redaction', true);
+                gtag('set', 'url_passthrough', true);
+                /* cookieyes.com end */
+            ";
+        }
+    ?>
 
     <?php if ($block->isLoadBeforeConsent()) { ?>
         <?php $script .= "
@@ -91,6 +101,10 @@ $script = '';
             };
 
             function customerDataAllowed() {
+                if (MagefanJs.getCookie('mf_cookie_consent') === '1') {
+                    return true;
+                }
+            
                 let cookie = getCookieValue(
                     '{$escaper->escapeHtml(\Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE)}'
                 );
@@ -107,15 +121,21 @@ $script = '';
             function grantConsent()
             {
                 window.mfGtmUserCookiesAllowed = true;
-                gtag('consent', 'update', {
+            ";
+
+            if (!$block->isMfCookieConsentExtensionEnabled()) {
+                $script .= "gtag('consent', 'update', {
                     'ad_user_data': 'granted',
                     'ad_personalization': 'granted',
                     'ad_storage': 'granted',
                     'analytics_storage': 'granted',
                     'functionality_storage': 'granted',
                     'personalization_storage': 'granted',
                     'security_storage': 'granted'
-                });
+                });";
+            }
+
+            $script .= "
             };
 
             if (customerDataAllowed()) {