ACP2E-1880: fix static and unit tests errors

Author: alzota

app/code/Magento/GoogleAnalytics/Block/Ga.php

@@ -82,6 +82,7 @@ public function getPageName()
      * @link https://developers.google.com/analytics/devguides/collection/analyticsjs/method-reference#set
      * @link https://developers.google.com/analytics/devguides/collection/analyticsjs/method-reference#gaObjectMethods
      * @deprecated 100.2.0 please use getPageTrackingData method
+     * @see getPageTrackingData method
      */
     public function getPageTrackingCode($accountId)
     {
@@ -103,6 +104,7 @@ public function getPageTrackingCode($accountId)
      *
      * @return string|void
      * @deprecated 100.2.0 please use getOrdersTrackingData method
+     * @see getOrdersTrackingData method
      */
     public function getOrdersTrackingCode()
     {
@@ -124,12 +126,12 @@ public function getOrdersTrackingCode()
                     "ga('ec:addProduct', {
                         'id': '%s',
                         'name': '%s',
-                        'price': '%f',
+                        'price': %.2f,
                         'quantity': %d
                     });",
                     $this->escapeJsQuote($item->getSku()),
                     $this->escapeJsQuote($item->getName()),
-                    $item->getPrice(),
+                    round($item->getPrice(), 2),
                     $item->getQtyOrdered()
                 );
             }
@@ -138,15 +140,15 @@ public function getOrdersTrackingCode()
                 "ga('ec:setAction', 'purchase', {
                     'id': '%s',
                     'affiliation': '%s',
-                    'revenue': '%f',
-                    'tax': '%f',
-                    'shipping': '%f'
+                    'revenue': %.2f,
+                    'tax': %.2f,
+                    'shipping': %.2f
                 });",
                 $order->getIncrementId(),
                 $this->escapeJsQuote($this->_storeManager->getStore()->getFrontendName()),
-                $order->getGrandTotal(),
-                $order->getTaxAmount(),
-                $order->getShippingAmount()
+                round($order->getGrandTotal(), 2),
+                round($order->getTaxAmount(), 2),
+                round($order->getShippingAmount(), 2)
             );
 
             $result[] = "ga('send', 'pageview');";
@@ -235,16 +237,16 @@ public function getOrdersTrackingData()
                 $result['products'][] = [
                     'id' => $this->escapeJsQuote($item->getSku()),
                     'name' =>  $this->escapeJsQuote($item->getName()),
-                    'price' => (float)$item->getPrice(),
+                    'price' => round((float)$item->getPrice(), 2),
                     'quantity' => (int)$item->getQtyOrdered(),
                 ];
             }
             $result['orders'][] = [
                 'id' =>  $order->getIncrementId(),
                 'affiliation' => $this->escapeJsQuote($this->_storeManager->getStore()->getFrontendName()),
-                'revenue' => (float)$order->getGrandTotal(),
-                'tax' => (float)$order->getTaxAmount(),
-                'shipping' => (float)$order->getShippingAmount(),
+                'revenue' => round((float)$order->getGrandTotal(), 2),
+                'tax' => round((float)$order->getTaxAmount(), 2),
+                'shipping' => round((float)$order->getShippingAmount(), 2)
             ];
             $result['currency'] = $order->getOrderCurrencyCode();
         }

app/code/Magento/GoogleAnalytics/Test/Unit/Block/GaTest.php

@@ -115,15 +115,15 @@ public function testOrderTrackingCode()
             ga('ec:addProduct', {
                                     'id': 'sku0',
                                     'name': 'testName0',
-                                    'price': '0.00',
+                                    'price': 0.00,
                                     'quantity': 1
                                 });
             ga('ec:setAction', 'purchase', {
                                 'id': '100',
                                 'affiliation': 'test',
-                                'revenue': '10',
-                                'tax': '2',
-                                'shipping': '1'
+                                'revenue': 10.00,
+                                'tax': 2.00,
+                                'shipping': 1.00
                             });
             ga('send', 'pageview');";
 
@@ -163,8 +163,8 @@ public function testOrderTrackingData()
                 [
                     'id' => 100,
                     'affiliation' => 'test',
-                    'revenue' => 10,
-                    'tax' => 2,
+                    'revenue' => 10.00,
+                    'tax' => 2.00,
                     'shipping' => 1
                 ]
             ],
@@ -213,7 +213,7 @@ protected function createOrderMock($orderItemCount = 1)
                 ->getMockForAbstractClass();
             $orderItemMock->expects($this->once())->method('getSku')->willReturn('sku' . $i);
             $orderItemMock->expects($this->once())->method('getName')->willReturn('testName' . $i);
-            $orderItemMock->expects($this->once())->method('getPrice')->willReturn($i . '.00');
+            $orderItemMock->expects($this->once())->method('getPrice')->willReturn(round((float)($i . '.0000'), 2));
             $orderItemMock->expects($this->once())->method('getQtyOrdered')->willReturn($i + 1);
             $orderItems[] = $orderItemMock;
         }
@@ -223,9 +223,9 @@ protected function createOrderMock($orderItemCount = 1)
             ->getMock();
         $orderMock->expects($this->once())->method('getIncrementId')->willReturn(100);
         $orderMock->expects($this->once())->method('getAllVisibleItems')->willReturn($orderItems);
-        $orderMock->expects($this->once())->method('getGrandTotal')->willReturn(10);
-        $orderMock->expects($this->once())->method('getTaxAmount')->willReturn(2);
-        $orderMock->expects($this->once())->method('getShippingAmount')->willReturn($orderItemCount);
+        $orderMock->expects($this->once())->method('getGrandTotal')->willReturn(10.00);
+        $orderMock->expects($this->once())->method('getTaxAmount')->willReturn(2.00);
+        $orderMock->expects($this->once())->method('getShippingAmount')->willReturn(round((float)$orderItemCount, 2));
         $orderMock->expects($this->once())->method('getOrderCurrencyCode')->willReturn('USD');
         return $orderMock;
     }