Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
This commit is contained in:
@@ -18,19 +18,11 @@ module LoginVerification
|
||||
end
|
||||
|
||||
def current_login_employee
|
||||
if (!session[:session_token].nil?)
|
||||
@employee = Employee.find_by_token_session(session[:session_token])
|
||||
else
|
||||
render_unauthorized
|
||||
end
|
||||
@employee = Employee.find_by_token_session(session[:session_token])
|
||||
end
|
||||
|
||||
def current_user
|
||||
if (!session[:session_token].nil?)
|
||||
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
|
||||
else
|
||||
render_unauthorized
|
||||
end
|
||||
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
|
||||
end
|
||||
|
||||
# Get current Cashiers
|
||||
@@ -54,9 +46,6 @@ module LoginVerification
|
||||
if @user
|
||||
return true
|
||||
#Maybe log - login?
|
||||
# else
|
||||
# flash[:notice] = 'Invalid Access!'
|
||||
# # return false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user