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

Browse Source
This commit is contained in:
Yan
2018-04-23 16:23:35 +06:30
parent 403f70480d 3d39e398df
commit 86199ab4b4
13 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/bill_controller.rb
View File

@@ -47,7 +47,9 @@ class Api::BillController < Api::ApiController
Promotion.promo_activate(@sale)
#BillBroadcastJob.perform_later(table)
ActionCable.server.broadcast "bill_channel",table: table
if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "bill_channel",table: table
end
else
@status = false
@error_message = "No Current Open Shift"

5
app/controllers/api/call_waiters_controller.rb
View File

@@ -6,8 +6,9 @@ class Api::CallWaitersController < ActionController::API
@time = params[:time]
@table = DiningFacility.find(@table_id)
# CallWaiterJob.perform_later(@table,@time)
ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "call_waiter_channel",table: @table,time:@time
end
# get printer info
@shop = Shop.first
unique_code = "CallWaiterPdf"

5
app/controllers/api/order_reserve/order_reservation_controller.rb
View File

@@ -59,8 +59,9 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
order_reservation_id, flag = OrderReservation.addOrderReservationInfo(params)
order_reservation = OrderReservation.find(order_reservation_id)
ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
# if ENV["SERVER_MODE"] != 'cloud'
# ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
# end
if flag
render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" }
else

3
app/controllers/concerns/token_verification.rb
View File

@@ -24,7 +24,8 @@ module TokenVerification
end
end
@user = Employee.authenticate_by_token(token)
@user = Employee.
(token)
if @user
return true
#Maybe log - login?

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)
# for second display
if ENV["SERVER_MODE"] != 'cloud'
if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale"
end
end
result = {:status=> @status, :data => @sale }
render :json => result.to_json
end

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

@@ -39,7 +39,9 @@ class Origami::RequestBillsController < ApplicationController
# Promotion Activation
Promotion.promo_activate(@sale)
#bill channel
ActionCable.server.broadcast "bill_channel",table: table
if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "bill_channel",table: table
end
if order.source == "quick_service"
result = {:status=> @status, :data => @sale.sale_id }
render :json => result.to_json

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

@@ -13,9 +13,9 @@ class Origami::SecondDisplayController < BaseOrigamiController
else
tax_profiles = nil
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]
end
end
end
#Shop Name in Navbor
helper_method :shop_detail

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

@@ -335,9 +335,9 @@ class Origami::SplitBillController < BaseOrigamiController
end
Promotion.promo_activate(sale)
ActionCable.server.broadcast "bill_channel",table: table
if ENV["SERVER_MODE"] != 'cloud'
ActionCable.server.broadcast "bill_channel",table: table
end
render :json => { status: status }
else
render :json => { status: false, error_message: 'No Current Open Shift!'}