diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 812a2658..5ea8a578 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -20,6 +20,7 @@ use App\Ramcar\WarrantyClass;
 use App\Ramcar\APIRiderStatus;
 use App\Ramcar\TransactionOrigin;
 use App\Ramcar\TradeInType;
+use App\Ramcar\JOEventType;
 
 use App\Service\InvoiceCreator;
 use App\Service\RisingTideGateway;
@@ -34,6 +35,7 @@ use App\Entity\JobOrder;
 use App\Entity\Promo;
 use App\Entity\Battery;
 use App\Entity\RiderRating;
+use App\Entity\JOEvent;
 
 use DateTime;
 
@@ -888,6 +890,14 @@ class APIController extends Controller
 
         $em->persist($jo);
         $em->persist($invoice);
+
+        // add event log
+        $event = new JOEvent();
+        $event->setDateHappen(new DateTime())
+            ->setTypeID(JOEventType::CREATE)
+            ->setJobOrder($jo);
+        $em->persist($event);
+
         $em->flush();
 
         // make invoice json data
@@ -1311,11 +1321,13 @@ class APIController extends Controller
 		$cancel_reason = $req->request->get('reason');
 
         $jo->cancel($cancel_reason);
-        /*
-        $jo->setStatus(JOStatus::CANCELLED)
-            ->setDateCancel(new DateTime())
-            ->setCancelReason($cancel_reason);
-        */
+
+        // add event log
+        $event = new JOEvent();
+        $event->setDateHappen(new DateTime())
+            ->setTypeID(JOEventType::CANCEL)
+            ->setJobOrder($jo);
+        $em->persist($event);
 
         $em->flush();