Fix purchase datalayer

Author: zawaze

Config/module.xml

@@ -13,11 +13,15 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>3.1.1</version>
+    <version>3.1.2</version>
     <authors>
         <author>
-            <name>Tom Pradat</name>
-            <email>tpradat@openstudio.fr</email>
+            <name>Bertrand Tourlonias</name>
+            <email>btourlonias@openstudio.fr</email>
+        </author>
+        <author>
+            <name>Nicolas Barbey</name>
+            <email>nbarbey@openstudio.fr</email>
         </author>
     </authors>
     <type>classic</type>

Hook/FrontHook.php

@@ -84,9 +84,9 @@ public function onMainHeadTop(HookRenderEvent $event)
                 ]));
             }
 
-            if ($view === 'order-placed') {
+            if ($view === 'order-placed' && $orderId = $request->get('order_id')) {
                 $event->add($this->render('datalayer/thelia-page-view.html', [
-                    'data' => $this->googleTagService->getPurchaseData($session->get('order_id'))
+                    'data' => $this->googleTagService->getPurchaseData($orderId)
                 ]));
             }
 

Service/GoogleTagService.php

@@ -243,7 +243,7 @@ public function getCheckOutData(int $cartId, $addressCountry): string
         ]);
     }
 
-    public function getPurchaseData($orderId)
+    public function getPurchaseData(int $orderId)
     {
         $order = OrderQuery::create()->findPk($orderId);