Merge pull request #1053 from solverat/order_extractor_bug

fix total tax in tag manager tracker
coreshop · Jul 24, 2019 · c7716b3 · c7716b3
2 parents cca705c + 3fa4a1e
commit c7716b3
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,11 @@ sudo: false
 language: php
 
 addons:
-    mariadb: '10.1'
+    mariadb: '10.2'
     hosts:
         - pimcore-test.dev
+services:
+    - mysql
 env:
     global:
         - PIMCORE_ENVIRONMENT=test
@@ -75,17 +77,17 @@ matrix:
         - sudo: required
           php: 7.1
           env:
-            - PIMCORE_VERSION="dev-master"
+            - PIMCORE_VERSION="dev-5.8"
 
         - sudo: required
           php: 7.2
           env:
-            - PIMCORE_VERSION="dev-master"
+            - PIMCORE_VERSION="dev-5.8"
     allow_failures:
         - env:
             - CORESHOP_SUITE=codestyle
         - env:
-            - PIMCORE_VERSION="dev-master"
+            - PIMCORE_VERSION="dev-5.8"
     fast_finish: true
 
 cache:

diff --git a/features/tracking/analytics_enhanced.feature b/features/tracking/analytics_enhanced.feature
@@ -53,5 +53,5 @@ Feature: In order to track ecommerce sales
     And I create an order from my cart
     Then tracking my order checkout complete with tracker "google-analytics-enhanced-ecommerce" should generate:
       """
-      ga('require', 'ec'); ga('set', 'currencyCode', 'EUR'); ga('ec:addProduct', {"id":%DataObject(orderItem, {"method": "getId"});,"name":"T-Shirt","category":"","price":24,"quantity":1,"currency":"EUR"}); ga('ec:setAction', 'purchase', {"id":%DataObject(order, {"method": "getId"});,"affiliation":24,"total":24,"tax":null,"shipping":0,"currency":"EUR"});
+      ga('require', 'ec'); ga('set', 'currencyCode', 'EUR'); ga('ec:addProduct', {"id":%DataObject(orderItem, {"method": "getId"});,"name":"T-Shirt","category":"","price":24,"quantity":1,"currency":"EUR"}); ga('ec:setAction', 'purchase', {"id":%DataObject(order, {"method": "getId"});,"affiliation":24,"total":24,"tax":4,"shipping":0,"currency":"EUR"});
       """
diff --git a/features/tracking/global_site_tag.feature b/features/tracking/global_site_tag.feature
@@ -52,5 +52,5 @@ Feature: In order to track ecommerce sales
     And I create an order from my cart
     Then tracking my order checkout complete with tracker "google-gtag-enhanced-ecommerce" should generate:
       """
-      gtag('event', 'purchase', {"id":%DataObject(order, {"method": "getId"});,"affiliation":24,"total":24,"tax":null,"shipping":0,"currency":"EUR","items":[{"id":%DataObject(orderItem, {"method": "getId"});,"name":"T-Shirt","category":"","price":24,"quantity":1,"currency":"EUR"}]});
+      gtag('event', 'purchase', {"id":%DataObject(order, {"method": "getId"});,"affiliation":24,"total":24,"tax":4,"shipping":0,"currency":"EUR","items":[{"id":%DataObject(orderItem, {"method": "getId"});,"name":"T-Shirt","category":"","price":24,"quantity":1,"currency":"EUR"}]});
       """
diff --git a/features/tracking/tag_manager_classic.feature b/features/tracking/tag_manager_classic.feature
@@ -21,5 +21,5 @@ Feature: In order to track ecommerce sales
   Scenario: Track Checkout Complete
     Then tracking my order checkout complete with tracker "google-gtm-classic-ecommerce" should generate:
       """
-      window.dataLayer = window.dataLayer || [];dataLayer.push({"transactionId":%DataObject(order, {"method" : "getId"});,"transactionAffiliation":24,"transactionTotal":24,"transactionTax":null,"transactionShipping":0,"transactionCurrency":"EUR","transactionProducts":[{"id":%DataObject(orderItem, {"method": "getId"});,"name":"T-Shirt","category":"","price":24,"quantity":1}]});
+      window.dataLayer = window.dataLayer || [];dataLayer.push({"transactionId":%DataObject(order, {"method" : "getId"});,"transactionAffiliation":24,"transactionTotal":24,"transactionTax":4,"transactionShipping":0,"transactionCurrency":"EUR","transactionProducts":[{"id":%DataObject(orderItem, {"method": "getId"});,"name":"T-Shirt","category":"","price":24,"quantity":1}]});
       """
