Different approach as Google analytics snippet on checkout success doesn't return default currency as base currency

Author: DominicWatts

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

@@ -120,7 +120,7 @@ public function getOrdersTrackingCode()
         $result[] = "ga('require', 'ec', 'ec.js');";
 
         foreach ($collection as $order) {
-            $result[] = "ga('set', 'currencyCode', '" . $order->getBaseCurrencyCode() . "');";
+            $result[] = "ga('set', 'currencyCode', '" . $order->getOrderCurrencyCode() . "');";
             foreach ($order->getAllVisibleItems() as $item) {
                 $result[] = sprintf(
                     "ga('ec:addProduct', {
@@ -131,7 +131,7 @@ public function getOrdersTrackingCode()
                     });",
                     $this->escapeJs($item->getSku()),
                     $this->escapeJs($item->getName()),
-                    $item->getBasePrice(),
+                    $item->getPrice(),
                     $item->getQtyOrdered()
                 );
             }
@@ -146,9 +146,9 @@ public function getOrdersTrackingCode()
                 });",
                 $order->getIncrementId(),
                 $this->escapeJs($this->_storeManager->getStore()->getFrontendName()),
-                $order->getBaseGrandTotal(),
-                $order->getBaseTaxAmount(),
-                $order->getBaseShippingAmount()
+                $order->getGrandTotal(),
+                $order->getTaxAmount(),
+                $order->getShippingAmount()
             );
 
             $result[] = "ga('send', 'pageview');";
@@ -233,18 +233,18 @@ public function getOrdersTrackingData()
                 $result['products'][] = [
                     'id' => $this->escapeJs($item->getSku()),
                     'name' =>  $this->escapeJs($item->getName()),
-                    'price' => $item->getBasePrice(),
+                    'price' => $item->getPrice(),
                     'quantity' => $item->getQtyOrdered(),
                 ];
             }
             $result['orders'][] = [
                 'id' =>  $order->getIncrementId(),
                 'affiliation' => $this->escapeJs($this->_storeManager->getStore()->getFrontendName()),
-                'revenue' => $order->getBaseGrandTotal(),
-                'tax' => $order->getBaseTaxAmount(),
-                'shipping' => $order->getBaseShippingAmount(),
+                'revenue' => $order->getGrandTotal(),
+                'tax' => $order->getTaxAmount(),
+                'shipping' => $order->getShippingAmount(),
             ];
-            $result['currency'] = $order->getBaseCurrencyCode();
+            $result['currency'] = $order->getOrderCurrencyCode();
         }
         return $result;
     }

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

@@ -204,18 +204,18 @@ protected function createOrderMock($orderItemCount = 1)
                 ->getMock();
             $orderItemMock->expects($this->once())->method('getSku')->willReturn('sku' . $i);
             $orderItemMock->expects($this->once())->method('getName')->willReturn('testName' . $i);
-            $orderItemMock->expects($this->once())->method('getBasePrice')->willReturn($i . '.00');
+            $orderItemMock->expects($this->once())->method('getPrice')->willReturn($i . '.00');
             $orderItemMock->expects($this->once())->method('getQtyOrdered')->willReturn($i + 1);
             $orderItems[] = $orderItemMock;
         }
 
         $orderMock = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock();
         $orderMock->expects($this->once())->method('getIncrementId')->willReturn(100);
         $orderMock->expects($this->once())->method('getAllVisibleItems')->willReturn($orderItems);
-        $orderMock->expects($this->once())->method('getBaseGrandTotal')->willReturn(10);
-        $orderMock->expects($this->once())->method('getBaseTaxAmount')->willReturn(2);
-        $orderMock->expects($this->once())->method('getBaseShippingAmount')->willReturn($orderItemCount);
-        $orderMock->expects($this->once())->method('getBaseCurrencyCode')->willReturn('USD');
+        $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('getOrderCurrencyCode')->willReturn('USD');
         return $orderMock;
     }