git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
phyusin
2018-02-28 10:07:17 +06:30
parent 5886389827 908b590ed1
commit a17a240a2e
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/concerns/login_verification.rb
View File

@@ -18,19 +18,11 @@ module LoginVerification
end end
def current_login_employee def current_login_employee
if (!session[:session_token].nil?) @employee = Employee.find_by_token_session(session[:session_token])
@employee = Employee.find_by_token_session(session[:session_token])
else
render_unauthorized
end
end end
def current_user def current_user
if (!session[:session_token].nil?) @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
else
render_unauthorized
end
end end
# Get current Cashiers # Get current Cashiers
@@ -54,9 +46,6 @@ module LoginVerification
if @user if @user
return true return true
#Maybe log - login? #Maybe log - login?
# else
# flash[:notice] = 'Invalid Access!'
# # return false
end end
end end
end end