Add value to payment, fix minor issues

Author: Hlavtox

classes/GoogleAnalyticsTools.php

@@ -40,14 +40,14 @@ public function renderPurchaseEvent($orderProducts, $orderData, $callbackUrl)
         }
 
         $callbackData = [
-            'orderid' => $orderData['id'],
+            'orderid' => $orderData['transaction_id'],
             'customer' => $orderData['customer'],
         ];
 
         $eventData = [
-            'transaction_id' => (int) $orderData['id'],
+            'transaction_id' => (int) $orderData['transaction_id'],
             'affiliation' => $orderData['affiliation'],
-            'value' => (float) $orderData['revenue'],
+            'value' => (float) $orderData['value'],
             'tax' => (float) $orderData['tax'],
             'shipping' => (float) $orderData['shipping'],
             'currency' => $orderData['currency'],

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -166,6 +166,7 @@ public function processOrder($idOrder)
             'add_payment_info',
             [
                 'currency' => $orderData['currency'],
+                'value' => (float) $orderData['value'],
                 'payment_type' => $orderData['payment_type'],
                 'items' => $orderProducts,
             ]

classes/Hook/HookDisplayOrderConfirmation.php

@@ -87,6 +87,7 @@ public function run()
             'add_payment_info',
             [
                 'currency' => $orderData['currency'],
+                'value' => (float) $orderData['value'],
                 'payment_type' => $orderData['payment_type'],
                 'items' => $orderProducts,
             ]

classes/Wrapper/OrderWrapper.php

@@ -43,14 +43,14 @@ public function wrapOrder($order)
         $currency = new Currency((int) $order->id_currency);
 
         return [
-            'id' => (int) $order->id,
+            'transaction_id' => (int) $order->id,
             'affiliation' => Shop::isFeatureActive() ? $this->context->shop->name : Configuration::get('PS_SHOP_NAME'),
-            'revenue' => (float) $order->total_paid,
+            'value' => (float) $order->total_paid,
             'shipping' => (float) $order->total_shipping,
             'tax' => (float) $order->total_paid_tax_incl - $order->total_paid_tax_excl,
             'customer' => (int) $order->id_customer,
             'currency' => $currency->iso_code,
-            'payment_type' => (int) $order->payment,
+            'payment_type' => (string) $order->payment,
         ];
     }
 }