diff --git a/order/(BACKUP) order.php b/order/(BACKUP) order.php
new file mode 100644
index 0000000000000000000000000000000000000000..c5c45aa3da2ef9715ec18e2d51b3925813d77b38
--- /dev/null
+++ b/order/(BACKUP) order.php
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>U Wanna Call Me Beibh?</title>
+ <link rel="stylesheet" type="text/css" href="../css/default_style.css">
+ <link rel="stylesheet" type="text/css" href="../css/order.css">
+ <link rel="stylesheet" type="text/css" href="../css/header.css">
+</head>
+<body>
+ <div class="frame">
+ <div class="header">
+ <?php
+ $user_id = $_GET['id'];
+ include '../database/dbconnect.php';
+
+ $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
+
+ if(mysqli_num_rows($query)!=0)
+ {
+ $row=mysqli_fetch_assoc($query);
+ $username = $row['username'];
+ include("../template/header.php");
+ }
+ mysqli_close($con);
+ ?>
+ </div>
+ <div class="menu_container">
+ <?php include'../template/menu.php';?>
+ </div>
+
+ <h1>Make an Order</h1>
+ <div class="submenu_container">
+ <div class="submenu left" onclick="showSelectDest()">
+ Select Destination
+ </div>
+
+ <div class="submenu mid" onclick="showSelectDriver()">
+ Select a Driver
+ </div>
+
+ <div class="submenu right" onclick="showCompleteOrder()">
+ Complete Order
+ </div>
+ </div>
+ <form method="post">
+ <div class="content" id="select_destination">
+ <div>
+ <div>
+ <span>Picking point</span>
+ <input type="text" name="picking_point">
+ </div>
+ <div>
+ <span>Destination</span>
+ <input type="text" name="destination">
+ </div>
+ <div>
+ <span>Preferred driver</span>
+ <input type="text" name="preferred_driver">
+ </div>
+ </div>
+ <div class="button green" onclick="showSelectDriver()">
+ Next
+ </div>
+ </div>
+ <div class="content" id="select_driver" style="display: none;">
+ <div id="preferred_driver">
+ <h2>Preferred driver</h2>
+ </div>
+ <div id="other_driver">
+ <h2>Other drivers</h2>
+ </div>
+ <div id="selected_driver" style="display: none">
+ <input type="text" name="selected_driver">
+ </div>
+ </div>
+ <div class="content" id="complete_order" style="display: none;">
+ <h2>
+ How was it?
+ </h2>
+ <input class="button green" type="submit" name="submit" value="Complete Order">
+ </div>
+ </form>
+ </div>
+
+ <script type="text/javascript">
+ var pref_driver = $("input#preferred_driver").val();
+ function showSelectDest() {
+ alert(pref_driver);
+ document.getElementById('select_destination').style.display= 'inline';
+ document.getElementById('select_driver').style.display= 'none';
+ document.getElementById('complete_order').style.display= 'none';
+ };
+
+ function showSelectDriver() {
+ document.getElementById('select_driver').style.display= 'inline';
+ document.getElementById('select_destination').style.display= 'none';
+ document.getElementById('complete_order').style.display= 'none';
+ };
+
+ function showCompleteOrder() {
+ document.getElementById('complete_order').style.display='inline';
+ document.getElementById('select_destination').style.display= 'none';
+ document.getElementById('select_driver').style.display= 'none';
+ };
+ </script>
+</body>
+</html>
diff --git a/order/complete_order.html b/order/complete_order.html
deleted file mode 100755
index d6d12cccf7560b357e12c5275ab62ff3e470601c..0000000000000000000000000000000000000000
--- a/order/complete_order.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
- <p>
- complete order
- </p>
-</body>
\ No newline at end of file
diff --git a/order/complete_order.php b/order/complete_order.php
new file mode 100644
index 0000000000000000000000000000000000000000..bf89c4f67b01f0252118e193fcd4a8dc0cd27fdd
--- /dev/null
+++ b/order/complete_order.php
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>U Wanna Call Me Beibh?</title>
+ <link rel="stylesheet" type="text/css" href="../css/default_style.css">
+ <link rel="stylesheet" type="text/css" href="../css/order.css">
+ <link rel="stylesheet" type="text/css" href="../css/header.css">
+</head>
+<body>
+ <div class="frame">
+ <div class="header">
+ <?php
+ $user_id = $_GET['id'];
+ include '../database/dbconnect.php';
+
+ $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
+
+ if(mysqli_num_rows($query)!=0)
+ {
+ $row=mysqli_fetch_assoc($query);
+ $username = $row['username'];
+ include("../template/header.php");
+ }
+ mysqli_close($con);
+ ?>
+ </div>
+ <div class="menu_container">
+ <?php include'../template/menu.php';?>
+ </div>
+
+ <h1>Make an Order</h1>
+ <div class="submenu_container">
+ <div class="submenu left">
+ Select Destination
+ </div>
+
+ <div class="submenu mid">
+ Select a Driver
+ </div>
+
+ <div class="submenu right">
+ Complete Order
+ </div>
+ </div>
+ <form method="post">
+ <div class="content" id="complete_order" style="display: none;">
+ <h2>
+ How was it?
+ </h2>
+ <input class="button green" type="submit" name="submit" value="Complete Order">
+ </div>
+ </form>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/order/order.php b/order/order.php
index c6fd2793578861251ff5149480119cf33bc73845..fa2ec3f671b5e19cda5356ad4a3360bb12108e1a 100644
--- a/order/order.php
+++ b/order/order.php
@@ -1,109 +1,3 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>U Wanna Call Me Beibh?</title>
- <link rel="stylesheet" type="text/css" href="../css/default_style.css">
- <link rel="stylesheet" type="text/css" href="../css/order.css">
- <link rel="stylesheet" type="text/css" href="../css/header.css">
-
-</head>
-<body>
- <div class="frame">
- <div class="header">
- <?php
- $user_id = $_GET['id'];
- include '../database/dbconnect.php';
-
- $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
-
- if(mysqli_num_rows($query)!=0)
- {
- $row=mysqli_fetch_assoc($query);
- $username = $row['username'];
- include("../template/header.php");
- }
- mysqli_close($con);
- ?>
- </div>
- <div class="menu_container">
- <?php include'../template/menu.php';?>
- <script>
- document.getElementById("order_link").setAttribute("class", "menu menu_active");
- </script>
- </div>
-
- <h1>Make an Order</h1>
- <div class="submenu_container">
- <div class="submenu left" onclick="showSelectDest()">
- Select Destination
- </div>
-
- <div class="submenu mid" onclick="showSelectDriver()">
- Select a Driver
- </div>
-
- <div class="submenu right" onclick="showCompleteOrder()">
- Complete Order
- </div>
- </div>
- <form method="post">
- <div class="content" id="select_destination">
- <div>
- <div>
- <span>Picking point</span>
- <input type="text" name="picking_point">
- </div>
- <div>
- <span>Destination</span>
- <input type="text" name="destination">
- </div>
- <div>
- <span>Preferred driver</span>
- <input type="text" name="preferred_driver">
- </div>
- </div>
- <div class="button green" id="next" onclick="showSelectDriver()">
- Next
- </div>
- </div>
- <div class="content" id="select_driver" style="display: none;">
- <div id="preferred_driver">
- <h2>Preferred driver</h2>
- </div>
- <div id="other_driver">
- <h2>Other drivers</h2>
- </div>
- <div id="selected_driver" style="display: none">
- <input type="text" name="selected_driver">
- </div>
- </div>
- <div class="content" id="complete_order" style="display: none;">
- <h2>
- How was it?
- </h2>
- <input class="button green" type="submit" name="submit" value="Complete Order">
- </div>
- </form>
- </div>
-
- <script type="text/javascript">
- function showSelectDest() {
- document.getElementById('select_destination').style.display= 'inline';
- document.getElementById('select_driver').style.display= 'none';
- document.getElementById('complete_order').style.display= 'none';
- };
-
- function showSelectDriver() {
- document.getElementById('select_driver').style.display= 'inline';
- document.getElementById('select_destination').style.display= 'none';
- document.getElementById('complete_order').style.display= 'none';
- };
-
- function showCompleteOrder() {
- document.getElementById('complete_order').style.display='inline';
- document.getElementById('select_destination').style.display= 'none';
- document.getElementById('select_driver').style.display= 'none';
- };
- </script>
-</body>
-</html>
+<?php
+ header('Location : select_location.php')
+?>
diff --git a/order/order_location_handler.php b/order/order_location_handler.php
new file mode 100644
index 0000000000000000000000000000000000000000..cd3f447c34acb8562a6793210c84e0d6c9adf76d
--- /dev/null
+++ b/order/order_location_handler.php
@@ -0,0 +1,7 @@
+<?php
+ include '../database/dbconnect.php';
+
+ if ($_SERVER["REQUEST_METHOD"] == "POST") {
+
+ }
+?>
\ No newline at end of file
diff --git a/order/select_driver.html b/order/select_driver.html
deleted file mode 100755
index 32ffbe45f9c209fe776ba7e27870c54e6cd79997..0000000000000000000000000000000000000000
--- a/order/select_driver.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
- <p>
- select driver
- </p>
-</body>
\ No newline at end of file
diff --git a/order/select_driver.php b/order/select_driver.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a936e2e1bccec6b68d12f925a9d7f7738ce398a
--- /dev/null
+++ b/order/select_driver.php
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>U Wanna Call Me Beibh?</title>
+ <link rel="stylesheet" type="text/css" href="../css/default_style.css">
+ <link rel="stylesheet" type="text/css" href="../css/order.css">
+ <link rel="stylesheet" type="text/css" href="../css/header.css">
+</head>
+<body>
+ <div class="frame">
+ <div class="header">
+ <?php
+ $user_id = $_GET['id'];
+ include '../database/dbconnect.php';
+
+ $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
+
+ if(mysqli_num_rows($query)!=0)
+ {
+ $row=mysqli_fetch_assoc($query);
+ $username = $row['username'];
+ include("../template/header.php");
+ }
+
+ //===========================================
+
+ $ppoint = $_POST['picking_point'];
+ $dest = $_POST['destination'];
+ $prefdrv = $_POST['preferred_driver'];
+ echo $prefdrv;
+
+ function ShowPrefDrv($prefdrv, $con)
+ {
+ if (!(is_null($prefdrv))) {
+ $pdQuery = mysqli_query($con, "SELECT * FROM driver RIGHT OUTER JOIN (SELECT * FROM user WHERE name='" . $prefdrv . "') AS usert ON user_id = driver_id") or die(mysqli_error($con));
+
+ while ($row = mysqli_fetch_assoc($pdQuery)) {
+ $driver_id = $row['driver_id'];
+ $driver_name = $row['username'];
+ $driver_votes = $row['votes'];
+ $driver_rating = ($driver_votes == 0) ? 0 : $row['total_score']/$row['votes'];
+ echo
+ "
+ <table id='tbl_pref_driver'>
+ <tr>
+ <td>
+ <img class='history_pict' src='../profile/getProfilePict.php?id=".$driver_id."'
+ </td>
+ <td>
+ <p class='driver_username'>".$driver_name."</p>
+ <p class='driver_rating'>★".$driver_rating." (".$driver_votes." votes)</p>
+ <div class='button green' onclick=''>
+ I CHOOSE YOU
+ </div>
+ </td>
+ </tr>
+ </table>
+ ";
+ }
+ }
+ else
+ {
+ echo "<h2>Nothing to display :(</h2>";
+ }
+ }
+ ?>
+ </div>
+ <div class="menu_container">
+ <?php include'../template/menu.php';?>
+ </div>
+
+ <h1>Make an Order</h1>
+ <div class="submenu_container">
+ <div class="submenu left">
+ Select Destination
+ </div>
+
+ <div class="submenu mid">
+ Select a Driver
+ </div>
+
+ <div class="submenu right">
+ Complete Order
+ </div>
+ </div>
+ <form method="post" action="complete_order.php">
+ <div class="content" id="select_driver">
+ <div id="preferred_driver">
+ <h2>Preferred driver</h2>
+ <?php ShowPrefDrv($prefdrv, $con) ?>
+ </div>
+ <div id="other_driver">
+ <h2>Other drivers</h2>
+ </div>
+ <input type="hidden" name="selected_driver">
+ <input type="submit" name="submit_select_drv" style="display: none;">
+ </div>
+ </form>
+ <?php mysqli_close($con) ?>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/order/select_location.php b/order/select_location.php
index 44b5ca0243fde2923992bf5b8879a47420e3a1fa..d372739347dd5ef63d73d1024eef74454d24b0cf 100644
--- a/order/select_location.php
+++ b/order/select_location.php
@@ -1,5 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>U Wanna Call Me Beibh?</title>
+ <link rel="stylesheet" type="text/css" href="../css/default_style.css">
+ <link rel="stylesheet" type="text/css" href="../css/order.css">
+ <link rel="stylesheet" type="text/css" href="../css/header.css">
+</head>
<body>
- <p>
- select location
- </p>
-</body>
\ No newline at end of file
+ <div class="frame">
+ <div class="header">
+ <?php
+ $user_id = $_GET['id'];
+ include '../database/dbconnect.php';
+
+ $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
+
+ if(mysqli_num_rows($query)!=0)
+ {
+ $row=mysqli_fetch_assoc($query);
+ $username = $row['username'];
+ include("../template/header.php");
+ }
+ mysqli_close($con);
+ ?>
+ </div>
+ <div class="menu_container">
+ <?php include'../template/menu.php';?>
+ </div>
+
+ <h1>Make an Order</h1>
+ <div class="submenu_container">
+ <div class="submenu left">
+ Select Destination
+ </div>
+
+ <div class="submenu mid">
+ Select a Driver
+ </div>
+
+ <div class="submenu right">
+ Complete Order
+ </div>
+ </div>
+ <form method="post" action=<?php echo "select_driver.php?id=" . $user_id;?>>
+ <div class="content" id="select_destination">
+ <div>
+ <div>
+ <span>Picking point</span>
+ <input type="text" name="picking_point">
+ </div>
+ <div>
+ <span>Destination</span>
+ <input type="text" name="destination">
+ </div>
+ <div>
+ <span>Preferred driver</span>
+ <input type="text" name="preferred_driver">
+ </div>
+ </div>
+ <input type="submit" name="submit_select_loc" class="button green">
+ </div>
+ </form>
+ </div>
+</body>
+</html>
diff --git a/order/show_drivers.php b/order/show_drivers.php
deleted file mode 100644
index 7a9ce35739f88a6cf18774724f1da2112a188181..0000000000000000000000000000000000000000
--- a/order/show_drivers.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
- include '../database/dbconnect.php';
-
-
-?>
\ No newline at end of file
diff --git a/template/menu.php b/template/menu.php
index 35d738d480e3156c2368ecea5b657d3f9b5c4ca6..88a34fc0e63e9719826afccdeb2e84a735ebb510 100644
--- a/template/menu.php
+++ b/template/menu.php
@@ -1,6 +1,6 @@
<?php
echo '
- <a href="../order/order.php?id='. $user_id .'" name="order_link">
+ <a href="../order/select_location.php?id='. $user_id .'" name="order_link">
<div class="menu" id="order_link">
<h3>ORDER</h3>
</div>