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

app/models/ability.rb

@@ -337,8 +337,9 @@ class Ability
     elsif user.role == "kitchen"
     
     #oqs Home
+        can :manage, OrderQueueStation
         can :index, :home
-        can :index, :show
+        # can :index, :show
         can :get_order_items, :home
         can :get_items_by_oqs, :home
         can :update_delivery_status, :home

app/views/layouts/_left_sidebar.html.erb

@@ -35,10 +35,14 @@
 				<% elsif current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
 					<a href="<%= origami_dashboard_path %>">
 				<%end%>
+				    <a href="#">
 					<i class="material-icons">home</i>
 					<span><%= t :dashboard %></span>
 				</a>
 			</li>
+			<% if current_login_employee.role == "kitchen" %> 
+				<li class="header"><%= t :main_navigation %></li>
+			<% end %>
 			<% if can? :menage, OrderQueueStation %>
 			<li>
 				<a href="<%= oqs_root_path %>">
@@ -48,6 +52,7 @@
 			</li>
 			<% end %>
 			<% if can? :index, :home %>
+				<% if current_login_employee.role != "kitchen" %> 
 				<li>
 					<a href="<%= origami_dashboard_path %>">
 						<i class="material-icons">monetization_on</i>
@@ -55,17 +60,19 @@
 					</a>
 				</li>
 				<% end %>
+			<% end %>
+			<% if can? :menage, Customer %>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">widgets</i>
 					<span><%= t :crm %></span>
 				</a>
 				<ul class="ml-menu">
-					<% if can? :menage, Customer %>
+					
 						<li>
 							<a href="<%= crm_customers_path %>"><%= t :customer %></a>
 						</li>
-					<% end %>	
+					
 					<% if can? :menage, DiningQueue %>
 						<li>
 							<a href="<%= crm_dining_queues_path %>"><%= t :queue %></a>
@@ -73,6 +80,7 @@
 					<% end %>	
 				</ul>
 			</li>
+			<% end %>	
 			<% if can? :menage, Inventory %>
 			<li>
 				<a href="<%= inventory_path %>">