D3Public/GoogleAnalytics4
8
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

[Changed] code cleanup

Browse Source 
php cs fixer
This commit is contained in:
MaxBuhe01
2024-11-25 18:48:39 +01:00
parent 2cd0652c31
commit c27834536d
47 changed files with 273 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.php-cs-fixer.php
View File

@ -1,13 +1,15 @@
<?php
$finder = PhpCsFixer\Finder::create()
->in(__DIR__)
;
$finder = PhpCsFixer\Finder::create()
->in(__DIR__)
;
$config = new PhpCsFixer\Config();
return $config->setRules([
'@PHP73Migration' => true,
'@PSR12' => true
])
->setFinder($finder)
;
$config = new PhpCsFixer\Config();
return $config->setRules([
'@PHP81Migration' => true,
'@PSR12' => true,
'php_unit_test_class_requires_covers' => true,
'doctrine_annotation_indentation' => true,
])
->setFinder($finder)
;

10
Application/Controller/Admin/GA4AdminUserInterface_main.php
View File

@ -41,10 +41,10 @@ class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controlle
'_blEnableUsercentricsConsentModeApi',
];
foreach ($aCheckBoxParams as $checkBoxName){
if (isset($aParams['bool'][$checkBoxName])){
foreach ($aCheckBoxParams as $checkBoxName) {
if (isset($aParams['bool'][$checkBoxName])) {
$aParams['bool'][$checkBoxName] = true;
}else{
} else {
$aParams['bool'][$checkBoxName] = false;
}
}
@ -60,8 +60,8 @@ class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controlle
{
$oConfig = Registry::getConfig();
foreach ($aParams as $sConfigType => $aConfigParams) {
foreach ($aConfigParams as $sParamName => $sParamValue){
if($this->d3GetModuleConfigParam($sParamName) !== $sParamValue){
foreach ($aConfigParams as $sParamName => $sParamValue) {
if ($this->d3GetModuleConfigParam($sParamName) !== $sParamValue) {
$oConfig->saveShopConfVar(
$sConfigType,
Constants::OXID_MODULE_ID.$sParamName,

1
Application/Model/CMP/ConsentManagementPlatformBaseModel.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Application\Model\CMP;
abstract class ConsentManagementPlatformBaseModel extends \OxidEsales\Eshop\Core\Model\BaseModel implements ConsentManagementPlatformInterface
{
public string $sCMPName;

9
Application/Model/CMP/Usercentrics.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Application\Model\CMP;
use D3\GoogleAnalytics4\Application\Model\ManagerTypes;
/**
@ -18,8 +17,8 @@ use D3\GoogleAnalytics4\Application\Model\ManagerTypes;
*/
class Usercentrics extends ConsentManagementPlatformBaseModel
{
const sExternalIncludationPublicName = "( Externe Einbindung ) Usercentrics";
const sExternalIncludationInternalName = "usercentrics";
const sModuleIncludationPublicName = "( Modul ) Usercentrics";
const sModuleIncludationInternalName = "oxps_usercentrics";
public const sExternalIncludationPublicName = "( Externe Einbindung ) Usercentrics";
public const sExternalIncludationInternalName = "usercentrics";
public const sModuleIncludationPublicName = "( Modul ) Usercentrics";
public const sModuleIncludationInternalName = "oxps_usercentrics";
}

1
Application/Model/Constants.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Application\Model;
class Constants
{
public const OXID_MODULE_ID = 'd3googleanalytics4';

23
Application/Model/ManagerHandler.php
View File

@ -12,7 +12,7 @@ class ManagerHandler
*
* @return string
*/
public function getCurrManager() :string
public function getCurrManager(): string
{
/** @var ManagerTypes $oManagerTypes */
$oManagerTypes = oxNew(ManagerTypes::class);
@ -22,15 +22,15 @@ class ManagerHandler
$aManagerList = $oManagerTypes->getManagerList();
if ($this->getModuleSettingExplicitManagerSelectValue()){
if ($this->getModuleSettingExplicitManagerSelectValue()) {
return $this->getExplicitManager();
}
foreach ($aManagerList as $shopModuleId => $publicCMPName){
if ($oViewConfig->d3IsModuleActive($shopModuleId)){
$this->d3SaveShopConfVar($shopModuleId);
return $shopModuleId;
}
foreach ($aManagerList as $shopModuleId => $publicCMPName) {
if ($oViewConfig->d3IsModuleActive($shopModuleId)) {
$this->d3SaveShopConfVar($shopModuleId);
return $shopModuleId;
}
}
return "";
@ -40,7 +40,8 @@ class ManagerHandler
* @param string $sParam
* @return void
*/
public function d3SaveShopConfVar(string $sParam){
public function d3SaveShopConfVar(string $sParam)
{
Registry::getConfig()->saveShopConfVar(
'select',
Constants::OXID_MODULE_ID."_HAS_STD_MANAGER",
@ -53,15 +54,15 @@ class ManagerHandler
/**
* @return string
*/
public function getModuleSettingExplicitManagerSelectValue() :string
public function getModuleSettingExplicitManagerSelectValue(): string
{
return Registry::get(ViewConfig::class)->d3GetModuleConfigParam('_HAS_STD_MANAGER')?:"";
return Registry::get(ViewConfig::class)->d3GetModuleConfigParam('_HAS_STD_MANAGER') ?: "";
}
/**
* @return string
*/
public function getExplicitManager() :string
public function getExplicitManager(): string
{
$sPotentialManagerName = $this->getModuleSettingExplicitManagerSelectValue();

58
Application/Model/ManagerTypes.php
View File

@ -6,26 +6,26 @@ use D3\GoogleAnalytics4\Application\Model\CMP\Usercentrics;
class ManagerTypes
{
const EXTERNAL_SERVICE = "eigener Service";
const INTERNAL_EXTERNAL_SERVICE = "externalService";
const NET_COOKIE_MANAGER = "Netensio Cookie Manager";
const INTERNAL_NET_COOKIE_MANAGER = "net_cookie_manager";
public const EXTERNAL_SERVICE = "eigener Service";
public const INTERNAL_EXTERNAL_SERVICE = "externalService";
public const NET_COOKIE_MANAGER = "Netensio Cookie Manager";
public const INTERNAL_NET_COOKIE_MANAGER = "net_cookie_manager";
/**
* Further information's:
* https://github.com/aggrosoft/oxid-cookie-compliance
*/
const AGCOOKIECOMPLIANCE = "Aggrosoft Cookie Compliance";
const INTERNAL_AGCOOKIECOMPLIANCE = "agcookiecompliance";
public const AGCOOKIECOMPLIANCE = "Aggrosoft Cookie Compliance";
public const INTERNAL_AGCOOKIECOMPLIANCE = "agcookiecompliance";
const CONSENTMANAGER = "Consentmanager";
const INTERNAL_CONSENTMANAGER = "cmconsentmanager";
public const CONSENTMANAGER = "Consentmanager";
public const INTERNAL_CONSENTMANAGER = "cmconsentmanager";
const COOKIEFIRST = "Cookiefirst";
const INTERNAL_COOKIEFIRST = "cookiefirst";
public const COOKIEFIRST = "Cookiefirst";
public const INTERNAL_COOKIEFIRST = "cookiefirst";
const COOKIEBOT = "Cookiebot";
const INTERNAL_COOKIEBOT = "cookiebot";
public const COOKIEBOT = "Cookiebot";
public const INTERNAL_COOKIEBOT = "cookiebot";
/**
* @return array
@ -48,25 +48,25 @@ class ManagerTypes
* @param string $sManager
* @return bool
*/
public function isManagerInList(string $sManager) :bool
public function isManagerInList(string $sManager): bool
{
return in_array($sManager, array_keys($this->getManagerList()), true);
}
/**
* @return array
*
* the CMP from this method always needs the script tag delivered to the dom.
*/
public function scriptTagDeliveredByDefaultArray() :array
{
return [
Usercentrics::sModuleIncludationInternalName,
Usercentrics::sExternalIncludationInternalName,
ManagerTypes::INTERNAL_CONSENTMANAGER,
ManagerTypes::INTERNAL_COOKIEFIRST,
ManagerTypes::INTERNAL_COOKIEBOT,
ManagerTypes::INTERNAL_EXTERNAL_SERVICE
];
}
/**
* @return array
*
* the CMP from this method always needs the script tag delivered to the dom.
*/
public function scriptTagDeliveredByDefaultArray(): array
{
return [
Usercentrics::sModuleIncludationInternalName,
Usercentrics::sExternalIncludationInternalName,
ManagerTypes::INTERNAL_CONSENTMANAGER,
ManagerTypes::INTERNAL_COOKIEFIRST,
ManagerTypes::INTERNAL_COOKIEBOT,
ManagerTypes::INTERNAL_EXTERNAL_SERVICE,
];
}
}

5
Application/views/admin_smarty/de/d3googleanalytics4_lang.php
View File

@ -1,9 +1,10 @@
<?php
$sLangName = "Deutsch";
// -------------------------------
// RESOURCE IDENTITFIER = STRING
// -------------------------------
$aLang = array(
$aLang = [
'charset' => 'UTF-8',
'd3mxgoogleanalytics4' => 'Google Analytics 4',
@ -120,4 +121,4 @@ Nachher:
src="{Domain}?id={Container-ID}"
</code>
</pre>',
);
];

1
Application/views/admin_smarty/de/module_options.php
View File

@ -1,4 +1,5 @@
<?php
/**
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.

4
CHANGELOG.md
View File

@ -4,9 +4,7 @@ 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).
## [unreleased](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.22.0...rel_2.x) - 2024-x
### Added
- data layer doesn't contain prices if current user hasn't "show price" rights
## [unreleased](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.17.2...rel_2.x) - 2024-x
## [2.22.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.21.0...2.22.0) - 2024-09-21
### Fixed

68
IntelliSenseHelper.php
View File

@ -14,18 +14,28 @@
*/
namespace D3\GoogleAnalytics4\Modules\Core{
class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig{}
class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig
{
}
}
namespace D3\GoogleAnalytics4\Modules\Application\Model{
use OxidEsales\Eshop\Application\Model\Payment;
class Category_parent extends \OxidEsales\Eshop\Application\Model\Category {}
class Basket_parent extends \OxidEsales\Eshop\Application\Model\Basket {}
class Manufacturer_parent extends \OxidEsales\Eshop\Application\Model\Manufacturer {}
class Category_parent extends \OxidEsales\Eshop\Application\Model\Category
{
}
class Basket_parent extends \OxidEsales\Eshop\Application\Model\Basket
{
}
class Manufacturer_parent extends \OxidEsales\Eshop\Application\Model\Manufacturer
{
}
class gtmPayment_parent extends Payment {}
class gtmPayment_parent extends Payment
{
}
}
namespace D3\GoogleAnalytics4\Modules\Application\Controller{
@ -38,36 +48,60 @@ namespace D3\GoogleAnalytics4\Modules\Application\Controller{
use OxidEsales\Eshop\Application\Controller\SearchController;
use OxidEsales\Eshop\Application\Controller\StartController;
class BasketController_parent extends \OxidEsales\Eshop\Application\Controller\BasketController {}
class ThankYouController_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController {}
class BasketController_parent extends \OxidEsales\Eshop\Application\Controller\BasketController
{
}
class ThankYouController_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController
{
}
class ArticleListController_AddToCartHelpMethods_parent extends ArticleListController {}
class ArticleListController_AddToCartHelpMethods_parent extends ArticleListController
{
}
class ArticleDetailsController_parent extends \OxidEsales\Eshop\Application\Controller\ArticleDetailsController {}
class ArticleDetailsController_parent extends \OxidEsales\Eshop\Application\Controller\ArticleDetailsController
{
}
class d3GtmAccountNoticeListController_parent extends AccountNoticeListController {}
class d3GtmAccountNoticeListController_parent extends AccountNoticeListController
{
}
class d3GtmAccountRecommlistController_parent extends AccountRecommlistController {}
class d3GtmAccountRecommlistController_parent extends AccountRecommlistController
{
}
class d3GtmAccountWishlistController_parent extends AccountWishlistController {}
class d3GtmAccountWishlistController_parent extends AccountWishlistController
{
}
class d3GtmStartController_parent extends StartController {}
class d3GtmStartController_parent extends StartController
{
}
class d3GtmSearchController_parent extends SearchController {}
class d3GtmSearchController_parent extends SearchController
{
}
class d3GtmManufacturerListController_parent extends ManufacturerController {}
class d3GtmManufacturerListController_parent extends ManufacturerController
{
}
}
namespace D3\GoogleAnalytics4\Modules\Application\Component{
use OxidEsales\Eshop\Application\Component\BasketComponent;
class d3GtmBasketComponentExtension_parent extends 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 {}
class d3GtmWidgetArticleDetails_parent extends ArticleDetails
{
}
}

1
Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget;
class d3GtmWidgetArticleDetails extends d3GtmWidgetArticleDetails_parent
{
public function render()

10
Modules/Application/Component/d3GtmBasketComponentExtension.php
View File

@ -24,9 +24,9 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent
$iAmountArticlesAddedToCart = (int) Registry::getRequest()->getRequestEscapedParameter('am');
if ($iAmountArticlesAddedToCart){
if ($iAmountArticlesAddedToCart) {
Registry::getSession()->setVariable('d3GtmAddToCartAmountArticles', $iAmountArticlesAddedToCart);
}else{
} else {
Registry::getSession()->setVariable('d3GtmAddToCartAmountArticles', 1);
}
@ -36,7 +36,7 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent
/**
* @return int
*/
public function getD3GtmAddToCartAmountArticles() :int
public function getD3GtmAddToCartAmountArticles(): int
{
$iAmount = Registry::getSession()->getVariable('d3GtmAddToCartAmountArticles');
@ -48,7 +48,7 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent
/**
* @return bool
*/
public function getAddToBasketDecision() :bool
public function getAddToBasketDecision(): bool
{
$decision = Registry::getSession()->getVariable('d3GtmAddToBasketTrigger');
@ -66,7 +66,7 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent
$oArticle = null;
if ($sAnid){
if ($sAnid) {
/** @var Article $oArticle */
$oArticle = oxNew(Article::class);
$oArticle->load($sAnid);

16
Modules/Application/Controller/BasketController.php
View File

@ -26,7 +26,7 @@ class BasketController extends BasketController_parent
* @return void
* @throws oxSystemComponentException
*/
public function d3GA4getRemovedArticlesListObject() :void
public function d3GA4getRemovedArticlesListObject(): void
{
$this->addTplParam('hasBeenReloaded', false);
// collecting items to add
@ -52,7 +52,7 @@ class BasketController extends BasketController_parent
'am' => $dAmount,
'sel' => $aSel,
'persparam' => $aPersParam,
'basketitemid' => $sBasketItemId
'basketitemid' => $sBasketItemId,
];
}
@ -84,9 +84,9 @@ class BasketController extends BasketController_parent
#dumpVar($this->getBasketArticles());
/** @var Article $item */
foreach ($oArtList->getArray() as $item){
foreach ($artIdOnArtAmountList as $artId => $artAmount){
if ($item->getId() === $artId){
foreach ($oArtList->getArray() as $item) {
foreach ($artIdOnArtAmountList as $artId => $artAmount) {
if ($item->getId() === $artId) {
$item->assign(['d3AmountThatGotRemoved' => $artAmount]);
}
}
@ -104,13 +104,13 @@ class BasketController extends BasketController_parent
* if that doesn't work, we check if there's an Article in the Products array, that has "'am' = 0"
* Which also shows we're in that state rn
*/
protected function isArticleRemovedState(array $productsArray) :bool
protected function isArticleRemovedState(array $productsArray): bool
{
if (Registry::getRequest()->getRequestEscapedParameter('removeBtn')
or Registry::getRequest()->getRequestEscapedParameter('updateBtn')
){
) {
return true;
}else{
} else {
foreach ($productsArray as $aProduct) {
if (intval($aProduct['am']) === 0) {
return true;

1
Modules/Application/Controller/d3GtmManufacturerListController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Modules\Application\Controller;
class d3GtmManufacturerListController extends d3GtmManufacturerListController_parent
{
public function render()

3
Modules/Application/Controller/d3GtmSearchController.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Modules\Application\Controller;
class d3GtmSearchController extends d3GtmSearchController_parent
{
/**
@ -14,7 +13,7 @@ class d3GtmSearchController extends d3GtmSearchController_parent
{
$return = parent::render();
if (false === in_array('oxcmp_basket', $this->getComponents())){
if (false === in_array('oxcmp_basket', $this->getComponents())) {
$this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
}

2
Modules/Application/Controller/d3GtmStartController.php
View File

@ -10,7 +10,7 @@ class d3GtmStartController extends d3GtmStartController_parent
{
$return = parent::render();
if (false === in_array('oxcmp_basket', $this->getComponents())){
if (false === in_array('oxcmp_basket', $this->getComponents())) {
$this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
}

6
Modules/Application/Model/Basket.php
View File

@ -9,11 +9,11 @@ class Basket extends Basket_parent
/**
* @return string
*/
public function getPaymentOnPaymentId() :string
public function getPaymentOnPaymentId(): string
{
if ($this->getPaymentId()){
if ($this->getPaymentId()) {
$oPayment = oxNew(Payment::class);
if ($oPayment->load($this->getPaymentId())){
if ($oPayment->load($this->getPaymentId())) {
return $oPayment->getFieldData('oxdesc');
}
}

1
Modules/Application/Model/Vendor.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Modules\Application\Model;
class Vendor extends \OxidEsales\Eshop\Application\Model\Vendor
{
use articleTreeStructure;

8
Modules/Application/Model/articleTreeStructure.php
View File

@ -8,9 +8,9 @@ trait articleTreeStructure
* @param int $indexOfArray
* @return string
*/
public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false) :string
public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false): string
{
if ($bShallTakeStd){
if ($bShallTakeStd) {
$splitCatArray =
array_values(
array_filter(
@ -26,9 +26,9 @@ trait articleTreeStructure
)
);
if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))){
if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))) {
return $splitCatArray[$indexOfArray];
}else{
} else {
return "";
}
}

5
Modules/Application/Model/gtmPayment.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Modules\Application\Model;
use OxidEsales\Eshop\Application\Model\Payment;
use OxidEsales\Eshop\Core\Registry;
@ -13,8 +12,8 @@ class gtmPayment extends gtmPayment_parent
/**
* @return string
*/
public function gtmGetSelectedPaymentName() :string
public function gtmGetSelectedPaymentName(): string
{
return $this->getFieldData('oxpayments__oxdesc')?: 'No payment name available';
return $this->getFieldData('oxpayments__oxdesc') ?: 'No payment name available';
}
}

103
Modules/Core/ViewConfig.php
View File

@ -1,4 +1,5 @@
<?php
/**
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
@ -28,7 +29,6 @@ use Psr\Container\NotFoundExceptionInterface;
class ViewConfig extends ViewConfig_parent
{
// Google Tag Manager Container ID
private $sContainerId = null;
@ -40,8 +40,7 @@ class ViewConfig extends ViewConfig_parent
public function getGtmContainerId()
{
if ($this->sContainerId === null)
{
if ($this->sContainerId === null) {
$this->sContainerId = $this->d3GetModuleConfigParam("_sContainerID");
}
return $this->sContainerId;
@ -50,10 +49,9 @@ class ViewConfig extends ViewConfig_parent
/**
* @return void
*/
public function defineCookieManagerType() :void
public function defineCookieManagerType(): void
{
if ($this->sCookieManagerType === null)
{
if ($this->sCookieManagerType === null) {
/** @var ManagerHandler $oManagerHandler */
$oManagerHandler = oxNew(ManagerHandler::class);
$this->sCookieManagerType = $oManagerHandler->getCurrManager();
@ -63,7 +61,7 @@ class ViewConfig extends ViewConfig_parent
/**
* @return bool
*/
public function shallUseOwnCookieManager() :bool
public function shallUseOwnCookieManager(): bool
{
return (bool) $this->d3GetModuleConfigParam('_blEnableOwnCookieManager');
}
@ -76,7 +74,7 @@ class ViewConfig extends ViewConfig_parent
/** @var Config $oConfig */
$oConfig = Registry::getConfig();
if (false === $this->isGA4enabled()){
if (false === $this->isGA4enabled()) {
return false;
}
@ -105,13 +103,11 @@ class ViewConfig extends ViewConfig_parent
}
if (
in_array
(
$this->sCookieManagerType,
(oxNew(ManagerTypes::class)->scriptTagDeliveredByDefaultArray())
)
)
{
in_array(
$this->sCookieManagerType,
(oxNew(ManagerTypes::class)->scriptTagDeliveredByDefaultArray())
)
) {
// Always needs the script-tags delivered to the DOM.
return true;
}
@ -125,32 +121,30 @@ class ViewConfig extends ViewConfig_parent
* This is especially important for UserCentrics.
* @return string
*/
public function getGtmScriptAttributes() :string
public function getGtmScriptAttributes(): string
{
$sControlParameter = trim($this->d3GetModuleConfigParam('_sControlParameter'));
if (false === $this->shallUseOwnCookieManager() or ($sControlParameter === '')){
if (false === $this->shallUseOwnCookieManager() or ($sControlParameter === '')) {
return "";
}
if (
$this->sCookieManagerType === Usercentrics::sModuleIncludationInternalName
or $this->sCookieManagerType === Usercentrics::sExternalIncludationInternalName
)
{
) {
return 'data-usercentrics="' . $sControlParameter . '" type="text/plain" async=""';
}
if ($this->sCookieManagerType === ManagerTypes::INTERNAL_CONSENTMANAGER)
{
if ($this->sCookieManagerType === ManagerTypes::INTERNAL_CONSENTMANAGER) {
return 'type="text/plain" class="cmplazyload" data-cmp-vendor="'.$sControlParameter.'"';
}
if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEFIRST){
if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEFIRST) {
return 'type="text/plain" data-cookiefirst-category="' . $sControlParameter .'"';
}
if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEBOT){
if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEBOT) {
return 'type="text/plain" data-cookieconsent="' . $sControlParameter .'"';
}
@ -163,22 +157,23 @@ class ViewConfig extends ViewConfig_parent
*/
public function isGA4enabled()
{
if ($this->blGA4enabled === null)
{
if ($this->blGA4enabled === null) {
$this->blGA4enabled = $this->d3GetModuleConfigParam("_blEnableGA4");
}
return $this->blGA4enabled;
}
public function isGtmConsentModeSetActivated() :bool
public function isGtmConsentModeSetActivated(): bool
{
return $this->d3GetModuleConfigParam("_blEnableConsentMode")?: false;
return $this->d3GetModuleConfigParam("_blEnableConsentMode") ?: false;
}
public function getGtmDataLayer()
{
if (!$this->getGtmContainerId()) return "[]";
if (!$this->getGtmContainerId()) {
return "[]";
}
$oConfig = Registry::getConfig();
$oView = $oConfig->getTopActiveView();
@ -213,9 +208,9 @@ class ViewConfig extends ViewConfig_parent
return json_encode([$dataLayer], JSON_PRETTY_PRINT);
}
public function isDebugModeOn() :bool
public function isDebugModeOn(): bool
{
return $this->d3GetModuleConfigParam("_blEnableDebug")?: false;
return $this->d3GetModuleConfigParam("_blEnableDebug") ?: false;
}
/**
@ -223,9 +218,9 @@ class ViewConfig extends ViewConfig_parent
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function getServerSidetaggingJsDomain() :string
public function getServerSidetaggingJsDomain(): string
{
return $this->d3GetModuleConfigParam("_sServersidetagging_js")?: "";
return $this->d3GetModuleConfigParam("_sServersidetagging_js") ?: "";
}
/**
@ -233,9 +228,9 @@ class ViewConfig extends ViewConfig_parent
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function getServerSidetaggingNoJsDomain() :string
public function getServerSidetaggingNoJsDomain(): string
{
return $this->d3GetModuleConfigParam('_sServersidetagging_nojs')?: "";
return $this->d3GetModuleConfigParam('_sServersidetagging_nojs') ?: "";
}
/**
@ -250,7 +245,7 @@ class ViewConfig extends ViewConfig_parent
/**
* @return bool
*/
public function d3IsUsercentricsCMPChosen() :bool
public function d3IsUsercentricsCMPChosen(): bool
{
$sCMPPubName = $this->d3GetModuleConfigParam('_HAS_STD_MANAGER');
$aPossibleCMP = (oxNew(ManagerTypes::class))->getManagerList();
@ -259,25 +254,25 @@ class ViewConfig extends ViewConfig_parent
or $sCMPPubName === Usercentrics::sModuleIncludationInternalName);
}
/**
* @return bool
*/
public function d3IsModuleActive(string $sModuleId) :bool
{
/** @var ModuleActivationBridgeInterface $moduleActivationBridge */
$moduleActivationBridge = $this
->getContainer()
->get(ModuleActivationBridgeInterface::class);
/**
* @return bool
*/
public function d3IsModuleActive(string $sModuleId): bool
{
/** @var ModuleActivationBridgeInterface $moduleActivationBridge */
$moduleActivationBridge = $this
->getContainer()
->get(ModuleActivationBridgeInterface::class);
try {
$isActiveBool = $moduleActivationBridge->isActive(
$sModuleId,
Registry::getConfig()->getShopId()
);
}catch (\Exception|ModuleConfigurationNotFoundException $e){
return false;
}
try {
$isActiveBool = $moduleActivationBridge->isActive(
$sModuleId,
Registry::getConfig()->getShopId()
);
} catch (\Exception|ModuleConfigurationNotFoundException $e) {
return false;
}
return (bool) $isActiveBool;
}
return (bool) $isActiveBool;
}
}

9
Modules/Core/WidgetControl.php
View File

@ -4,7 +4,8 @@ namespace D3\GoogleAnalytics4\Modules\Core;
use OxidEsales\EshopCommunity\Core\Registry;
class WidgetControl extends WidgetControl_parent{
class WidgetControl extends WidgetControl_parent
{
protected function getFrontendStartControllerKey() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
{
/*
@ -27,14 +28,12 @@ class WidgetControl extends WidgetControl_parent{
)
*/
$sScriptName = $_SERVER['SCRIPT_NAME'];
if($sScriptName !== '/widget.php')
{
if ($sScriptName !== '/widget.php') {
return parent::getFrontendStartControllerKey();
}
$aParameter = $_GET;
if(is_null($aParameter['actcontrol']) and is_null($aParameter['oxwparent']))
{
if (is_null($aParameter['actcontrol']) and is_null($aParameter['oxwparent'])) {
return 'D3\GoogleAnalytics4\Application\Component\Widget\d3GtmStartWidget';
}

6
Setup/Actions.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Setup;
use D3\GoogleAnalytics4\Application\Model\Constants;
use OxidEsales\Eshop\Core\Registry;
use OxidEsales\Eshop\Core\ViewConfig;
@ -17,10 +16,11 @@ class Actions
* @param string $sSettingValue
* @return void
*/
public function d3SaveDefaultSettings(string $sVarType, string $sSettingName, string $sSettingValue){
public function d3SaveDefaultSettings(string $sVarType, string $sSettingName, string $sSettingValue)
{
$oConfig = Registry::getConfig();
if ($this->d3GetModuleConfigParam($sSettingName) and (trim($this->d3GetModuleConfigParam($sSettingName)) !== trim($sSettingValue))){
if ($this->d3GetModuleConfigParam($sSettingName) and (trim($this->d3GetModuleConfigParam($sSettingName)) !== trim($sSettingValue))) {
$sSettingValue = trim($this->d3GetModuleConfigParam($sSettingName));
}

5
Setup/Events.php
View File

@ -4,7 +4,6 @@ declare(strict_types=1);
namespace D3\GoogleAnalytics4\Setup;
class Events
{
/**
@ -33,5 +32,7 @@ class Events
/**
* @return void
*/
public static function onDeactivate(){}
public static function onDeactivate()
{
}
}

7
composer.json
View File

@ -37,9 +37,16 @@
"google/apiclient":" ^2.0",
"phpstan/phpstan": "^1.10"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.9"
},
"autoload": {
"psr-4": {
"D3\\GoogleAnalytics4\\": ""
}
},
"scripts": {
"php-cs-fixer_audit": "./vendor/bin/php-cs-fixer list-files --config=./vendor/d3/google-analytics4/.php-cs-fixer.php",
"php-cs-fixer_fix": "./vendor/bin/php-cs-fixer fix --config=./vendor/d3/google-analytics4/.php-cs-fixer.php"
}
}

31
metadata.php
View File

@ -57,7 +57,7 @@ $aModule = [
'email' => 'support@shopmodule.com',
'url' => 'https://www.oxidmodule.com/',
'controllers' => [
'd3googleanalytics4_main' => GA4AdminUserInterfaceMainController::class
'd3googleanalytics4_main' => GA4AdminUserInterfaceMainController::class,
],
'extend' => [
// Core
@ -114,45 +114,48 @@ $aModule = [
'template' => 'layout/base.tpl',
'block' => 'head_meta_robots',
'file' => 'views/smarty/blocks/_gtm_js.tpl',
'position' => 150
'position' => 150,
],
// tag manager nojs
[
'template' => 'layout/base.tpl',
'block' => 'theme_svg_icons',
'file' => 'views/smarty/blocks/_gtm_nojs.tpl'
'file' => 'views/smarty/blocks/_gtm_nojs.tpl',
'position' => 150,
],
// details
[
'template' => 'page/details/inc/productmain.tpl',
'block' => 'details_productmain_title',
'file' => 'views/smarty/blocks/view_item.tpl',
'position' => 150
'position' => 150,
],
// View Cart
[
'template' => 'page/checkout/basket.tpl',
'block' => 'checkout_basket_main',
'file' => 'views/smarty/blocks/view_cart.tpl'
'file' => 'views/smarty/blocks/view_cart.tpl',
'position' => 150,
],
// add_to_cart
[
'template' => 'page/details/inc/productmain.tpl',
'block' => 'details_productmain_tobasket',
'file' => 'views/smarty/blocks/details_productmain_tobasket.tpl',
'position' => 150
'position' => 150,
],
// remove_from_cart
[
'template' => 'page/checkout/basket.tpl',
'block' => 'checkout_basket_main',
'file' => 'views/smarty/blocks/remove_from_cart.tpl',
'position' => 150
'position' => 150,
],
[
'template' => 'page/checkout/thankyou.tpl',
'block' => 'checkout_thankyou_main',
'file' => 'views/smarty/blocks/purchase.tpl'
'file' => 'views/smarty/blocks/purchase.tpl',
'position' => 150,
],
// Lists
// view_item_list
@ -160,26 +163,26 @@ $aModule = [
'template' => 'page/list/list.tpl',
'block' => 'page_list_productlist',
'file' => 'views/smarty/blocks/view_item_list.tpl',
'position' => 150
'position' => 150,
],
// view_search_result
[
'template' => 'page/search/search.tpl',
'block' => 'search_results',
'file' => 'views/smarty/blocks/view_search_result.tpl',
'position' => 150
'position' => 150,
],
[
'template' => 'page/list/list.tpl',
'block' => 'page_list_listbody',
'file' => 'views/smarty/blocks/page_list_listbody.tpl',
'position' => 150
'position' => 150,
],
[
'template' => 'page/shop/start.tpl',
'block' => 'start_welcome_text',
'file' => 'views/smarty/blocks/start_welcome_text.tpl',
'position' => 150
'position' => 150,
],
// Checkout process
// Begin CHeckout
@ -187,7 +190,7 @@ $aModule = [
'template' => 'page/checkout/user.tpl',
'block' => 'checkout_user_main',
'file' => 'views/smarty/blocks/begin_checkout.tpl',
'position' => 150
'position' => 150,
],
// Add payment info
// We add it into checkout_order_main ( checkout/order.tpl ) to make sure a payment is actually added;
@ -196,7 +199,7 @@ $aModule = [
'template' => 'page/checkout/order.tpl',
'block' => 'checkout_order_main',
'file' => 'views/smarty/blocks/add_payment_info.tpl',
'position' => 150
'position' => 150,
],
],
'events' => [

2
views/smarty/admin/d3googleanalytics4_main.tpl
View File

@ -1,4 +1,4 @@
[{include file="ga4/admin/d3ga4uiheaditem.tpl" title="GENERAL_ADMIN_TITLE"|oxmultilangassign}]
[{include file="@d3googleanalytics4/admin/d3ga4uiheaditem.tpl" title="GENERAL_ADMIN_TITLE"|oxmultilangassign}]
<style>
body {
background-image: linear-gradient(to top, #d5d4d0 0%, #d5d4d0 1%, #eeeeec 31%, #efeeec 75%, #e9e9e7 100%);

2
views/smarty/event/add_payment_info.tpl
View File

@ -36,7 +36,7 @@
'item_category_4': '[{$gtmBasketItemCategory->getSplitCategoryArray(3, true)}]',
'item_list_name': '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
[{/if}]
[{oxhasrights ident="SHOWARTICLEPRICE"}]'price': [{$gtmItemPriceObject->getPrice()}],[{/oxhasrights}]
'price': [{$gtmItemPriceObject->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}]

2
views/smarty/event/add_to_cart.tpl
View File

@ -37,7 +37,7 @@
{
'item_id': '[{$oGtmProduct->getFieldData('oxartnum')}]',
'item_name': '[{$oGtmProduct->getFieldData('oxtitle')}]',
[{oxhasrights ident="SHOWARTICLEPRICE"}]'price': [{$d3PriceObject->getPrice()}],[{/oxhasrights}]
'price': [{$d3PriceObject->getPrice()}],
'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
'item_variant': '[{if $oGtmProduct->getFieldData('oxvarselect')}][{$oGtmProduct->getFieldData('oxvarselect')}][{/if}]',
[{if $gtmCategory}]

2
views/smarty/event/begin_checkout.tpl
View File

@ -35,7 +35,7 @@
'item_category_4': '[{$gtmBasketItemCategory->getSplitCategoryArray(3, true)}]',
'item_list_name': '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
[{/if}]
[{oxhasrights ident="SHOWARTICLEPRICE"}]'price': [{$d3oItemPrice->getPrice()}],[{/oxhasrights}]
'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}]

2
views/smarty/event/purchase.tpl
View File

@ -40,7 +40,7 @@
'item_category_4': '[{$gtmPurchaseItemCategory->getSplitCategoryArray(3, true)}]',
'item_list_name': '[{$gtmPurchaseItemCategory->getSplitCategoryArray()}]',
[{/if}]
[{oxhasrights ident="SHOWARTICLEPRICE"}]'price': [{$gtmPurchaseItemPriceObject->getPrice()}],[{/oxhasrights}]
'price': [{$gtmPurchaseItemPriceObject->getPrice()}],
'quantity': [{$gtmBasketItem->getFieldData("oxamount")}],
'position': [{$smarty.foreach.gtmArticles.iteration}]
}[{if !$smarty.foreach.gtmArticles.last}],[{/if}]

2
views/smarty/event/remove_from_cart.tpl
View File

@ -28,7 +28,7 @@
'item_category_4': '[{$gtmBasketItemCategory->getSplitCategoryArray(3, true)}]',
'item_list_name': '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
[{/if}]
[{oxhasrights ident="SHOWARTICLEPRICE"}]'price': [{$d3oItemPrice->getPrice()}],[{/oxhasrights}]
'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}]

2
views/smarty/event/view_cart.tpl
View File

@ -33,7 +33,7 @@
'item_category_4': '[{$gtmBasketItemCategory->getSplitCategoryArray(3, true)}]',
'item_list_name': '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
[{/if}]
[{oxhasrights ident="SHOWARTICLEPRICE"}]'price': [{$d3oItemPrice->getPrice()}],[{/oxhasrights}]
'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}]

2
views/smarty/event/view_item.tpl
View File

@ -28,7 +28,7 @@
'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
[{/if}]
[{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
[{oxhasrights ident="SHOWARTICLEPRICE"}]'price': [{$d3PriceObject->getPrice()}][{/oxhasrights}]
'price': [{$d3PriceObject->getPrice()}]
}
]
}[{if $oViewConf->isDebugModeOn()}],

2
views/smarty/event/view_item_list.tpl
View File

@ -22,7 +22,7 @@
{
'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
[{oxhasrights ident="SHOWARTICLEPRICE"}]'price': [{$d3PriceObject->getPrice()}],[{/oxhasrights}]
'price': [{$d3PriceObject->getPrice()}],
'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
[{if $gtmCategory}]
'item_category': '[{$gtmCategory->getSplitCategoryArray(0, true)}]',

2
views/smarty/event/view_search_result.tpl
View File

@ -18,7 +18,7 @@
{
'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
[{oxhasrights ident="SHOWARTICLEPRICE"}]'price': [{$d3PriceObject->getPrice()}],[{/oxhasrights}]
'price': [{$d3PriceObject->getPrice()}],
'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
[{if $gtmCategory}]
'item_category': '[{$gtmCategory->getSplitCategoryArray(0, true)}]',