Merge remote-tracking branch '37688/2.4-develop' into comm_jul

Author: engcom-Charlie

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

@@ -159,6 +159,7 @@ public function getOrdersTrackingData(): array
                 'value' => number_format((float) $order->getGrandTotal(), 2),
                 'tax' => number_format((float) $order->getTaxAmount(), 2),
                 'shipping' => number_format((float) $order->getShippingAmount(), 2),
+                'currency' => $order->getOrderCurrencyCode(),
             ];
             $result['currency'] = $order->getOrderCurrencyCode();
         }

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

@@ -166,7 +166,8 @@ public function testOrderTrackingData()
                     'affiliation' => 'test',
                     'value' => 10.00,
                     'tax' => 2.00,
-                    'shipping' => 1.00
+                    'shipping' => 1.00,
+                    'currency' => 'USD'
                 ]
             ],
             'products' => [
@@ -223,7 +224,7 @@ protected function createOrderMock($orderItemCount = 1)
         $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');
+        $orderMock->expects($this->exactly(2))->method('getOrderCurrencyCode')->willReturn('USD');
         return $orderMock;
     }