Pull from master

2018-05-03 09:31:36 +06:30
parent caa0180e8c
commit 45531453c7
47 changed files with 1042 additions and 263 deletions
--- a/app/controllers/concerns/token_verification.rb
+++ b/app/controllers/concerns/token_verification.rb
@@ -24,8 +24,7 @@ module TokenVerification
        end
      end

-      @user = Employee.
-      (token)
+      @user = Employee.authenticate_by_token(token)
      if @user
        return true
        #Maybe log - login?