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

Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill

Browse Source
This commit is contained in:
phyusin
2018-02-26 10:01:49 +06:30
parent 8b064a4428 a0b34e8084
commit da7dad05e4
1 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
app/views/origami/addorders/detail.html.erb
View File

@@ -84,48 +84,56 @@
<%end %> <%end %>
</ul> </ul>
</div> </div>
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10" > <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
<div class="card-columns custom-card-columns menu_items_list" style="column-gap: ;"> <div class="card">
<!-- append data --> <div class="card-block">
<div id="custom-slimscroll"> <div id="custom-slimscroll">
<% @menu.each do |menu| %> <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
<% if !menu.valid_time.nil? %> <!-- append data -->
<% if menu.menu_category_id.nil? %> <% @menu.each do |menu| %>
<!--if type quick_service or cashier for table --> <% if !menu.valid_time.nil? %>
<% if type %> <% if menu.menu_category_id.nil? %>
<% if !menu.code.include? "SPL" %> <!--if type quick_service or cashier for table -->
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>"> <% if type %>
<div class='card-block custom-card-block'> <% if !menu.code.include? "SPL" %>
<p><%=menu.name%> <p> <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
<p><%=menu.code%> <p> <div class='card-block custom-card-block'>
</div> <p><%=menu.name%> <p>
</div> <p><%=menu.code%> <p>
<% end%> </div>
<!-- else quick_service or cashier for table --> </div>
<% else %> <% end%>
<% if @table.get_current_checkout_booking.nil? %> <!-- else quick_service or cashier for table -->
<% if !menu.code.include? "SPL" %> <% else %>
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>"> <% if @table.get_current_checkout_booking.nil? %>
<div class='card-block custom-card-block'> <% if !menu.code.include? "SPL" %>
<p><%=menu.name%> <p> <div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
<p><%=menu.code%> <p> <div class='card-block custom-card-block'>
</div> <p><%=menu.name%> <p>
</div> <p><%=menu.code%> <p>
</div>
</div>
<% end%>
<% else %>
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>">
<div class='card-block custom-card-block'>
<p><%=menu.name%> <p>
<p><%=menu.code%> <p>
</div>
</div>
<% end%>
<!-- end quick_service or cashier for table -->
<% end %>
<% end%> <% end%>
<% else %> <% end %>
<div class="card custom-card testimonial-card animated fadeInRight menu_category sub_click" data-id="<%=menu.id%>"> <%end %>
<div class='card-block custom-card-block'> </div>
<p><%=menu.name%> <p> </div>
<p><%=menu.code%> <p> </div>
</div> </div>
</div>
<% end%>
<!-- end quick_service or cashier for table -->
<% end %>
<% end%>
<% end %>
<%end %>
</div> </div>
</div> </div>
<div class="col-md-3 col-lg-3 col-sm-3 m-t-10"> <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">