Skip to content
Snippets Groups Projects
Commit b7fd416f authored by Muhammad Umar Fariz Tumbuan's avatar Muhammad Umar Fariz Tumbuan
Browse files

Bikin fron end laman complete order

parent af6a9dd1
1 merge request!45OneHundred - 13515005 - Husnulzaki Wibisono Haryadi
Hide whitespace changes
Inline Side-by-side
css/order.css
+ 49
− 4
View file @ b7fd416f
...@@ -81,7 +81,7 @@ div.step_name { ...@@ -81,7 +81,7 @@ div.step_name {
margin-bottom: 10px; margin-bottom: 10px;
} }
.content span { .content span.loc_form_label {
width: 30%; width: 30%;
margin-right: auto; margin-right: auto;
float: left; float: left;
...@@ -92,7 +92,7 @@ div.step_name { ...@@ -92,7 +92,7 @@ div.step_name {
height: 20px; height: 20px;
} }
.content input[type=submit] { .content input[type=submit]#loc_button {
position: absolute; position: absolute;
margin: 10px; margin: 10px;
left: 45%; left: 45%;
...@@ -105,9 +105,27 @@ div.step_name { ...@@ -105,9 +105,27 @@ div.step_name {
margin: 7px 0; margin: 7px 0;
} }
div h2 {
margin: 0;
padding: 0;
text-align: left;
}
.star { .star {
size: 300%; font-size: 30px;
color: yellow; color: yellow;
text-shadow:
-1px -1px 0 #000,
1px -1px 0 #000,
-1px 1px 0 #000,
1px 1px 0 #000;
}
div.rating_bar {
height: auto;
vertical-align: top;
border-radius: 20px;
} }
#order_link { #order_link {
...@@ -169,4 +187,31 @@ div.choose_driver { ...@@ -169,4 +187,31 @@ div.choose_driver {
width: 50%; width: 50%;
text-align: center; text-align: center;
padding: 5px; padding: 5px;
} }
\ No newline at end of file
div#driver_profile {
margin: 0;
padding-top: 10px;
text-align: center;
}
div#driver_profile p {
padding: 0;
margin: 0;
}
div#complete_order {
text-align: center;
}
div#left_complete {
margin-top: 5px;
width: 40%;
float: left;
}
div#right_complete {
margin-top: 20px;
width: 60%;
float: right;
}
login/sign_up.php
+ 1
− 1
View file @ b7fd416f
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
$user_id=$row['user_id']; $user_id=$row['user_id'];
if ($status == "customer") { if ($status == "customer") {
header("Location: ../order/select_location.php?id=$user_id"); header("Location: ../order/order.php?id=$user_id");
} else { } else {
$query = mysqli_query($con,"INSERT INTO driver (driver_id,total_score,votes) VALUES ('$user_id',0,0)") or die(mysqli_error($con)); $query = mysqli_query($con,"INSERT INTO driver (driver_id,total_score,votes) VALUES ('$user_id',0,0)") or die(mysqli_error($con));
if ($query) { if ($query) {
......
order/complete_order.php
+ 70
− 43
View file @ b7fd416f
...@@ -39,55 +39,82 @@ ...@@ -39,55 +39,82 @@
<div class="menu_container"> <div class="menu_container">
<?php include'../template/menu.php';?> <?php include'../template/menu.php';?>
</div> </div>
<script>
document.getElementById("order_link").setAttribute("class", "menu menu_active");
</script>
<h1>Make an Order</h1> <div class="order_container">
<div class="submenu_container"> <div class="subheader">
<div class="submenu left"> <div class="title"><h1>Make an Order</h1></div>
Select Destination </div>
</div> <div class="submenu_container">
<div class="submenu left">
<div class="submenu mid"> <div class="step_num">
Select a Driver <p>1</p>
</div> </div>
<div class="step_name">
<div class="submenu right"> <p>Select Destination</p>
Complete Order </div>
</div>
</div>
<form id="submit_cmplt_ordr" method="post" action="order_handler.php">
<div class="content" id="complete_order">
<h2>
How was it?
</h2>
<div>
<?php echo "
<img class='driver_pict' src='../profile/getProfilePict.php?id=".$seldrv."'>"
;?>
<p> @<?php echo $driver_username;?></p>
<p> <?php echo $driver_name;?></p>
</div> </div>
<div class="rating_bar">
<span class="star" id="1-star" onclick="rate1()">&starf;</span> <div class="submenu mid">
<span class="star" id="2-star" onclick="rate2()">&starf;</span> <div class="step_num">
<span class="star" id="3-star" onclick="rate3()">&starf;</span> <p>2</p>
<span class="star" id="4-star" onclick="rate4()">&starf;</span> </div>
<span class="star" id="5-star" onclick="rate5()">&starf;</span> <div class="step_name">
<input type="hidden" name="rating" id="rating"> <p>Select a Driver</p>
</div>
</div> </div>
<div>
<textarea id="comment" name="comment" form="submit_cmplt_ordr"> <div class="submenu right submenu_active">
</textarea> <div class="step_num">
<p>3</p>
</div>
<div class="step_name">
<p>Complete Order</p>
</div>
</div> </div>
</div>
<input type="hidden" name="picking_point" value=<?php echo $ppoint ?>>
<input type="hidden" name="destination" value=<?php echo $dest ?>>
<input type="hidden" name="selected_driver" value=<?php echo $seldrv ?>>
<input type="hidden" name="customer" value=<?php echo $user_id ?>>
<input class="button green" type="submit" name="submit" value="Complete Order"> <form id="submit_cmplt_ordr" method="post" action="order_handler.php">
</div> <div class="content" id="complete_order">
</form> <h2>How was it?</h2>
<?php mysqli_close($con); ?> <div id="left_complete">
<div id="driver_profile">
<?php echo "
<img class='driver_pict' src='../profile/getProfilePict.php?id=".$seldrv."'>"
;?>
<p> @<?php echo $driver_username;?></p>
<p> <?php echo $driver_name;?></p>
</div>
<div class="rating_bar" style="background-color: rgba(0,255,0,0.2);">
<span class="star" id="1-star" onclick="rate1()">&starf;</span>
<span class="star" id="2-star" onclick="rate2()">&starf;</span>
<span class="star" id="3-star" onclick="rate3()">&starf;</span>
<span class="star" id="4-star" onclick="rate4()">&starf;</span>
<span class="star" id="5-star" onclick="rate5()">&starf;</span>
<input type="hidden" name="rating" id="rating">
</div>
</div>
<div id="right_complete">
<div>
<textarea id="comment" name="comment" form="submit_cmplt_ordr" rows="8" cols="27">
</textarea>
</div>
<input type="hidden" name="picking_point" value=<?php echo $ppoint ?>>
<input type="hidden" name="destination" value=<?php echo $dest ?>>
<input type="hidden" name="selected_driver" value=<?php echo $seldrv ?>>
<input type="hidden" name="customer" value=<?php echo $user_id ?>>
<input class="button green" type="submit" name="submit" value="Complete Order">
</div>
</div>
</form>
<?php mysqli_close($con); ?>
</div>
</div> </div>
</body> </body>
<script type="text/javascript"> <script type="text/javascript">
......
order/order.php
+ 1
− 1
View file @ b7fd416f
<?php <?php
header('Location : select_location.php') header('Location: select_location.php')
?> ?>
order/select_location.php
+ 4
− 4
View file @ b7fd416f
...@@ -68,18 +68,18 @@ ...@@ -68,18 +68,18 @@
<form method="post" action=<?php echo "select_driver.php?id=" . $user_id;?>> <form method="post" action=<?php echo "select_driver.php?id=" . $user_id;?>>
<div class="content" id="select_destination"> <div class="content" id="select_destination">
<div> <div>
<span>Picking point</span> <span class="loc_form_label">Picking point</span>
<input type="text" name="picking_point"> <input type="text" name="picking_point">
</div> </div>
<div> <div>
<span>Destination</span> <span class="loc_form_label">Destination</span>
<input type="text" name="destination"> <input type="text" name="destination">
</div> </div>
<div> <div>
<span>Preferred driver</span> <span class="loc_form_label">Preferred driver</span>
<input type="text" name="preferred_driver"> <input type="text" name="preferred_driver">
</div> </div>
<input type="submit" name="submit_select_loc" class="button green" value="Next"> <input type="submit" name="submit_select_loc" class="button green" id="loc_button" value="Next">
</div> </div>
</form> </form>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment