diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index f9065d2d..a39a91cd 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -1268,6 +1268,7 @@ class JobOrderController extends BaseController
                 ->setTier2Notes($req->request->get('tier2_notes'))
                 ->setDeliveryAddress($req->request->get('delivery_address'))
                 ->setHub($hub)
+                ->setProcessedBy($this->getUser())
                 ->clearRider();
 
             // validate
@@ -1288,6 +1289,14 @@ class JobOrderController extends BaseController
             ], 422);
         }
 
+        // add event
+        $event = new JOEvent();
+        $event->setDateHappen(new DateTime())
+            ->setTypeID(JOEventType::HUB_ASSIGN)
+            ->setUser($this->getUser())
+            ->setJobOrder($obj);
+        $em->persist($event);
+
         // validated! save the entity
         $em->flush();
 
@@ -1384,6 +1393,7 @@ class JobOrderController extends BaseController
                 ->setDeliveryAddress($req->request->get('delivery_address'))
                 ->setAssignedBy($this->getUser())
                 ->setDateAssign(new DateTime())
+                ->setAssignedBy($this->getUser())
                 ->setRider($rider);
 
             // validate
@@ -1404,6 +1414,14 @@ class JobOrderController extends BaseController
             ], 422);
         }
 
+        // add event
+        $event = new JOEvent();
+        $event->setDateHappen(new DateTime())
+            ->setTypeID(JOEventType::RIDER_ASSIGN)
+            ->setUser($this->getUser())
+            ->setJobOrder($obj);
+        $em->persist($event);
+
         // validated! save the entity
         $em->flush();