Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001

2018-05-18 13:06:50 +06:30
parent fbb80c3f01 e120a32307
commit b2c66f3a92
9 changed files with 42 additions and 17 deletions
--- 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