diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 6fe5f08d..eba37122 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -1501,6 +1501,22 @@ class APIController extends Controller implements LoggedController
         return $res->getReturnResponse();
     }
 
+    protected function generateAPIRiderStatus($status)
+    {
+        switch ($status)
+        {
+            case JOStatus::PENDING:
+                return APIRiderStatus::OUTLET_ASSIGN;
+            case JOStatus::RIDER_ASSIGN:
+                return APIRiderStatus::RIDER_ASSIGN;
+            case JOStatus::ASSIGNED:
+            case JOStatus::IN_TRANSIT:
+            case JOStatus::IN_PROGRESS:
+                return APIRiderStatus::RIDER_PICK_UP;
+        }
+        return 'unknown';
+    }
+
     protected function getOngoingJobOrders($cust)
     {
         $em = $this->getDoctrine()->getManager();
@@ -1889,7 +1905,8 @@ class APIController extends Controller implements LoggedController
 			],
 			'delivery_address' => $jo->getDeliveryAddress(),
 			'delivery_instructions' => $jo->getDeliveryInstructions(),
-            'status' => $status,
+            'jo_status' => $status,
+            'status' => $this->generateAPIRiderStatus($status),
 		];
 
         // customer vehicle and warranty