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

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

Browse Source
This commit is contained in:
phyusin
2018-05-23 17:29:10 +06:30
parent 777d83d35c 770ef87678
commit 9aa4bc0f2c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/origami/split_bill_controller.rb
View File

@@ -337,12 +337,12 @@ class Origami::SplitBillController < BaseOrigamiController
end end
Promotion.promo_activate(sale) Promotion.promo_activate(sale)
# if ENV["SERVER_MODE"] == 'cloud' if ENV["SERVER_MODE"] == 'cloud'
# from = request.subdomain + "." + request.domain from = request.subdomain + "." + request.domain
# else else
# from = "" from = ""
# end end
# ActionCable.server.broadcast "bill_channel",table: table,from:from ActionCable.server.broadcast "bill_channel",table: table,from:from
render :json => { status: status } render :json => { status: status }
else else