revision adjusted

.gitattributes

@@ -11,18 +11,18 @@ Sources/UGA_Einstellungen.jpg -text
 Sources/UGA_Trichtereinrichtung.jpg -text
 Sources/UGA_Trichtereinrichtung_1.jpg -text
 Sources/trustedShops.jpg -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl -text
-changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl -text
+changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl -text
 copy_this/.noencode -text
 copy_this/modules/d3/d3_googleanalytics/IntelliSenseHelper.php -text
 copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php -text

copy_this/modules/d3/d3_googleanalytics/metadata.php

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

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 Services Schnittstelle';
 
-    public $sModVersion = '3.3.3.0';
+    public $sModVersion = '3.4.0.0';
 
-    public $sModRevision = '237';
+    public $sModRevision = '242';
 
     // heredoc syntax using for class members is available from PHP 5.3 up
     public $sBaseConf =
-    "BZtOXBwVDA5M0hEL3JqNlIwbDZ5OC9lYzM0NFM3RC82d2ZnQzU5TjgvSHduVWJtMjNZd1hkSHVpYUd5d
+    "ZJ0MzB1N2F3em43V1dqWXkvVnc1WXVOeStnMU95aHM2d1BiZEJlbGVhbzNIcE5nTVJxQlZYOEFwU2RrK
-mdDY1h0ejBtZmVWL01VL2dlQWF4NVBJY0d0ZHErSS9yOFY2UEtMcjhMWkN5T3J2ckdNMWl4RWhKSERCd
+2dBSUlQNm43Ly9ldkNZUlFEemNNNmVvVXlTNWRwSVp5RGk4UGxKb2xTckQ4U2pRWUZKVFR1bWx3N0dRU
-FdkMWZKZW5IZU9BMHJNeG5NdXExaWhRYXZqMEhPeHR2cTh0dEk2L2NTYkVsNWkzbGhiQnUvSk90L1pqb
+3FzbThEOGNqSWcvZDFXNVJhSlUydEFwejZ2OFRRektPai9nNVcvWGJURGV2SGJpTkZxMjBOM1pXMkJRU
-Uk4amw1UXBaMTh2aUpoZlphbmN2ZG1ZcVAxQ2pUVW9ycUFhOFQrTHRDUlc0bFh6SXFEWWFjVDVzaHVBd
+jVoN1dybnBhTlFWQ0s2Lzh4NjMvZXZMMlJHV21LTnNJcDBIWngxSkJVM3hDODZ4bzBaWS9zRHZ1WC9jY
-XYxSzhpcGxhMTRySGFVdmlnMTNSNDJ1aXJVQmMvRC9jaWltcnJQd3JwVmdobTlhWldrVm1WOXhwWGpiR
+UtkNFB6WEdzR2NLMG8yWGpMdG9XTmZsQ0lCNkdGSzZ1N0JRMFVlV3JhRXhtZ2tNUi9pd3hsMDIwRlNHY
-EpqbzRPb1QyYysrcy9oZHlJV3VMUDBmTmVjMzhWOG5kd0xJdVVYcWxsYTF3PT0=";
+np5bjJIQjE5aGIycW4wSGpCQXI5alVwYmJreTBRS3NMckNQODZvYXJnZjdBPT0=";
 
     public $sRequirements = '';
 

setup+doku/changelog.txt

@@ -1,5 +1,11 @@
-=> 3.3.3.0
+=> 3.4.0.0
 - Remarketing (via Analytics) eingefügt
+- Remarketing-Liste für Startseite eingefügt
+- Template-Blöcke eingefügt
+- Titel der Konfigurationsseiten angepasst
+- Staffelpreisübergaben korrigiert (#3679)
+- Steuerberechnung korrigiert
+- Scriptsyntax angepasst
 
 => 3.3.2.0
 - fix: Optionen im Admin können nicht deaktivert werden