git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
phyusin
2018-05-04 11:19:11 +06:30
parent 135ccae8a6 fc69efff16
commit 62636cc8c9
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/base_origami_controller.rb
View File

@@ -5,6 +5,7 @@ class BaseOrigamiController < ActionController::Base
before_action :check_user before_action :check_user
#before_action :check_installation #before_action :check_installation
protect_from_forgery with: :exception
helper_method :shop_detail, :current_token helper_method :shop_detail, :current_token
@@ -14,18 +15,14 @@ class BaseOrigamiController < ActionController::Base
redirect_to origami_dashboard_path redirect_to origami_dashboard_path
end end
def check_user def check_user
if check_mobile if check_mobile
if current_user.nil? if current_user.nil?
return render status: 401, json: { return render status: 401, json: {
message: "User using other device!" message: "User using other device!"
}.to_json }.to_json
end end
else else
if ENV["SERVER_MODE"] != 'cloud'
protect_from_forgery with: :exception
end
if current_user.nil? if current_user.nil?
redirect_to root_path redirect_to root_path
end end

11
app/controllers/origami/other_charges_controller.rb
View File

@@ -15,12 +15,11 @@ class Origami::OtherChargesController < BaseOrigamiController
@table = DiningFacility.find(@sale_data.bookings[0].dining_facility_id) @table = DiningFacility.find(@sale_data.bookings[0].dining_facility_id)
else else
@table = nil @table = nil
end end
end end
end end
def create def create
sale_id = params[:sale_id] sale_id = params[:sale_id]
other_charges_items = JSON.parse(params[:other_charges_items]) other_charges_items = JSON.parse(params[:other_charges_items])
sub_total = params[:sub_total] sub_total = params[:sub_total]
@@ -79,8 +78,6 @@ class Origami::OtherChargesController < BaseOrigamiController
if !table.nil? if !table.nil?
dining = {:table_id => table_id, :table_type => table.type } dining = {:table_id => table_id, :table_type => table.type }
render :json => dining.to_json render :json => dining.to_json
end end
end
end
end end

4
config/initializers/action_controller.rb
View File

@@ -8,7 +8,7 @@ class ActionController::Base
from = request.subdomain.downcase + "." + request.domain.downcase from = request.subdomain.downcase + "." + request.domain.downcase
@license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
if (!@license.nil?) if (!@license.nil?)
logger.info "Location - " + @license.dbhost logger.info "Location - " + @license.dbschema
ActiveRecord::Base.establish_connection(website_connection(@license)) ActiveRecord::Base.establish_connection(website_connection(@license))
# authenticate_session_token # authenticate_session_token
# logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
@@ -97,7 +97,7 @@ class ActionController::API
from = request.subdomain.downcase + "." + request.domain.downcase from = request.subdomain.downcase + "." + request.domain.downcase
@license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
if (!@license.nil?) if (!@license.nil?)
# logger.info "Location - " + @license.dbhost logger.info "Location - " + @license.dbschema
ActiveRecord::Base.establish_connection(website_connection(@license)) ActiveRecord::Base.establish_connection(website_connection(@license))
# authenticate_session_token # authenticate_session_token
# logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema