Use order currency, not context

Author: Hlavtox

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -101,7 +101,7 @@ public function run()
                                     'value' => (float) $transaction['revenue'],
                                     'tax' => (float) $transaction['tax'],
                                     'shipping' => (float) $transaction['shipping'],
-                                    'currency' => $this->context->currency->iso_code,
+                                    'currency' => $transaction['currency'],
                                     'event_callback' => "function() {
                                         $.get('" . $transaction['url'] . "', " . json_encode($callbackData, JSON_UNESCAPED_UNICODE) . ');
                                     }',

classes/Hook/HookDisplayOrderConfirmation.php

@@ -63,9 +63,12 @@ public function run()
                 $gaTagHandler = new GanalyticsJsHandler($this->module, $this->context);
                 $productWrapper = new ProductWrapper($this->context);
 
+                // Prepare currency information
+                $currency = new Currency((int) $order->id_currency);
+
                 // Add payment data
                 $eventData = [
-                    'currency' => $this->context->currency->iso_code,
+                    'currency' => $currency->iso_code,
                     'payment_type' => $order->payment,
                 ];
                 $gaScripts = $this->module->getTools()->renderEvent(
@@ -76,13 +79,13 @@ public function run()
                 // Prepare transaction data
                 $transaction = [
                     'id' => (int) $order->id,
-                    'affiliation' => (Shop::isFeatureActive()) ? $this->context->shop->name : Configuration::get('PS_SHOP_NAME'),
+                    'affiliation' => Shop::isFeatureActive() ? $this->context->shop->name : Configuration::get('PS_SHOP_NAME'),
                     'revenue' => (float) $order->total_paid,
                     'shipping' => (float) $order->total_shipping,
                     'tax' => (float) $order->total_paid_tax_incl - $order->total_paid_tax_excl,
                     'url' => $this->context->link->getModuleLink('ps_googleanalytics', 'ajax', [], true),
                     'customer' => (int) $order->id_customer,
-                    'currency' => $this->context->currency->iso_code,
+                    'currency' => $currency->iso_code,
                 ];
 
                 // Prepare order products

classes/Wrapper/OrderWrapper.php

@@ -43,16 +43,23 @@ public function wrapOrder($id_order)
     {
         $order = new Order((int) $id_order);
 
-        if (Validate::isLoadedObject($order)) {
-            return [
-                'id' => $id_order,
-                'affiliation' => Shop::isFeatureActive() ? $this->context->shop->name : Configuration::get('PS_SHOP_NAME'),
-                'revenue' => $order->total_paid,
-                'shipping' => $order->total_shipping,
-                'tax' => $order->total_paid_tax_incl - $order->total_paid_tax_excl,
-                'url' => $this->context->link->getAdminLink('AdminGanalyticsAjax'),
-                'customer' => $order->id_customer,
-            ];
+        // Check order still exists
+        if (!Validate::isLoadedObject($order)) {
+            return;
         }
+
+        // Prepare currency information
+        $currency = new Currency((int) $order->id_currency);
+
+        return [
+            'id' => (int) $order->id,
+            'affiliation' => Shop::isFeatureActive() ? $this->context->shop->name : Configuration::get('PS_SHOP_NAME'),
+            'revenue' => (float) $order->total_paid,
+            'shipping' => (float) $order->total_shipping,
+            'tax' => (float) $order->total_paid_tax_incl - $order->total_paid_tax_excl,
+            'url' => $this->context->link->getAdminLink('AdminGanalyticsAjax'),
+            'customer' => (int) $order->id_customer,
+            'currency' => $currency->iso_code,
+        ];
     }
 }