From 9c36baa3d3538b616a70efe8ba85741219045a4b Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Fri, 12 May 2023 15:32:02 +0800
Subject: [PATCH] Fix jo id null on outlet_assign #730

---
 src/Controller/CustomerAppAPI/JobOrderController.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Controller/CustomerAppAPI/JobOrderController.php b/src/Controller/CustomerAppAPI/JobOrderController.php
index a5fa37f5..ecf21ae4 100644
--- a/src/Controller/CustomerAppAPI/JobOrderController.php
+++ b/src/Controller/CustomerAppAPI/JobOrderController.php
@@ -817,6 +817,8 @@ class JobOrderController extends ApiController
             ->setJobOrder($jo);
         $this->em->persist($event);
 
+        $this->em->flush();
+
         // check JO status
         if ($jo->getStatus() == JOStatus::ASSIGNED) {
             // add event logs for hub and rider assignments
@@ -834,12 +836,9 @@ class JobOrderController extends ApiController
 
             $this->em->persist($rider_assign_event);
 
-            error_log("Outlet assigned A");
-
             // user mqtt event
             $payload = [
                 'event' => 'outlet_assign',
-                'jo_id' => $jo->getID(),
             ];
             $mclientv2->sendEvent($jo, $payload);
 
@@ -855,12 +854,9 @@ class JobOrderController extends ApiController
 
             $this->em->persist($hub_assign_event);
 
-            error_log("Outlet assigned B");
-
             // user mqtt event
             $payload = [
                 'event' => 'outlet_assign',
-                'jo_id' => $jo->getID(),
             ];
             $mclientv2->sendEvent($jo, $payload);
         }
@@ -1184,12 +1180,9 @@ class JobOrderController extends ApiController
 
             $this->em->persist($rider_assign_event);
 
-            error_log("Outlet assigned C");
-
             // user mqtt event
             $payload = [
                 'event' => 'outlet_assign',
-                'jo_id' => $jo->getID(),
             ];
             $mclientv2->sendEvent($jo, $payload);