diff --git a/ChatService/app/routes.js b/ChatService/app/routes.js
index 267ea26d7969acdb1a0b56d73d96679a877b14aa..eadf841d36f5a78b0bc25543a5578f169e936016 100644
--- a/ChatService/app/routes.js
+++ b/ChatService/app/routes.js
@@ -106,6 +106,28 @@ module.exports = function(app) {
                     }
                 });
             });
+
+            // cancel find order
+            app.post('/cancelfindorder', function(req, res){
+                Driver.findOne({"idDriver" : req.body.id}, function(err, foundDriver){
+                    if (err){
+                        var response = {"status" : 503, "message" : "Database error detected"};
+                        res.json(response);
+                    }
+                    else {
+                        if (foundDriver){
+                            foundDriver.remove();
+                            var response = {"status" : 200, "message" : "Cancel order succes"};
+                            res.json(response);
+                        } else {
+                            // foundDriver["status"] = "available";
+                            // foundDriver.save();
+                            var response = {"status" : 503, "message" : "Driver not found"};
+                            res.json(response);
+                        }
+                    }
+                });
+            });
     
             // user select certain driver
             app.post('/selectdriver', function(req, res){
diff --git a/PrOjek/ojek-cmpt/src/main/java/com/jauharteam/ojek/ojek/LocationService.java b/PrOjek/ojek-cmpt/src/main/java/com/jauharteam/ojek/ojek/LocationService.java
index e6ea34ca6c9915d78aeb2ed0e304d8fcd926af99..5d746877a3aee26059703ea246d7713a3226ad4f 100644
--- a/PrOjek/ojek-cmpt/src/main/java/com/jauharteam/ojek/ojek/LocationService.java
+++ b/PrOjek/ojek-cmpt/src/main/java/com/jauharteam/ojek/ojek/LocationService.java
@@ -22,6 +22,9 @@ public interface LocationService {
     @WebMethod
     public Location[] getAllLocation(String token);
 
+    @WebMethod
+    public Location[] getAllLocation(Integer id);
+
     @WebMethod
     public Boolean editLocation(String token, Location pastLocation, Location newLocation);
 
diff --git a/PrOjek/ojek/src/main/java/com/jauharteam/ojek/ojek/location/LocationServiceImpl.java b/PrOjek/ojek/src/main/java/com/jauharteam/ojek/ojek/location/LocationServiceImpl.java
index 711cbd814c21fffc922ef8f3d5d96abf89a3dd30..e1dd72ed645491c672663a722e1f39f79725393e 100644
--- a/PrOjek/ojek/src/main/java/com/jauharteam/ojek/ojek/location/LocationServiceImpl.java
+++ b/PrOjek/ojek/src/main/java/com/jauharteam/ojek/ojek/location/LocationServiceImpl.java
@@ -66,6 +66,15 @@ public class LocationServiceImpl implements LocationService {
         return new Location[0];
     }
 
+    @Override
+    public Location[] getAllLocation(Integer id) {
+        if(id){
+            ArrayList<Location> locations = locationDAO.getAllLocation(user.getId());
+            return locations.toArray(new Location[locations.size()]);
+        }
+        return new Location[0];
+    }
+
     @Override
     public Boolean editLocation(String token, Location pastLocation, Location newLocation) {
         if(getIdentityService().isTokenValid(token)) {
diff --git a/PrOjek/webapp/src/main/webapp/resources/js/order.js b/PrOjek/webapp/src/main/webapp/resources/js/order.js
index 408fc42f5c5bd36158f93d3925f5707dd89bb355..ccb42dde7cf456a47243942f03c1aa387e035138 100644
--- a/PrOjek/webapp/src/main/webapp/resources/js/order.js
+++ b/PrOjek/webapp/src/main/webapp/resources/js/order.js
@@ -60,6 +60,7 @@ function backToFindOrder() {
     var next = 'find-order';
     document.getElementById(prev).style.display = 'none';
     document.getElementById(next).style.display = 'block';
+    $.post('http://localhost:3000/cancelfindorder',{id:idCustomer});
 }
 
 function nextToGotAnOrder() {