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

#4220

Browse Source
This commit is contained in:
SusiKober 2015-07-29 07:06:17 +00:00
parent cdb3c7256e
commit e59fdfdbeb
4 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ $aModule = array(
'Trusted Shops account to your shop.', 'Trusted Shops account to your shop.',
), ),
'thumbnail' => 'picture.png', 'thumbnail' => 'picture.png',
'version' => '3.3.1.0', 'version' => '3.3.2.0',
'author' => 'D³ Data Development (Inh. Thomas Dartsch)', 'author' => 'D³ Data Development (Inh. Thomas Dartsch)',
'email' => 'support@shopmodule.com', 'email' => 'support@shopmodule.com',
'url' => 'http://www.oxidmodule.com/', 'url' => 'http://www.oxidmodule.com/',

40
copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php
View File

@ -21,18 +21,18 @@ class d3_googleanalytics_update extends d3install_updatebase
public $sModName = 'Google Services Schnittstelle'; public $sModName = 'Google Services Schnittstelle';
public $sModVersion = '3.3.1.0'; public $sModVersion = '3.3.2.0';
public $sModRevision = '214'; public $sModRevision = '228';
// heredoc syntax using for class members is available from PHP 5.3 up // heredoc syntax using for class members is available from PHP 5.3 up
public $sBaseConf = public $sBaseConf =
"U88cS9acWI1SStIK2FRa1hienV0TW43N1djMUFrQTBmdEpsKzF4U2t3M3h6Wk1KcnI4bjFFZ3pUWFgxY "9I7SjYrOVJJbDRCZTBFTjhiOVI5VElTamJwNDQ3Qk9FeWdLQjVXaHBaRFBHemxYV0NZYVJ2ZWN2SmMrS
XNCc2VDSHIzSTFDN2xURkIxSUZuMG12cnQ3ajJKWEozRmNoZ2Y3TVRkK2hsSFFCU3BXcEh1ekdQcnR2V m1taGh4OHk3Z0NXbUFDWUJaWjZXYVJicEM3a3AwTTFYWlVOZXlhYitWa2ptTDBLSVh0R1ArbkRYT3Jub
S9yL3QzT0NuZm1LNHQ2R3RCOHlzekIrTjFJTjhucm0rY29WeTEzeFgzc3Y5MkFUYlh3ZkFuc3ByRkZYT jE0cm1sSVgxOWpIMGQ1NjJ3TklEVTE1YW5YR1VueW4zcUNqZHNQK0NKRW1WOFpENGdISms4QTlDdS8xQ
2ZSWVYvaHpJY3A5Ky85cDJnYTkrc3l6MXgzK0NTcmY2MTZDV0hIMmFuRmJ1MzFHSnNJUEFDLzUvSGxWT kYzUldpVkJiNXVkUVZFK0dyd2hTcXRRb0tjN0ZCdHJ3VGJyVzZSbFdyc01yeXp4WVM3Sk9DblhqR0ZIY
DRNWEFybDE3SGJXdjJNS1R1a0lPejFqZFVMN3JzMWYrRElYY2t0RTdQUmN6bnJmdDNaNnR1SndaSjcza lZWa0h3WGF3b0NYWlloT0dsU0dPYkJpWjR6M3dWdllFVFE0eVhiQWM0cHdLdmQ4cHhYR1kySWZ3T2EzW
kk9"; DQ9";
public $sRequirements = ''; public $sRequirements = '';
@ -78,7 +78,7 @@ kk9";
public function checkModCfgItemExist() public function checkModCfgItemExist()
{ {
$blRet = false; $blRet = false;
foreach ($this->_getShopList() as $oShop) { foreach ($this->getShopList() as $oShop) {
/** @var $oShop oxshop */ /** @var $oShop oxshop */
$aWhere = array( $aWhere = array(
'oxmodid' => $this->sModKey, 'oxmodid' => $this->sModKey,
@ -104,7 +104,7 @@ kk9";
$blRet = false; $blRet = false;
if ($this->checkModCfgItemExist()) { if ($this->checkModCfgItemExist()) {
foreach ($this->_getShopList() as $oShop) { foreach ($this->getShopList() as $oShop) {
/** @var $oShop oxshop */ /** @var $oShop oxshop */
$aWhere = array( $aWhere = array(
'oxmodid' => $this->sModKey, 'oxmodid' => $this->sModKey,
@ -178,10 +178,10 @@ kk9";
'use_quote' => true, 'use_quote' => true,
), ),
); );
$aRet = $this->_updateTableItem('d3_cfg_mod', $aInsertFields, $aWhere); $aRet = $this->_updateTableItem2('d3_cfg_mod', $aInsertFields, $aWhere);
$blRet = $aRet['blRet']; $blRet = $aRet['blRet'];
$this->_setActionLog('SQL', $aRet['sql'], __METHOD__); $this->setActionLog('SQL', $aRet['sql'], __METHOD__);
$this->_setUpdateBreak(false); $this->setUpdateBreak(false);
if ($this->getStepByStepMode()) { if ($this->getStepByStepMode()) {
break; break;
@ -199,7 +199,7 @@ kk9";
public function checkContentGANoticeItemExist() public function checkContentGANoticeItemExist()
{ {
$blRet = false; $blRet = false;
foreach ($this->_getShopList() as $oShop) { foreach ($this->getShopList() as $oShop) {
/** @var $oShop oxshop */ /** @var $oShop oxshop */
$aWhere = array( $aWhere = array(
'oxloadid' => 'Analytics_Security_Informations', 'oxloadid' => 'Analytics_Security_Informations',
@ -224,7 +224,7 @@ kk9";
$blRet = false; $blRet = false;
if ($this->checkContentGANoticeItemExist()) { if ($this->checkContentGANoticeItemExist()) {
foreach ($this->_getShopList() as $oShop) { foreach ($this->getShopList() as $oShop) {
/** @var $oShop oxshop */ /** @var $oShop oxshop */
$aWhere = array( $aWhere = array(
'oxloadid' => 'Analytics_Security_Informations', 'oxloadid' => 'Analytics_Security_Informations',
@ -282,11 +282,11 @@ kk9";
'force_update' => false, 'force_update' => false,
), ),
); );
$aRet = $this->_updateTableItem('oxcontents', $aInsertFields, $aWhere); $aRet = $this->_updateTableItem2('oxcontents', $aInsertFields, $aWhere);
$blRet = $aRet['blRet']; $blRet = $aRet['blRet'];
$this->_setActionLog('SQL', $aRet['sql'], __METHOD__); $this->setActionLog('SQL', $aRet['sql'], __METHOD__);
$this->_setUpdateBreak(false); $this->setUpdateBreak(false);
if ($this->getStepByStepMode()) { if ($this->getStepByStepMode()) {
break; break;
@ -316,8 +316,8 @@ kk9";
if ($this->checkModCfgSameRevision($this->sModKey)) { if ($this->checkModCfgSameRevision($this->sModKey)) {
$aRet = $this->_updateModCfgSameRevision($this->sModKey); $aRet = $this->_updateModCfgSameRevision($this->sModKey);
$this->_setActionLog('SQL', $aRet['sql'], __METHOD__); $this->setActionLog('SQL', $aRet['sql'], __METHOD__);
$this->_setUpdateBreak(false); $this->setUpdateBreak(false);
$blRet = $aRet['blRet']; $blRet = $aRet['blRet'];
} }

12
setup+doku/Precheck/d3precheck.php
View File

@ -41,9 +41,9 @@ class requConfig
{ {
public $sModName = 'D³ Google Services'; public $sModName = 'D³ Google Services';
public $sModId = 'd3_googleanalytics'; public $sModId = 'd3_googleanalytics';
public $sModVersion = '3.3.1.0'; public $sModVersion = '3.3.2.0';
/********************** check configuration section ************************/ /********************** check configuration section ************************/
@ -113,9 +113,9 @@ class requConfig
'hasMaxShopVersion' => array( 'hasMaxShopVersion' => array(
'blExec' => 1, 'blExec' => 1,
'aParams' => array( 'aParams' => array(
'PE' => '4.9.0', 'PE' => '4.9.4',
'CE' => '4.9.0', 'CE' => '4.9.4',
'EE' => '5.2.0' 'EE' => '5.2.4'
), ),
), ),
@ -143,7 +143,7 @@ class requConfig
'aParams' => array( 'aParams' => array(
'id' => 'd3modcfg_lib', 'id' => 'd3modcfg_lib',
'name' => 'Modul-Connector', 'name' => 'Modul-Connector',
'version' => '4.0.0.0', 'version' => '4.3.3.0',
), ),
), ),
), ),

1
setup+doku/changelog.txt
View File

@ -7,6 +7,7 @@
- fix: Kampagnencode wurde nicht übertragen - fix: Kampagnencode wurde nicht übertragen
- Link "Hilfe starten" korrigieren - Link "Hilfe starten" korrigieren
- Aktualisierung der Modulinstallationsanleitung / Vorabprüfung (d3precheck) - Aktualisierung der Modulinstallationsanleitung / Vorabprüfung (d3precheck)
- freigegeben bis PHP 5.6
=> 3.3.1.0 => 3.3.1.0
- Lieferzeitangabe kann nun für lagernde und nicht lagernde Artikel getrennt angegeben werden - Lieferzeitangabe kann nun für lagernde und nicht lagernde Artikel getrennt angegeben werden