Merge branch 'r-1902001-01' into foodcourt

2020-07-19 19:44:59 +06:30
parent 530d49bb64 ced6a09095
commit 53f4320371
17 changed files with 240 additions and 146 deletions
--- a/app/models/employee.rb
+++ b/app/models/employee.rb
@@ -47,6 +47,7 @@ class Employee < ApplicationRecord
    if (session_token)
      user = Employee.find_by_token_session(session_token)
      expiry_time = login_expiry_time
+
      if user && user.session_expiry && 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