diff --git a/config/routes/rider_api.yaml b/config/routes/rider_api.yaml
index f5d2ae0a..2f61be21 100644
--- a/config/routes/rider_api.yaml
+++ b/config/routes/rider_api.yaml
@@ -54,3 +54,8 @@ rapi_change_service:
     path: /rapi/service
     controller: App\Controller\RAPIController::changeService
     methods: [POST]
+
+rapi_available:
+    path: /rapi/available
+    controller: App\Controller\RAPIController::available
+    methods: [POST]
diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php
index eb3f63d9..2cd95f60 100644
--- a/src/Controller/RAPIController.php
+++ b/src/Controller/RAPIController.php
@@ -477,7 +477,7 @@ class RAPIController extends Controller
     public function payment(Request $req)
     {
         $em = $this->getDoctrine()->getManager();
-        $required_params = ['jo_id', 'stype_id', 'promo_id', 'batt_id', 'trade_in'];
+        $required_params = ['jo_id'];
         $res = $this->checkJO($req, $required_params, $jo);
         if ($res->isError())
             return $res->getReturnResponse();
@@ -489,6 +489,27 @@ class RAPIController extends Controller
         $jo->setStatus(JOStatus::FULFILLED);
 
         $em->flush();
+
+        // TODO: add event
+
+        return $res->getReturnResponse();
+    }
+    
+    public function available(Request $req)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $required_params = [];
+        $res = $this->checkParamsAndKey($req, $em, $required_params);
+        if ($res->isError())
+            return $res->getReturnResponse();
+
+        // make rider available
+        $this->session->getRider()->setAvailable(true);
+
+        // TODO: log rider available
+        $em->flush();
+
+        return $res->getReturnResponse();
     }
 
     public function getPromos(Request $req)