bump version && changelog to 2.8.0

extend Basket-Model to add method to get payment-desc

.gitignore

@@ -1 +0,0 @@
-.idea

Application/Model/ManagerTypes.php

@@ -34,8 +34,6 @@ class ManagerTypes
 
     const CONSENTMANAGER            = "CONSENTMANAGER";
 
-    const COOKIEFIRST               = "COOKIEFIRST";
-
     /**
      * @return array
      */
@@ -47,8 +45,7 @@ class ManagerTypes
             "net_cookie_manager"    => self::NET_COOKIE_MANAGER,
             "oxps_usercentrics"     => self::USERCENTRICS_MODULE,
             "usercentrics"          => self::USERCENTRICS_MANUALLY,
-            "consentmanager"        => self::CONSENTMANAGER,
-            "cookiefirst"        => self::COOKIEFIRST
+            "consentmanager"        => self::CONSENTMANAGER
         ];
     }
 

Application/views/admin/de/module_options.php

@@ -31,17 +31,10 @@ $aLang = [
     // for cookie manager settings
     'SHOP_MODULE_GROUP_d3_gtm_settings_cookiemanager'   => 'Cookie Manager Einstellungen',
     'SHOP_MODULE_d3_gtm_settings_hasOwnCookieManager'   => 'Cookie Manager nutzen?',
-    'HELP_SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER'              => 'Mehr Informationen zu den genannten Coookie-Manager finden Sie auf den folgenden Home-Pages<br><br>
-                                                                        <a href="https://consentmanager.net/">Consentmanager</a><br>
-                                                                        <a href="https://usercentrics.com/">Usercentrics</a><br>
-                                                                        <a href="https://cookiefirst.com">Cookiefirst</a><br>
-                                                                        <hr>
-                                                                        Bei weiteren Fragen stehen wir gern zur Verfügung! Kontaktieren Sie uns einfach unter <a href="https://www.d3data.de/">https://www.d3data.de/</a>',
     'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER'                   => 'Nutzen Sie eine der folgenden Einbindungen?<br>
                                                                         Dann wählen Sie bitte die zutreffende aus.',
     'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_NONE'              => '---',
     'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_CONSENTMANAGER'    => 'consentmanager',
     'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_USERCENTRICS'      => 'usercentrics',
-    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_COOKIEFIRST'       => 'cookiefirst',
     'SHOP_MODULE_d3_gtm_settings_cookieName'  => 'CookieID',
 ];

Application/views/blocks/purchase.tpl

@@ -1,56 +1,49 @@
 [{$smarty.block.parent}]
 
-[{block name="d3_ga4_purchase_block"}]
-    [{capture assign=d3_ga4_purchase}]
-        [{strip}]
-            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-            [{assign var="gtmOrder"         value=$oView->getOrder()}]
-            [{assign var="gtmBasket"         value=$oView->getBasket()}]
-            [{assign var="gtmArticles"      value=$gtmOrder->getOrderArticles()}]
-            [{assign var="gtmOrderVouchers"  value=$gtmOrder->getVoucherNrList()}]
+[{strip}]
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    [{assign var="gtmOrder"         value=$oView->getOrder()}]
+    [{assign var="gtmBasket"         value=$oView->getBasket()}]
+    [{assign var="gtmArticles"      value=$gtmOrder->getOrderArticles()}]
+    [{assign var="gtmOrderVouchers"  value=$gtmOrder->getVoucherNrList()}]
 
