D3Public
/
GoogleServices
8
0
Fork 0
Code Pull Requests Releases Activity

remove deprecated code, improve code

This commit is contained in:
Daniel Seifert 2021-07-20 10:11:53 +02:00
parent 18c7c4c162
commit 0c86152619
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
27 changed files with 254 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/IntelliSenseHelper.php
View File

@ -1,4 +1,13 @@
<?php <?php
use OxidEsales\Eshop\Application\Component\UtilsComponent;
use OxidEsales\Eshop\Application\Controller\OrderController;
use OxidEsales\Eshop\Application\Controller\ThankYouController;
use OxidEsales\Eshop\Application\Model\Basket as Basket;
use OxidEsales\Eshop\Application\Model\BasketItem;
use OxidEsales\Eshop\Application\Model\Order as Order;
use OxidEsales\Eshop\Core\UtilsView;
/** /**
* This module is free software: you can redistribute it and/or modify * This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -17,22 +26,24 @@
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch) * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
*/ */
class d3_oxcmp_utils_googleAnalytics_parent extends oxcmp_utils {} class d3_oxcmp_utils_googleanalytics_parent extends UtilsComponent {}
/** */ /** */
class d3_oxorder_googleanalytics_parent extends oxOrder {} class d3_oxorder_googleanalytics_parent extends Order
{}
/** */ /** */
class d3_thankyou_googleanalytics_parent extends thankyou {} class d3_thankyou_googleanalytics_parent extends ThankYouController {}
/** */ /** */
class d3_order_googleanalytics_parent extends order {} class d3_order_googleanalytics_parent extends OrderController {}
/** */ /** */
class d3_oxutilsview_googleanalytics_parent extends oxUtilsView {} class d3_oxutilsview_googleanalytics_parent extends UtilsView {}
/** */ /** */
class d3_oxbasket_googleanalytics_parent extends oxbasket {} class d3_oxbasket_googleanalytics_parent extends Basket
{}
/** */ /** */
class d3_oxbasketitem_googleanalytics_parent extends oxBasketItem {} class d3_oxbasketitem_googleanalytics_parent extends BasketItem {}

10
src/controllers/admin/d3_cfg_googleanalytics.php
View File

