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

fixed compatibility bugs for oxid v6.0.0.0 + d3modcfg V 5.1.0.0

This commit is contained in:
kristianhempel 2018-04-10 10:50:05 +02:00
parent 8914b6affd
commit c977d4ba1b
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
copy_this/modules/d3/d3_googleanalytics/metadata.php
View File

@ -28,7 +28,7 @@ $sMetadataVersion = '1.1';
*/
$aModule = array(
'id' => 'd3_googleanalytics',
'title' => (class_exists('d3utils') ? d3utils::getInstance()->getD3Logo() : 'D³').
'title' => (class_exists(\D3\ModCfg\Application\Model\d3utils::class) ? \D3\ModCfg\Application\Model\d3utils::getInstance()->getD3Logo() : 'D³').
' Google Services Schnittstelle',
'description' => array(
'de' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-'.
@ -63,7 +63,6 @@ $aModule = array(
'd3_cfg_googleanalytics_trustedstore' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php',
'd3_cfg_googleanalyticslog' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php',
'd3_cfg_googleanalyticslog_list' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php',
'd3_googleanalytics_update' => 'd3/d3_googleanalytics/setup/d3_googleanalytics_update.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_googleanalytics_update' => 'd3/d3_googleanalytics/setup/d3_googleanalytics_update.php',

6
copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
View File

@ -193,8 +193,8 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
protected function _d3GANormalizeUrl($sUrl)
{
$sPattern = "^http(s?)://";
/** @var d3str $oD3Str */
$oD3Str = oxNew('d3str');
/** @var \D3\ModCfg\Application\Model\d3str $oD3Str */
$oD3Str = oxNew(\D3\ModCfg\Application\Model\d3str::class);
return preg_replace('@'.$sPattern.'@', '', $oD3Str->untrailingslashit($sUrl));
}
@ -387,7 +387,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
}
/**
* @return string
* @return array
*/
public function d3GetGAProdInfos()
{

2
copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics.php
View File

@ -59,7 +59,7 @@ class d3_thankyou_googleanalytics extends d3_thankyou_googleanalytics_parent
public function logCode($sGACode)
{
\D3\ModCfg\Application\Model\Configuration\d3_cfg_mod::get($this->_sModCfgId)->d3getLog()->log(
d3log::NOTICE,
\D3\ModCfg\Application\Model\Log\d3log::NOTICE,
__CLASS__,
__FUNCTION__,
__LINE__,

2
copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasket_googleanalytics.php
View File

@ -22,7 +22,7 @@ class d3_oxbasket_googleanalytics extends d3_oxbasket_googleanalytics_parent
public function d3GetCurrentLocatorTitle()
{
$sTitle = '';
/** @var oxview $oView */
/** @var \OxidEsales\Eshop\Application\Controller\FrontendController $oView */
$oView = oxRegistry::getConfig()->getActiveView();
if (method_exists($oView, 'getBreadCrumb') &&

2
copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php
View File

@ -39,7 +39,7 @@ class d3_oxorder_googleanalytics extends d3_oxorder_googleanalytics_parent
{
$sSelect =
"SELECT oxvoucherserieid FROM oxvouchers WHERE oxorderid = " . oxDb::getDb()->quote($this->getId());
$aVoucherIds = (array) oxDb::getDb()->getArray($sSelect);
$aVoucherIds = (array) oxDb::getDb()->getAll($sSelect);
$aVoucherSerieList = array();
foreach ($aVoucherIds as $aVoucherId) {