fixed conflit
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -525,6 +525,7 @@ scope "(:locale)", locale: /en|mm/ do
|
||||
get "order_reservation/get_shift_by_date", to: "order_reservation#show", as: "get_shift_by_order_reservation"
|
||||
get "induty/get_shift_by_date", to: "induty#show", as: "get_shift_by_induty"
|
||||
get "shiftsale_print/:id" , to: "shiftsale#print_close_receipt", as: "get_shift_id"
|
||||
post "print_sale_items", to: "saleitem#print_sale_items", as: "print_sale_items"
|
||||
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user