-            dataLayer.push({
-                'event': 'purchase',
-                'eventLabel':'Checkout Step 5',
-                'ecommerce': {
-                    'transaction_id': '[{$gtmOrder->getFieldData("oxordernr")}]',
-                    'affiliation':    '[{$oxcmp_shop->getFieldData("oxname")}]',
-                    'value':          [{$gtmOrder->getTotalOrderSum()}],
-                    'tax':            [{math equation="x+y" x=$gtmOrder->getFieldData("oxartvatprice1") y=$gtmOrder->getFieldData("oxartvatprice2") }],
-                    'shipping':       [{$gtmOrder->getFieldData("oxdelcost")}],
-                    'currency':       '[{$gtmOrder->getFieldData('oxcurrency')}]',
-                    'coupon':         '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
-                    'paymentType':    '[{$gtmBasket->getPaymentOnPaymentId()}]',
-                    'items': [
-                        [{foreach from=$gtmArticles item="gtmBasketItem" name="gtmArticles"}]
-                            [{assign var="gtmPurchaseItemPriceObject"   value=$gtmBasketItem->getPrice()}]
-                            [{assign var="gtmPurchaseItem"              value=$gtmBasketItem->getArticle()}]
-                            [{assign var="gtmPurchaseItemCategory"      value=$gtmPurchaseItem->getCategory()}]
+    dataLayer.push({
+        'event': 'purchase',
+        'eventLabel':'Checkout Step 5',
+        'ecommerce': {
+            'transaction_id': '[{$gtmOrder->getFieldData("oxordernr")}]',
+            'affiliation':    '[{$oxcmp_shop->getFieldData("oxname")}]',
+            'value':          [{$gtmOrder->getTotalOrderSum()}],
+            'tax':            [{math equation="x+y" x=$gtmOrder->getFieldData("oxartvatprice1") y=$gtmOrder->getFieldData("oxartvatprice2") }],
+            'shipping':       [{$gtmOrder->getFieldData("oxdelcost")}],
+            'currency':       '[{$gtmOrder->getFieldData('oxcurrency')}]',
+            'coupon':         '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
+            'paymentType':    '[{$gtmBasket->getPaymentOnPaymentId()}]',
+            'items': [
+                [{foreach from=$gtmArticles item="gtmBasketItem" name="gtmArticles"}]
+                    [{assign var="gtmPurchaseItemPriceObject"   value=$gtmBasketItem->getPrice()}]
+                    [{assign var="gtmPurchaseItem"              value=$gtmBasketItem->getArticle()}]
+                    [{assign var="gtmPurchaseItemCategory"      value=$gtmPurchaseItem->getCategory()}]
 
-                            {
-                                'item_id':          '[{$gtmBasketItem->getFieldData("oxartnum")}]',
-                                'item_name':        '[{$gtmBasketItem->getFieldData("oxtitle")}]',
-                                'affiliation':      '[{$gtmBasketItem->getFieldData("oxtitle")}]',
-                                'coupon':           '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
-                                'item_variant':     '[{$gtmBasketItem->getFieldData("oxselvariant")}]',
-                                [{if $gtmPurchaseItemCategory}]
-                                'item_category':    '[{$gtmPurchaseItemCategory->getSplitCategoryArray(0)}]',
-                                'item_category_2':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(1)}]',
-                                'item_category_3':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(2)}]',
-                                'item_category_4':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(3)}]',
-                                'item_list_name':   '[{$gtmPurchaseItemCategory->getSplitCategoryArray()}]',
-                                [{/if}]
-                                'price':            [{$gtmPurchaseItemPriceObject->getPrice()}],
-                                'quantity':         [{$gtmBasketItem->getFieldData("oxamount")}],
-                                'position':         [{$smarty.foreach.gtmArticles.iteration}]
-                            }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
-                        [{/foreach}]
-                    ]
-                }[{if $oViewConf->isDebugModeOn()}],
-                'debug_mode': 'true'
-                [{/if}]
-            })
-        [{/strip}]
-    [{/capture}]
-    [{oxscript add=$d3_ga4_purchase}]
-[{/block}]
+                    {
+                        'item_id':          '[{$gtmBasketItem->getFieldData("oxartnum")}]',
+                        'item_name':        '[{$gtmBasketItem->getFieldData("oxtitle")}]',
+                        'affiliation':      '[{$gtmBasketItem->getFieldData("oxtitle")}]',
+                        'coupon':           '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
+                        'item_variant':     '[{$gtmBasketItem->getFieldData("oxselvariant")}]',
+                        'item_category':    '[{$gtmPurchaseItemCategory->getSplitCategoryArray(0)}]',
+                        'item_category_2':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(1)}]',
+                        'item_category_3':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(2)}]',
+                        'item_category_4':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(3)}]',
+                        'item_list_name':   '[{$gtmPurchaseItemCategory->getSplitCategoryArray()}]',
+                        'price':            [{$gtmPurchaseItemPriceObject->getPrice()}],
+                        'quantity':         [{$gtmBasketItem->getFieldData("oxamount")}],
+                        'position':         [{$smarty.foreach.gtmArticles.iteration}]
+                    }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
+                [{/foreach}]
+            ]
+        }
+    })
+</script>
+[{/strip}]

Application/views/blocks/view_cart.tpl