@ -1,5 +1,7 @@
<?php <?php
use OxidEsales\Eshop\Core\Registry;
/** /**
* This module is free software: you can redistribute it and/or modify * This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -30,16 +32,20 @@ class d3_cfg_googleanalytics extends D3\ModCfg\Application\Controller\Admin\d3_c
return parent::render(); return parent::render();
} }
/**
* @return string
* @throws oxFileException
*/
public function getAdditionalHeadContent() public function getAdditionalHeadContent()
{ {
$oViewConf = oxRegistry::getConfig()->getActiveView()->getViewConfig(); $oViewConf = Registry::getConfig()->getActiveView()->getViewConfig();
$sScriptUrl = $oViewConf->getModuleUrl('d3_googleanalytics', 'out/src/d3_googleanalytics_test.js'); $sScriptUrl = $oViewConf->getModuleUrl('d3_googleanalytics', 'out/src/d3_googleanalytics_test.js');
return parent::getAdditionalHeadContent().' return parent::getAdditionalHeadContent().'
<script src="'.$sScriptUrl.'"></script> <script src="'.$sScriptUrl.'"></script>
<script type="text/javascript"> <script type="text/javascript">
if(null === document.getElementById("SePiRENuJOBWx")){ if(null === document.getElementById("SePiRENuJOBWx")){
alert("'.oxRegistry::getLang()->translateString('D3_GOOGLEANALYTICS_ADBLOCKER', null, true).'"); alert("'.Registry::getLang()->translateString('D3_GOOGLEANALYTICS_ADBLOCKER', null, true).'");
} }
</script> </script>
'; ';

9
src/controllers/admin/d3_cfg_googleanalytics_adwords.php
View File

@ -1,5 +1,10 @@
<?php <?php
use Doctrine\DBAL\Driver\Exception as DoctrineException;
use Doctrine\DBAL\Exception as Exception;
use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
/** /**
* This module is free software: you can redistribute it and/or modify * This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -29,6 +34,10 @@ class d3_cfg_googleanalytics_adwords extends D3\ModCfg\Application\Controller\Ad
/** /**
* @return mixed * @return mixed
* @throws DoctrineException
* @throws Exception
* @throws DatabaseConnectionException
* @throws DatabaseErrorException
*/ */
public function getGaType() public function getGaType()
{ {

8
src/core/smarty/plugins/function.d3getArticleFromOrderArticle.php
View File

@ -18,6 +18,8 @@
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch) * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
*/ */
use OxidEsales\Eshop\Application\Model\Article as Article;
/** /**
* Smarty plugin * Smarty plugin
* ------------------------------------------------------------- * -------------------------------------------------------------
@ -29,11 +31,11 @@
* *
* @return string * @return string
*/ */
function smarty_function_d3getArticleFromOrderArticle( $params, &$smarty ) function smarty_function_d3getArticleFromOrderArticle( $params, $smarty )
{ {
$sArtId = $params['aid']; $sArtId = $params['aid'];
$oArticle = oxNew('oxarticle'); $oArticle = oxNew( Article::class);
$oArticle->Load($sArtId); $oArticle->load($sArtId);
if (isset($params['assign']) && $params['assign']) { if (isset($params['assign']) && $params['assign']) {
$smarty->assign($params['assign'], $oArticle); $smarty->assign($params['assign'], $oArticle);

48
src/metadata.php
View File

@ -23,15 +23,15 @@
*/ */
$sMetadataVersion = '1.1'; $sMetadataVersion = '1.1';
$sLogo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em"> ';
/** /**
* Module information * Module information
*/ */
$aModule = array( $aModule = [
'id' => 'd3_googleanalytics', 'id' => 'd3_googleanalytics',
'title' => 'title' => $sLogo.'Google Services Schnittstelle',
'<svg style="height:1em;width:1em"><image xlink:href="https://logos.oxidmodule.com/d3logo.svg" style="height:1em;width:1em" /></svg> '. 'description' => [
'Google Services Schnittstelle',
'description' => array(
'de' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-'. 'de' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-'.
'Kontos in Ihren Shop zur Verf&uuml;gung. Hierbei werden &uuml;ber standardisierte Schnittstellen die '. 'Kontos in Ihren Shop zur Verf&uuml;gung. Hierbei werden &uuml;ber standardisierte Schnittstellen die '.
'Besucherdaten und eCommerce-Daten zu Google &uuml;bertragen. Ebenfalls &uuml;bermittelt werden Daten '. 'Besucherdaten und eCommerce-Daten zu Google &uuml;bertragen. Ebenfalls &uuml;bermittelt werden Daten '.
@ -39,13 +39,13 @@ $aModule = array(
'Trusted Shops &uuml;bertragen werden.', 'Trusted Shops &uuml;bertragen werden.',
'en' => 'Provides a quick and easy integration with your Google Analytics, Google Adwords and Google '. 'en' => 'Provides a quick and easy integration with your Google Analytics, Google Adwords and Google '.
'Trusted Shops account to your shop.', 'Trusted Shops account to your shop.',
), ],
'thumbnail' => 'picture.png', 'thumbnail' => 'picture.png',
'version' => '4.1.0.0', 'version' => '4.1.0.0',
'author' => 'D&sup3; Data Development (Inh. Thomas Dartsch)', 'author' => 'D&sup3; Data Development (Inh. Thomas Dartsch)',
'email' => 'support@shopmodule.com', 'email' => 'support@shopmodule.com',
'url' => 'http://www.oxidmodule.com/', 'url' => 'https://www.oxidmodule.com/',
'extend' => array( 'extend' => [
'oxcmp_utils' => 'd3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics', 'oxcmp_utils' => 'd3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics',
'oxbasket' => 'd3/d3_googleanalytics/modules/models/d3_oxbasket_googleanalytics', 'oxbasket' => 'd3/d3_googleanalytics/modules/models/d3_oxbasket_googleanalytics',
'oxbasketitem' => 'd3/d3_googleanalytics/modules/models/d3_oxbasketitem_googleanalytics', 'oxbasketitem' => 'd3/d3_googleanalytics/modules/models/d3_oxbasketitem_googleanalytics',
@ -53,8 +53,8 @@ $aModule = array(
'order' => 'd3/d3_googleanalytics/modules/controllers/d3_order_googleanalytics', 'order' => 'd3/d3_googleanalytics/modules/controllers/d3_order_googleanalytics',
'oxutilsview' => 'd3/d3_googleanalytics/modules/core/d3_oxutilsview_googleanalytics', 'oxutilsview' => 'd3/d3_googleanalytics/modules/core/d3_oxutilsview_googleanalytics',
'thankyou' => 'd3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics', 'thankyou' => 'd3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics',
), ],
'files' => array( 'files' => [
'd3_cfg_googleanalytics' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php', 'd3_cfg_googleanalytics' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php',
'd3_cfg_googleanalytics_adwords' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_adwords.php', 'd3_cfg_googleanalytics_adwords' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_adwords.php',
'd3_cfg_googleanalytics_campaigns' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php', 'd3_cfg_googleanalytics_campaigns' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php',
@ -67,8 +67,8 @@ $aModule = array(
'd3_google_remarketing_articlelister' => 'd3/d3_googleanalytics/models/d3_google_remarketing_articlelister.php', 'd3_google_remarketing_articlelister' => 'd3/d3_googleanalytics/models/d3_google_remarketing_articlelister.php',
'd3_google_trustedstore_articlelister' => 'd3/d3_googleanalytics/models/d3_google_trustedstore_articlelister.php', 'd3_google_trustedstore_articlelister' => 'd3/d3_googleanalytics/models/d3_google_trustedstore_articlelister.php',
'd3_googleanalytics_update' => 'd3/d3_googleanalytics/setup/d3_googleanalytics_update.php', 'd3_googleanalytics_update' => 'd3/d3_googleanalytics/setup/d3_googleanalytics_update.php',
), ],
'templates' => array( 'templates' => [
'd3_googleanalytics.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl', 'd3_googleanalytics.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl',
'd3ga_universal.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl', 'd3ga_universal.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl',
'd3ga_universal_custom.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl', 'd3ga_universal_custom.tpl' => 'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl',
@ -83,25 +83,25 @@ $aModule = array(
'd3_cfg_googleanalytics_adwords.tpl' => 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl', 'd3_cfg_googleanalytics_adwords.tpl' => 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl',
'd3_cfg_googleanalytics_campaigns.tpl' => 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl', 'd3_cfg_googleanalytics_campaigns.tpl' => 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl',
'd3_cfg_googleanalytics_trustedstore.tpl' => 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl', 'd3_cfg_googleanalytics_trustedstore.tpl' => 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl',
), ],
'events' => array( 'events' => [
'onActivate' => '\D3\ModCfg\Application\Model\Install\d3install::checkUpdateStart', 'onActivate' => '\D3\ModCfg\Application\Model\Install\d3install::checkUpdateStart',
), ],
'blocks' => array( 'blocks' => [
array( [
'template' => 'layout/base.tpl', 'template' => 'layout/base.tpl',
'block' => 'head_css', 'block' => 'head_css',
'file' => '/views/blocks/layout/d3_base_googleanalytics.tpl', 'file' => '/views/blocks/layout/d3_base_googleanalytics.tpl',
), ],
array( [
'template' => 'layout/base.tpl', 'template' => 'layout/base.tpl',
'block' => 'base_js', 'block' => 'base_js',
'file' => '/views/blocks/layout/d3_base_googleadwordscode.tpl', 'file' => '/views/blocks/layout/d3_base_googleadwordscode.tpl',
), ],
array( [
'template' => 'layout/footer.tpl', 'template' => 'layout/footer.tpl',
'block' => 'footer_main', 'block' => 'footer_main',
'file' => '/views/blocks/layout/d3_base_optout.tpl', 'file' => '/views/blocks/layout/d3_base_optout.tpl',
), ],
), ],
); ];

9
src/models/d3_google_remarketing_articlelister.php
View File

@ -1,5 +1,8 @@
<?php <?php
/**
use OxidEsales\Eshop\Application\Model\ArticleList;
/**
* This Software is the property of Data Development and is protected * This Software is the property of Data Development and is protected
* by copyright law - it is NOT Freeware. * by copyright law - it is NOT Freeware.
* *
@ -36,14 +39,14 @@ class d3_google_remarketing_articlelister
public function getStartProdList($oView) public function getStartProdList($oView)
{ {
/** @var oxArticleList $oArticleList */ /** @var oxArticleList $oArticleList */
$oArticleList = oxNew('oxarticlelist'); $oArticleList = oxNew(ArticleList::class);
if (is_array($this->aStartListMethodNames) && count($this->aStartListMethodNames)) { if (is_array($this->aStartListMethodNames) && count($this->aStartListMethodNames)) {
foreach ($this->aStartListMethodNames as $sListName) { foreach ($this->aStartListMethodNames as $sListName) {
/** @var oxArticleList $oList */ /** @var oxArticleList $oList */
$mList = call_user_func(array($oView, $sListName)); $mList = call_user_func(array($oView, $sListName));
if ($mList instanceof oxArticleList) { if ($mList instanceof ArticleList) {
if ($mList->count()) { if ($mList->count()) {
foreach ($mList->getArray() as $sID => $oArticle) { foreach ($mList->getArray() as $sID => $oArticle) {
$oArticleList->offsetSet($sID, $oArticle); $oArticleList->offsetSet($sID, $oArticle);

10
src/models/d3_google_trustedstore_articlelister.php
View File

@ -1,5 +1,9 @@
<?php <?php
/**
use D3\ModCfg\Application\Model\Configuration\d3_cfg_mod;
use OxidEsales\Eshop\Application\Model\ArticleList;
/**
* This Software is the property of Data Development and is protected * This Software is the property of Data Development and is protected
* by copyright law - it is NOT Freeware. * by copyright law - it is NOT Freeware.
* *
@ -41,7 +45,7 @@ class d3_google_trustedstore_articlelister
/** @var oxArticleList $oList */ /** @var oxArticleList $oList */
$mList = call_user_func(array($oView, $sListName)); $mList = call_user_func(array($oView, $sListName));
if ($mList instanceof oxArticleList) { if ($mList instanceof ArticleList) {
if ($mList->count()) { if ($mList->count()) {
foreach ($mList->getArray() as $sID => $oArticle) { foreach ($mList->getArray() as $sID => $oArticle) {
$oArticleList->offsetSet($sID, $oArticle); $oArticleList->offsetSet($sID, $oArticle);
@ -170,7 +174,7 @@ class d3_google_trustedstore_articlelister
if (isset($aArticleList)) { if (isset($aArticleList)) {
foreach ($aArticleList as $oArticle) { foreach ($aArticleList as $oArticle) {
$aArticleIds[] = $oArticle->getFieldData( $aArticleIds[] = $oArticle->getFieldData(
\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('sD3GATSShoppingArtId') d3_cfg_mod::get($this->_sModId)->getValue('sD3GATSShoppingArtId')
); );
} }
} }

98
src/modules/components/d3_oxcmp_utils_googleanalytics.php
View File

@ -1,5 +1,13 @@
<?php <?php
use D3\ModCfg\Application\Model\Configuration\d3_cfg_mod;
use D3\ModCfg\Application\Model\d3str;
use Doctrine\DBAL\Driver\Exception as DoctrineException;
use Doctrine\DBAL\Exception as Exception;
use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
use OxidEsales\Eshop\Core\Registry;
/** /**
* This module is free software: you can redistribute it and/or modify * This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -44,7 +52,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
{ {
$ret = parent::render(); $ret = parent::render();
$oSet = \D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_d3getModId()); $oSet = d3_cfg_mod::get($this->_d3getModId());
if ($oSet->isActive()) { if ($oSet->isActive()) {
/** @var $oParentView oxView */ /** @var $oParentView oxView */
@ -93,10 +101,14 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
/** /**
* @return string * @return string
* @throws DoctrineException
* @throws Exception
* @throws DatabaseConnectionException
* @throws DatabaseErrorException
*/ */
public function d3getGATTpl() public function d3getGATTpl()
{ {
if (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('sD3GAType') == 'async') { if ( d3_cfg_mod::get( $this->_sModId)->getValue( 'sD3GAType') == 'async') {
return 'd3_googleanalytics.tpl'; return 'd3_googleanalytics.tpl';
} }
@ -108,7 +120,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
public function d3GetCreateCurrentShopUrl() public function d3GetCreateCurrentShopUrl()
{ {
if (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('blD3GAAllowDomainLinker')) { if ( d3_cfg_mod::get( $this->_sModId)->getValue( 'blD3GAAllowDomainLinker')) {
return 'auto'; return 'auto';
} }
@ -120,7 +132,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
public function d3GetCurrentShopUrl() public function d3GetCurrentShopUrl()
{ {
return oxRegistry::getConfig()->getActiveShop()->getFieldData('oxurl'); return Registry::getConfig()->getActiveShop()->getFieldData('oxurl');
} }
/** /**
@ -128,7 +140,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
public function afGetMoreUrls() public function afGetMoreUrls()
{ {
if (false == \D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('blD3GAAllowDomainLinker')) { if (false == d3_cfg_mod::get($this->_sModId)->getValue('blD3GAAllowDomainLinker')) {
return ''; return '';
} }
@ -142,13 +154,13 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3GetNonBaseLanguageUrls() protected function _d3GetNonBaseLanguageUrls()
{ {
$myConfig = oxRegistry::getConfig(); $myConfig = Registry::getConfig();
$aLanguageUrls = $myConfig->getConfigParam('aLanguageURLs'); $aLanguageUrls = $myConfig->getConfigParam('aLanguageURLs');
$aSslLanguageUrls = $myConfig->getConfigParam('aLanguageSSLURLs'); $aSslLanguageUrls = $myConfig->getConfigParam('aLanguageSSLURLs');
$aUrls = array(); $aUrls = array();
if ($myConfig->getConfigParam('bl_perfLoadLanguages')) { if ($myConfig->getConfigParam('bl_perfLoadLanguages')) {
$aLanguages = oxRegistry::getLang()->getLanguageArray(null, true, true); $aLanguages = Registry::getLang()->getLanguageArray(null, true, true);
reset($aLanguages); reset($aLanguages);
foreach ($aLanguages as $oVal) { foreach ($aLanguages as $oVal) {
$this->_d3AddLanguageUrlsToList($aLanguageUrls, $oVal, $aSslLanguageUrls, $aUrls); $this->_d3AddLanguageUrlsToList($aLanguageUrls, $oVal, $aSslLanguageUrls, $aUrls);
@ -170,7 +182,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3AddLanguageUrlsToList($aLanguageUrls, $oVal, $aSslLanguageUrls, &$aUrls) protected function _d3AddLanguageUrlsToList($aLanguageUrls, $oVal, $aSslLanguageUrls, &$aUrls)
{ {
$blIsSsl = oxRegistry::getConfig()->isSsl(); $blIsSsl = Registry::getConfig()->isSsl();
if ($this->_d3CheckLanguageUrlsToList($aLanguageUrls, $oVal, $blIsSsl)) { if ($this->_d3CheckLanguageUrlsToList($aLanguageUrls, $oVal, $blIsSsl)) {
$sUrl = $this->_d3GANormalizeUrl($aLanguageUrls[$oVal->id]); $sUrl = $this->_d3GANormalizeUrl($aLanguageUrls[$oVal->id]);
@ -193,8 +205,8 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
protected function _d3GANormalizeUrl($sUrl) protected function _d3GANormalizeUrl($sUrl)
{ {
$sPattern = "^http(s?)://"; $sPattern = "^http(s?)://";
/** @var \D3\ModCfg\Application\Model\d3str $oD3Str */ /** @var d3str $oD3Str */
$oD3Str = oxNew(\D3\ModCfg\Application\Model\d3str::class); $oD3Str = oxNew( d3str::class);
return preg_replace('@'.$sPattern.'@', '', $oD3Str->untrailingslashit($sUrl)); return preg_replace('@'.$sPattern.'@', '', $oD3Str->untrailingslashit($sUrl));
} }
@ -204,7 +216,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3UnsetCurrentUrl(&$aUrls) protected function _d3UnsetCurrentUrl(&$aUrls)
{ {
unset($aUrls[md5($this->_d3GANormalizeUrl(oxRegistry::getConfig()->getCurrentShopUrl()))]); unset($aUrls[md5($this->_d3GANormalizeUrl(Registry::getConfig()->getCurrentShopUrl()))]);
} }
/** /**
@ -216,7 +228,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3CheckLanguageUrlsToList($aLanguageUrls, $oVal, $blIsSsl) protected function _d3CheckLanguageUrlsToList($aLanguageUrls, $oVal, $blIsSsl)
{ {
return $blIsSsl || $aLanguageUrls[$oVal->id] != $aLanguageUrls[oxRegistry::getLang()->getBaseLanguage()]; return $blIsSsl || $aLanguageUrls[$oVal->id] != $aLanguageUrls[Registry::getLang()->getBaseLanguage()];
} }
/** /**
@ -244,7 +256,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
public function d3getSendPageViewParameters() public function d3getSendPageViewParameters()
{ {
if (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('sD3GAType') == 'async') { if ( d3_cfg_mod::get( $this->_sModId)->getValue( 'sD3GAType') == 'async') {
return $this->_d3getAsyncSendpageViewParameters(); return $this->_d3getAsyncSendpageViewParameters();
} }
@ -259,7 +271,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
$aParameter = array(); $aParameter = array();
/** @var oxUBase $oCurrentView */ /** @var oxUBase $oCurrentView */
$oCurrentView = oxRegistry::getConfig()->getActiveView(); $oCurrentView = Registry::getConfig()->getActiveView();
$oCurrentView->getIsOrderStep(); $oCurrentView->getIsOrderStep();
$aParameter = $this->_d3getAsynchSendpageViewClassParameter($oCurrentView, $aParameter); $aParameter = $this->_d3getAsynchSendpageViewClassParameter($oCurrentView, $aParameter);
@ -279,7 +291,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
$aParameter = array(); $aParameter = array();
/** @var oxUBase $oCurrentView */ /** @var oxUBase $oCurrentView */
$oCurrentView = oxRegistry::getConfig()->getActiveView(); $oCurrentView = Registry::getConfig()->getActiveView();
$oCurrentView->getIsOrderStep(); $oCurrentView->getIsOrderStep();
$aParameter = $this->_d3getUniversalSendPageViewPageParameter($oCurrentView, $aParameter); $aParameter = $this->_d3getUniversalSendPageViewPageParameter($oCurrentView, $aParameter);
@ -320,12 +332,12 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
public function d3GetGAPageType() public function d3GetGAPageType()
{ {
$oCurrentView = oxRegistry::getConfig()->getActiveView(); $oCurrentView = Registry::getConfig()->getActiveView();
$key = strtolower($oCurrentView->getClassName()); $key = strtolower($oCurrentView->getClassKey());
if (array_key_exists($key, $this->aD3GAPageTypes)) { if (array_key_exists($key, $this->aD3GAPageTypes)) {
return $this->aD3GAPageTypes[$key]; return $this->aD3GAPageTypes[$key];
}; }
return 'other'; return 'other';
} }
@ -335,14 +347,14 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
public function d3GetGTSLang() public function d3GetGTSLang()
{ {
$aHomeCountries = oxRegistry::getConfig()->getConfigParam('aHomeCountry'); $aHomeCountries = Registry::getConfig()->getConfigParam('aHomeCountry');
$aKeys = array_keys($aHomeCountries); $aKeys = array_keys($aHomeCountries);
$sHomeCountryId = $aHomeCountries[current($aKeys)]; $sHomeCountryId = $aHomeCountries[current($aKeys)];
/** @var oxcountry $oCountry */ /** @var oxcountry $oCountry */
$oCountry = oxNew('oxcountry'); $oCountry = oxNew('oxcountry');
$oCountry->load($sHomeCountryId); $oCountry->load($sHomeCountryId);
return strtolower(oxRegistry::getLang()->getLanguageAbbr()).'_'. return strtolower(Registry::getLang()->getLanguageAbbr()).'_'.
strtoupper($oCountry->getFieldData('OXISOALPHA2')); strtoupper($oCountry->getFieldData('OXISOALPHA2'));
} }
@ -353,11 +365,11 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
{ {
startProfile(__METHOD__); startProfile(__METHOD__);
$oCurrentView = oxRegistry::getConfig()->getActiveView(); $oCurrentView = Registry::getConfig()->getActiveView();
$aArticleIds = array(); $aArticleIds = array();
$sMethodName = 'get'.ucfirst($oCurrentView->getClassName())."ProdList"; $sMethodName = 'get'.ucfirst($oCurrentView->getClassKey())."ProdList";
$oArticleLister = oxNew('d3_google_trustedstore_articlelister'); $oArticleLister = oxNew('d3_google_trustedstore_articlelister');
if (method_exists($oArticleLister, $sMethodName)) { if (method_exists($oArticleLister, $sMethodName)) {
@ -393,12 +405,12 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
{ {
startProfile(__METHOD__); startProfile(__METHOD__);
$oCurrentView = oxRegistry::getConfig()->getActiveView(); $oCurrentView = Registry::getConfig()->getActiveView();
$aArticleIds = array(); $aArticleIds = array();
$dPrice = 0; $dPrice = 0;
$sMethodName = 'get'.ucfirst($oCurrentView->getClassName())."ProdList"; $sMethodName = 'get'.ucfirst($oCurrentView->getClassKey())."ProdList";
$oArticleLister = oxNew('d3_google_remarketing_articlelister'); $oArticleLister = oxNew('d3_google_remarketing_articlelister');
if (method_exists($oArticleLister, $sMethodName)) { if (method_exists($oArticleLister, $sMethodName)) {
@ -438,10 +450,10 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3getCreateDomainNameParameter($aParameter) protected function _d3getCreateDomainNameParameter($aParameter)
{ {
if (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetDomainName')) { if ( d3_cfg_mod::get( $this->_sModId)->getValue( 'sD3GASetDomainName')) {
$aParameter[] = "'cookieDomain': '" . \D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetDomainName') . "'"; $aParameter[] = "'cookieDomain': '" . d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetDomainName') . "'";
$aParameter[] = "'legacyCookieDomain': '" . $aParameter[] = "'legacyCookieDomain': '" .
\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetDomainName') . "'"; d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetDomainName') . "'";
return $aParameter; return $aParameter;
} }
@ -456,8 +468,8 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3getCreateCookiePathParameter($aParameter) protected function _d3getCreateCookiePathParameter($aParameter)
{ {
if (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetCookiePath')) { if ( d3_cfg_mod::get( $this->_sModId)->getValue( 'sD3GASetCookiePath')) {
$aParameter[] = "'cookiePath': '" . \D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetCookiePath') . "'"; $aParameter[] = "'cookiePath': '" . d3_cfg_mod::get($this->_sModId)->getValue('sD3GASetCookiePath') . "'";
return $aParameter; return $aParameter;
} }
@ -472,7 +484,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3getCreateDomainLinkerParameter($aParameter) protected function _d3getCreateDomainLinkerParameter($aParameter)
{ {
if (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('blD3GAAllowDomainLinker')) { if ( d3_cfg_mod::get( $this->_sModId)->getValue( 'blD3GAAllowDomainLinker')) {
$aParameter[] = "'allowLinker': true"; $aParameter[] = "'allowLinker': true";
return $aParameter; return $aParameter;
@ -488,9 +500,9 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3getCreateSpeedSamplerateParameter($aParameter) protected function _d3getCreateSpeedSamplerateParameter($aParameter)
{ {
if (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('iD3GASiteSpeedSampleRate')) { if ( d3_cfg_mod::get( $this->_sModId)->getValue( 'iD3GASiteSpeedSampleRate')) {
$aParameter[] = "'siteSpeedSampleRate': " . $aParameter[] = "'siteSpeedSampleRate': " .
\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('iD3GASiteSpeedSampleRate'); d3_cfg_mod::get($this->_sModId)->getValue('iD3GASiteSpeedSampleRate');
return $aParameter; return $aParameter;
} }
@ -505,8 +517,8 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3getCreateSamplerateParameter($aParameter) protected function _d3getCreateSamplerateParameter($aParameter)
{ {
if (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('iD3GASampleRate')) { if ( d3_cfg_mod::get( $this->_sModId)->getValue( 'iD3GASampleRate')) {
$aParameter[] = "'sampleRate': " . \D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('iD3GASampleRate'); $aParameter[] = "'sampleRate': " . d3_cfg_mod::get($this->_sModId)->getValue('iD3GASampleRate');
return $aParameter; return $aParameter;
} }
@ -523,10 +535,10 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
protected function _d3getAsynchSendpageViewClassParameter($oCurrentView, $aParameter) protected function _d3getAsynchSendpageViewClassParameter($oCurrentView, $aParameter)
{ {
if ($oCurrentView->getIsOrderStep() || if ($oCurrentView->getIsOrderStep() ||
strtolower($oCurrentView->getClassName()) == 'thankyou' || strtolower($oCurrentView->getClassKey()) == 'thankyou' ||
$this->_d3HasNoPageParameter() $this->_d3HasNoPageParameter()
) { ) {
$aParameter[] = "'/{$oCurrentView->getClassName()}.html'"; $aParameter[] = "'/{$oCurrentView->getClassKey()}.html'";
return $aParameter; return $aParameter;
} }
@ -542,14 +554,14 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3getUniversalSendPageViewPageParameter($oCurrentView, $aParameter) protected function _d3getUniversalSendPageViewPageParameter($oCurrentView, $aParameter)
{ {
if ($oCurrentView->getIsOrderStep() || strtolower($oCurrentView->getClassName()) == 'thankyou') { if ($oCurrentView->getIsOrderStep() || strtolower($oCurrentView->getClassKey()) == 'thankyou') {
$aParameter[] = "'page': '/{$oCurrentView->getClassName()}.html'"; $aParameter[] = "'page': '/{$oCurrentView->getClassKey()}.html'";
$aParameter[] = "'title': 'Checkout: " . ucfirst($oCurrentView->getClassName()) . "'"; $aParameter[] = "'title': 'Checkout: " . ucfirst($oCurrentView->getClassKey()) . "'";
return $aParameter; return $aParameter;
} elseif ($this->_d3HasNoPageParameter()) { } elseif ($this->_d3HasNoPageParameter()) {
$aParameter[] = "'page': '/{$oCurrentView->getClassName()}.html'"; $aParameter[] = "'page': '/{$oCurrentView->getClassKey()}.html'";
$aParameter[] = "'title': '" . ucfirst($oCurrentView->getClassName()) . "'"; $aParameter[] = "'title': '" . ucfirst($oCurrentView->getClassKey()) . "'";
return $aParameter; return $aParameter;
} }
@ -564,7 +576,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
protected function _d3getUniversalSendPageViewDebugParameter($aParameter) protected function _d3getUniversalSendPageViewDebugParameter($aParameter)
{ {
if (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->hasDebugMode()) { if ( d3_cfg_mod::get( $this->_sModId)->hasDebugMode()) {
$aParameter[] = " $aParameter[] = "
'hitCallback': function() { 'hitCallback': function() {
alert('analytics.js done sending data'); alert('analytics.js done sending data');
@ -597,7 +609,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
*/ */
public function d3GetSendNoBounceEventTime() public function d3GetSendNoBounceEventTime()
{ {
$iTime = \D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModId)->getValue('iSendNoBounceEventTime'); $iTime = d3_cfg_mod::get($this->_sModId)->getValue('iSendNoBounceEventTime');
if (isset($iTime) && is_int($iTime)) { if (isset($iTime) && is_int($iTime)) {
return $iTime; return $iTime;

7
src/modules/controllers/d3_order_googleanalytics.php
View File

@ -1,5 +1,8 @@
<?php <?php
use OxidEsales\Eshop\Application\Model\User as User;
use OxidEsales\Eshop\Core\Registry;
/** /**
* This module is free software: you can redistribute it and/or modify * This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -32,8 +35,8 @@ class d3_order_googleanalytics extends d3_order_googleanalytics_parent
protected function _d3SetIsNewCustomer() protected function _d3SetIsNewCustomer()
{ {
$oUser = $this->getUser(); $oUser = $this->getUser();
$isNewCustomer = (isset($oUser) && $oUser instanceof oxuser) ? $oUser->inGroup('oxidnotyetordered') : 0 ; $isNewCustomer = (isset($oUser) && $oUser instanceof User ) ? $oUser->inGroup( 'oxidnotyetordered') : 0 ;
oxRegistry::getSession()->setVariable('iD3GANewCustomer', (int)$isNewCustomer); Registry::getSession()->setVariable('iD3GANewCustomer', (int)$isNewCustomer);
} }
} }

32
src/modules/controllers/d3_thankyou_googleanalytics.php
View File

@ -1,5 +1,11 @@
<?php <?php
use D3\ModCfg\Application\Model\Configuration\d3_cfg_mod;
use D3\ModCfg\Application\Model\Log\d3log;
use OxidEsales\Eshop\Application\Model\OrderArticle;
use OxidEsales\Eshop\Core\Model\ListModel;
use OxidEsales\Eshop\Core\Registry;
/** /**
* This module is free software: you can redistribute it and/or modify * This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -47,8 +53,8 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
*/ */
public function isNewCustomer() public function isNewCustomer()
{ {
$iIsNewCustomer = oxRegistry::getSession()->getVariable("iD3GANewCustomer"); $iIsNewCustomer = Registry::getSession()->getVariable("iD3GANewCustomer");
oxRegistry::getSession()->deleteVariable("iD3GANewCustomer"); Registry::getSession()->deleteVariable("iD3GANewCustomer");
return $iIsNewCustomer; return $iIsNewCustomer;
} }
@ -58,8 +64,8 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
*/ */
public function logCode($sGACode) public function logCode($sGACode)
{ {
\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModCfgId)->d3getLog()->log( d3_cfg_mod::get($this->_sModCfgId)->d3getLog()->log(
\D3\ModCfg\Application\Model\Log\d3log::NOTICE, d3log::NOTICE,
__CLASS__, __CLASS__,
__FUNCTION__, __FUNCTION__,
__LINE__, __LINE__,
@ -119,7 +125,7 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
$sModCfgVarName = 'iEstShippingTimeValueOutOfStock'; $sModCfgVarName = 'iEstShippingTimeValueOutOfStock';
} }
$iTimeValue = \D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModCfgId)->getValue($sModCfgVarName); $iTimeValue = d3_cfg_mod::get($this->_sModCfgId)->getValue($sModCfgVarName);
for ($i = 0; $i < $iTimeValue; $i++) { for ($i = 0; $i < $iTimeValue; $i++) {
$iTimestamp += 86400; $iTimestamp += 86400;
@ -187,7 +193,7 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
* *
* @return bool * @return bool
*/ */
protected function _d3GAhasArticleBackorderPreorder(oxorderarticle $oOrderArticle) protected function _d3GAhasArticleBackorderPreorder( OrderArticle $oOrderArticle)
{ {
/** @var oxarticle $oArticle */ /** @var oxarticle $oArticle */
$oArticle = $oOrderArticle->getArticle(); $oArticle = $oOrderArticle->getArticle();
@ -211,7 +217,7 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
if ($this->_d3GAhasArticleDigitalGoods($oOrderArticle)) { if ($this->_d3GAhasArticleDigitalGoods($oOrderArticle)) {
return 'Y'; return 'Y';
} }
}; }
return 'N'; return 'N';
} }
@ -221,7 +227,7 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
* *
* @return bool * @return bool
*/ */
protected function _d3GAhasArticleDigitalGoods(oxorderarticle $oOrderArticle) protected function _d3GAhasArticleDigitalGoods(OrderArticle $oOrderArticle)
{ {
/** @var oxarticle $oArticle */ /** @var oxarticle $oArticle */
$oArticle = $oOrderArticle->getArticle(); $oArticle = $oOrderArticle->getArticle();
@ -243,7 +249,7 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
* *
* @return bool * @return bool
*/ */
protected function _d3GAhasArticlePurchasedDownload(oxList $oArticleFileList) protected function _d3GAhasArticlePurchasedDownload( ListModel $oArticleFileList)
{ {
/** @var oxfile $oArticleFile */ /** @var oxfile $oArticleFile */
foreach ($oArticleFileList->getArray() as $oArticleFile) { foreach ($oArticleFileList->getArray() as $oArticleFile) {
@ -262,14 +268,14 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
*/ */
public function d3GAgetProductId($oOrderArticle) public function d3GAgetProductId($oOrderArticle)
{ {
switch (\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModCfgId)->getValue('sD3GATSShoppingArtId')) { switch ( d3_cfg_mod::get( $this->_sModCfgId)->getValue( 'sD3GATSShoppingArtId')) {
case 'oxartnum': case 'oxartnum':
return $oOrderArticle->getFieldData('oxartnum'); return $oOrderArticle->getFieldData('oxartnum');
case 'oxid': case 'oxid':
return $oOrderArticle->getFieldData('oxartid'); return $oOrderArticle->getFieldData('oxartid');
}; }
return $oOrderArticle->getFieldData(\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModCfgId)->getValue('sD3GATSShoppingArtId')); return $oOrderArticle->getFieldData( d3_cfg_mod::get( $this->_sModCfgId)->getValue( 'sD3GATSShoppingArtId'));
} }
/** /**
@ -277,7 +283,7 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
*/ */
public function hasOutOfStockArticles() public function hasOutOfStockArticles()
{ {
if (oxRegistry::getConfig()->getConfigParam('blUseStock')) { if (Registry::getConfig()->getConfigParam('blUseStock')) {
foreach ($this->getOrder()->getOrderArticles() as $oOrderArticle) { foreach ($this->getOrder()->getOrderArticles() as $oOrderArticle) {
if ($this->_d3GAhasArticleBackorderPreorder($oOrderArticle)) { if ($this->_d3GAhasArticleBackorderPreorder($oOrderArticle)) {
return true; return true;

10
src/modules/core/d3_oxutilsview_googleanalytics.php
View File

@ -1,5 +1,7 @@
<?php <?php
use OxidEsales\Eshop\Core\Registry;
/** /**
* This module is free software: you can redistribute it and/or modify * This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -25,12 +27,12 @@ class d3_oxutilsview_googleanalytics extends d3_oxutilsview_googleanalytics_pare
* *
* @return null|void * @return null|void
*/ */
protected function _fillCommonSmartyProperties($oSmarty) protected function _fillCommonSmartyProperties($smarty)
{ {
parent::_fillCommonSmartyProperties($oSmarty); parent::_fillCommonSmartyProperties($smarty);
$oSmarty->plugins_dir[] = $smarty->plugins_dir[] =
oxRegistry::getConfig()->getActiveView()->getViewConfig()->getModulePath('d3_googleanalytics'). Registry::getConfig()->getActiveView()->getViewConfig()->getModulePath('d3_googleanalytics').
'core/smarty/plugins'; 'core/smarty/plugins';
} }
} }

12
src/modules/models/d3_oxbasket_googleanalytics.php
View File

@ -1,5 +1,8 @@
<?php <?php
/**
use OxidEsales\Eshop\Core\Registry;
/**
* This Software is the property of Data Development and is protected * This Software is the property of Data Development and is protected
* by copyright law - it is NOT Freeware. * by copyright law - it is NOT Freeware.
* *
@ -22,8 +25,7 @@ class d3_oxbasket_googleanalytics extends d3_oxbasket_googleanalytics_parent
public function d3GetCurrentLocatorTitle() public function d3GetCurrentLocatorTitle()
{ {
$sTitle = ''; $sTitle = '';
/** @var \OxidEsales\Eshop\Application\Controller\FrontendController $oView */ $oView = Registry::getConfig()->getActiveView();
$oView = oxRegistry::getConfig()->getActiveView();
if (method_exists($oView, 'getBreadCrumb') && if (method_exists($oView, 'getBreadCrumb') &&
($aPaths = $oView->getBreadCrumb()) ($aPaths = $oView->getBreadCrumb())
@ -31,7 +33,7 @@ class d3_oxbasket_googleanalytics extends d3_oxbasket_googleanalytics_parent
foreach ($aPaths as $aPath) { foreach ($aPaths as $aPath) {
$sTitle .= "/".$aPath['title']; $sTitle .= "/".$aPath['title'];
} }
} elseif ($oView->getClassName() == 'details' && } elseif ($oView->getClassKey() == 'details' &&
( (
( (
($oCatTree = $oView->getCategoryTree()) && ($oCatTree = $oView->getCategoryTree()) &&
@ -46,7 +48,7 @@ class d3_oxbasket_googleanalytics extends d3_oxbasket_googleanalytics_parent
$sTitle .= "/".$oCat->getFieldData('oxtitle'); $sTitle .= "/".$oCat->getFieldData('oxtitle');
} }
} else { } else {
$sTitle = "page: ".ucfirst($oView->getClassName()); $sTitle = "page: ".ucfirst($oView->getClassKey());
} }
return $sTitle; return $sTitle;

10
src/modules/models/d3_oxorder_googleanalytics.php
View File

@ -1,5 +1,7 @@
<?php <?php
use OxidEsales\Eshop\Core\DatabaseProvider;
/** /**
* This module is free software: you can redistribute it and/or modify * This module is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -38,13 +40,13 @@ class d3_oxorder_googleanalytics extends d3_oxorder_googleanalytics_parent
public function d3getVoucherSerieList() public function d3getVoucherSerieList()
{ {
$sSelect = $sSelect =
"SELECT oxvoucherserieid FROM oxvouchers WHERE oxorderid = " . oxDb::getDb()->quote($this->getId()); "SELECT oxvoucherserieid FROM oxvouchers WHERE oxorderid = " . DatabaseProvider::getDb()->quote($this->getId());
$aVoucherIds = (array) oxDb::getDb()->getAll($sSelect); $aVoucherIds = DatabaseProvider::getDb()->getAll($sSelect);
$aVoucherSerieList = array(); $aVoucherSerieList = [];
foreach ($aVoucherIds as $aVoucherId) { foreach ($aVoucherIds as $aVoucherId) {
$oVoucherSerie = oxNew('oxvoucherserie'); $oVoucherSerie = oxNew('oxvoucherserie');
$oVoucherSerie->Load($aVoucherId[0]); $oVoucherSerie->load($aVoucherId[0]);
$aVoucherSerieList[] = $oVoucherSerie; $aVoucherSerieList[] = $oVoucherSerie;
} }

7
src/setup/d3_googleanalytics_update.php
View File

@ -1,6 +1,7 @@
<?php <?php
use D3\ModCfg\Application\Model\Install\d3install_updatebase; use D3\ModCfg\Application\Model\Install\d3install_updatebase;
use OxidEsales\Eshop\Core\Registry;
/** /**
* This Software is the property of Data Development and is protected * This Software is the property of Data Development and is protected
@ -172,7 +173,7 @@ KEY;
'use_quote' => true, 'use_quote' => true,
), ),
'OXSHOPVERSION' => array( 'OXSHOPVERSION' => array(
'content' => oxRegistry::getConfig()->getEdition(), 'content' => Registry::getConfig()->getEdition(),
'force_update' => true, 'force_update' => true,
'use_quote' => true, 'use_quote' => true,
), ),
@ -284,7 +285,7 @@ KEY;
'force_update' => false, 'force_update' => false,
), ),
'OXCONTENT' => array( 'OXCONTENT' => array(
'content' => "'<p>Diese Website benutzt Google Analytics, einen Webanalysedienst der Google\r\n\r\nInc. (&quot;Google&quot;). Google Analytics verwendet sog. &quot;Cookies&quot;, Textdateien, die auf\r\n\r\nIhrem Computer gespeichert werden und die eine Analyse der Benutzung der Website\r\n\r\ndurch Sie ermöglichen. Die durch den Cookie erzeugten Informationen über Ihre\r\n\r\nBenutzung dieser Website (einschließlich Ihrer IP-Adresse<span style=\"color: #800000\">, die jedoch mit der Methode _anonymizeIp() anonymisiert wird, so dass Sie nicht mehr einem Anschluss\r\n\r\nzugeordnet werden kann</span>) wird an einen Server von Google in den USA\r\n\r\nübertragen und dort gespeichert. Google wird diese Informationen benutzen, um\r\n\r\nIhre Nutzung der Website auszuwerten, um Reports über die Websiteaktivitäten für\r\n\r\ndie Websitebetreiber zusammenzustellen und um weitere mit der Websitenutzung und\r\n\r\nder Internetnutzung verbundene Dienstleistungen zu erbringen. Auch wird Google\r\n\r\ndiese Informationen gegebenenfalls an Dritte übertragen, sofern dies gesetzlich\r\n\r\nvorgeschrieben oder soweit Dritte diese Daten im Auftrag von Google verarbeiten.\r\n\r\nGoogle wird in keinem Fall Ihre IP-Adresse mit anderen Daten von Google in\r\n\r\nVerbindung bringen. Sie können die Installation der Cookies durch eine\r\n\r\nentsprechende Einstellung Ihrer Browser Software verhindern; wir weisen Sie\r\n\r\njedoch darauf hin, dass Sie in diesem Fall gegebenenfalls nicht sämtliche\r\n\r\nFunktionen dieser Website vollumfänglich nutzen können. Durch die Nutzung dieser\r\n\r\nWebsite erklären Sie sich mit der Bearbeitung der über Sie erhobenen Daten durch\r\n\r\nGoogle in der zuvor beschriebenen Art und Weise und zu dem zuvor benannten Zweck\r\n\r\neinverstanden.</p>\r\n<p><span style=\"color: #800000\">Sie können der Erhebung der\r\n\r\nDaten durch Google-Analytics mit Wirkung für die Zukunft widersprechen, indem\r\n\r\nsie ein Deaktivierungs-Add-on (<a href=\"http://tools.google.com/dlpage/gaoptout?hl=de\" title=\"\">http://tools.google.com/dlpage/gaoptout?hl=de</a>)\r\n\r\nfür Ihren Browser installieren.</span></p>'", 'content' => "'<p>Diese Website benutzt Google Analytics, einen Webanalysedienst der Google\r\n\r\nInc. (&quot;Google&quot;). Google Analytics verwendet sog. &quot;Cookies&quot;, Textdateien, die auf\r\n\r\nIhrem Computer gespeichert werden und die eine Analyse der Benutzung der Website\r\n\r\ndurch Sie ermöglichen. Die durch den Cookie erzeugten Informationen über Ihre\r\n\r\nBenutzung dieser Website (einschließlich Ihrer IP-Adresse<span style=\"color: #800000\">, die jedoch mit der Methode _anonymizeIp() anonymisiert wird, so dass Sie nicht mehr einem Anschluss\r\n\r\nzugeordnet werden kann</span>) wird an einen Server von Google in den USA\r\n\r\nübertragen und dort gespeichert. Google wird diese Informationen benutzen, um\r\n\r\nIhre Nutzung der Website auszuwerten, um Reports über die Websiteaktivitäten für\r\n\r\ndie Websitebetreiber zusammenzustellen und um weitere mit der Websitenutzung und\r\n\r\nder Internetnutzung verbundene Dienstleistungen zu erbringen. Auch wird Google\r\n\r\ndiese Informationen gegebenenfalls an Dritte übertragen, sofern dies gesetzlich\r\n\r\nvorgeschrieben oder soweit Dritte diese Daten im Auftrag von Google verarbeiten.\r\n\r\nGoogle wird in keinem Fall Ihre IP-Adresse mit anderen Daten von Google in\r\n\r\nVerbindung bringen. Sie können die Installation der Cookies durch eine\r\n\r\nentsprechende Einstellung Ihrer Browser Software verhindern; wir weisen Sie\r\n\r\njedoch darauf hin, dass Sie in diesem Fall gegebenenfalls nicht sämtliche\r\n\r\nFunktionen dieser Website vollumfänglich nutzen können. Durch die Nutzung dieser\r\n\r\nWebsite erklären Sie sich mit der Bearbeitung der über Sie erhobenen Daten durch\r\n\r\nGoogle in der zuvor beschriebenen Art und Weise und zu dem zuvor benannten Zweck\r\n\r\neinverstanden.</p>\r\n<p><span style=\"color: #800000\">Sie können der Erhebung der\r\n\r\nDaten durch Google-Analytics mit Wirkung für die Zukunft widersprechen, indem\r\n\r\nsie ein Deaktivierungs-Add-on (<a href=\"https://tools.google.com/dlpage/gaoptout?hl=de\" title=\"\">https://tools.google.com/dlpage/gaoptout?hl=de</a>)\r\n\r\nfür Ihren Browser installieren.</span></p>'",
'force_update' => false, 'force_update' => false,
), ),
'OXCATID' => array( 'OXCATID' => array(
@ -327,7 +328,7 @@ KEY;
{ {
$blRet = false; $blRet = false;
if ($this->checkModCfgSameRevision($this->sModKey)) { if ($this->checkModCfgSameRevision()) {
$aRet = $this->_updateModCfgSameRevision($this->sModKey); $aRet = $this->_updateModCfgSameRevision($this->sModKey);
$this->setActionLog('SQL', $aRet['sql'], __METHOD__); $this->setActionLog('SQL', $aRet['sql'], __METHOD__);

20
src/views/admin/de/d3_googleanalytics_lang.php
View File

@ -41,7 +41,7 @@ $aLang = array(
'Deaktivieren Sie die Funktion f&uuml;r den Livebetrieb.', 'Deaktivieren Sie die Funktion f&uuml;r den Livebetrieb.',
'D3_GOOGLEANALYTICS_DESC' => 'Diese Einstellungen betreffen den Dienst '. 'D3_GOOGLEANALYTICS_DESC' => 'Diese Einstellungen betreffen den Dienst '.
'<a href="http://www.google.com/analytics/" target="_blank">"Google Analytics"</a>. '. '<a href="https://www.google.com/analytics/" target="_blank">"Google Analytics"</a>. '.
'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.', 'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.',
'D3_GOOGLEANALYTICS_DESC1' => 'Während der Anmeldung werden Sie aufgefordert, '. 'D3_GOOGLEANALYTICS_DESC1' => 'Während der Anmeldung werden Sie aufgefordert, '.
'einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dies erledigt das vorliegende Modul für Sie. '. 'einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dies erledigt das vorliegende Modul für Sie. '.
@ -215,8 +215,8 @@ $aLang = array(
'd3_googleanalytics.tpl" (f&uuml;r Async) oder "modules/d3/d3_googleanalytics/views/tpl/widget/inc/'. 'd3_googleanalytics.tpl" (f&uuml;r Async) oder "modules/d3/d3_googleanalytics/views/tpl/widget/inc/'.
'd3ga_universal_custom.tpl" (f&uuml;r Universal) um die gew&uuml;nschten Daten. Details F&uuml;r die '. 'd3ga_universal_custom.tpl" (f&uuml;r Universal) um die gew&uuml;nschten Daten. Details F&uuml;r die '.
'Einrichtung der Datenaufzeichnung bei Analytics entnehmen Sie bitte der Moduldokumentation.<br><br>Weitere '. 'Einrichtung der Datenaufzeichnung bei Analytics entnehmen Sie bitte der Moduldokumentation.<br><br>Weitere '.
'Informationen finden Sie <a href="http://code.google.com/apis/analytics/docs/tracking/'. 'Informationen finden Sie <a href="https://code.google.com/apis/analytics/docs/tracking/'.
'gaTrackingCustomVariables.html" target="gahelp">hier</a>.<br>Auf Anregung durch <a href="http://'. 'gaTrackingCustomVariables.html" target="gahelp">hier</a>.<br>Auf Anregung durch <a href="https://'.
'www.commodule.de/blog/tracking/zahlungsarten-in-google-analytics-tracken/" target="Commodule">Commodule-Blog'. 'www.commodule.de/blog/tracking/zahlungsarten-in-google-analytics-tracken/" target="Commodule">Commodule-Blog'.
'</a> haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank f&uuml;r diese Unterst&uuml;tzung!', '</a> haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank f&uuml;r diese Unterst&uuml;tzung!',
@ -243,7 +243,7 @@ $aLang = array(
'target="gahelp">Google-Suche</a>.</p>', 'target="gahelp">Google-Suche</a>.</p>',
'D3_GOOGLEANALYTICS_ADWORDS_DESC' => 'Diese Einstellungen betreffen den Dienst '. 'D3_GOOGLEANALYTICS_ADWORDS_DESC' => 'Diese Einstellungen betreffen den Dienst '.
'<a href="http://www.google.de/AdWords" target="_blank">"Google Adwords"</a>. '. '<a href="https://www.google.de/AdWords" target="_blank">"Google Adwords"</a>. '.
'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.', 'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.',
'D3_GOOGLEANALYTICS_ADWORDS_DESC1' => 'Während der Anmeldung werden Sie aufgefordert, '. 'D3_GOOGLEANALYTICS_ADWORDS_DESC1' => 'Während der Anmeldung werden Sie aufgefordert, '.
'einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dies erledigt das vorliegende Modul für Sie. '. 'einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dies erledigt das vorliegende Modul für Sie. '.
@ -270,32 +270,32 @@ $aLang = array(
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY' => 'Kampagnenname (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY' => 'Kampagnenname (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY_DESC' => 'Unter diesem Namen sehen Sie die Auswertung '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY_DESC' => 'Unter diesem Namen sehen Sie die Auswertung '.
'der Daten aus dieser Shopkampagne in Analytics.<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: '. 'der Daten aus dieser Shopkampagne in Analytics.<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: '.
'<a href="http://code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._'. '<a href="https://code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._'.
'setCampNameKey" target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/'. 'setCampNameKey" target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/'.
'devguides/collection/analyticsjs/field-reference#campaignName" target="gahelp">hier</a></li></ul>', 'devguides/collection/analyticsjs/field-reference#campaignName" target="gahelp">hier</a></li></ul>',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY' => 'Kampagnenmedium (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY' => 'Kampagnenmedium (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY_DESC' => 'Definieren Sie das Medium dieser Kampagne '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY_DESC' => 'Definieren Sie das Medium dieser Kampagne '.
'(z.B. Werbebanner, Mailkampagne oder auch Klickkampagne). Diese Einstellung finden Sie in der Kampagnen'. '(z.B. Werbebanner, Mailkampagne oder auch Klickkampagne). Diese Einstellung finden Sie in der Kampagnen'.
'auswertung unter "Keywords".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="http://'. 'auswertung unter "Keywords".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="https://'.
'code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampMediumKey" '. 'code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampMediumKey" '.
'target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/'. 'target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/'.
'collection/analyticsjs/field-reference#campaignMedium" target="gahelp">hier</a></li></ul>', 'collection/analyticsjs/field-reference#campaignMedium" target="gahelp">hier</a></li></ul>',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY' => 'Kampagnenquelle (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY' => 'Kampagnenquelle (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY_DESC' => 'Benennen Sie hier die Quelle der Shopkampagne, '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY_DESC' => 'Benennen Sie hier die Quelle der Shopkampagne, '.
'vergeben Sie zum Beispiel den Webseiten-Name oder den Firmenname.<br><br>Weitere Informationen finden Sie '. 'vergeben Sie zum Beispiel den Webseiten-Name oder den Firmenname.<br><br>Weitere Informationen finden Sie '.
'hier: <ul><li>Async: <a href="http://code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#'. 'hier: <ul><li>Async: <a href="https://code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#'.
'_gat.GA_Tracker_._setCampSourceKey" target="gahelp">hier</a></li><li>Universal: <a href="https://developers.'. '_gat.GA_Tracker_._setCampSourceKey" target="gahelp">hier</a></li><li>Universal: <a href="https://developers.'.
'google.com/analytics/devguides/collection/analyticsjs/field-reference#campaignSource" target="gahelp">hier'. 'google.com/analytics/devguides/collection/analyticsjs/field-reference#campaignSource" target="gahelp">hier'.
'</a></li></ul>', '</a></li></ul>',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY' => 'Schl&uuml;sselwort(e) Ihrer Kampagne (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY' => 'Schl&uuml;sselwort(e) Ihrer Kampagne (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY_DESC' => 'Auch diese Keywords erscheinen in Analytics '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY_DESC' => 'Auch diese Keywords erscheinen in Analytics '.
'unter "Keywords".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="http://code.google.'. 'unter "Keywords".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="https://code.google.'.
'com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampTermKey" target="gahelp">'. 'com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampTermKey" target="gahelp">'.
'hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/collection/analyticsjs'. 'hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/collection/analyticsjs'.
'/field-reference#campaignKeyword" target="gahelp">hier</a></li></ul>', '/field-reference#campaignKeyword" target="gahelp">hier</a></li></ul>',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY' => 'Inhaltsbeschreibung der Kampagne (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY' => 'Inhaltsbeschreibung der Kampagne (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY_DESC' => 'Den beschrieben Inhalt finden Sie in der '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY_DESC' => 'Den beschrieben Inhalt finden Sie in der '.
'Auswertung als "Ad Content".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="http://'. 'Auswertung als "Ad Content".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="https://'.
'code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampContentKey" '. 'code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampContentKey" '.
'target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/'. 'target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/'.
'collection/analyticsjs/field-reference#campaignContent" target="gahelp">hier</a></li></ul>', 'collection/analyticsjs/field-reference#campaignContent" target="gahelp">hier</a></li></ul>',
@ -332,7 +332,7 @@ $aLang = array(
'Dieser Code wird 1:1 in den Seitenquelltext eingef&uuml;gt und nicht geparst.', 'Dieser Code wird 1:1 in den Seitenquelltext eingef&uuml;gt und nicht geparst.',
'D3_GOOGLEANALYTICS_TS_DESC' => 'Diese Einstellungen betreffen den Dienst '. 'D3_GOOGLEANALYTICS_TS_DESC' => 'Diese Einstellungen betreffen den Dienst '.
'<a href="http://www.google.de/zertifiziertehaendler/" target="_blank">"Google Zertifizierter Händler"</a>. '. '<a href="https://www.google.de/zertifiziertehaendler/" target="_blank">"Google Zertifizierter Händler"</a>. '.
'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.', 'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.',
'D3_GOOGLEANALYTICS_TS_DESC1' => 'Während der Aktivierung werden Sie '. 'D3_GOOGLEANALYTICS_TS_DESC1' => 'Während der Aktivierung werden Sie '.
'aufgefordert, einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dieser wird von unserem Modul '. 'aufgefordert, einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dieser wird von unserem Modul '.

20
src/views/admin/en/d3_googleanalytics_lang.php
View File

@ -41,7 +41,7 @@ $aLang = array(
'Deaktivieren Sie die Funktion f&uuml;r den Livebetrieb.', 'Deaktivieren Sie die Funktion f&uuml;r den Livebetrieb.',
'D3_GOOGLEANALYTICS_DESC' => 'Diese Einstellungen betreffen den Dienst '. 'D3_GOOGLEANALYTICS_DESC' => 'Diese Einstellungen betreffen den Dienst '.
'<a href="http://www.google.com/analytics/" target="_blank">"Google Analytics"</a>. '. '<a href="https://www.google.com/analytics/" target="_blank">"Google Analytics"</a>. '.
'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.', 'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.',
'D3_GOOGLEANALYTICS_DESC1' => 'Während der Anmeldung werden Sie aufgefordert, '. 'D3_GOOGLEANALYTICS_DESC1' => 'Während der Anmeldung werden Sie aufgefordert, '.
'einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dies erledigt das vorliegende Modul für Sie. '. 'einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dies erledigt das vorliegende Modul für Sie. '.
@ -215,8 +215,8 @@ $aLang = array(
'd3_googleanalytics.tpl" (f&uuml;r Async) oder "modules/d3/d3_googleanalytics/views/tpl/widget/inc/'. 'd3_googleanalytics.tpl" (f&uuml;r Async) oder "modules/d3/d3_googleanalytics/views/tpl/widget/inc/'.
'd3ga_universal_custom.tpl" (f&uuml;r Universal) um die gew&uuml;nschten Daten. Details F&uuml;r die '. 'd3ga_universal_custom.tpl" (f&uuml;r Universal) um die gew&uuml;nschten Daten. Details F&uuml;r die '.
'Einrichtung der Datenaufzeichnung bei Analytics entnehmen Sie bitte der Moduldokumentation.<br><br>Weitere '. 'Einrichtung der Datenaufzeichnung bei Analytics entnehmen Sie bitte der Moduldokumentation.<br><br>Weitere '.
'Informationen finden Sie <a href="http://code.google.com/apis/analytics/docs/tracking/'. 'Informationen finden Sie <a href="https://code.google.com/apis/analytics/docs/tracking/'.
'gaTrackingCustomVariables.html" target="gahelp">hier</a>.<br>Auf Anregung durch <a href="http://'. 'gaTrackingCustomVariables.html" target="gahelp">hier</a>.<br>Auf Anregung durch <a href="https://'.
'www.commodule.de/blog/tracking/zahlungsarten-in-google-analytics-tracken/" target="Commodule">Commodule-Blog'. 'www.commodule.de/blog/tracking/zahlungsarten-in-google-analytics-tracken/" target="Commodule">Commodule-Blog'.
'</a> haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank f&uuml;r diese Unterst&uuml;tzung!', '</a> haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank f&uuml;r diese Unterst&uuml;tzung!',
@ -243,7 +243,7 @@ $aLang = array(
'target="gahelp">Google-Suche</a>.</p>', 'target="gahelp">Google-Suche</a>.</p>',
'D3_GOOGLEANALYTICS_ADWORDS_DESC' => 'Diese Einstellungen betreffen den Dienst '. 'D3_GOOGLEANALYTICS_ADWORDS_DESC' => 'Diese Einstellungen betreffen den Dienst '.
'<a href="http://www.google.de/AdWords" target="_blank">"Google Adwords"</a>. '. '<a href="https://www.google.de/AdWords" target="_blank">"Google Adwords"</a>. '.
'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.', 'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.',
'D3_GOOGLEANALYTICS_ADWORDS_DESC1' => 'Während der Anmeldung werden Sie aufgefordert, '. 'D3_GOOGLEANALYTICS_ADWORDS_DESC1' => 'Während der Anmeldung werden Sie aufgefordert, '.
'einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dies erledigt das vorliegende Modul für Sie. '. 'einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dies erledigt das vorliegende Modul für Sie. '.
@ -270,32 +270,32 @@ $aLang = array(
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY' => 'Kampagnenname (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY' => 'Kampagnenname (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY_DESC' => 'Unter diesem Namen sehen Sie die Auswertung '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY_DESC' => 'Unter diesem Namen sehen Sie die Auswertung '.
'der Daten aus dieser Shopkampagne in Analytics.<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: '. 'der Daten aus dieser Shopkampagne in Analytics.<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: '.
'<a href="http://code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._'. '<a href="https://code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._'.
'setCampNameKey" target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/'. 'setCampNameKey" target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/'.
'devguides/collection/analyticsjs/field-reference#campaignName" target="gahelp">hier</a></li></ul>', 'devguides/collection/analyticsjs/field-reference#campaignName" target="gahelp">hier</a></li></ul>',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY' => 'Kampagnenmedium (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY' => 'Kampagnenmedium (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY_DESC' => 'Definieren Sie das Medium dieser Kampagne '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY_DESC' => 'Definieren Sie das Medium dieser Kampagne '.
'(z.B. Werbebanner, Mailkampagne oder auch Klickkampagne). Diese Einstellung finden Sie in der Kampagnen'. '(z.B. Werbebanner, Mailkampagne oder auch Klickkampagne). Diese Einstellung finden Sie in der Kampagnen'.
'auswertung unter "Keywords".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="http://'. 'auswertung unter "Keywords".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="https://'.
'code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampMediumKey" '. 'code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampMediumKey" '.
'target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/'. 'target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/'.
'collection/analyticsjs/field-reference#campaignMedium" target="gahelp">hier</a></li></ul>', 'collection/analyticsjs/field-reference#campaignMedium" target="gahelp">hier</a></li></ul>',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY' => 'Kampagnenquelle (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY' => 'Kampagnenquelle (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY_DESC' => 'Benennen Sie hier die Quelle der Shopkampagne, '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY_DESC' => 'Benennen Sie hier die Quelle der Shopkampagne, '.
'vergeben Sie zum Beispiel den Webseiten-Name oder den Firmenname.<br><br>Weitere Informationen finden Sie '. 'vergeben Sie zum Beispiel den Webseiten-Name oder den Firmenname.<br><br>Weitere Informationen finden Sie '.
'hier: <ul><li>Async: <a href="http://code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#'. 'hier: <ul><li>Async: <a href="https://code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#'.
'_gat.GA_Tracker_._setCampSourceKey" target="gahelp">hier</a></li><li>Universal: <a href="https://developers.'. '_gat.GA_Tracker_._setCampSourceKey" target="gahelp">hier</a></li><li>Universal: <a href="https://developers.'.
'google.com/analytics/devguides/collection/analyticsjs/field-reference#campaignSource" target="gahelp">hier'. 'google.com/analytics/devguides/collection/analyticsjs/field-reference#campaignSource" target="gahelp">hier'.
'</a></li></ul>', '</a></li></ul>',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY' => 'Schl&uuml;sselwort(e) Ihrer Kampagne (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY' => 'Schl&uuml;sselwort(e) Ihrer Kampagne (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY_DESC' => 'Auch diese Keywords erscheinen in Analytics '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY_DESC' => 'Auch diese Keywords erscheinen in Analytics '.
'unter "Keywords".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="http://code.google.'. 'unter "Keywords".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="https://code.google.'.
'com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampTermKey" target="gahelp">'. 'com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampTermKey" target="gahelp">'.
'hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/collection/analyticsjs'. 'hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/collection/analyticsjs'.
'/field-reference#campaignKeyword" target="gahelp">hier</a></li></ul>', '/field-reference#campaignKeyword" target="gahelp">hier</a></li></ul>',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY' => 'Inhaltsbeschreibung der Kampagne (optional)', 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY' => 'Inhaltsbeschreibung der Kampagne (optional)',
'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY_DESC' => 'Den beschrieben Inhalt finden Sie in der '. 'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY_DESC' => 'Den beschrieben Inhalt finden Sie in der '.
'Auswertung als "Ad Content".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="http://'. 'Auswertung als "Ad Content".<br><br>Weitere Informationen finden Sie hier: <ul><li>Async: <a href="https://'.
'code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampContentKey" '. 'code.google.com/apis/analytics/docs/gaJS/gaJSApiCampaignTracking.html#_gat.GA_Tracker_._setCampContentKey" '.
'target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/'. 'target="gahelp">hier</a></li><li>Universal: <a href="https://developers.google.com/analytics/devguides/'.
'collection/analyticsjs/field-reference#campaignContent" target="gahelp">hier</a></li></ul>', 'collection/analyticsjs/field-reference#campaignContent" target="gahelp">hier</a></li></ul>',
@ -332,7 +332,7 @@ $aLang = array(
'Dieser Code wird 1:1 in den Seitenquelltext eingef&uuml;gt und nicht geparst.', 'Dieser Code wird 1:1 in den Seitenquelltext eingef&uuml;gt und nicht geparst.',
'D3_GOOGLEANALYTICS_TS_DESC' => 'Diese Einstellungen betreffen den Dienst '. 'D3_GOOGLEANALYTICS_TS_DESC' => 'Diese Einstellungen betreffen den Dienst '.
'<a href="http://www.google.com/trustedstores/" target="_blank">"Google Zertifizierter Händler"</a>. '. '<a href="https://www.google.com/trustedstores/" target="_blank">"Google Zertifizierter Händler"</a>. '.
'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.', 'Möchten Sie diesen nutzen, melden Sie sich auf der Webseite dafür an.',
'D3_GOOGLEANALYTICS_TS_DESC1' => 'Während der Aktivierung werden Sie '. 'D3_GOOGLEANALYTICS_TS_DESC1' => 'Während der Aktivierung werden Sie '.
'aufgefordert, einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dieser wird von unserem Modul '. 'aufgefordert, einen Trackingcode in den Quelltext Ihrer Seite einzukopieren. Dieser wird von unserem Modul '.

20
src/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
View File

@ -8,7 +8,7 @@
function UpdateList( sID) function UpdateList( sID)
{ {
var oSearch = parent.list.document.getElementById("search"); let oSearch = parent.list.document.getElementById("search");
oSearch.oxid.value=sID; oSearch.oxid.value=sID;
oSearch.fnc.value=''; oSearch.fnc.value='';
oSearch.submit(); oSearch.submit();
@ -16,28 +16,28 @@ function UpdateList( sID)
function EditThis( sID) function EditThis( sID)
{ {
var oTransfer = document.getElementById("transfer"); let oTransfer = document.getElementById("transfer");
oTransfer.oxid.value=sID; oTransfer.oxid.value=sID;
oTransfer.cl.value=''; oTransfer.cl.value='';
oTransfer.submit(); oTransfer.submit();
var oSearch = parent.list.document.getElementById("search"); let oSearch = parent.list.document.getElementById("search");
oSearch.actedit.value = 0; oSearch.actedit.value = 0;
oSearch.oxid.value=sID; oSearch.oxid.value=sID;
oSearch.submit(); oSearch.submit();
} }
function _groupExp(el) { function _groupExp(el) {
var _cur = el.parentNode; let _cur = el.parentNode;
if (_cur.className == "exp") _cur.className = ""; if (_cur.className === "exp") _cur.className = "";
else _cur.className = "exp"; else _cur.className = "exp";
} }
--> -->
</script> </script>
<style type="text/css"> <style>
<!-- <!--
fieldset { fieldset {
border: 1px inset black; border: 1px inset black;
@ -251,7 +251,7 @@ function _groupExp(el) {
<label for="sD3GAAdWordConversionId">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDS_CONVID"}]</label> <label for="sD3GAAdWordConversionId">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDS_CONVID"}]</label>
</dt> </dt>
<dd> <dd>
<input type="text" class="edittext ext_edittext" size="15" maxlength="50" name="value[sD3GAAdWordConversionId]" value="[{$edit->getValue('sD3GAAdWordConversionId')}]"> <input type="text" id="sD3GAAdWordConversionId" class="edittext ext_edittext" size="15" maxlength="50" name="value[sD3GAAdWordConversionId]" value="[{$edit->getValue('sD3GAAdWordConversionId')}]">
[{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDS_CONVID_DESC"}] [{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDS_CONVID_DESC"}]
</dd> </dd>
</dl> </dl>
@ -260,7 +260,7 @@ function _groupExp(el) {
<label for="sD3GAAdWordConversionLabel">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDS_CONVLABEL"}]</label> <label for="sD3GAAdWordConversionLabel">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDS_CONVLABEL"}]</label>
</dt> </dt>
<dd> <dd>
<input type="text" class="edittext ext_edittext" size="15" maxlength="50" name="value[sD3GAAdWordConversionLabel]" value="[{$edit->getValue('sD3GAAdWordConversionLabel')}]"> <input type="text" id="sD3GAAdWordConversionLabel" class="edittext ext_edittext" size="15" maxlength="50" name="value[sD3GAAdWordConversionLabel]" value="[{$edit->getValue('sD3GAAdWordConversionLabel')}]">
[{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDS_CONVLABEL_DESC"}] [{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDS_CONVLABEL_DESC"}]
</dd> </dd>
</dl> </dl>
@ -289,7 +289,7 @@ function _groupExp(el) {
<label for="sD3GARemarketingConversionId">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDS_REMARKETINGCONVID"}]</label> <label for="sD3GARemarketingConversionId">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDS_REMARKETINGCONVID"}]</label>
</dt> </dt>
<dd> <dd>
<input type="text" class="edittext ext_edittext" size="15" maxlength="15" name="value[sD3GARemarketingConversionId]" value="[{$edit->getValue('sD3GARemarketingConversionId')}]"> <input type="text" id="sD3GARemarketingConversionId" class="edittext ext_edittext" size="15" maxlength="15" name="value[sD3GARemarketingConversionId]" value="[{$edit->getValue('sD3GARemarketingConversionId')}]">
[{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDS_REMARKETINGCONVID_DESC"}] [{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDS_REMARKETINGCONVID_DESC"}]
</dd> </dd>
</dl> </dl>
@ -298,7 +298,7 @@ function _groupExp(el) {
<label for="sD3GARemarketingConversionLabel">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDS_REMARKETINGCONVLABEL"}]</label> <label for="sD3GARemarketingConversionLabel">[{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDS_REMARKETINGCONVLABEL"}]</label>
</dt> </dt>
<dd> <dd>
<input type="text" class="edittext ext_edittext" size="15" maxlength="15" name="value[sD3GARemarketingConversionLabel]" value="[{$edit->getValue('sD3GARemarketingConversionLabel')}]"> <input type="text" id="sD3GARemarketingConversionLabel" class="edittext ext_edittext" size="15" maxlength="15" name="value[sD3GARemarketingConversionLabel]" value="[{$edit->getValue('sD3GARemarketingConversionLabel')}]">
[{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDS_REMARKETINGCONVLABEL_DESC"}] [{oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDS_REMARKETINGCONVLABEL_DESC"}]
</dd> </dd>
</dl> </dl>

12
src/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
View File

@ -8,7 +8,7 @@
function UpdateList( sID) function UpdateList( sID)
{ {
var oSearch = parent.list.document.getElementById("search"); let oSearch = parent.list.document.getElementById("search");
oSearch.oxid.value=sID; oSearch.oxid.value=sID;
oSearch.fnc.value=''; oSearch.fnc.value='';
oSearch.submit(); oSearch.submit();
@ -16,28 +16,28 @@ function UpdateList( sID)
function EditThis( sID) function EditThis( sID)
{ {
var oTransfer = document.getElementById("transfer"); let oTransfer = document.getElementById("transfer");
oTransfer.oxid.value=sID; oTransfer.oxid.value=sID;
oTransfer.cl.value=''; oTransfer.cl.value='';
oTransfer.submit(); oTransfer.submit();
var oSearch = parent.list.document.getElementById("search"); let oSearch = parent.list.document.getElementById("search");
oSearch.actedit.value = 0; oSearch.actedit.value = 0;
oSearch.oxid.value=sID; oSearch.oxid.value=sID;
oSearch.submit(); oSearch.submit();
} }
function _groupExp(el) { function _groupExp(el) {
var _cur = el.parentNode; let _cur = el.parentNode;
if (_cur.className == "exp") _cur.className = ""; if (_cur.className === "exp") _cur.className = "";
else _cur.className = "exp"; else _cur.className = "exp";
} }
--> -->
</script> </script>
<style type="text/css"> <style>
<!-- <!--
fieldset { fieldset {
border: 1px inset black; border: 1px inset black;

16
src/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
View File

@ -8,7 +8,7 @@
function UpdateList( sID) function UpdateList( sID)
{ {
var oSearch = parent.list.document.getElementById("search"); let oSearch = parent.list.document.getElementById("search");
oSearch.oxid.value=sID; oSearch.oxid.value=sID;
oSearch.fnc.value=''; oSearch.fnc.value='';
oSearch.submit(); oSearch.submit();
@ -16,21 +16,21 @@
function EditThis( sID) function EditThis( sID)
{ {
var oTransfer = document.getElementById("transfer"); let oTransfer = document.getElementById("transfer");
oTransfer.oxid.value=sID; oTransfer.oxid.value=sID;
oTransfer.cl.value=''; oTransfer.cl.value='';
oTransfer.submit(); oTransfer.submit();
var oSearch = parent.list.document.getElementById("search"); let oSearch = parent.list.document.getElementById("search");
oSearch.actedit.value = 0; oSearch.actedit.value = 0;
oSearch.oxid.value=sID; oSearch.oxid.value=sID;
oSearch.submit(); oSearch.submit();
} }
function _groupExp(el) { function _groupExp(el) {
var _cur = el.parentNode; let _cur = el.parentNode;
if (_cur.className == "exp") _cur.className = ""; if (_cur.className === "exp") _cur.className = "";
else _cur.className = "exp"; else _cur.className = "exp";
} }
@ -142,7 +142,7 @@
<label for="sD3GAType">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE"}]</label> <label for="sD3GAType">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE"}]</label>
</dt> </dt>
<dd> <dd>
<input type="radio" name="value[sD3GAType]" value="universal" [{if $oView->getGaType() != 'async'}]checked[{/if}] onclick="alert('[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_UNIVERSAL_DESC"}]');"> [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_UNIVERSAL"}]<br> <input type="radio" id="sD3GAType" name="value[sD3GAType]" value="universal" [{if $oView->getGaType() != 'async'}]checked[{/if}] onclick="alert('[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_UNIVERSAL_DESC"}]');"> [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_UNIVERSAL"}]<br>
<input type="radio" name="value[sD3GAType]" value="async" [{if $oView->getGaType() == 'async'}]checked[{/if}] onclick="alert('[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_ASYNC_DESC"}]');"> [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_ASYNC"}] <input type="radio" name="value[sD3GAType]" value="async" [{if $oView->getGaType() == 'async'}]checked[{/if}] onclick="alert('[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_ASYNC_DESC"}]');"> [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_ASYNC"}]
[{oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_DESC"}] [{oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_GATYPE_DESC"}]
</dd> </dd>
@ -170,7 +170,7 @@
</dl> </dl>
<dl> <dl>
<dt> <dt>
<label for="blD3GASampleRate">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_SAMPLERATE"}]</label> <label for="iD3GASampleRate">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_SAMPLERATE"}]</label>
[{* _gaq.push(['_setSampleRate', 5]); *}] [{* _gaq.push(['_setSampleRate', 5]); *}]
</dt> </dt>
<dd> <dd>
@ -192,7 +192,7 @@
</dl> </dl>
<dl> <dl>
<dt> <dt>
<label for="blD3GASiteSpeedSampleRate">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_SITESPEEDSAMPLERATE"}]</label> <label for="iD3GASiteSpeedSampleRate">[{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_SITESPEEDSAMPLERATE"}]</label>
[{* _gaq.push(['_setSiteSpeedSampleRate', 5]); *}] [{* _gaq.push(['_setSiteSpeedSampleRate', 5]); *}]
</dt> </dt>
<dd> <dd>

12
src/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
View File

@ -8,7 +8,7 @@
function UpdateList( sID) function UpdateList( sID)
{ {
var oSearch = parent.list.document.getElementById("search"); let oSearch = parent.list.document.getElementById("search");
oSearch.oxid.value=sID; oSearch.oxid.value=sID;
oSearch.fnc.value=''; oSearch.fnc.value='';
oSearch.submit(); oSearch.submit();
@ -16,28 +16,28 @@
function EditThis( sID) function EditThis( sID)
{ {
var oTransfer = document.getElementById("transfer"); let oTransfer = document.getElementById("transfer");
oTransfer.oxid.value=sID; oTransfer.oxid.value=sID;
oTransfer.cl.value=''; oTransfer.cl.value='';
oTransfer.submit(); oTransfer.submit();
var oSearch = parent.list.document.getElementById("search"); let oSearch = parent.list.document.getElementById("search");
oSearch.actedit.value = 0; oSearch.actedit.value = 0;
oSearch.oxid.value=sID; oSearch.oxid.value=sID;
oSearch.submit(); oSearch.submit();
} }
function _groupExp(el) { function _groupExp(el) {
var _cur = el.parentNode; let _cur = el.parentNode;
if (_cur.className == "exp") _cur.className = ""; if (_cur.className === "exp") _cur.className = "";
else _cur.className = "exp"; else _cur.className = "exp";
} }
--> -->
</script> </script>
<style type="text/css"> <style>
<!-- <!--
fieldset { fieldset {
border: 1px inset black; border: 1px inset black;

6
src/views/tpl/widget/d3_googleanalytics.tpl
View File

@ -186,7 +186,7 @@
var scrollCount = 0; var scrollCount = 0;
function testScroll() { function testScroll() {
++scrollCount; ++scrollCount;
if (scrollCount == 2) { if (scrollCount === 2) {
_gaq.push(['_trackEvent', 'window', 'scrolled']); _gaq.push(['_trackEvent', 'window', 'scrolled']);
} }
} }
@ -198,9 +198,9 @@
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
[{if $oD3GASettings->getValue('blD3GAUseRemarketing')}] [{if $oD3GASettings->getValue('blD3GAUseRemarketing')}]
ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js'; ga.src = 'https://stats.g.doubleclick.net/dc.js';
[{else}] [{else}]
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src = 'https://ssl.google-analytics.com/ga.js';
[{/if}] [{/if}]
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

2
src/views/tpl/widget/d3ga_universal.tpl
View File

@ -66,7 +66,7 @@
var scrollCount = 0; var scrollCount = 0;
function testScroll() { function testScroll() {
++scrollCount; ++scrollCount;
if (scrollCount == 2) { if (scrollCount === 2) {
ga('send', 'event', 'window', 'scrolled'); ga('send', 'event', 'window', 'scrolled');
} }
} }

6
src/views/tpl/widget/inc/d3_googleanalytics.tpl
View File

@ -186,7 +186,7 @@
var scrollCount = 0; var scrollCount = 0;
function testScroll() { function testScroll() {
++scrollCount; ++scrollCount;
if (scrollCount == 2) { if (scrollCount === 2) {
_gaq.push(['_trackEvent', 'window', 'scrolled']); _gaq.push(['_trackEvent', 'window', 'scrolled']);
} }
} }
@ -198,9 +198,9 @@
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
[{if $oD3GASettings->getValue('blD3GAUseRemarketing')}] [{if $oD3GASettings->getValue('blD3GAUseRemarketing')}]
ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js'; ga.src = 'https://stats.g.doubleclick.net/dc.js';
[{else}] [{else}]
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src = 'https://ssl.google-analytics.com/ga.js';
[{/if}] [{/if}]
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

8
src/views/tpl/widget/inc/d3ga_universal.tpl
View File

@ -66,7 +66,7 @@
var scrollCount = 0; var scrollCount = 0;
function testScroll() { function testScroll() {
++scrollCount; ++scrollCount;
if (scrollCount == 2) { if (scrollCount === 2) {
ga('send', 'event', 'window', 'scrolled'); ga('send', 'event', 'window', 'scrolled');
} }
} }
@ -80,9 +80,9 @@
[{if $oD3GASettings->getValue('blD3GATrackPageLoadTime')}] [{if $oD3GASettings->getValue('blD3GATrackPageLoadTime')}]
[{block name="d3ga_trackpageloadtime"}] [{block name="d3ga_trackpageloadtime"}]
var perfData = window.performance.timing; let perfData = window.performance.timing;
var pageLoadTime = perfData.domComplete - perfData.navigationStart; let pageLoadTime = perfData.domComplete - perfData.navigationStart;
var loadTime = ""; let loadTime;
if (pageLoadTime < 1000) { loadTime = "0-1 seconds"; } if (pageLoadTime < 1000) { loadTime = "0-1 seconds"; }
else if (pageLoadTime < 2000) { loadTime = "1-2 seconds"; } else if (pageLoadTime < 2000) { loadTime = "1-2 seconds"; }

14
src/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl
View File

@ -15,13 +15,13 @@
<!-- Google Code for Conversion Page --> <!-- Google Code for Conversion Page -->
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
var google_conversion_id = [{$oD3GASettings->getValue('sD3GAAdWordConversionId')}]; let google_conversion_id = [{$oD3GASettings->getValue('sD3GAAdWordConversionId')}];
var google_conversion_language = "de"; let google_conversion_language = "de";
var google_conversion_format = "3"; let google_conversion_format = "3";
var google_conversion_color = "ffffff"; let google_conversion_color = "ffffff";
var google_conversion_label = "[{$oD3GASettings->getValue('sD3GAAdWordConversionLabel')}]"; let google_conversion_label = "[{$oD3GASettings->getValue('sD3GAAdWordConversionLabel')}]";
var google_conversion_value = [{$sTotal}]; let google_conversion_value = [{$sTotal}];
var google_remarketing_only = false; let google_remarketing_only = false;
/* ]]> */ /* ]]> */
</script> </script>

8
src/views/tpl/widget/inc/d3ga_universal_remarketing.tpl
View File

@ -10,7 +10,7 @@
---------------------------------------------------*}] ---------------------------------------------------*}]
<script type="text/javascript"> <script type="text/javascript">
var google_tag_params = { let google_tag_params = {
ecomm_prodid: [{$sD3GARemarketingProdId}], ecomm_prodid: [{$sD3GARemarketingProdId}],
ecomm_pagetype: '[{$sD3GARemarketingPageType}]', ecomm_pagetype: '[{$sD3GARemarketingPageType}]',
ecomm_totalvalue: [{$sD3GARemarketingPrice}] ecomm_totalvalue: [{$sD3GARemarketingPrice}]
@ -18,12 +18,12 @@
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
var google_conversion_id = [{$oD3GASettings->getValue('sD3GARemarketingConversionId')}]; let google_conversion_id = [{$oD3GASettings->getValue('sD3GARemarketingConversionId')}];
[{if $oD3GASettings->getValue('sD3GARemarketingConversionLabel')}] [{if $oD3GASettings->getValue('sD3GARemarketingConversionLabel')}]
var google_conversion_label = "[{$oD3GASettings->getValue('sD3GARemarketingConversionLabel')}]"; var google_conversion_label = "[{$oD3GASettings->getValue('sD3GARemarketingConversionLabel')}]";
[{/if}] [{/if}]
var google_custom_params = window.google_tag_params; let google_custom_params = window.google_tag_params;
var google_remarketing_only = true; let google_remarketing_only = true;
/* ]]> */ /* ]]> */
</script> </script>
<script type="text/javascript" src="//www.googleadservices.com/pagead/conversion.js"> <script type="text/javascript" src="//www.googleadservices.com/pagead/conversion.js">

6
src/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl
View File

@ -2,7 +2,7 @@
[{* https://support.google.com/trustedstoresmerchant/answer/6063080?hl=de&ref_topic=6063044 *}] [{* https://support.google.com/trustedstoresmerchant/answer/6063080?hl=de&ref_topic=6063044 *}]
<!-- BEGIN: Google Certified Shops --> <!-- BEGIN: Google Certified Shops -->
<script type="text/javascript"> <script type="text/javascript">
var gts = gts || []; let gts = gts || [];
[{if $oD3GASettings->getValue('sD3GATSShoppingActive')}] [{if $oD3GASettings->getValue('sD3GATSShoppingActive')}]
gts.push(["id", "[{$oD3GASettings->getValue('sD3GATSId')}]"]); gts.push(["id", "[{$oD3GASettings->getValue('sD3GATSId')}]"]);
@ -17,11 +17,11 @@
[{/if}] [{/if}]
(function() { (function() {
var gts = document.createElement("script"); let gts = document.createElement("script");
gts.type = "text/javascript"; gts.type = "text/javascript";
gts.async = true; gts.async = true;
gts.src = "https://www.googlecommerce.com/trustedstores/api/js"; gts.src = "https://www.googlecommerce.com/trustedstores/api/js";
var s = document.getElementsByTagName("script")[0]; let s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(gts, s); s.parentNode.insertBefore(gts, s);
})(); })();
</script> </script>