license and local move to base action and update other base

This commit is contained in:
Yan
2018-02-27 11:41:24 +06:30
parent 13b7b1f800
commit ac470c5747
9 changed files with 77 additions and 64 deletions

View File

@@ -5,15 +5,13 @@ class BaseReportController < ActionController::Base
#before_action :check_installation
protect_from_forgery with: :exception
helper_method :current_company,:current_login_employee,:current_user
rescue_from CanCan::AccessDenied do |exception|
flash[:warning] = exception.message
redirect_to root_path
end
def current_user
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
end
PERIOD = {
"today" => 0,
"yesterday" => 1,
@@ -83,8 +81,30 @@ class BaseReportController < ActionController::Base
end
return from, to
end
private
def current_user
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
end
# Get current Cashier
def get_cashier
@cashier = Employee.where("role = 'cashier' AND token_session <> ''")
end
def current_company
begin
return Company.first
rescue
return nil
end
end
def current_login_employee
if (!session[:session_token].nil?)
@employee = Employee.find_by_token_session(session[:session_token])
end
end
end