fixed conflict

2017-06-04 13:12:02 +06:30
parent fa34d1db8f 89cbb59e7c
commit aa295c3a12
23 changed files with 250 additions and 43 deletions
--- a/app/jobs/order_broadcast_job.rb
+++ b/app/jobs/order_broadcast_job.rb
@@ -1,7 +1,6 @@
 class OrderBroadcastJob < ApplicationJob
  queue_as :default

-
  def perform(message)
  	order = Order.find(message) # message come as order_id
    ApplicationCable.server.broadcast "order_queue_station_channel", order: order