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

merge with master

Browse Source
This commit is contained in:
Yan
2017-12-13 11:43:22 +06:30
parent fef4d4caa1 ebf46e856d
commit b3b443735a
9 changed files with 96 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,20 +9,15 @@
<ul class="nav nav-tabs flex-column" role="tablist" >
<% @menu.each do |menu| %>
<% if menu.menu_category_id.nil?%>
<li class="nav-item menu_category">
<li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class=" sub_category_list hidden" id="sub_category_list">
</ul>
</a>
</li>
<% end%>
<!-- Sub-Category -->
<% if !menu.menu_category_id.nil? %>
<ul class="collapse" id="<%= menu.menu_category_id %>">
<li>
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" role="tab"> <%= menu.name%></a>
</li>
</ul>
<% end%>
<%end %>
<!-- <li class="nav-item menu_category">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu 1 <b class="caret"></b></a>