diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index f7c0e516..d6960bc3 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -34,7 +34,6 @@ class HomeController < ApplicationController if @employee != nil if @employee.role == "administrator" session[:session_token] = @employee.token_session - puts "ADDDDDD" redirect_to dashboard_path elsif @employee.role == "cashier" session[:session_token] = @employee.token_session @@ -83,7 +82,7 @@ class HomeController < ApplicationController if !shift.nil? redirect_to origami_root_path else - redirect_to new_origami_shift_path + redirect_to dashboard_path end elsif employee.role == "cashier" #check if cashier has existing open cashier diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 6bdadd85..68fb80e4 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -105,7 +105,8 @@
- + +
diff --git a/dump.rdb b/dump.rdb index c0500eab..aca182bf 100644 Binary files a/dump.rdb and b/dump.rdb differ