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

# Conflicts: # Gemfile.lock # app/views/layouts/application.html.erb
2017-06-26 21:57:55 +06:30
parent b607154037 1023f4348a
commit 1ea9125f80
128 changed files with 3988 additions and 646 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -38,6 +38,12 @@ class HomeController < ApplicationController
      elsif @employee.role == "cashier"
        session[:session_token] = @employee.token_session
        redirect_to origami_root_path
+      elsif @employee.role == "manager"
+        session[:session_token] = @employee.token_session
+        redirect_to dashboard_path
+      elsif @employee.role == "accountant"
+        session[:session_token] = @employee.token_session
+        redirect_to dashboard_path
      else
         render :index
      end