fixed conflit

2019-05-24 15:00:12 +06:30
parent 7d105b2789 c1d3653612
commit e84091dc43
17 changed files with 1070 additions and 21 deletions
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -17,15 +17,17 @@ class ActionController::Base
        logger.info 'License is nil'
        # redirect_to root_url(:host => request.domain) + "store_error"
         render :json => [{ status: false, message: 'Invalid Access!'}]
+
      end
    else
-      check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end
+      # check for license file
+       if check_license
+         current_license(ENV["SX_PROVISION_URL"])
+       else
+         redirect_to activate_path
+       end
    end
+
  end

  def current_license(url)