From ed7a93b8ae412806d4fedf2c45de4325c5d26576 Mon Sep 17 00:00:00 2001
From: MaxBUhe <mb@shopmodule.com>
Date: Wed, 29 May 2024 15:53:05 +0200
Subject: [PATCH] [Changed] clear code

---
 .../admin/tpl/d3googleanalytics4_main.tpl     | 55 +------------------
 Application/views/blocks/_gtm_js.tpl          | 23 ++++----
 2 files changed, 14 insertions(+), 64 deletions(-)

diff --git a/Application/views/admin/tpl/d3googleanalytics4_main.tpl b/Application/views/admin/tpl/d3googleanalytics4_main.tpl
index a2731ce..abb8c26 100644
--- a/Application/views/admin/tpl/d3googleanalytics4_main.tpl
+++ b/Application/views/admin/tpl/d3googleanalytics4_main.tpl
@@ -32,7 +32,7 @@
                         <div class="form-check mb-3">
                             <input class="form-check-input" type="checkbox" value="" name="editval[bool][_blEnableGa4]" [{if $d3ViewObject->d3GetModuleConfigParam('_blEnableGa4')}]checked[{/if}] id="blGA4enab">
                             <label class="form-check-label" for="flexCheckDefault">
-                                [{oxmultilang ident="D3ACTIVATEMOD"}]
+                                [{oxmultilang ident="D3ACTIVATEMOD"}] [{if false === $d3ViewObject->d3GetModuleConfigParam('_blEnableGa4')}]<span style="color: red">[{oxmultilang ident="D3INACTIVATEMOD"}]</span>[{/if}]
                             </label>
                         </div>
                         <div class="input-group mb-3 w-50">
@@ -184,55 +184,4 @@
             </div>
         </div>
     </form>
-</div>
-
-<script>
-    // Active-Button and it's placed
-    let activeButton            = document.querySelector('input[name="_blEnableGa4"]');
-    let containerIdInput        = document.querySelector('input[name="_sContainerID"]');
-    let debugModeCheckbox       = document.querySelector('input[name="_blEnableDebug"]');
-    let GConsentModeCheckbox    = document.querySelector('input[name="_blEnableConsentMode"]');
-    let inputs = [containerIdInput, debugModeCheckbox, GConsentModeCheckbox];
-
-    let d3Disable = true;
-
-    if (activeButton.checked){
-        d3Disable = false;
-    }
-
-    // Initial setup
-    inputs.forEach(function(input) {
-        input.disabled = d3Disable;
-    });
-
-    activeButton.addEventListener('change', function() {
-        d3Disable = !activeButton.checked;
-        inputs.forEach(function(input) {
-            input.disabled = d3Disable;
-        });
-    });
-
-    // Cookie Manager-Button and it's placed
-    let usingCMP        = document.querySelector('input[name="_blEnableOwnCookieManager"]');
-    let controlParam    = document.querySelector('input[name="_sControlParameter"]');
-    let cmp             = document.querySelector('select[name="_HAS_STD_MANAGER"]');
-
-    let usingCmpInputs  = [controlParam, cmp];
-    d3Disable = true;
-
-    if (usingCMP.checked){
-        d3Disable = false;
-    }
-
-    // Initial setup
-    usingCmpInputs.forEach(function(input) {
-        input.disabled = d3Disable;
-    });
-
-    usingCMP.addEventListener('change', function() {
-        d3Disable = !usingCMP.checked;
-        usingCmpInputs.forEach(function(input) {
-            input.disabled = d3Disable;
-        });
-    });
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/Application/views/blocks/_gtm_js.tpl b/Application/views/blocks/_gtm_js.tpl
index 9b97924..090310c 100755
--- a/Application/views/blocks/_gtm_js.tpl
+++ b/Application/views/blocks/_gtm_js.tpl
@@ -1,9 +1,10 @@
 [{* Always prepare the data layer to avoid errors *}]
-<script>
-  var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
-</script>
-
-[{assign var="d3GtmContainerIdString" value=$oViewConf->getGtmContainerId()}]
+[{if $oViewConf->isGA4enabled()}]
+    [{assign var="d3GtmContainerIdString" value=$oViewConf->getGtmContainerId()}]
+    <script>
+      var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+    </script>
+[{/if}]
 
 [{if $oViewConf->isGA4enabled() and $oViewConf->D3blShowGtmScript()}]
     [{if $d3GtmContainerIdString}]
@@ -15,15 +16,15 @@
                         [{$oViewConf->d3GetModuleConfigParam('_sMeasurementCapabilities')|strip}]
                 [{else}]
                     function gtag() {
-                        dataLayer.push(arguments);
+                    dataLayer.push(arguments);
                     }
 
                     gtag("consent", "default", {
-                        ad_user_data: "denied",
-                        ad_personalization: "denied",
-                        ad_storage: "denied",
-                        analytics_storage: "denied",
-                        wait_for_update: 2000
+                    ad_user_data: "denied",
+                    ad_personalization: "denied",
+                    ad_storage: "denied",
+                    analytics_storage: "denied",
+                    wait_for_update: 2000
                     });
                 [{/if}]
                 </script>