From 59f0e37ccef19ca6f78ecf5249f69d7398b28aa6 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Mon, 22 Jan 2024 11:15:54 +0100 Subject: [PATCH 1/6] bump changelog && version to 2.14.0 --- CHANGELOG.md | 10 +++++++++- metadata.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1575d7..5a50064 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,16 @@ 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.14.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.13.1...2.14.0) - 2023-01-22 +### Added +- add_to_cart Event to several new shop-pages (landing-page, Account, category article-list, start) +- PHPStan code-cleanup +### Changed +- template structure +- code cleanup + ## [2.13.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.13.0...2.13.1) - 2023-01-03 -## Fixed +### Fixed - error on array-count at zero entries ## [2.13.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.12.0...2.13.0) - 2023-09-13 diff --git a/metadata.php b/metadata.php index d34fff3..c62f7cf 100755 --- a/metadata.php +++ b/metadata.php @@ -44,7 +44,7 @@ $aModule = [ Die Entwicklung basiert auf einem Fork von Marat Bedoev - Github-Link ", 'thumbnail' => 'thumbnail.png', - 'version' => '2.13.1', + 'version' => '2.14.0', 'author' => 'Data Development (Inh.: Thomas Dartsch)', 'email' => 'support@shopmodule.com', 'url' => 'https://www.oxidmodule.com/', From 13ef2bef7b6982cf0c75b02cd5cb321b2be2b250 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Mon, 22 Jan 2024 11:27:04 +0100 Subject: [PATCH 2/6] [Changed] phpstan.neon --- phpstan.neon | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 6ade348..a95e556 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,16 +1,17 @@ parameters: - scanFiles: + bootstrapFiles: + - ../../../../Shops/CE/65x/vendor/oxid-esales/oxideshop-ce/source/bootstrap.php - IntelliSenseHelper.php - - ../../../../Shops/CE/6.1.x/616_/vendor/oxid-esales/oxideshop-ce/source/bootstrap.php - - ../../../../Shops/CE/6.1.x/616_/vendor/oxid-esales/oxideshop-ce/source/oxfunctions.php - - ../../../../Shops/CE/6.1.x/616_/vendor/oxid-esales/oxideshop-ce/source/overridablefunctions.php + scanFiles: + - ../../../../Shops/CE/65x/vendor/oxid-esales/oxideshop-ce/source/oxfunctions.php + - ../../../../Shops/CE/65x/vendor/oxid-esales/oxideshop-ce/source/overridablefunctions.php scanDirectories: - - ../../../../Shops/CE/6.1.x/616_/vendor/oxid-esales + - ../../../../Shops/CE/65x/vendor/oxid-esales ignoreErrors: - '#.*is not subtype of Throwable.*#' - '#\$sValue of method OxidEsales\\EshopCommunity\\Core\\Controller\\BaseController::addTplParam\(\) expects string,[ a-zA-Z\.]+#' paths: - ./ level: 5 - phpVersion: 70200 + phpVersion: 80100 checkMissingIterableValueType: false From e4969f2cbd6ef39d719fb927699541d4c3a1af2f Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Mon, 22 Jan 2024 14:23:09 +0100 Subject: [PATCH 3/6] [Changed] phpstan.neon --- phpstan.neon | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index a95e556..572b91f 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,15 +1,13 @@ parameters: - bootstrapFiles: - - ../../../../Shops/CE/65x/vendor/oxid-esales/oxideshop-ce/source/bootstrap.php - - IntelliSenseHelper.php scanFiles: - - ../../../../Shops/CE/65x/vendor/oxid-esales/oxideshop-ce/source/oxfunctions.php - - ../../../../Shops/CE/65x/vendor/oxid-esales/oxideshop-ce/source/overridablefunctions.php + - IntelliSenseHelper.php + - ../../oxid-esales/oxideshop-ce/source/bootstrap.php + - ../../oxid-esales/oxideshop-ce/source/oxfunctions.php + - ../../oxid-esales/oxideshop-ce/source/overridablefunctions.php scanDirectories: - - ../../../../Shops/CE/65x/vendor/oxid-esales + - ../../oxid-esales ignoreErrors: - '#.*is not subtype of Throwable.*#' - - '#\$sValue of method OxidEsales\\EshopCommunity\\Core\\Controller\\BaseController::addTplParam\(\) expects string,[ a-zA-Z\.]+#' paths: - ./ level: 5 From 59ef1d06259f24eb9ec6d0c396b18c850304fdf2 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Mon, 22 Jan 2024 14:30:59 +0100 Subject: [PATCH 4/6] [Added] extended Doks --- Docs/README.md | 44 ++++++++------------------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/Docs/README.md b/Docs/README.md index 8c5afaf..29b581b 100644 --- a/Docs/README.md +++ b/Docs/README.md @@ -10,38 +10,7 @@ Tragen Sie hier im Normalfall die ID des zu prüfenden Cookies ein. In bestimmten Fällen, müssen Sie hier alternative Werte eintragen. Diese Fälle sind bedingt nach der gewählten CMP (Consent Manager Platform). -> nähere Infos unter [CMP](#consent-manager-platform-cmp) - -## Blöcke -Für den geregelten Ablauf sind folgende Blöcke nötig: -- Suchergebnisse - - Blockname: search_results - - Datei: page/search/search.tpl - - GA4 Event: view_search_results -- Artikelliste - - Blockname: page_list_productlist - - Datei: page/list/list.tpl - - GA4 Event: view_item_list -- Detailseite - - Blockname: details_productmain_title - - Datei: page/details/inc/productmain.tpl - - GA4 Event: view_item -- dem WK hinzufügen (button) - - 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 - - GA4 Event: view_cart -- abgeschlossener Kauf - - Blockname: checkout_thankyou_main - - Datei: page/checkout/thankyou.tpl - - GA4 Event: purchase +> nähere Infos unter [CMP](#consent-manager-platform-cmp) ## Verfügbare Datalayer Variablen Für die einfachste Übersicht der enthaltenen Daten empfehle ich den Vorschau-Modus vom Google Tag Manager. @@ -80,7 +49,7 @@ Aktivieren Sie anschließend diese Weiche. Setzen Sie den Haken bei "Eigenen Coo - 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 @@ -88,6 +57,9 @@ Aktivieren Sie anschließend diese Weiche. Setzen Sie den Haken bei "Eigenen Coo - 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 - -- [Cookiebot](https://www.cookiebot.com) - - Nähere Informationen folgen bald! Bis dato, besuchen Sie bitte die offizielle Webseite. \ No newline at end of file + +- [Cookiefirst](https://cookiefirst.com) + - im Cookiefirst-Hub das jeweilige Cookie finden underen zugeordnete Kategorie kopieren + - die kopierte Kategory wird nun in den Einstellungen des Moduls hinterlegt: + ```Erweiterungen > Module > Google Analytics 4 > Einstell. > Cookie Manager Einstellungen > Steuerungsparameter (vormals CookieID)``` + - **Wichtig!** bei Nutzung des Consent-Managers von Google, muss zwangsläufig die Einstellung "Cookie manager Nutzen?" __ausgeschalten!__ werden \ No newline at end of file From 05df5ef1003cafa571ea12fa4d5cd255cf4f9499 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Thu, 25 Jan 2024 14:49:32 +0100 Subject: [PATCH 5/6] [Fix] missing Component-ArticleDetails extension; missing ManufacturerList-Extension --- IntelliSenseHelper.php | 10 ++++++++++ .../Widget/d3GtmWidgetArticleDetails.php | 18 ++++++++++++++++++ .../d3GtmManufacturerListController.php | 18 ++++++++++++++++++ metadata.php | 19 ++++++++++++++++--- 4 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php create mode 100644 Modules/Application/Controller/d3GtmManufacturerListController.php diff --git a/IntelliSenseHelper.php b/IntelliSenseHelper.php index 94dc65a..4666e9e 100644 --- a/IntelliSenseHelper.php +++ b/IntelliSenseHelper.php @@ -28,6 +28,7 @@ namespace D3\GoogleAnalytics4\Modules\Application\Controller{ use OxidEsales\Eshop\Application\Controller\AccountNoticeListController; use OxidEsales\Eshop\Application\Controller\AccountRecommlistController; use OxidEsales\Eshop\Application\Controller\AccountWishlistController; + use OxidEsales\Eshop\Application\Controller\Admin\ManufacturerController; use OxidEsales\Eshop\Application\Controller\ArticleListController; use OxidEsales\Eshop\Application\Controller\SearchController; use OxidEsales\Eshop\Application\Controller\StartController; @@ -48,6 +49,8 @@ namespace D3\GoogleAnalytics4\Modules\Application\Controller{ class d3GtmStartController_parent extends StartController {} class d3GtmSearchController_parent extends SearchController {} + + class d3GtmManufacturerListController_parent extends ManufacturerController {} } namespace D3\GoogleAnalytics4\Modules\Application\Component{ @@ -55,4 +58,11 @@ namespace D3\GoogleAnalytics4\Modules\Application\Component{ use OxidEsales\Eshop\Application\Component\BasketComponent; class d3GtmBasketComponentExtension_parent extends BasketComponent {} +} + +namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget{ + + use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails; + + class d3GtmWidgetArticleDetails_parent extends ArticleDetails {} } \ No newline at end of file diff --git a/Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php b/Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php new file mode 100644 index 0000000..9bb5c43 --- /dev/null +++ b/Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php @@ -0,0 +1,18 @@ +addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket')); + + return $return; + } +} \ No newline at end of file diff --git a/Modules/Application/Controller/d3GtmManufacturerListController.php b/Modules/Application/Controller/d3GtmManufacturerListController.php new file mode 100644 index 0000000..8064beb --- /dev/null +++ b/Modules/Application/Controller/d3GtmManufacturerListController.php @@ -0,0 +1,18 @@ +addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket')); + + return $return; + } +} \ No newline at end of file diff --git a/metadata.php b/metadata.php index c62f7cf..dbcc6be 100755 --- a/metadata.php +++ b/metadata.php @@ -1,12 +1,14 @@ 'support@shopmodule.com', 'url' => 'https://www.oxidmodule.com/', 'extend' => [ + // Core OEViewConfig::class => ViewConfig::class, + + // Model OECategory::class => Category::class, OEBasket::class => Basket::class, - OEBasketController::class => BasketController::class, OEManufacturer::class => Manufacturer::class, + + // Controller + OEBasketController::class => BasketController::class, OEThankYouController::class => ThankYouController::class, OEArticleListController::class => ArticleListController_AddToCartHelpMethods::class, - OEBasketComponent::class => d3GtmBasketComponentExtension::class, OEArticleDetailsController::class => ArticleDetailsController::class, OEAccountNoticeListController::class => d3GtmAccountNoticeListController::class, OEAccountRecommlistController::class => d3GtmAccountRecommlistController::class, OEAccountWishlistController::class => d3GtmAccountWishlistController::class, OEStartController::class => d3GtmStartController::class, - OESearchController::class => d3GtmSearchController::class + OESearchController::class => d3GtmSearchController::class, + OEManufacturerListController::class => d3GtmManufacturerListController::class, + + // Component + OEArticleDetails::class => d3GtmWidgetArticleDetails::class, + OEBasketComponent::class => d3GtmBasketComponentExtension::class, ], 'templates' => [ // Event files that store the GA4 Event-Information From 9410495a58e746052e1b5a394ad4e1aa3344dde6 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Mon, 5 Feb 2024 14:12:02 +0100 Subject: [PATCH 6/6] [Bump] Metadata && Changelog --- CHANGELOG.md | 9 +++++++++ metadata.php | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a50064..ed1ef38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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.15.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.14.0...2.15.0) - 2024-02-05 +### Fixed +- missing Component-ArticleDetails extension, missing ManufacturerListController extension + ## [2.14.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.13.1...2.14.0) - 2023-01-22 ### Added - add_to_cart Event to several new shop-pages (landing-page, Account, category article-list, start) @@ -137,6 +141,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...2.0) - 2023-01-20 ### Added - using of ContainerFactory in ViewConfig + +## [1.15.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.14.0...1.15.0) - 2024-01-25 +### Fixed +- missing Component-ArticleDetails extension, missing ManufacturerListController extension + ## [1.14.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.13.0...1.14.0) - 2024-01-03 ### Added - add_to_cart Event to several new shop-pages (landing-page, Account, category article-list, start) diff --git a/metadata.php b/metadata.php index dbcc6be..fb8c1c7 100755 --- a/metadata.php +++ b/metadata.php @@ -48,7 +48,7 @@ $aModule = [ Die Entwicklung basiert auf einem Fork von Marat Bedoev - Github-Link ", 'thumbnail' => 'thumbnail.png', - 'version' => '2.14.0', + 'version' => '2.15.0', 'author' => 'Data Development (Inh.: Thomas Dartsch)', 'email' => 'support@shopmodule.com', 'url' => 'https://www.oxidmodule.com/',