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

2017-06-18 20:18:12 +06:30
parent 7881ae4dfa 5906dde741
commit 6ffa73fa6f
53 changed files with 906 additions and 207 deletions
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -14,6 +14,7 @@
              <li><%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %></li>
              <hr>
              <li><%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %></li>
+              <li><%= link_to "Zones", settings_zones_path, :tabindex =>"-1" %></li>
              <hr>
              <li><%= link_to "Cashier Terminals ", settings_cashier_terminals_path, :tabindex =>"-1" %></li>
              <li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>