@@ -5,46 +5,38 @@
 [{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
 [{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
 
-[{block name="d3_ga4_view_cart_block"}]
-    [{capture assign=d3_ga4_view_cart}]
-        [{strip}]
-            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-            dataLayer.push({
-                'event': 'view_cart',
-                'eventLabel':'Checkout Step 1',
-                'ecommerce': {
-                    'actionField': "step: 1",
-                    'currency': "[{$currency->name}]",
-                    'value': [{$d3BasketPrice->getPrice()}],
-                    'coupon':         '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                    'items': [
-                        [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
-                            [{assign var="d3oItemPrice" value=$basketitem->getPrice()}]
-                            [{assign var="gtmBasketItem" value=$basketitem->getArticle()}]
-                            [{assign var="gtmBasketItemCategory" value=$gtmBasketItem->getCategory()}]
-                            {
-                                'item_id':          '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
-                                'item_name':        '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
-                                'item_variant':     '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
-                                [{if $gtmBasketItemCategory}]
-                                'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0)}]',
-                                'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1)}]',
-                                'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2)}]',
-                                'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3)}]',
-                                'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
-                                [{/if}]
-                                'price':            [{$d3oItemPrice->getPrice()}],
-                                'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                                'quantity':         [{$basketitem->getAmount()}],
-                                'position':         [{$smarty.foreach.gtmCartContents.index}]
-                            }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
-                        [{/foreach}]
-                        ]
-                }[{if $oViewConf->isDebugModeOn()}],
-                'debug_mode': 'true'
-                [{/if}]
-            });
-        [{/strip}]
-    [{/capture}]
-    [{oxscript add=$d3_ga4_view_cart}]
-[{/block}]
+[{strip}][{capture assign=d3_ga4_view_cart}]
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event': 'view_cart',
+        'eventLabel':'Checkout Step 1',
+        'ecommerce': {
+            'actionField': "step: 1",
+            'currency': "[{$currency->name}]",
+            'value': [{$d3BasketPrice->getPrice()}],
+            'coupon':         '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
+            'items': [
+                [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
+                    [{assign var="d3oItemPrice" value=$basketitem->getPrice()}]
+                    [{assign var="gtmBasketItem" value=$basketitem->getArticle()}]
+                    [{assign var="gtmBasketItemCategory" value=$gtmBasketItem->getCategory()}]
+                    {
+                        'item_id':          '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
+                        'item_name':        '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
+                        'item_variant':     '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
+                        'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0)}]',
+                        'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1)}]',
+                        'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2)}]',
+                        'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3)}]',
+                        'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
+                        'price':            [{$d3oItemPrice->getPrice()}],
+                        'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
+                        'quantity':         [{$basketitem->getAmount()}],
+                        'position':         [{$smarty.foreach.gtmCartContents.index}]
+                    }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
+                [{/foreach}]
+                ]
+        }
+    });
+[{/capture}][{/strip}]
+[{oxscript add=$d3_ga4_view_cart}]

Application/views/blocks/view_item.tpl

@@ -3,38 +3,29 @@
 [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
 [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
 
-[{block name="d3_ga4_view_item_block"}]
-  [{capture assign=d3_ga4_view_item}]
-    [{strip}]
-      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+<script>
+  dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
 
-      dataLayer.push({
-        'event': 'view_item',
-        'eventLabel':'Product View',
-        'ecommerce': {
-          'currency': '[{$currency->name}]',
-          'items': [
-            {
-              'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-              'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-              'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-              'item_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
-              [{if $gtmCategory}]
-              'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
-              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
-              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
-              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
-              'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-              [{/if}]
-              [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-              'price': [{$d3PriceObject->getPrice()}]
-            }
-          ]
-        }[{if $oViewConf->isDebugModeOn()}],
-        'debug_mode': 'true'
-        [{/if}]
-      });
-    [{/strip}]
-  [{/capture}]
-  [{oxscript add=$d3_ga4_view_item}]
-[{/block}]
+  dataLayer.push({
+    'event': 'view_item',
+    'eventLabel':'Product View',
+    'ecommerce': {
+      'currency': '[{$currency->name}]',
+      'items': [
+        {
+          'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+          'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+          'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+          'item_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
+          'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
+          'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+          'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+          'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+          'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+          [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+          'price': [{$d3PriceObject->getPrice()}]
+        }
+      ]
+    }
+  });
+</script>

Application/views/ga4/add_to_cart.tpl

@@ -6,47 +6,41 @@
 [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
 [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
 
-[{block name="d3_ga4_add_to_cart_block"}]
-  [{capture assign=d3_ga4_add_to_cart}]
-    [{strip}]
-      $("#toBasket").click(function(event) {
-        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+[{capture assign=d3_ga4_add_to_cart}]
+  [{block name="d3_ga4_add_to_basket"}]
+  $("#toBasket").click(function(event) {
+  dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
 
-        [{*** Debug cases ***}]
-        [{*event.preventDefault();*}]
+  [{*** Debug cases ***}]
+  [{*event.preventDefault();*}]
 
-        let iArtQuantity = $("#amountToBasket").val();
+  let iArtQuantity = $("#amountToBasket").val();
 
-        dataLayer.push({
-          'isAddToBasket': true,
-          'event':'add_to_cart',
-          'eventLabel': 'add_to_cart',
-          'ecommerce': {
-            'currency':   "[{$currency->name}]",
-            'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
-            'items':      [
-              {
-              'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
-              'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
-              'price':          [{$d3PriceObject->getPrice()}],
-              'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-              'item_variant':   '[{if $gtmProduct->getFieldData('oxvarselect')}][{$gtmProduct->getFieldData('oxvarselect')}][{/if}]',
-              [{if $gtmCategory}]
-              'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
-              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
-              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
-              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
-              'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-              [{/if}]
-              'quantity': iArtQuantity
-              }
-            ]
-          }[{if $oViewConf->isDebugModeOn()}],
-          'debug_mode': 'true'
-          [{/if}]
-        });
-      });
-    [{/strip}]
+  dataLayer.push({
+    'isAddToBasket': true,
+    'event':'add_to_cart',
+    'eventLabel': 'add_to_cart',
+    'ecommerce': {
+      'currency':   "[{$currency->name}]",
+      'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
+      'items':      [
+        {
+        'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
+        'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
+        'price':          [{$d3PriceObject->getPrice()}],
+        'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+        'item_variant':   '[{if $gtmProduct->getFieldData('oxvarselect')}][{$gtmProduct->getFieldData('oxvarselect')}][{/if}]',
+        'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
+        'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+        'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+        'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+        'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+        'quantity': iArtQuantity
+        }
+      ]
+      }
+    });
+  });
+  [{/block}]
   [{/capture}]
-  [{oxscript add=$d3_ga4_add_to_cart}]
-[{/block}]
+[{oxscript add=$d3_ga4_add_to_cart}]

Application/views/ga4/remove_from_cart.tpl

@@ -1,48 +0,0 @@
-[{$smarty.block.parent}]
-
-[{block name="d3_ga4_remove_from_cart_block"}]
-    [{if $hasBeenReloaded}]
-        [{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-        [{capture assign=d3_ga4_remove_from_cart}]
-            [{strip}]
-                dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-                dataLayer.push({
-                    'isRemoveFromCart': true,
-                    'event': 'remove_from_cart',
-                    'eventLabel':'remove_from_cart',
-                    'ecommerce': {
-                        'actionField': "step: 1",
-                        'currency': "[{$currency->name}]",
-                        'value': [{$d3BasketPrice->getPrice()}],
-                        'coupon':         '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                        'items': [
-                            [{foreach from=$toRemoveArticles->getArray() name=gtmRemovedItems item=rmItem  key=rmItemindex}]
-                            [{assign var="d3oItemPrice" value=$rmItem->getPrice()}]
-                            [{assign var="gtmBasketItemCategory" value=$rmItem->getCategory()}]
-                            {
-                            'item_id':          '[{$rmItem->getFieldData('oxartnum')}]',
-                            'item_name':        '[{$rmItem->getFieldData('oxtitle')}]',
-                            'item_variant':     '[{$rmItem->getFieldData('oxvarselect')}]',
-                            [{if $gtmBasketItemCategory}]
-                            'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0)}]',
-                            'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1)}]',
-                            'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2)}]',
-                            'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3)}]',
-                            'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
-                            [{/if}]
-                            'price':            [{$d3oItemPrice->getPrice()}],
-                            'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                            'quantity':         '[{$rmItem->getFieldData('d3AmountThatGotRemoved')}]',
-                            'position':         [{$smarty.foreach.gtmRemovedItems.index}]
-                            }[{if !$smarty.foreach.gtmRemovedItems.last}],[{/if}]
-                            [{/foreach}]
-                        ]
-                    }[{if $oViewConf->isDebugModeOn()}],
-                    'debug_mode': 'true'
-                    [{/if}]
-                });
-            [{/strip}]
-        [{/capture}]
-        [{oxscript add=$d3_ga4_remove_from_cart}]
-    [{/if}]
-[{/block}]

Application/views/ga4/view_item_list.tpl

@@ -1,46 +1,40 @@
-[{$smarty.block.parent}]
-[{assign var="gtmProducts" value=$oView->getArticleList()}]
-[{assign var="gtmCategory" value=$oView->getActiveCategory()}]
-
-[{assign var="breadCrumb" value=''}]
-
-[{block name="d3_ga4_view_item_list_block"}]
-    [{if $gtmProducts|@count}]
-        [{capture assign=d3_ga4_view_item_list}]
-            [{strip}]
-                dataLayer.push({ecommerce: null});
-                dataLayer.push({
-                    'event':'view_item_list',
-                    'event_name': 'view_item_list',
-                    'ecommerce': {
-                        'item_list_id': '[{$oView->getCategoryId()}]',
-                        'item_list_name': '[{foreach from=$oView->getBreadCrumb() item=sCrum}][{if $sCrum.title }][{$breadCrumb|cat:$sCrum.title|cat:" > "}][{/if}][{/foreach}]',
-                        'items': [
-                            [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-                            [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-                            [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-                            [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
-                            {
-                                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                                'price': [{$d3PriceObject->getPrice()}],
-                                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                                [{if $gtmCategory}]
-                                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
-                                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
-                                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
-                                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
-                                [{/if}]
-                                'quantity': 1
-                            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-                            [{/foreach}]
-                        ]
-                    }[{if $oViewConf->isDebugModeOn()}],
-                    'debug_mode': 'true'
-                    [{/if}]
-                });
-            [{/strip}]
-        [{/capture}]
-        [{oxscript add=$d3_ga4_view_item_list}]
-    [{/if}]
-[{/block}]
+[{$smarty.block.parent}]
+[{assign var="gtmProducts" value=$oView->getArticleList()}]
+[{assign var="gtmCategory" value=$oView->getActiveCategory()}]
+
+[{assign var="breadCrumb" value=''}]
+
+[{if $gtmProducts|@count}]
+[{strip}]
+    <script>
+        /* ga4 */
+        dataLayer.push({ecommerce: null});
+        dataLayer.push({
+            'event':'view_item_list',
+            'event_name': 'view_item_list',
+            'ecommerce': {
+                'item_list_id': '[{$oView->getCategoryId()}]',
+                'item_list_name': '[{foreach from=$oView->getBreadCrumb() item=sCrum}][{if $sCrum.title }][{$breadCrumb|cat:$sCrum.title|cat:" > "}][{/if}][{/foreach}]',
+                'items': [
+                    [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
+                    [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+                    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+                    [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
+                    {
+                        'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                        'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                        'price': [{$d3PriceObject->getPrice()}],
+                        'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                        'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
+                        'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+                        'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+                        'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+                        'quantity': 1
+                    }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+                    [{/foreach}]
+                ]
+            }
+        });
+    </script>
+[{/strip}]
+[{/if}]

Application/views/ga4/view_search_result.tpl

@@ -2,43 +2,36 @@
 
 [{assign var="gtmProducts" value=$oView->getArticleList()}]
 
-[{block name="d3_ga4_view_search_result_block"}]
-  [{if $gtmProducts|@count}]
-    [{capture assign=d3_ga4_view_search_result}]
-      [{strip}]
-        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-        dataLayer.push({
-          'event': 'view_search_result',
-          'eventLabel':'view_search_result[{if $oViewConf->isDebugModeOn()}]_test[{/if}]',
-          'ecommerce': {
-            'search_term': '[{$searchparamforhtml}]',
-            'items': [
-              [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-              [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-              [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-              [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-              {
-                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                'price': [{$d3PriceObject->getPrice()}],
-                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                [{if $gtmCategory}]
-                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
-                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
-                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
-                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
-                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-                [{/if}]
-                'quantity': 1
-              }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-              [{/foreach}]
-            ]
-          }[{if $oViewConf->isDebugModeOn()}],
-          'debug_mode': 'true'
-          [{/if}]
-        });
-      [{/strip}]
-    [{/capture}]
-    [{oxscript add=$d3_ga4_view_search_result}]
-  [{/if}]
-[{/block}]
+[{if $gtmProducts|@count}]
+  [{strip}]
+    <script>
+      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+      dataLayer.push({
+        'event': 'view_search_result',
+        'eventLabel':'view_search_result',
+        'ecommerce': {
+          'search_term': '[{$searchparamforhtml}]',
+          'items': [
+            [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
+            [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+            [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+            [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+            {
+              'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+              'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+              'price': [{$d3PriceObject->getPrice()}],
+              'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+              'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
+              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+              'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+              'quantity': 1
+            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+            [{/foreach}]
+          ]
+        }
+      });
+    </script>
+  [{/strip}]
+[{/if}]

CHANGELOG.md

@@ -4,36 +4,87 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.11.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.11.0...1.11.1) - 2023-08-17
-### Fixed
-- metadata class entry
-
-## [1.11.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.10.0...1.11.0) - 2023-08-16
-### Added
-- remove_from_cart
-- auto debug_mode setter
-- manufacturer extension for breadcrumb
-### Changed
-- general template cleanup
-
-## [1.10.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.9.0...1.10.0) - 2023-06-27
+## [2.8.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.7.0...2.8.0) - 2023-06-23
 ### Added
+- Method to get the in order used Payment-Name
+- Method to get the current Article Category
 - Following Entries to dedicated event-templates
   - coupon
   - paymentType
   - item_list_name
   - item_category
-- Method to get the in order used Payment-Name
-- Method to get the current Article Category
 ### Changed
-- cookieManager handling
-- general template cleanup
-- renaming the template to a more intuitive name
+- all used template-files have a more dedicated name
+- general code cleanup
 
-## [1.9.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.8.0...1.9.0) - 2023-06-19
+## [2.7.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.6.0...2.7.0) - 2023-06-19
 ### Changed
 - add_to_cart event template-structure
 
+## [2.6.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.5.0...2.6.0) - 2023-05-31
+### Added
+- add settings to explicit choose an external service (usercentrics/ consentmanager)
+- position to block-extension
+- extended instructions to check for in readme
+### Fixed
+- usercentrics script
+- missing right articleList-getter
+### Changed
+- view_item_list-template block extension
+- cookieManager handling
+### Removed
+- additional check for cookieManagerType
+
+## [2.5.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.4.0...2.5.0) - 2023-05-23
+### Added
+- additional settings to explicitly indicate that consentmanager is used
+### Fixed
+- unnecessary converting of int to str
+- missing PriceObject-bug
+### Changed
+- genuine code cleanup
+
+## [2.4.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.3.3...2.4.0) - 2023-05-02
+### Added
+- "OXID Cookie Management powered by usercentrics" compatibility
+- usercentrics defined script attributes
+- cookie-manager evaluation
+### Changed
+- genuine clean up of base-js-files
+
+## [2.3.3](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.3.2...2.3.3) - 2023-03-20
+### Fixed
+- metadata file path for view_item
+
+## [2.3.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.2.2...2.3.2) - 2023-03-17
+### Added
+- Aggrosoft-Cookie-Consent compatibility
+### Fixed
+- wrong function for pageview on thankyou page
+### Deleted
+- unused files
+
+## [2.2.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.2.1...2.2.2) - 2023-02-22
+### Fixed
+- price formatting in view_cart
+
+## [2.2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.1.1...2.2.1) - 2023-02-21
+### Added
+- cookie handling
+
+## [2.1.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.1...2.1.1) - 2023-01-27
+### Fixed
+- add missing class import
+
+## [2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.0...2.1) - 2023-01-27
+### Added
+- block section for add_to_basket js
+- template block order positions
+
+## [2.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...2.0) - 2023-01-20
+### Added
+- using of ContainerFactory in ViewConfig
+
 ## [1.8.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.7.0...1.8.0) - 2023-05-31
 ### Fixed
 - bug in explicit manager selection

Docs/README.md

@@ -12,7 +12,7 @@ Für den geregelten Ablauf sind folgende Blöcke nötig:
     - Datei: page/search/search.tpl
     - GA4 Event: view_search_results
 - Artikelliste
-    - Blockname: page_list_productlist
+    - Blockname: page_list_productlist (muss hinzugefügt werden)
     - Datei: page/list/list.tpl
     - GA4 Event: view_item_list
 - Detailseite
@@ -23,10 +23,6 @@ Für den geregelten Ablauf sind folgende Blöcke nötig:
     - Blockname: details_productmain_tobasket
     - Datei: page/details/inc/productmain.tpl
     - GA4 Event: add_to_cart
-- aus dem WK entfernen
-    - Blockname: checkout_basket_main
-    - Datei: page/checkout/basket.tpl
-    - GA4 Event: remove_from_cart
 - Warenkorb
     - Blockname: checkout_basket_main
     - Datei: page/checkout/basket.tpl

IntelliSenseHelper.php

@@ -20,9 +20,4 @@ namespace D3\GoogleAnalytics4\Modules\Core{
 namespace D3\GoogleAnalytics4\Modules\Application\Model{
     class Category_parent extends \OxidEsales\Eshop\Application\Model\Category {}
     class Basket_parent extends \OxidEsales\Eshop\Application\Model\Basket {}
-}
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller{
-    class BasketController_parent extends \OxidEsales\Eshop\Application\Controller\BasketController {}
-    class ThankYouController_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController {}
 }

Modules/Application/Controller/BasketController.php

@@ -1,103 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-use OxidEsales\Eshop\Application\Component\BasketComponent;
-use OxidEsales\Eshop\Application\Model\Article;
-use OxidEsales\Eshop\Application\Model\ArticleList;
-use OxidEsales\Eshop\Core\Registry;
-use oxSystemComponentException;
-
-class BasketController extends BasketController_parent
-{
-    /**
-     * @throws oxSystemComponentException
-     */
-    public function render()
-    {
-        $return = parent::render();
-
-        $this->d3GA4getRemovedArticlesListObject();
-
-        return $return;
-    }
-
-    /**
-     * @return void
-     * @throws oxSystemComponentException
-     */
-    public function d3GA4getRemovedArticlesListObject() :void
-    {
-        $this->addTplParam('hasBeenReloaded', false);
-        // collecting items to add
-        $aProducts = Registry::getRequest()->getRequestEscapedParameter('aproducts');
-
-        // collecting specified item
-        $sProductId = $sProductId ?? Registry::getRequest()->getRequestEscapedParameter('aid');
-        if ($sProductId) {
-            // additionally fetching current product info
-            $dAmount = $dAmount ?? Registry::getRequest()->getRequestEscapedParameter('am');
-
-            // select lists
-            $aSel = $aSel ?? Registry::getRequest()->getRequestEscapedParameter('sel');
-
-            // persistent parameters
-            if (empty($aPersParam)) {
-
-                /** @var BasketComponent $oBasketComponent */
-                $oBasketComponent = $this->getComponent('oxcmp_basket');
-
-                $aPersParam = $oBasketComponent->__call('getPersistedParameters', []);
-            }
-
-            $sBasketItemId = Registry::getRequest()->getRequestEscapedParameter('bindex');
-
-            $aProducts[$sProductId] = ['am'           => $dAmount,
-                'sel'          => $aSel,
-                'persparam'    => $aPersParam,
-                'basketitemid' => $sBasketItemId
-            ];
-        }
-
-        if (is_array($aProducts) && count($aProducts)) {
-            $toRemoveArticleIdList = [];
-            $artIdOnArtAmountList = [];
-
-            if (Registry::getRequest()->getRequestEscapedParameter('removeBtn') !== null
-                or Registry::getRequest()->getRequestParameter('updateBtn') !== null) {
-
-                //setting amount to 0 if removing article from basket
-                foreach ($aProducts as $sProductId => $aProduct) {
-                    if ((isset($aProduct['remove']) && $aProduct['remove']) or intval($aProduct['am']) === 0) {
-                        if (!in_array($aProduct, $toRemoveArticleIdList)) {
-                            $toRemoveArticleIdList[] = $aProduct['aid'];
-                            $artIdOnArtAmountList[$aProduct['aid']] = $aProduct['am'];
-                        }
-
-                        $aProducts[$sProductId]['am'] = 0;
-                        #for GA4 Event
-                        $this->addTplParam('hasBeenReloaded', true);
-                    } else {
-                        unset($aProducts[$sProductId]);
-                    }
-                }
-            }
-
-            $oArtList = oxNew(ArticleList::class);
-            $oArtList->loadIds($toRemoveArticleIdList);
-
-            #dumpVar($this->getBasketArticles());
-
-            /** @var Article $item */
-            foreach ($oArtList->getArray() as $item){
-                foreach ($artIdOnArtAmountList as $artId => $artAmount){
-                    if ($item->getId() === $artId){
-                        $item->assign(['d3AmountThatGotRemoved' => $artAmount]);
-                    }
-                }
-            }
-
-            $this->addTplParam('toRemoveArticles', $oArtList);
-        }
-    }
-}

Modules/Application/Controller/ThankYouController.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-use OxidEsales\Eshop\Application\Model\Country;
-
-class ThankYouController extends ThankYouController_parent
-{
-    /**
-     * @return Country
-     */
-    public function d3GAGetUserCountry()
-    {
-        $sCountryId = $this->getOrder()->getFieldData('oxbillcountryid');
-
-        /** @var Country $oCountry */
-        $oCountry = oxNew(Country::class);
-        $oCountry->load($sCountryId);
-
-        return $oCountry;
-    }
-}

Modules/Application/Model/Manufacturer.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model;
-
-class Manufacturer extends Manufacturer_parent
-{
-    /**
-     * @param int $indexOfArray
-     * @return string
-     */
-    public function getSplitCategoryArray(int $indexOfArray = -1) :string
-    {
-        if ($indexOfArray > -1){
-            $splitCatArray =
-                array_values(
-                    array_filter(
-                        explode(
-                            '/',
-                            trim(
-                                parse_url(
-                                    $this->getLink(),
-                                    5
-                                )
-                            )
-                        )
-                    )
-                );
-
-            if ($splitCatArray[$indexOfArray]){
-                return $splitCatArray[$indexOfArray];
-            }else{
-                return "";
-            }
-        }
-
-        return
-            trim(
-                parse_url(
-                    $this->getLink(),
-                    5
-                )
-            );
-    }
-}

Modules/Core/ViewConfig.php

@@ -17,6 +17,8 @@ use D3\GoogleAnalytics4\Application\Model\ManagerTypes;
 use OxidEsales\Eshop\Application\Controller\FrontendController;
 use OxidEsales\Eshop\Core\Config;
 use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
 
 class ViewConfig extends ViewConfig_parent
 {
@@ -29,7 +31,10 @@ class ViewConfig extends ViewConfig_parent
     {
         if ($this->sContainerId === null)
         {
-            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_sContainerID');
+            $this->sContainerId = ContainerFactory::getInstance()
+                                                  ->getContainer()
+                                                  ->get(ModuleSettingBridgeInterface::class)
+                                                  ->get('d3_gtm_sContainerID', 'd3googleanalytics4');
         }
         return $this->sContainerId;
     }
@@ -70,7 +75,7 @@ class ViewConfig extends ViewConfig_parent
 
         $this->defineCookieManagerType();
 
-        $sCookieID = trim($oConfig->getConfigParam('d3_gtm_settings_cookieName'));
+        $sCookieID = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
 
         // Netensio Cookie Manager
         if ($this->sCookieManagerType === ManagerTypes::NET_COOKIE_MANAGER) {
@@ -92,7 +97,6 @@ class ViewConfig extends ViewConfig_parent
             $this->sCookieManagerType       === ManagerTypes::USERCENTRICS_MODULE
             or $this->sCookieManagerType    === ManagerTypes::USERCENTRICS_MANUALLY
             or $this->sCookieManagerType    === ManagerTypes::CONSENTMANAGER
-            or $this->sCookieManagerType    === ManagerTypes::COOKIEFIRST
             or $this->sCookieManagerType    === ManagerTypes::EXTERNAL_SERVICE
         )
         {
@@ -111,7 +115,8 @@ class ViewConfig extends ViewConfig_parent
      */
     public function getGtmScriptAttributes() :string
     {
-        $sCookieId = trim(Registry::getConfig()->getConfigParam('d3_gtm_settings_cookieName'));
+        $oConfig = Registry::getConfig();
+        $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
 
         if (false === $this->shallUseOwnCookieManager()){
             return "";
@@ -139,10 +144,6 @@ class ViewConfig extends ViewConfig_parent
             }
         }
 
-        if ($this->sCookieManagerType === ManagerTypes::COOKIEFIRST){
-            return 'type="text/plain" data-cookiefirst-category="' . $sCookieId .'"';
-        }
-
         return "";
     }
 
@@ -152,7 +153,10 @@ class ViewConfig extends ViewConfig_parent
     {
         if ($this->blGA4enabled === null)
         {
-            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_blEnableGA4');
+            $this->sContainerId = ContainerFactory::getInstance()
+                                                  ->getContainer()
+                                                  ->get(ModuleSettingBridgeInterface::class)
+                                                  ->get('d3_gtm_blEnableGA4', 'd3googleanalytics4');
         }
 
         return $this->blGA4enabled;
@@ -195,11 +199,6 @@ class ViewConfig extends ViewConfig_parent
         return json_encode([$dataLayer], JSON_PRETTY_PRINT);
     }
 
-    public function isDebugModeOn() :bool
-    {
-        return Registry::getConfig()->getConfigParam('d3_gtm_blEnableDebug');
-    }
-
     public function isPromotionList($listId)
     {
         $oConfig           = Registry::getConfig();

composer.json

@@ -1,56 +1,56 @@
-{
-  "name": "d3/google-analytics4",
-  "description": "Google Tag Manager with new Google Analytics 4 for OXID eShop v6",
-  "type": "oxideshop-module",
-  "keywords": [
-    "oxid",
-    "modules",
-    "eShop",
-    "d3",
-    "google",
-    "ga4",
-    "googleanalytics",
-    "gtm",
-    "configuration"
-  ],
-  "homepage": "https://www.d3data.de",
-  "license": [
-    "GPL-3.0"
-  ],
-  "authors": [
-    {
-      "name": "Marat Bedoev",
-      "email": "hello@mb-dev.pro"
-    },
-    {
-      "name": "D3 Data Development (Inh. Thomas Dartsch)",
-      "email": "info@shopmodule.com",
-      "homepage": "https://www.d3data.de"
-    }
-  ],
-  "support": {
-    "email": "support@shopmodule.com"
-  },
-  "extra": {
-    "oxideshop": {
-      "blacklist-filter": [
-        "*.md",
-        "composer.json",
-        ".php-cs-fixer.php",
-        "*.xml",
-        "*.neon"
-      ],
-      "target-directory": "d3/googleanalytics4"
-    }
-  },
-  "require": {
-    "php": ">=7.1",
-    "oxid-esales/oxideshop-ce": "v6.0 - 6.3",
-    "google/apiclient":" ^2.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "D3\\GoogleAnalytics4\\": "../../../source/modules/d3/googleanalytics4"
-    }
-  }
+{
+  "name": "d3/google-analytics4",
+  "description": "Google Tag Manager with new Google Analytics 4 for OXID eShop v6",
+  "type": "oxideshop-module",
+  "keywords": [
+    "oxid",
+    "modules",
+    "eShop",
+    "d3",
+    "google",
+    "ga4",
+    "googleanalytics",
+    "gtm",
+    "configuration"
+  ],
+  "homepage": "https://www.d3data.de",
+  "license": [
+    "GPL-3.0"
+  ],
+  "authors": [
+    {
+      "name": "Marat Bedoev",
+      "email": "hello@mb-dev.pro"
+    },
+    {
+      "name": "D3 Data Development (Inh. Thomas Dartsch)",
+      "email": "info@shopmodule.com",
+      "homepage": "https://www.d3data.de"
+    }
+  ],
+  "support": {
+    "email": "support@shopmodule.com"
+  },
+  "extra": {
+    "oxideshop": {
+      "blacklist-filter": [
+        "*.md",
+        "composer.json",
+        ".php-cs-fixer.php",
+        "*.xml",
+        "*.neon"
+      ],
+      "target-directory": "d3/googleanalytics4"
+    }
+  },
+  "require": {
+    "php": ">=7.1",
+    "oxid-esales/oxideshop-ce": "^6.5",
+    "google/apiclient":" ^2.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "D3\\GoogleAnalytics4\\": "../../../source/modules/d3/googleanalytics4"
+    }
+  }
 }

metadata.php

@@ -1,16 +1,10 @@
 <?php
 
-use D3\GoogleAnalytics4\Modules\Application\Controller\BasketController;
-use D3\GoogleAnalytics4\Modules\Application\Controller\ThankYouController;
 use D3\GoogleAnalytics4\Modules\Application\Model\Basket as Basket;
 use D3\GoogleAnalytics4\Modules\Application\Model\Category as Category;
-use D3\GoogleAnalytics4\Modules\Application\Model\Manufacturer as Manufacturer;
 use D3\GoogleAnalytics4\Modules\Core\ViewConfig;
-use OxidEsales\Eshop\Application\Controller\BasketController as OEBasketController;
-use OxidEsales\Eshop\Application\Controller\ThankYouController as OEThankYouController;
 use OxidEsales\Eshop\Application\Model\Basket as OEBasket;
 use OxidEsales\Eshop\Application\Model\Category as OECategory;
-use OxidEsales\Eshop\Application\Model\Manufacturer as OEManufacturer;
 use OxidEsales\Eshop\Core\ViewConfig as OEViewConfig;
 
 $sMetadataVersion = '2.1';
@@ -28,17 +22,14 @@ $aModule          = [
                       Die Entwicklung basiert auf einem Fork von Marat Bedoev - <a href='https://github.com/vanilla-thunder/oxid-module-gtm'>Github-Link</a>
                       ",
     'thumbnail'   => 'thumbnail.png',
-    'version'     => '1.11.0',
+    'version'     => '2.8.0',
     'author'      => 'Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
     'extend'      => [
         OEViewConfig::class => ViewConfig::class,
         OECategory::class => Category::class,
-        OEBasket::class => Basket::class,
-        OEBasketController::class => BasketController::class,
-        OEManufacturer::class => Manufacturer::class,
-        OEThankYouController::class => ThankYouController::class
+        OEBasket::class => Basket::class
     ],
     'templates'   => [],
     'blocks'      => [
@@ -94,13 +85,6 @@ $aModule          = [
             'block'    => 'details_productmain_tobasket',
             'file'     => '/Application/views/ga4/add_to_cart.tpl',
             'position' => 150
-        ],
-        // remove_from_cart
-        [
-            'template' => 'page/checkout/basket.tpl',
-            'block'    => 'checkout_basket_main',
-            'file'     => '/Application/views/ga4/remove_from_cart.tpl',
-            'position' => 150
         ]
     ],
     'settings'    => [
@@ -144,7 +128,7 @@ $aModule          = [
             'name' => 'd3_gtm_settings_HAS_STD_MANAGER',
             'type' => 'select',
             'value' => 'none',
-            'constraints' => 'NONE|CONSENTMANAGER|USERCENTRICS|COOKIEFIRST',
+            'constraints' => 'NONE|CONSENTMANAGER|USERCENTRICS',
         ],
     ]
 ];