diff --git a/features/tracking/tag_manager_enhanced.feature b/features/tracking/tag_manager_enhanced.feature
@@ -53,5 +53,5 @@ Feature: In order to track ecommerce sales
     And I create an order from my cart
     Then tracking my order checkout complete with tracker "google-gtm-enhanced-ecommerce" should generate:
       """
-      window.dataLayer = window.dataLayer || [];dataLayer.push({'ecommerce' : { 'purchase' : {"actionField":{"id":%DataObject(order, {"method": "getId"});,"affiliation":24,"total":24,"tax":null,"shipping":0,"currency":"EUR"},"products":[{"id":%DataObject(orderItem, {"method": "getId"});,"sku":null,"name":"T-Shirt","category":"","price":24,"quantity":1,"currency":"EUR"}]} } });
+      window.dataLayer = window.dataLayer || [];dataLayer.push({'ecommerce' : { 'purchase' : {"actionField":{"id":%DataObject(order, {"method": "getId"});,"affiliation":24,"total":24,"tax":4,"shipping":0,"currency":"EUR"},"products":[{"id":%DataObject(orderItem, {"method": "getId"});,"sku":null,"name":"T-Shirt","category":"","price":24,"quantity":1,"currency":"EUR"}]} } });
       """
diff --git a/features/tracking/universal_ecommerce.feature b/features/tracking/universal_ecommerce.feature
@@ -21,5 +21,5 @@ Feature: In order to track ecommerce sales
     And I create an order from my cart
     Then tracking my order checkout complete with tracker "google-analytics-universal-ecommerce" should generate:
       """
-      ga('require', 'ecommerce', 'ecommerce.js'); ga('ecommerce\u003AaddTransaction', {"id":%DataObject(order, {"method": "getId"});,"affiliation":24,"total":24,"tax":null,"shipping":0,"currency":"EUR"}); ga('ecommerce\u003AaddItem', {"id":%DataObject(orderItem, {"method": "getId"});,"name":"T-Shirt","category":"","price":24,"quantity":1,"currency":"EUR"}); ga('ecommerce:send');
+      ga('require', 'ecommerce', 'ecommerce.js'); ga('ecommerce\u003AaddTransaction', {"id":%DataObject(order, {"method": "getId"});,"affiliation":24,"total":24,"tax":4,"shipping":0,"currency":"EUR"}); ga('ecommerce\u003AaddItem', {"id":%DataObject(orderItem, {"method": "getId"});,"name":"T-Shirt","category":"","price":24,"quantity":1,"currency":"EUR"}); ga('ecommerce:send');
       """
diff --git a/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/GlobalSiteTagEnhancedEcommerce.php b/src/CoreShop/Bundle/TrackingBundle/Tracker/Google/GlobalSiteTagEnhancedEcommerce.php
@@ -169,7 +169,7 @@ public function trackCheckoutComplete($order)
         $orderData = $this->transformOrder($order);
         $items = $order['items'];
 
-        $actionData = array_merge($this->transformOrder($orderData), ['items' => []]);
+        $actionData = array_merge($orderData, ['items' => []]);
 
         foreach ($items as $item) {
             $actionData['items'][] = $this->transformProductAction($item);

diff --git a/src/CoreShop/Bundle/TrackingBundle/Tracker/Matomo/Matomo.php b/src/CoreShop/Bundle/TrackingBundle/Tracker/Matomo/Matomo.php
@@ -160,7 +160,7 @@ public function trackCheckoutComplete($order)
             $order['id'],
             $order['total'],
             $order['subtotal'],
-            $order['tax'],
+            $order['totalTax'],
             $order['shipping'],
             $order['discount'],
         ];

diff --git a/src/CoreShop/Component/Core/Tracking/Extractor/OrderExtractor.php b/src/CoreShop/Component/Core/Tracking/Extractor/OrderExtractor.php
@@ -60,7 +60,7 @@ public function updateMetadata($object, $data = []): array
                 'affiliation' => $object->getTotal() / 100,
                 'total' => $object->getTotal() / 100,
                 'subtotal' => $object->getSubtotal() / 100,
-                'tax' => $object->getTotalTax() / 100,
+                'totalTax' => $object->getTotalTax() / 100,
                 'shipping' => $object->getAdjustmentsTotal(AdjustmentInterface::SHIPPING) / 100,
                 'discount' => $object->getAdjustmentsTotal(AdjustmentInterface::CART_PRICE_RULE) / 100,
                 'currency' => $object->getCurrency()->getIsoCode(),