Commit c8dc6237 authored by Erma Safira Nurmasyita's avatar Erma Safira Nurmasyita
parents 081a31ca 5ecbf0b9
...@@ -153,6 +153,11 @@ a { ...@@ -153,6 +153,11 @@ a {
} }
.c-border {
border: 2px solid black!important;
}
.alert-box:before, .alert-box:before,
.alert-box:after { .alert-box:after {
content: ""; content: "";
......
...@@ -20,7 +20,22 @@ class historyController { ...@@ -20,7 +20,22 @@ class historyController {
$conn = connect_to_mysql(); $conn = connect_to_mysql();
$arrResult = array(); $arrResult = array();
if ($conn != null) { if ($conn != null) {
$sql_query = "SELECT * FROM book_order JOIN books ON book_id=books.ID where user_Id=$userId ORDER BY tanggal DESC"; // $sql_query = "SELECT * FROM book_order JOIN books ON book_id=books.ID where user_Id=$userId ORDER BY tanggal DESC";
$sql_query = "
SELECT
*,
(CASE
WHEN EXISTS (SELECT * FROM review where Nomor_Order=order_id) THEN TRUE
ELSE FALSE
END) as reviewed
FROM
book_order
JOIN
books
ON
book_id=books.ID
where user_Id=$userId ORDER BY tanggal DESC, Nomor_Order DESC
";
$result = $conn->query($sql_query); $result = $conn->query($sql_query);
if ($result != NULL){ if ($result != NULL){
while ($row = $result->fetch_assoc()) { while ($row = $result->fetch_assoc()) {
......
...@@ -40,7 +40,7 @@ class historyView { ...@@ -40,7 +40,7 @@ class historyView {
$resultHTML = ' $resultHTML = '
<div class="flex-history-item align-items-flex-start"> <div class="flex-history-item align-items-flex-start">
<div class="flex-1"> <div class="flex-1">
<img class="history-image-item" src="'.$data['imgSource'].'"> <img class="c-border history-image-item" src="'.$data['imgSource'].'">
</div> </div>
<div class="flex-2" > <div class="flex-2" >
<div class="orange-text text-size-40 title-item-history" >'.$data['itemName'].'</div> <div class="orange-text text-size-40 title-item-history" >'.$data['itemName'].'</div>
...@@ -67,7 +67,7 @@ class historyView { ...@@ -67,7 +67,7 @@ class historyView {
$resultHTML = ' $resultHTML = '
<div class="flex-history-item align-items-flex-start"> <div class="flex-history-item align-items-flex-start">
<div class="flex-1"> <div class="flex-1">
<img class="history-image-item" src="'.$data['imgSource'].'"> <img class="c-border history-image-item" src="'.$data['imgSource'].'">
</div> </div>
<div class="flex-2" > <div class="flex-2" >
<div class="orange-text text-size-40 title-item-history" >'.$data['itemName'].'</div> <div class="orange-text text-size-40 title-item-history" >'.$data['itemName'].'</div>
...@@ -76,8 +76,8 @@ class historyView { ...@@ -76,8 +76,8 @@ class historyView {
</div> </div>
<div id="right-most-column-history-item"> <div id="right-most-column-history-item">
<div class="flex-container align-items-flex-end add-flex-direction-column "> <div class="flex-container align-items-flex-end add-flex-direction-column ">
<div class="font-weight-bold gray-text">'.$data['date'].'</div> <div class="font-weight-bold text-size-20 gray-text">'.$data['date'].'</div>
<div class="font-weight-bold gray-text">Nomor Order #'.$data['orderNumber'].'</div> <div class="font-weight-bold text-size-20 gray-text">Nomor Order #'.$data['orderNumber'].'</div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -20,7 +20,7 @@ function viewProfile (array $params) { ...@@ -20,7 +20,7 @@ function viewProfile (array $params) {
<label id="label-text-my-profile" >My Profile</label> <label id="label-text-my-profile" >My Profile</label>
</div> </div>
<div class="text-size-40" id="profile-data-table"> <div class="text-size-30" id="profile-data-table">
<div class="flex-container align-items-flex-center"> <div class="flex-container align-items-flex-center">
<object class="icon-profile" type="image/svg+xml" data="../svgIcon/user.svg"> <object class="icon-profile" type="image/svg+xml" data="../svgIcon/user.svg">
Your browser does not support SVG Your browser does not support SVG
......
Markdown is supported
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