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

order reservation updated

Browse Source
This commit is contained in:
phyusin
2018-04-12 14:28:44 +06:30
parent b4ccd02fc2
commit 4137026c16
7 changed files with 319 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,13 +5,13 @@
<div class="col-lg-4 col-md-4 col-sm-4" style="margin:0px 0px 0px -5px !important ">
<ul class="nav nav-tabs tab-col-teal" role="tablist">
<li class="nav-item active" data-color="#F44336" data-type="pending" style="background-color: #F44336;">
<a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">4</p> <%= t :pending %></a>
<a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num">1</p> <%= t :pending %></a>
</li>
<li class="nav-item" data-color="#673AB7" data-type="processing" style="background-color: #673AB7;">
<a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">4</p> <%= t :process %></a>
<a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num">2</p> <%= t :processing %></a>
</li>
<li class="nav-item" data-color="#009688" data-type="delivery" style="background-color: #009688;">
<a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">4</p> <%= t :delivery %></a>
<a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num">3</p> <%= t :delivering %></a>
</li>
<li class="nav-item" data-color="#03A9F4" data-type="completed" style="background-color: #03A9F4;">
<a class="nav-link" data-toggle="tab" href="#completed" role="tab"><p class="num">4</p> <%= t :completed %></a>
@@ -27,9 +27,9 @@
<% i=1
@order.each do |order| %>
<% if order.status == 'new' %>
<tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>">
<tr class="custom-tr first-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left">
<%=i%>
<%=i%>
</td>
<td width ="30%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
@@ -38,7 +38,7 @@
<%=order.grand_total%>
</td>
<td width ="30%" class="align-center">
<span class="font-10 col-blue"><%=order.status%></span>
<span class="font-10 col-blue"><%= order.status %></span>
</td>
</tr>
<%i+=1%>
@@ -59,9 +59,9 @@
<% i=1
@order.each do |order| %>
<% if order.status == 'accepted' %>
<tr class="custom-tr " style="" data-id="<%=order.order_reservation_id%>">
<tr class="custom-tr second-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left">
<%=i%>
<%=i%>
</td>
<td width ="30%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
@@ -89,8 +89,8 @@
<tbody>
<% i=1
@order.each do |order| %>
<% if order.status == 'processed' %>
<tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
<% if order.status == 'send_to_kitchen' %>
<tr class="custom-tr third-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left">
<%=i%>
</td>
@@ -113,15 +113,15 @@
</div>
</div>
<!--- Panel 3 - Orders -->
<div class="tab-pane dining" id="delivery" role="tabpanel">
<div class="tab-pane dining" id="completed" role="tabpanel">
<div class="card-block font-13">
<div id="menu-slimscroll" data-height="50">
<table class="table table-stripe custom-table">
<tbody>
<% i=1
@order.each do |order| %>
<% if order.status == 'completed' %>
<tr class="custom-tr" style="" data-id="<%=order.order_reservation_id%>">
<% if order.status == 'ready_to_delivery' %>
<tr class="custom-tr fourth-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left">
<%=i%>
</td>
@@ -153,10 +153,10 @@
<table class="table">
<tr>
<td width ="70%" class="header-td align-left">
<b class="col-pink font-16">No.11</b>
<span class="font-13">(DELIVERY)</span>
<b class="col-pink font-16"><span id="sr_number"></span> </b>
<span class="font-13"><span id="delivery_info"></span></span>
</td>
<td width ="30%" class="header-td font-16 align-right"><b>0065 4321</b></td>
<td width ="30%" class="header-td font-16 align-right"><b><span id="contact_info">0065 4321</span></b></td>
</tr>
</table>
</div>
@@ -214,6 +214,9 @@
</td>
<td width ="30%" class="footer-td align-right col-blue" id="grand_total">0.00</td>
</tr>
<tr>
<td colspan="2" id="order_remark"></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="cancel">
@@ -287,7 +290,7 @@
</div>
<p id="ref_no" class="hidden"></p>
<p id="callback_url" class="hidden"></p>
<p id="order_id" class="hidden"></p>
<p id="order_id"></p>
<p id="status" class="hidden"></p>
<script type="text/javascript">
jQuery(function(){