bump version && changelog to 1.10.0

moving the procedere into one step so there's not an accidental triggering of an GA-Push-Event which at the end overwrites the View-Item-Push-Event in the cmpEvent

Application/views/admin/de/module_options.php

@@ -31,11 +31,11 @@ $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>
+    '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.',

Application/views/blocks/purchase.tpl

@@ -32,13 +32,11 @@
                         '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}]

Application/views/blocks/view_cart.tpl

@@ -24,13 +24,11 @@
                         '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()}],

Application/views/blocks/view_item.tpl

@@ -17,13 +17,11 @@
           '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()}]
         }

Application/views/ga4/add_to_cart.tpl

@@ -30,13 +30,11 @@
         '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
         }
       ]

Application/views/ga4/remove_from_cart.tpl

@@ -1,45 +0,0 @@
-[{$smarty.block.parent}]
-
-[{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-
-[{if $hasBeenReloaded}]
-    [{strip}]
-            [{capture assign=d3_ga4_view_cart}]
-                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}]
-                        ]
-                    }
-                });
-            [{/capture}]
-    [{/strip}]
-    [{oxscript add=$d3_ga4_view_cart}]
-[{/if}]

Application/views/ga4/view_item_list.tpl

@@ -1,42 +1,40 @@
-[{$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}]',
-                        [{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}]
-                ]
-            }
-        });
-    </script>
-[{/strip}]
+[{$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

@@ -21,13 +21,11 @@
               '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}]

CHANGELOG.md

@@ -4,107 +4,6 @@ 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).
 
-## [2.10.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.10.0...2.10.1) - 2023-08-03
-### Added
-- missing param to identify the event
-
-## [2.10.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.9.2...2.10.0) - 2023-08-02
-### Added
-- new Event "remove_from_cart"
-
-## [2.9.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.9.1...2.9.2) - 2023-06-29
-### Fixed
-- wrong variable for category-object check
-
-## [2.9.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.9.0...2.9.1) - 2023-06-27
-### Fixed
-- deny method call on no category
-
-## [2.9.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.8.0...2.9.0) - 2023-06-27
-### Added
-- Cookiefirst usability
-
-## [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
-### Changed
-- all used template-files have a more dedicated name
-- general code cleanup
-
-## [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.10.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.9.0...1.10.0) - 2023-06-27
 ### Added
 - Following Entries to dedicated event-templates

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 (muss hinzugefügt werden)
+    - Blockname: page_list_productlist
     - Datei: page/list/list.tpl
     - GA4 Event: view_item_list
 - Detailseite
@@ -65,12 +65,4 @@ Aktivieren Sie anschließend diese Weiche. Setzen Sie den Haken bei "Eigenen Coo
 - [OXID Cookie Management powered by usercentrics](https://docs.oxid-esales.com/modules/usercentrics/de/latest/einfuehrung.html)
   - In der Usercentrics-Verwaltung die Services "Google Analytics" und "Google Tag Manager" anlegen
   - Den Service ```Google Tag Manager``` in den Moduleinstellungen des 'Google Analytics 4' unter
-    Google Tag Manager eintragen
-  - 
-- [Consent Management Provider](https://www.consentmanager.net/)
-  - In der Consentmanager-Oberfläche den Anbieter "Google Tag Manager" mit der ID s905 hinzufügen
-  - Im Frontend, im consentmanager-Pop-up nach dem 'Google Tag Manager' suchen
-    - kleines Fragezeichen neben den Namen anklicken und ganz runter scrollen
-      - prüfen, ob ein Cookie vorgegeben ist
-      - sonst, in der Consentmanager-Oberfläche Cookie-Liste entsprechendes Cookie suchen und im Admin unter
-        ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
+    ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen

IntelliSenseHelper.php

@@ -20,8 +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 {}
 }

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/Core/ViewConfig.php

@@ -17,8 +17,6 @@ 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
 {
@@ -31,10 +29,7 @@ class ViewConfig extends ViewConfig_parent
     {
         if ($this->sContainerId === null)
         {
-            $this->sContainerId = ContainerFactory::getInstance()
-                                                  ->getContainer()
-                                                  ->get(ModuleSettingBridgeInterface::class)
-                                                  ->get('d3_gtm_sContainerID', 'd3googleanalytics4');
+            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_sContainerID');
         }
         return $this->sContainerId;
     }
@@ -157,10 +152,7 @@ class ViewConfig extends ViewConfig_parent
     {
         if ($this->blGA4enabled === null)
         {
-            $this->sContainerId = ContainerFactory::getInstance()
-                                                  ->getContainer()
-                                                  ->get(ModuleSettingBridgeInterface::class)
-                                                  ->get('d3_gtm_blEnableGA4', 'd3googleanalytics4');
+            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_blEnableGA4');
         }
 
         return $this->blGA4enabled;

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": "^6.5",
-    "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": "v6.0 - 6.3",
+    "google/apiclient":" ^2.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "D3\\GoogleAnalytics4\\": "../../../source/modules/d3/googleanalytics4"
+    }
+  }
 }

metadata.php

@@ -1,10 +1,8 @@
 <?php
 
-use D3\GoogleAnalytics4\Modules\Application\Controller\BasketController;
 use D3\GoogleAnalytics4\Modules\Application\Model\Basket as Basket;
 use D3\GoogleAnalytics4\Modules\Application\Model\Category as Category;
 use D3\GoogleAnalytics4\Modules\Core\ViewConfig;
-use OxidEsales\Eshop\Application\Controller\BasketController as OEBasketController;
 use OxidEsales\Eshop\Application\Model\Basket as OEBasket;
 use OxidEsales\Eshop\Application\Model\Category as OECategory;
 use OxidEsales\Eshop\Core\ViewConfig as OEViewConfig;
@@ -24,15 +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'     => '2.10.1',
+    'version'     => '1.10.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
+        OEBasket::class => Basket::class
     ],
     'templates'   => [],
     'blocks'      => [
@@ -88,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'    => [