Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service

2018-02-14 15:01:57 +06:30
parent a2e7ebd27a 867148a038
commit 9757c34a09
14 changed files with 146 additions and 54 deletions
--- 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