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

change order reservation

Browse Source
This commit is contained in:
phyusin
2018-04-27 13:47:54 +06:30
parent 172c2136cc
commit 11473c7fcd
9 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,19 +2,47 @@
<%= javascript_include_tag 'order_reservation', 'data-turbolinks-track': 'reload' %>
<div class="container-fluid">
<div class="row m-t--10">
<div class="col-lg-4 col-md-4 col-sm-4" style="margin:0px 0px 0px -5px !important ">
<div class="col-lg-4 col-md-4 col-sm-4 div_order_margin">
<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">1</p> <%= t :pending %></a>
<li class="nav-item red" data-color="#F44336" data-type="pending">
<a class="nav-link" data-toggle="tab" href="#pending" role="tab"><p class="num p-t-20">
<% if !@count_on_order.nil? %>
<% @count_on_order.each do |count_order|
if count_order.status == "new" %>
<%= count_order.count %>
<% end
end %>
<% end %></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">2</p> <%= t :processing %></a>
<li class="nav-item purple" data-color="#673AB7" data-type="processing">
<a class="nav-link" data-toggle="tab" href="#processing" role="tab"><p class="num p-t-20">
<% if !@count_on_order.nil? %>
<% @count_on_order.each do |count_order|
if count_order.status == "accepted" %>
<%= count_order.count %>
<% end
end %>
<% end %></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">3</p> <%= t :delivering %></a>
<li class="nav-item darkgreen" data-color="#009688" data-type="delivery" style="background-color: #009688;">
<a class="nav-link" data-toggle="tab" href="#delivery" role="tab"><p class="num p-t-20">
<% if !@count_on_order.nil? %>
<% @count_on_order.each do |count_order|
if count_order.status == "send_to_kitchen" %>
<%= count_order.count %>
<% end
end %>
<% end %></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>
<a class="nav-link" data-toggle="tab" href="#completed" role="tab"><p class="num p-t-20">
<% if !@count_on_order.nil? %>
<% @count_on_order.each do |count_order|
if count_order.status == "ready_to_delivery" %>
<%= count_order.count %>
<% end
end %>
<% end %></p> <%= t :completed %></a>
</li>
</ul>
@@ -32,10 +60,10 @@
<%=i%>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
<%= order.created_at.utc.getlocal.strftime("%d-%m-%Y") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
<%= order.created_at.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="20%" class="align-center">
<%=order.grand_total%>
@@ -67,10 +95,10 @@
<%=i%>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
<%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
<%= order.created_at.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="20%" class="align-center">
<%=order.grand_total%>
@@ -101,10 +129,10 @@
<%=i%>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
<%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
<%= order.created_at.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="20%" class="align-center">
<%=order.grand_total%>
@@ -135,10 +163,10 @@
<%=i%>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %>
<%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %>
</td>
<td width ="20%" class="align-center">
<%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %>
<%= order.created_at.utc.getlocal.strftime("%I:%M %p") %>
</td>
<td width ="20%" class="align-center">
<%=order.grand_total%>
@@ -164,9 +192,9 @@
<div class="card-header custom-card-header" style="color:">
<table class="table">
<tr>
<td width ="30%" class="header-td align-left">
<b class="col-pink font-16"><span id="sr_number"></span> </b>
<span class="font-13"><span id="delivery_info"></span></span>
<td width ="50%" class="header-td align-left">
<b class="col-pink font-16"><span id="sr_number"></span> </b>
<b><span class="font-15" id="requested_date_time"></span></b>
</td>
<td class="header-td align-left"></td>
<td width ="50%" class="header-td font- align-right"><b><span id="contact_info"></span></b></td>
@@ -199,7 +227,7 @@
</tr>
<tr>
<td width ="70%" class="footer-td align-left">
DELIVERY FEES (PICK-UP)
DELIVERY FEES <span id="delivery_info"></span>
</td>
<td width ="30%" class="footer-td align-right" id="delivery_fee">0.00</td>
</tr>
@@ -227,9 +255,6 @@
</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">
@@ -294,6 +319,12 @@
<b id="delivery_to"></b>
</td>
</tr>
<tr>
<td class="body-td align-left">
<span class="font-13">REMARK</span><br>
<b id="order_remark"></b>
</td>
</tr>
</tbody>
</table>
</div>