From 86599ccf0e59d6ce96b7f4756f2445c90e3cc4de Mon Sep 17 00:00:00 2001
From: ayamberkakienam <zackhardyz@gmail.com>
Date: Sat, 7 Oct 2017 00:21:41 +0700
Subject: [PATCH] Restructure order interface
---
order/complete_order.html | 5 ---
order/complete_order.php | 55 ++++++++++++++++++++++++++++++
order/order.php | 4 ++-
order/select_driver.html | 5 ---
order/select_driver.php | 60 +++++++++++++++++++++++++++++++++
order/select_location.php | 71 ++++++++++++++++++++++++++++++++++++---
6 files changed, 185 insertions(+), 15 deletions(-)
delete mode 100755 order/complete_order.html
create mode 100644 order/complete_order.php
delete mode 100755 order/select_driver.html
create mode 100644 order/select_driver.php
diff --git a/order/complete_order.html b/order/complete_order.html
deleted file mode 100755
index d6d12ccc..00000000
--- 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 00000000..bf89c4f6
--- /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 e9e8bbd7..c5c45aa3 100644
--- a/order/order.php
+++ b/order/order.php
@@ -58,7 +58,7 @@
<input type="text" name="preferred_driver">
</div>
</div>
- <div class="button green" id="next" onclick="showSelectDriver()">
+ <div class="button green" onclick="showSelectDriver()">
Next
</div>
</div>
@@ -83,7 +83,9 @@
</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';
diff --git a/order/select_driver.html b/order/select_driver.html
deleted file mode 100755
index 32ffbe45..00000000
--- 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 00000000..7fa7efda
--- /dev/null
+++ b/order/select_driver.php
@@ -0,0 +1,60 @@
+<!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="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>
+ </form>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/order/select_location.php b/order/select_location.php
index 44b5ca02..4e08d6bc 100644
--- a/order/select_location.php
+++ b/order/select_location.php
@@ -1,5 +1,68 @@
+<!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">
+ <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>
+ </form>
+ </div>
+</body>
+</html>
--
GitLab