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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-03-26 16:42:32 +06:30
parent 4b78de3f9a d064b7a552
commit f21a75e73e
11 changed files with 614 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@
<%end%>
</ul>
</li>
<div id="menu-slimscroll" data-height="0">
<ul class="nav nav-tabs flex-column category_list" role="tablist" id="ul-navbar">
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
@@ -80,6 +81,7 @@
<% end %>
<%end %>
</ul>
</div>
</div>
@@ -199,7 +201,7 @@
</div>
<div class="card-block">
<div class="card-text" id="order-detail-slimscroll" data-height="180">
<div class="card-text" id="order-detail-slimscroll" data-height="140">
<table class="table table-striped summary-items" id="order-items-table" >
<thead>
<tr>