diff --git a/WebService/.idea/libraries/json_20171018.xml b/WebService/.idea/libraries/json_20171018.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d4ad60c109474a8db0639f97daafa26f90188e0a
--- /dev/null
+++ b/WebService/.idea/libraries/json_20171018.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="json-20171018">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/Downloads/json-20171018.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/WebService/.idea/libraries/mysql_connector_java_5_0_8_bin.xml b/WebService/.idea/libraries/mysql_connector_java_5_0_8_bin.xml
new file mode 100644
index 0000000000000000000000000000000000000000..637dd472c21185bf3f2667956031579fe8ae6e9f
--- /dev/null
+++ b/WebService/.idea/libraries/mysql_connector_java_5_0_8_bin.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="mysql-connector-java-5.0.8-bin">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/mysql-connector-java-5.0.8-bin.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/WebService/.idea/libraries/mysql_connector_java_5_1_44_bin.xml b/WebService/.idea/libraries/mysql_connector_java_5_1_44_bin.xml
deleted file mode 100644
index 83a280c8d2a77bc721077cf1146aaf6911a5a7c7..0000000000000000000000000000000000000000
--- a/WebService/.idea/libraries/mysql_connector_java_5_1_44_bin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="mysql-connector-java-5.1.44-bin">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/Downloads/mysql-connector-java-5.1.44/mysql-connector-java-5.1.44-bin.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/WebService/intellij.iml b/WebService/intellij.iml
index bac22cebc11e8e129e3453e33e4b579306288444..a8d9a718f4180ea03c93307fde1456b44984a3c1 100644
--- a/WebService/intellij.iml
+++ b/WebService/intellij.iml
@@ -7,6 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="mysql-connector-java-5.1.44-bin" level="project" />
+    <orderEntry type="library" name="mysql-connector-java-5.0.8-bin" level="project" />
+    <orderEntry type="library" name="json-20171018" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/WebService/src/com/informatika/ojek/webservice/Order.java b/WebService/src/com/informatika/ojek/webservice/Order.java
index a3d2cc03d6605d5576fba99306d0c8f7e82ff362..ed4c119dbe155f712c86b5e82f00f1e0df095f42 100644
--- a/WebService/src/com/informatika/ojek/webservice/Order.java
+++ b/WebService/src/com/informatika/ojek/webservice/Order.java
@@ -9,6 +9,8 @@ import javax.jws.WebService;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import org.json.*;
+
 //Service Implementation
 @WebService(endpointInterface = "com.informatika.ojek.webservice.IOrder")
 public class Order implements IOrder {
@@ -23,6 +25,7 @@ public class Order implements IOrder {
         if(valid){
             id_active =  1;
         } else {
+            System.err.println("data invalid");
             return null;
         }
 
@@ -75,12 +78,14 @@ public class Order implements IOrder {
     }
     @Override
     public Account[] getNonPrefferedDriver(String access_token, String preffered_driver, String picking_point, String destination){
-        boolean valid = true;
-        int id_active;
+        boolean valid = validateToken(access_token);
         //cek akses token
+
+        int id_active;
         if(valid){
             id_active =  1;
         } else {
+            System.err.println("data invalid");
             return null;
         }
 
@@ -133,13 +138,14 @@ public class Order implements IOrder {
 
     }
     @Override public boolean PuttransactionDetails(String access_token,  int id_driver, String picking_point, String destination, int rating, String comment){
-        boolean valid = true;
-        int id_active;
-
+        boolean valid = validateToken(access_token);
+        //cek akses token
 
+        int id_active;
         if(valid){
             id_active =  1;
         } else {
+            System.err.println("data invalid");
             return false;
         }
         try
@@ -233,6 +239,17 @@ public class Order implements IOrder {
 
             //print result
             System.out.println(response.toString());
+
+
+            JSONObject obj = new JSONObject(response.toString());
+            String data = obj.getString("data");
+
+            if(data.equals("valid")){
+                return true;
+            } else
+            {
+                return false;
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }