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

2018-02-14 15:01:57 +06:30
parent a2e7ebd27a 867148a038
commit 9757c34a09
14 changed files with 146 additions and 54 deletions
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -70,12 +70,12 @@
 				</ul>
 			</li>
 			<% if can? :menage, Inventory %>
-			<!-- <li>
+			<li>
 				<a href="<%= inventory_path %>">
 					<i class="material-icons">store</i>
 					<span><%= t :inventory %></span>
 				</a>
-			</li> -->
+			</li>
 			<%end%>
 			<li class="header"><%= t :backend %></li>
 			<li>