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

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

@@ -84,10 +84,15 @@
<%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">
<div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
<!-- append data -->
<% @menu.each do |menu| %> <% @menu.each do |menu| %>
<% if !menu.valid_time.nil? %> <% if !menu.valid_time.nil? %>
<% if menu.menu_category_id.nil? %> <% if menu.menu_category_id.nil? %>
@@ -125,7 +130,10 @@
<% end%> <% end%>
<% end %> <% end %>
<%end %> <%end %>
</div> </div> </div>
</div>
</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">