From e18cba27c413e27a884c5bf6abf2f0765cb2f5bc Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 4 Jun 2018 13:11:58 +0630 Subject: [PATCH] update order api action cable --- app/assets/stylesheets/addorder.scss | 2 +- app/controllers/api/orders_controller.rb | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 36ea4e33..1ffdb8f0 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -57,7 +57,7 @@ section .content{ .nav-tabs .nav-item { border-bottom: 1px solid #fff; margin-left:2px; - margin-right: -1.555rem; + margin-right: -1.4755rem; } #ul-navbar{ border-left: 1px solid #54A5AF; diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 59fbd864..e1b88e9d 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -120,6 +120,13 @@ class Api::OrdersController < Api::ApiController if @status && @booking Order.process_order_queue(@order.order_id,@order.table_id,@order.source) end + if @order.table_id.to_i > 0 + table = DiningFacility.find(@booking.dining_facility_id) + type = 'order' + from = getCloudDomain #get sub domain in cloud mode + ActionCable.server.broadcast "order_channel",table: table,type:type,from:from + + end # # for parallel order # remoteIP = "" # begin @@ -263,4 +270,16 @@ class Api::OrdersController < Api::ApiController return return_json_status_with_code(406, "Checkout time is over!") end end + + #get cloud domain + def getCloudDomain + from = "" + if ENV["SERVER_MODE"] == 'cloud' + from = request.subdomain + "." + request.domain + end + + return from + end + end +