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

2017-08-17 13:50:24 +06:30
parent 88eb1d6c64 0138ae2efa
commit f2829fab0f
29 changed files with 536 additions and 7 deletions
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -30,6 +30,9 @@
              <li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>
              <hr class="hr_advance" />
              <li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li>
+              <hr class="hr_advance" />
+              <li><%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %></li>]
+              <li><%= link_to "Products", settings_products_path, :tabindex =>"-1" %></li>
          </ul>
        </li>