Pull from master

2018-05-03 09:31:36 +06:30
parent caa0180e8c
commit 45531453c7
47 changed files with 1042 additions and 263 deletions
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -39,9 +39,9 @@ class Origami::RequestBillsController < ApplicationController
      # Promotion Activation
      Promotion.promo_activate(@sale)
      #bill channel
-      if ENV["SERVER_MODE"] != 'cloud'
+      #if ENV["SERVER_MODE"] != 'cloud'
        ActionCable.server.broadcast "bill_channel",table: table
-      end
+      #end
      if order.source == "quick_service"
        result = {:status=> @status, :data => @sale.sale_id }
          render :json => result.to_json