shop code
This commit is contained in:
@@ -3,7 +3,6 @@ class Employee < ApplicationRecord
|
||||
has_many :commissioners
|
||||
has_many :shit_sales
|
||||
belongs_to :order_queue_station
|
||||
belongs_to :shop
|
||||
validates_presence_of :name, :role
|
||||
validates_presence_of :password, :on => [:create]
|
||||
validates :emp_id, uniqueness: true, numericality: true, length: {in: 1..4}, allow_blank: true
|
||||
@@ -21,7 +20,7 @@ class Employee < ApplicationRecord
|
||||
end
|
||||
|
||||
def self.login(shop,emp_id, password)
|
||||
user = shop.employees.find_by_emp_id(emp_id)
|
||||
user = Employee.find_by_emp_id_and_shop_code(emp_id,shop.shop_code)
|
||||
expiry_time = login_expiry_time(shop)
|
||||
if (user)
|
||||
#user.authenticate(password)
|
||||
@@ -39,7 +38,7 @@ class Employee < ApplicationRecord
|
||||
|
||||
def self.authenticate_by_token(session_token,shop)
|
||||
if (session_token)
|
||||
user = shop.employees.find_by_token_session(session_token)
|
||||
user = Employee.find_by_token_session_and_shop_code(session_token,shop.shop_code)
|
||||
expiry_time = login_expiry_time(shop)
|
||||
|
||||
if user && user.session_expiry.utc > DateTime.now.utc
|
||||
@@ -57,7 +56,7 @@ class Employee < ApplicationRecord
|
||||
|
||||
def self.logout(shop,session_token)
|
||||
if (session_token)
|
||||
user = shop.employees.find_by_token_session(session_token)
|
||||
user = Employee.find_by_token_session_and_shop_code(session_token,shop.shop_code)
|
||||
|
||||
if user
|
||||
user.token_session = nil
|
||||
@@ -75,7 +74,7 @@ class Employee < ApplicationRecord
|
||||
|
||||
def self.login_expiry_time(shop)
|
||||
expiry_time = 30
|
||||
login_expiry = shop.lookups.collection_of('expiry_time')
|
||||
login_expiry = Lookup.where("shop_code='#{shop.shop_code}'").collection_of('expiry_time')
|
||||
if !login_expiry.empty?
|
||||
login_expiry.each do |exp_time|
|
||||
if exp_time[0].downcase == "login"
|
||||
|
||||
Reference in New Issue
Block a user