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

Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

Browse Source
This commit is contained in:
Yan
2017-10-12 10:16:00 +06:30
parent 5057b8e224 60b5a17388
commit de1469bd5e
11 changed files with 188 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,13 +3,15 @@
<div class="row">
<div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" >
<% @menu.each do |menu| %>
<li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
</li>
<% end %>
<% @menu.each do |menu| %>
<li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
</li>
<% end %>
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li>
</ul>
</div>
<div class="col-md-7 col-lg-7 col-sm-7">

4
app/views/origami/addorders/get_all_product.json.jbuilder Normal file
View File

@@ -0,0 +1,4 @@
json.array! @product, :id, :item_code, :name, :alt_name,:image_path,
:description,:information,:taxable,:unit_price, :created_at,
:updated_at, :created_by