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-04-23 14:41:18 +06:30
parent b92889fb23 924f8b03cd
commit 9b12ed0254
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/origami/addorders_controller.rb
View File

@@ -184,11 +184,11 @@ puts items_arr.to_json
@status, @sale = Sale.request_bill(@order,current_user,current_login_employee) @status, @sale = Sale.request_bill(@order,current_user,current_login_employee)
# for second display # for second display
if ENV["SERVER_MODE"] != 'cloud' # if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale" ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
end # end
result = {:status=> @status, :data => @sale } result = {:status=> @status, :data => @sale }
render :json => result.to_json render :json => result.to_json
end end

4
app/controllers/origami/second_display_controller.rb
View File

@@ -13,9 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController
else else
tax_profiles = nil tax_profiles = nil
end end
if ENV["SERVER_MODE"] != 'cloud' if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status] ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status]
end end
end end
#Shop Name in Navbor #Shop Name in Navbor
helper_method :shop_detail helper_method :shop_detail

5
app/models/my_aes_crypt.rb
View File

@@ -62,8 +62,9 @@ class MyAesCrypt
shop_json = JSON.parse(shop_data) shop_json = JSON.parse(shop_data)
shop_json["data"].each do |j| shop_json["data"].each do |j|
if j["lookup"] == from if j["lookup"] == from
if(j["value"]["key"] == token) # add [0...44] for production cloud for remove \n
if(j["value"]["key"][0...44] == token)
return true return true
end end
end end

2
config/initializers/mysql2_adapter.rb
View File

@@ -24,7 +24,7 @@ module ActiveRecord
end end
client = Mysql2::Client.new(config.symbolize_keys) client = Mysql2::Client.new(config.symbolize_keys)
options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0] options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], config[:wait_timeout], 0]
ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config) ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
end end
end end