Merge branch 'rel_3.x' of http://phab.d3data.local/source/GoogleServices into rel_3.x

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.4.0.0',
+    'version'      => '3.4.0.1',
     'author'       => 'D³ Data Development (Inh. Thomas Dartsch)',
     'email'        => 'support@shopmodule.com',
     'url'          => 'http://www.oxidmodule.com/',

copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php

@@ -31,7 +31,10 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
         'details'           => 'product',
         'oxwarticledetails' => 'product',
         'basket'            => 'cart',
-        'order'             => 'purchase',
+        'user'              => 'cart',
+        'payment'           => 'cart',
+        'order'             => 'cart',
+        'thankyou'          => 'purchase',
     );
 
     /**
@@ -302,19 +305,29 @@ class d3_oxcmp_utils_googleanalytics extends d3_oxcmp_utils_googleanalytics_pare
     }
 
     /**
+     * Indicates the type of page that the tag is on. Valid values:
+     *
+     *  home - Used on the home page or landing page of your site.
+     *  searchresults - Used on pages where the results of a user's search are displayed.
+     *  category - Used on pages that list multiple items within a category, for example a page showing all shoes in a given style.
+     *  product - Used on individual product pages.
+     *  cart - Used on the cart/basket/checkout page.
+     *  purchase - Used on the page shown once a user has purchased (and so converted), for example a "Thank You" or confirmation page.
+     *  other - Used where the page does not fit into the other types of page, for example a "Contact Us" or "About Us" page.
+     *
+     * @link https://developers.google.com/adwords-remarketing-tag/parameters#retail-sites
      * @return string
      */
     public function d3GetGAPageType()
     {
         $oCurrentView = oxRegistry::getConfig()->getActiveView();
 
-        if (is_array($this->aD3GAPageTypes) &&
-            isset($this->aD3GAPageTypes[strtolower($oCurrentView->getClassName())])
-        ) {
-            return $this->aD3GAPageTypes[strtolower($oCurrentView->getClassName())];
+        $key = strtolower($oCurrentView->getClassName());
+        if (array_key_exists($key, $this->aD3GAPageTypes)) {
+            return $this->aD3GAPageTypes[$key];
         };
 
-        return 'Siteview';
+        return 'other';
     }
 
     /**

copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php

@@ -21,18 +21,20 @@ class d3_googleanalytics_update extends d3install_updatebase
 
     public $sModName = 'Google Services Schnittstelle';
 
-    public $sModVersion = '3.4.0.0';
+    public $sModVersion = '3.4.0.1';
 
     public $sModRevision = '242';
 
     // heredoc syntax using for class members is available from PHP 5.3 up
     public $sBaseConf =
-    "ZJ0MzB1N2F3em43V1dqWXkvVnc1WXVOeStnMU95aHM2d1BiZEJlbGVhbzNIcE5nTVJxQlZYOEFwU2RrK
-2dBSUlQNm43Ly9ldkNZUlFEemNNNmVvVXlTNWRwSVp5RGk4UGxKb2xTckQ4U2pRWUZKVFR1bWx3N0dRU
-3FzbThEOGNqSWcvZDFXNVJhSlUydEFwejZ2OFRRektPai9nNVcvWGJURGV2SGJpTkZxMjBOM1pXMkJRU
-jVoN1dybnBhTlFWQ0s2Lzh4NjMvZXZMMlJHV21LTnNJcDBIWngxSkJVM3hDODZ4bzBaWS9zRHZ1WC9jY
-UtkNFB6WEdzR2NLMG8yWGpMdG9XTmZsQ0lCNkdGSzZ1N0JRMFVlV3JhRXhtZ2tNUi9pd3hsMDIwRlNHY
-np5bjJIQjE5aGIycW4wSGpCQXI5alVwYmJreTBRS3NMckNQODZvYXJnZjdBPT0=";
+    "--------------------------------------------------------------------------------
+47PWGtBQVFQVEFDOXp0V0VxUG1nRHZzUUpHYmlxTlVDRzNWay9yTHExYytvbXZiN0oxc0JBY3liMTRlO
+FdDTGk3K3ExU2RSUUFaL1c2U1huUkt4ckpmWmtpNERmNnk4dVpXaFJ2N0NIMjlDSFhRSnpwY0ZnRWdjT
+ERSZTRObXczSjBCY2VUREtrbUs4ZDhQUXEwN3pTemo1eHBEcG9ieDhzL1lSUjBZZlFXQXNUVXNteUZNc
+FN2aUExeEVsSU1IK0l4NFY2eEl6LzBZSlFjSkNIWEFXeG1JNGd6SXorK0FDc2xHblZEVmxNaEQ1dnROd
+U5jbUNKaUszK3JlOEt0YTNlL0k4QU9KUVNjSGNweDJBeDF4NGQ1T2tWbWJ2TDBSeWNsRXJCNEtBNzlOb
+FZKZXVRN1RMRWpHeUF6eGlCeXdIUHRnMlZzRDN3SEZnRUdIY05SUFZNcjRBPT0=
+--------------------------------------------------------------------------------";
 
     public $sRequirements = '';
 

copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl

@@ -13,7 +13,7 @@
             var google_tag_params = {
                 ecomm_prodid: [{$sD3GARemarketingProdId}],
                 ecomm_pagetype: '[{$sD3GARemarketingPageType}]',
-                ecomm_totalvalue: '[{$sD3GARemarketingPrice}]'
+                ecomm_totalvalue: [{$sD3GARemarketingPrice}]
             };
         </script>
         <script type="text/javascript">

setup+doku/Precheck/d3precheck.php

@@ -43,7 +43,7 @@ class requConfig
 
     public $sModId   = 'd3_googleanalytics';
 
-    public $sModVersion = '3.4.0.0';
+    public $sModVersion = '3.4.0.1';
 
     /********************** check configuration section ************************/
 

setup+doku/changelog.txt

@@ -1,3 +1,8 @@
+=> 3.4.0.1
+- #5078: ecomm_totalvalue darf nicht in Apostrophen stehen
+- #4814: Remarketing: Werte für ecomm_pagetype anpassen
+- #4509: changed_full entfernen
+
 => 3.4.0.0
 - Remarketing (via Analytics) eingefügt
 - Remarketing-Liste für Startseite eingefügt