diff --git a/.gitattributes b/.gitattributes index 926df25..cfb5250 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,8 +1,4 @@ * text=auto !eol -Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#042[!!-~]-[!!-~]'Kampagnenverwaltung'[!!-~]-[!!-~]adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png -text -Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#043[!!-~]-[!!-~]'Kampagnenverwaltung'[!!-~]-[!!-~]adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png -text -Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#044[!!-~]-[!!-~]'Kampagnenverwaltung'[!!-~]-[!!-~]adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png -text -Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#045[!!-~]-[!!-~]'Kampagnenverwaltung'[!!-~]-[!!-~]adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png -text Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#250[!!-~]-[!!-~]'Conversion-Tracking'[!!-~]-[!!-~]adwords_google_com_ct_ConversionTracking_Manager___c=1858313983&__u=7452293233&__o=cues#acc_ALL_con.png -text Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#251[!!-~]-[!!-~]'Conversion-Tracking'[!!-~]-[!!-~]adwords_google_com_ct_ConversionTracking_Manager___c=1858313983&__u=7452293233&__o=cues#acc_ALL_con.png -text Sources/FireShot[!!-~]Screen[!!-~]Capture[!!-~]#252[!!-~]-[!!-~]'Google[!!-~]Analytics'[!!-~]-[!!-~]www_google_com_analytics_web__authuser=0#management_Settings_a50621059w82651812p85583465__m_page=CustomMetrics.png -text diff --git a/Sources/FireShot Screen Capture #042 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png b/Sources/FireShot Screen Capture #042 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png deleted file mode 100644 index d364286..0000000 Binary files a/Sources/FireShot Screen Capture #042 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png and /dev/null differ diff --git a/Sources/FireShot Screen Capture #043 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png b/Sources/FireShot Screen Capture #043 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png deleted file mode 100644 index 5c1470e..0000000 Binary files a/Sources/FireShot Screen Capture #043 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png and /dev/null differ diff --git a/Sources/FireShot Screen Capture #044 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png b/Sources/FireShot Screen Capture #044 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png deleted file mode 100644 index ebd239e..0000000 Binary files a/Sources/FireShot Screen Capture #044 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png and /dev/null differ diff --git a/Sources/FireShot Screen Capture #045 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png b/Sources/FireShot Screen Capture #045 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png deleted file mode 100644 index 42f4a77..0000000 Binary files a/Sources/FireShot Screen Capture #045 - 'Kampagnenverwaltung' - adwords_google_com_cm_CampaignMgmt___u=7452293233&__c=18583.png and /dev/null differ diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl index 0c07579..626c837 100644 --- a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl +++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl @@ -1,9 +1,14 @@ [{$smarty.block.parent}] [{d3modcfgcheck modid="d3_googleanalytics"}] +[{/d3modcfgcheck}] + +[{if $mod_d3_googleanalytics}] + [{* Content shouldn't rendered in disabled module! + Because of this reason, it can't included in d3modcfgcheck block. *}] [{include file="d3ga_universal_adwordscode.tpl"}] [{include file="d3ga_universal_remarketing.tpl"}] [{include file="d3ga_universal_campaigncode.tpl"}] -[{/d3modcfgcheck}] \ No newline at end of file +[{/if}] \ No newline at end of file diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl index fdef014..47a4eaa 100644 --- a/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl +++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl @@ -1,5 +1,10 @@ [{$smarty.block.parent}] [{d3modcfgcheck modid="d3_googleanalytics"}] +[{/d3modcfgcheck}] + +[{if $mod_d3_googleanalytics}] + [{* Content shouldn't rendered in disabled module! + Because of this reason, it can't included in d3modcfgcheck block. *}] [{include file=$sD3GATTpl}] -[{/d3modcfgcheck}] \ No newline at end of file +[{/if}] \ No newline at end of file diff --git a/copy_this/modules/d3/d3_googleanalytics/metadata.php b/copy_this/modules/d3/d3_googleanalytics/metadata.php index 7cfb7a8..a13a57c 100644 --- a/copy_this/modules/d3/d3_googleanalytics/metadata.php +++ b/copy_this/modules/d3/d3_googleanalytics/metadata.php @@ -39,7 +39,7 @@ $aModule = array( 'en' => 'Provides a quick and easy integration with your Google Analytics account to your shop.', ), 'thumbnail' => 'picture.png', - 'version' => '3.1.0.1', + 'version' => '3.1.0.2', 'author' => 'D³ Data Development (Inh. Thomas Dartsch)', 'email' => 'support@shopmodule.com', 'url' => 'http://www.oxidmodule.com/', diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php b/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php index 6e663db..274d82b 100644 --- a/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php +++ b/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php @@ -291,7 +291,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare { $aArticleList = array(); $aArticleList[] = $oView->getProduct(); - return $this->_d3GetGAProdList($aArticleList); + return $this->_d3GetGAProductList($aArticleList); } /** @@ -302,7 +302,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare protected function _d3GetGAalistProdList($oView) { $oArticleList = $oView->getArticleList(); - return $this->_d3GetGAProdList($oArticleList); + return $this->_d3GetGAProductList($oArticleList); } /** @@ -313,7 +313,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare protected function _d3GetGAsearchProdList($oView) { $oArticleList = $oView->getArticleList(); - return $this->_d3GetGAProdList($oArticleList); + return $this->_d3GetGAProductList($oArticleList); } /** @@ -324,7 +324,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare protected function _d3GetGAvendorlistProdList($oView) { $oArticleList = $oView->getArticleList(); - return $this->_d3GetGAProdList($oArticleList); + return $this->_d3GetGAProductList($oArticleList); } /** @@ -335,7 +335,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare protected function _d3GetGAmanufacturerlistProdList($oView) { $oArticleList = $oView->getArticleList(); - return $this->_d3GetGAProdList($oArticleList); + return $this->_d3GetGAProductList($oArticleList); } /** @@ -346,7 +346,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare protected function _d3GetGAbasketProdList($oView) { $aArticleList = $oView->getBasketArticles(); - return $this->_d3GetGAProdList($aArticleList); + return $this->_d3GetGAProductList($aArticleList); } /** @@ -357,7 +357,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare protected function _d3GetGAorderProdList($oView) { $aArticleList = $oView->getBasketArticles(); - return $this->_d3GetGAProdList($aArticleList); + return $this->_d3GetGAProductList($aArticleList); } /** @@ -368,7 +368,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare protected function _d3GetGAcompareProdList($oView) { $aArticleList = $oView->getCompArtList(); - return $this->_d3GetGAProdList($aArticleList); + return $this->_d3GetGAProductList($aArticleList); } /** @@ -380,7 +380,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare protected function _d3GetGAaccount_noticelistProdList($oView) { $aArticleList = $oView->getNoticeProductList(); - return $this->_d3GetGAProdList($aArticleList); + return $this->_d3GetGAProductList($aArticleList); } /** @@ -392,7 +392,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare protected function _d3GetGAaccount_wishlistProdList($oView) { $aArticleList = $oView->getWishProductList(); - return $this->_d3GetGAProdList($aArticleList); + return $this->_d3GetGAProductList($aArticleList); } /** @@ -400,7 +400,7 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare * * @return array */ - protected function _d3GetGAProdList($aArticleList) + protected function _d3GetGAProductList($aArticleList) { $aArticleIds = array(); $dPrice = 0; diff --git a/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php b/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php index c80bdfc..7215f47 100644 --- a/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php +++ b/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php @@ -21,18 +21,18 @@ class d3_googleanalytics_update extends d3install_updatebase public $sModName = 'Google Analytics Schnittstelle'; - public $sModVersion = '3.1.0.1'; + public $sModVersion = '3.1.0.2'; - public $sModRevision = '139'; + public $sModRevision = '148'; // heredoc syntax using for class members is available from PHP 5.3 up public $sBaseConf = - "3QUUzJvQ0pJTWcxNnpQNDZkL1JTTWVPTjZ2Q01FY0JsdTZXMjNoU0d4RE9vYmR0NUpsaG8xaGl5Y05TO -G1idWZHbmRjdTF4MENadXpHSHNPYmRjeEJrQW1TT3JRYUd3VzJPMUUzaEw5ZFI1R1UwTmRoN2s5WXNIS -TBaMEljeVZlRjdDZ2ZZZThRZWIvNDZVVEp2VGcxcUJzVG5yNkN1YTZvbkdjMFRnWUhnaVNWOFNpSzFNa -Tk4cytwd3NSNUg4M3p0dUhuZEhKejBld255QnYrYktxdmo1b2c5RnE1Nm1KMDdnMlZVR2xSK2tNY3R2Z -21pWEhRamVEZVNoU0wxN3l0WS9sMTdmeGZkMitreU44L0RuRU82WGVxRFBHNUNkKytscXEyVlUrZDB2a -009"; + "N7WTkZra2M3UUViK0d4RXNUTlM0Z092bERqZEVrYVQ1M0hsMTlQQ0ZRemZ6eDZvZlhWUDJZZSsxKzJSO +HdDMnpVRDBJdS9rSDlTUDBOQUpWRTRPZTBSVWEvOHVrV2JoVU9zZVk4VHU0T1pSTXBrSU1ZeVplY002c +lJXRFd4K1dIWEtIUlpTUXh6QzhJNVQwWlNDSG1VMVQzMmN3T3kvayttQ1dqek1KQndYditMWHowbTJhM +Fo3THFtVkc1ejVUWC9TY1pkY1dkd3BMZ3JHeVpONitvMGdEM2JleEJyaFc5UHRzblM5TTBpNXdUa29lS +mxwaWIyY0VwSzJIRXQ5SUFENm44Q29uYmI2QkZwaVpJc1dOajl6VjdZZytIb0Nndk1zOHVJWHl5QWt3R +mM9"; public $sRequirements = ''; diff --git a/setup+doku/Precheck/d3precheck.php b/setup+doku/Precheck/d3precheck.php index 9104a8f..e1ba9f5 100644 --- a/setup+doku/Precheck/d3precheck.php +++ b/setup+doku/Precheck/d3precheck.php @@ -6,7 +6,7 @@ class requConfig public $sModId = 'd3_googleanalytics'; - public $sModVersion = '3.1.0.1'; + public $sModVersion = '3.1.0.2'; /********************** check configuration section ************************/ diff --git a/setup+doku/changelog.txt b/setup+doku/changelog.txt index 86b7286..01d3712 100644 --- a/setup+doku/changelog.txt +++ b/setup+doku/changelog.txt @@ -1,3 +1,7 @@ +=> 3.1.0.2 +- Bugfix: deaktiviertes Modul kann benötigtes Objekt nicht laden +- Bugfix: Seiten ohne Klassenangaben (z.B. 404-Seiten) versuchen Artikellisten für Remarketing zu laden + => 3.1.0.1 - Universal-Trackingcode für Multi-Domain-Nutzung angepasst