diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4dafef41..3a35a15b 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -38,11 +38,11 @@ class ApplicationController < 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/app/models/license.rb b/app/models/license.rb index d025e349..cdebdbdd 100755 --- a/app/models/license.rb +++ b/app/models/license.rb @@ -60,9 +60,9 @@ class License return true end else - @license = Marshal.load(cache_license) - assign(aes_key, aes_iv) - Rails.logger.info 'API License' + # @license = Marshal.load(cache_license) + # assign(aes_key, aes_iv) + # Rails.logger.info 'API License' return true end end diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index f40cb3b3..77600370 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -247,8 +247,8 @@ $('#back').on('click',function(){ function warnBeforeRedirect(linkURL) { swal({ - title: "Oops", - text: "Are you sure you want to Logout ?", + title: "Alert!", + text: "Are you sure you want to close cashier?", type: "warning", showCancelButton: true }, function() { diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb index b0a0de04..0963b2ca 100755 --- a/app/views/origami/split_bill/index.html.erb +++ b/app/views/origami/split_bill/index.html.erb @@ -26,12 +26,11 @@