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

change order reservation -not finished

Browse Source
This commit is contained in:
phyusin
2018-05-09 11:28:01 +06:30
parent 313f1b2909
commit 4faee913f3
13 changed files with 211 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,11 +19,14 @@
delivered_count = count_order.count
elsif count_order.status == "ready_to_delivery"
completed_count = count_order.count
elsif count_order.status == "delivered"
processed_count = count_order.count
end
end
end %>
end
if !@count_on_completed.nil?
processed_count = @count_on_completed.count
end
%>
<!-- end count function -->
<div class="row m-t--10">
<div class="col-lg-5 col-md-5 col-sm-5 div_order_margin">
@@ -237,7 +240,7 @@
<tbody>
<% i=1
@order.each do |order| %>
<% if order.status == 'delivered' %>
<% if order.status == 'delivered' && (order.created_at.utc.getlocal.strftime("%Y-%m-%d") == DateTime.now.strftime("%Y-%m-%d")) %>
<tr class="custom-tr fifth-<%=i%>" style="" data-id="<%=order.order_reservation_id%>" data-sr-no="<%= i %>">
<td width ="5%" class="align-left">
<%=i%>
@@ -443,6 +446,10 @@
</div>
</div>
</div>
<div id="notify_new_order"></div>
<div id="notify_order_send_to_kitchen"></div>
<div id="notify_order_ready_to_delivery"></div>
</div>
<p id="ref_no" class="hidden"></p>
@@ -508,6 +515,7 @@
<div class="modal-body">
<div class="form-group">
<textarea id="reject_reason" name="reject_reason" class="form-control" rows="3" cols="30"></textarea>
<span id="reject_reasonErr" style="color:red"></span>
</div>
</div>
<div class="modal-footer ">
@@ -557,7 +565,7 @@
</div>
</div>
<div class="modal fade " id="notify_new_order" tabindex="-1" role="dialog">
<!-- <div class="modal fade " id="notify_new_order" tabindex="-1" role="dialog">
<div class="modal-dialog modal-md" role="document">
<div class="modal-content">
<div class="modal-header">
@@ -621,10 +629,5 @@
</div>
</div>
</div>
</div>
<!-- <div id="notify_new_order"></div>
<div id="notify_order_send_to_kitchen"></div>
<div id="notify_order_ready_to_delivery"></div> -->
</div> -->
</div>