Skip to content

Commit

Permalink
view css
Browse files Browse the repository at this point in the history
  • Loading branch information
@yeshanGune
yeshanGune committed Mar 31, 2021
1 parent 733f811 commit 15cdf8f
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 24 deletions.
2 changes: 1 addition & 1 deletion application/controllers/cashier_controller.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ public function completeOrder(){
if($cart_data['status'] === "success"){

$data = [
'Order_Date_Time' => date($cart_data['data']->Service_date ." ". $cart_data['data']->Service_time), //combined serve date and time
'Order_Date_Time' => date("Y-m-d H:i:s"), //combined serve date and time
'Item_count' => $cart_data['data']->Item_count,
'Total_price' => $cart_data['data']->Sub_total + $cart_data['data']->Sub_total*0.05, //including service charge, disregarded discounts here...
'Service_charge' => $cart_data['data']->Sub_total*0.05, //service charge is 5%
Expand Down
30 changes: 15 additions & 15 deletions application/models/cashier_model.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,24 +213,24 @@ public function get_cart_items($cart_id){
}
}

public function getQtywithItemCount_reorder($order_id){
// public function getQtywithItemCount_reorder($order_id){

$query =
"SELECT order_item.Quantity AS Quantity , fooditem.Current_count AS Current_count
FROM order_item
INNER JOIN fooditem ON order_item.Food_ID = fooditem.Food_ID
WHERE order_item.Order_ID='".$order_id."' ";
// $query =
// "SELECT order_item.Quantity AS Quantity , fooditem.Current_count AS Current_count
// FROM order_item
// INNER JOIN fooditem ON order_item.Food_ID = fooditem.Food_ID
// WHERE order_item.Order_ID='".$order_id."' ";

$result =$this->Query($query, $options = []);
// $result =$this->Query($query, $options = []);

if($this->Count() > 0){
$order_items = $this->AllRecords();
//print_r($order_items);
return ['status'=>'success', 'data'=>$order_items];
}else{
return "order_items_not_found";
}
}
// if($this->Count() > 0){
// $order_items = $this->AllRecords();
// //print_r($order_items);
// return ['status'=>'success', 'data'=>$order_items];
// }else{
// return "order_items_not_found";
// }
// }

public function get_cart_data($cart_id){

Expand Down
2 changes: 1 addition & 1 deletion application/models/dp_model.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function getAnnouncement(){
$announcement = $this->AllRecords();
//print_r($announcement);
if($announcement){
return ['status'=>'success', 'data'=>$announcement];
return ['status'=>'success','data'=>array_reverse($announcement, true)];
}else{
return "Announcement_not_retrieved";
}
Expand Down
2 changes: 1 addition & 1 deletion application/models/rm_model.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function getAnnouncement(){
$announcement = $this->AllRecords();
//print_r($announcement);
if($announcement){
return ['status'=>'success', 'data'=>$announcement];
return ['status'=>'success', 'data'=>array_reverse($announcement, true)];
}else{
return "Announcement_not_retrieved";
}
Expand Down
2 changes: 1 addition & 1 deletion application/views/cashier/orderfood/cashier-cart.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class="delete" onclick="onclickDeleteCartitem(<?php echo $row->CartItem_ID ?>)"

</div><br><br>
<div class="total"><b>Total: LKR <?php echo number_format($this->get_session('cart_sub_total'),2,'.', ','); ?></b></div><br>
<input type="submit" class="checkout-button" value="COMPLETE ORDER">
<input type="submit" class="checkout-button" value="COMPLETE ORDER">

<?php echo form_close();?>
</div>
Expand Down
6 changes: 3 additions & 3 deletions application/views/kitchenmanager/foodmenu/foodmenu.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
<?php echo form_open("km_controller/updateCurrentCount/".$row->Food_ID."/".$category->Category_name, "POST");?>
<label for="quantity">Count :</label>
<input type="number" id="quantity" name="quantity" value=<?php echo $row->Current_count;?> min="1" max="1000">
<!-- <input type="submit" value='<i class="fas fa-check"></i>'> -->
<button type="submit" id="count_submit"><i class="fas fa-check"></i></button>
<input type="submit" value="submit">
<!-- <button type="submit" id="count_submit"><i class="fas fa-check"></i></button> -->
<?php echo form_close();?>
</div>

Expand Down Expand Up @@ -123,7 +123,7 @@
<?php echo form_open("km_controller/updateCurrentCount/".$row->Food_ID."/".$category->Category_name, "POST");?>
<label for="quantity">Count :</label>
<input type="number" id="quantity" name="quantity" value=<?php echo $row->Current_count;?> min="1" max="1000">
<input type="submit">
<input type="submit" value="submit">
<?php echo form_close();?>
</div>

Expand Down
5 changes: 4 additions & 1 deletion public/css/cashier/cashier_cart.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,20 @@ body {
.cart-container .summary-container .summary-title {
font-weight: 600;
font-size: 20px;
margin-bottom: 20px;

}
.cart-container .summary-container .total {
/* border-bottom: 1px solid #ccc; */
font-weight: 500;
margin-top: 20px;
}
.checkout-button {
background-color: var(--buy-color);
color: #fff;
font-size: 14px;
font-weight: 600;
width: 80%;
width: 90%;
height: 50px;
margin: 12% auto;
border: 1px solid #ccc;
Expand Down
2 changes: 1 addition & 1 deletion public/css/kitchen-manager/foodmenu/foodmenu.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
.grid article .quantity input[type=number]{
height: 30px;
padding-left: 10px;
width: 60px;
width: 50px;
border: 1px solid #999;
}

Expand Down

0 comments on commit 15cdf8f

Please sign in to comment.