git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some changes for order reservation

Browse Source
This commit is contained in:
phyusin
2018-09-06 11:45:24 +06:30
parent 6af0c40456
commit 1f03a19d5b
12 changed files with 216 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
app/views/origami/order_reservation/index.html.erb
View File

@@ -325,7 +325,7 @@
<div class="col-lg-4 col-md-4 col-sm-4 div_card_order">
<div class="card m-b-5 p-t-5">
<div class="card-header custom-card-header" style="color:">
<div class="card-header custom-card-header">
<table class="table">
<tr>
<td width ="10%" class="header-td align-left">
@@ -343,7 +343,7 @@
</table>
</div>
<div class="card-block custom-card-block">
<div id="order-detail-slimscroll" data-height="220">
<div id="order-detail-slimscroll" data-height="100">
<table class="table summary-items">
<tbody>
<!-- <tr>
@@ -393,39 +393,6 @@
</tbody>
</table>
</div>
<div class="card-footer grand-card-footer">
<table class="table">
<tbody>
<tr>
<td width ="70%" class="footer-td align-left col-blue">
GRAND TOTAL
</td>
<td width ="30%" class="footer-td align-right col-blue" id="grand_total">0.00</td>
</tr>
<tr>
<td width ="50%" class="footer-td align-left col-blue">
<button type="button" class="btn btn-lg bg-red waves-effect" id="cancel" data-value="rejected">
<strong>REJECT</strong>
</button>
</td>
<td width ="50%" class="footer-td align-right col-blue">
<button type="button" class="btn btn-lg bg-blue waves-effect " id="accepted" data-value="accepted">
ACCEPT
</button>
<!-- <button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="delivery">
<strong>SEND TO KITCHEN</strong>
</button>
<button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="completed">
<strong>READY TO DELIVERY</strong>
</button>
<button type="button" class="btn btn-lg bg-blue waves-effect hidden" id="accepted" data-value="pick-up">
<strong>PICK UP</strong>
</button> -->
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
@@ -454,7 +421,7 @@
</tr>
<tr>
<td class="body-td align-left">
<span class="font-13">REQUESTED TIME</span><br>
<span class="font-13">DELIVERY REQUESTED TIME</span><br>
<b id="requested_time"></b>
</td>
<td class="body-td align-right expected_time">
@@ -463,26 +430,22 @@
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<td class="body-td align-left">
<span class="font-13">NAME</span><br>
<b id="customer_name"></b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<td class="body-td align-left">
<span class="font-13">PHONE</span><br>
<b id="phone"></b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<td class="body-td align-left">
<span class="font-13">ADDRESS</span><br>
<b id="address"></b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<span class="font-13">DELEVERY</span><br>
<td class="body-td align-left">
<span class="font-13">DELIVERY</span><br>
<b id="delivery_to"></b>
</td>
</tr>
@@ -499,8 +462,62 @@
</tr>
</tbody>
</table>
<table class="table">
<tr>
<td colspan="2" class="body-td align-left">
<span class="font-13">ACCEPTED</span><br>
<b id="accepted_time">Sept 06, 2018(Weds) 10:00 AM</b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<span class="font-13">SEND TO KITCHEN</span><br>
<b id="send_kitchen_time">Sept 06, 2018(Weds) 11:00 AM</b>
</td>
</tr>
<tr>
<td colspan="2" class="body-td align-left">
<span class="font-13">READY TO DELIVERY</span><br>
<b id="ready_delivery_time">Sept 06, 2018(Weds) 12:00 PM</b>
</td>
</tr>
</table>
</div>
<div class="card-footer order_close_cashier">
<div class="card-footer grand-card-footer">
<table class="table">
<tbody>
<tr>
<td width ="70%" class="footer-td align-left col-blue grand-total-padding">
GRAND TOTAL
</td>
<td width ="30%" class="footer-td align-right col-blue grand-total-padding" id="grand_total">0.00</td>
</tr>
<tr class="order_btns">
<td width ="50%" class="footer-td align-left col-blue">
<button type="button" class="btn btn-lg btn-link bg-red waves-effect" id="cancel" data-value="rejected">
<strong>REJECT</strong>
</button>
</td>
<td width ="50%" class="footer-td align-right col-blue">
<button type="button" class="btn btn-lg btn-link bg-blue waves-effect " id="accepted" data-value="accepted">
ACCEPT
</button>
</td>
</tr>
<% if current_user.role != "waiter" %>
<tr class="order_close_cashier" style="display:none">
<td colspan="2" width="100%" class="footer-td align-right col-blue">
<button id="order_close_cashier" class="btn btn-lg btn-link bg-blue waves-effect"><%= t("views.btn.close_cashier") %></button>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
<!-- <div class="card-footer order_close_cashier">
<% if current_user.role != "waiter" %>
<div class="row">
<div class="col-sm-7 col-xs-7 col-md-7 col-lg-7"></div>
@@ -509,7 +526,7 @@
</div>
</div>
<% end %>
</div>
</div> -->
</div>
</div>
<div id="<%= @shop.shop_code ? @shop.shop_code : '' %>_doemal_new_order"></div>
@@ -530,12 +547,12 @@
<h4 class="modal-title" id="waiting_timeModalLabel">Expected Waiting Time for <span id="requested_order_time"></span></h4>
</div>
<div class="modal-body">
<div class="row text-center m-t-20">
<!-- <div class="row text-center m-t-20">
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3"></div>
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
<button type="button" class="btn btn-lg btn-link bg-info timer_type" data-value="after">After</button>
</div>
</div>
</div> -->
<div class="row text-center m-t-20">
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
@@ -561,11 +578,19 @@
<button type="button" class="btn btn-lg btn-link bg-info time_interval" data-value="90">90 Mins.</button>
</div>
</div>
<div class="row text-center m-t-20">
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
<button type="button" class="btn btn-lg btn-link bg-info time_interval" data-value="105">105 Mins.</button>
</div>
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">
<button type="button" class="btn btn-lg btn-link bg-info time_interval" data-value="120">120 Mins.</button>
</div>
</div>
</div>
<div class="modal-footer ">
<div class="row p-r-20">
<div class="col-md-5">
<button type="button" class="btn btn-link p-t-5 p-b-5 bg-red waves-effect" data-dismiss="modal">CLOSE</button>
<button type="button" style="margin-bottom: 10px;" class="btn btn-lg btn-link bg-red waves-effect" data-dismiss="modal">CLOSE</button>
</div>
</div>
</div>
@@ -587,11 +612,11 @@
</div>
<div class="modal-footer ">
<div class="row p-r-20">
<div class="col-md-5">
<button type="button" class="btn btn-link p-t-5 p-b-5 bg-blue waves-effect send_status">SEND</button>
<div class="col-md-5 mr-1">
<button type="button" class="btn btn-lg btn-link p-t-5 p-b-5 bg-blue waves-effect send_status">SEND</button>
</div>
<div class="col-md-5">
<button type="button" class="btn btn-link p-t-5 p-b-5 bg-red waves-effect" data-dismiss="modal">CLOSE</button>
<button type="button" class="btn btn-lg btn-link p-t-5 p-b-5 bg-red waves-effect" data-dismiss="modal">CLOSE</button>
</div>
</div>
</div>