diff --git a/src/order-ojek.php b/src/order-ojek.php
index 002928b71b2728c7cc8ae1c3aaa61ca15be5582e..faefef37b53edb80aab9821b120d6840e223fc3f 100644
--- a/src/order-ojek.php
+++ b/src/order-ojek.php
@@ -41,7 +41,7 @@
       </div>
 
       <div class="mtop10 rowflex">
-            <div class="rowflex order-step flexone box font-order">
+            <div class="rowflex order-step flexone box font-order selected-order">
               <div class="number mr20 lh40">
                 1
               </div>
@@ -49,7 +49,7 @@
                 Select Destination
               </div>
             </div>
-            <div class="rowflex order-step flexone box font-order selected-order">
+            <div class="rowflex order-step flexone box font-order ">
               <div class="number mr20 lh40">
                 2
               </div>
@@ -67,22 +67,21 @@
             </div>
       </div>
 
+      <form method="post" onsubmit="return isFilled()" action="<?php echo 'select-driver.php?id_active='.$_GET['id_active']?>" >     >
       <div class="rowflex mtop30">
         <div class="labels mlauto">
           Picking Point
         </div>
-        <input class="mrauto" placeholder="  insert picking point"/>
+        <input class="mrauto" name='source' placeholder="  insert picking point"/>
       </div>
 
-
       <div class="rowflex mtop10">
         <div class="labels mlauto">
           Destination
         </div>
-        <input class="mrauto" placeholder="  insert destination"/>
+        <input class="mrauto" name='destination' placeholder="  insert destination"/>
       </div>
 
-
       <div class="rowflex mtop10">
         <div class="labels mlauto">
           Preferred Driver
@@ -90,11 +89,27 @@
         <input class="mrauto" placeholder="  optional"/>
       </div>
 
-      <div class="mtop50 button mcenter">
-        Complete Order
+      <div class="textcenter">
+        <input class="mtop30 button " type="submit" value="Complete Order" />
       </div>
 
+      </form>
+    </div>
 
     </div>
   </body>
+
+  <script>
+  function isFilled(){
+    var form = document.getElementsByTagName('input');
+
+    for (var i = 0; i < 2; i++){
+      if (form[i].value == ''){
+        alert('Harap isikan form yang wajib !');
+        return false;
+      }
+    }
+    return true;
+  }
+  </script>
 </html>