diff --git a/app/models/license.rb b/app/models/license.rb
index 132585d8..ed8e3eb8 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -140,20 +140,30 @@ class License
@varified = response.parsed_response
Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
if (@varified["status"])
-
if (!check_expired(@varified["renewable_date"]))
return true
end
else
delete_license_file
end
+
rescue SocketError => e
Rails.logger.debug "In SocketError No Internet connection ! "
return true
+ rescue HTTParty::Error
+ Rails.logger.debug "Server Error HTTParty"
+ return true
+ rescue Net::OpenTimeout
+ Rails.logger.debug "connection Timeout"
+ return true
+ rescue OpenURI::HTTPError
+ Rails.logger.debug "Can't connect server"
+ return true
end
return false
end
+
# Check Expired before 30 days
def check_expiring(renewal_date_str)
if !renewal_date_str.empty?
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index f2f6f958..04fe8ded 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -11,8 +11,8 @@
-
-
+
<%= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track': 'reload' %>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 02e35bb8..8f310dab 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -20,11 +20,11 @@ class ActionController::Base
end
else
# check for license file
- # if check_license
- # current_license(ENV["SX_PROVISION_URL"])
- # else
- # redirect_to activate_path
- # end
+ if check_license
+ current_license(ENV["SX_PROVISION_URL"])
+ else
+ redirect_to activate_path
+ end
end
end
diff --git a/config/secrets.yml b/config/secrets.yml
index 076b6691..0282c5fc 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,7 +12,7 @@
development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
- sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
+ sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
server_mode: application
cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L