Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

app/models/application_record.rb

@@ -5,6 +5,7 @@ class ApplicationRecord < ActiveRecord::Base
     super
 
     return unless subclass.superclass == self
+    return unless subclass.name != "Shop"
     return unless subclass.column_names.include? 'shop_code'
 
     subclass.class_eval do

app/models/employee.rb

@@ -38,25 +38,22 @@ class Employee < ApplicationRecord
       end
     end
     return nil
-
   end
 
-  def self.authenticate_by_token(session_token)
+  def self.authenticate_by_token(token)
-    if (session_token)
+    if token
-      user = Employee.find_by_token_session(session_token)
+      if user = Employee.find_by_token_session(token)
         expiry_time = login_expiry_time
-      if user && !user.session_expiry.nil?
+        if user.session_expiry && user.session_expiry.utc > DateTime.now.utc
-        if user && user.session_expiry.utc > DateTime.now.utc
           #Extend the login time each time authenticatation take place
           user.session_expiry = user.session_expiry.utc + expiry_time.minutes
           user.save
           return true
-        else
+        end
-          return false
+      elsif user = Employee.find_by_app_token(token)
+        return true
       end
     end
-    end
-
     return false
   end