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

update shift

Browse Source
This commit is contained in:
Nweni
2017-06-30 13:10:28 +06:30
parent 063d561f3e
commit 5e3935f176
7 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/api/orders_controller.rb
View File

@@ -68,8 +68,6 @@ class Api::OrdersController < Api::ApiController
if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
if !booking.sale_id.nil?
sale_status = check_order_with_booking(booking)
puts "WWwwWWWWWWww"
puts sale_status
if sale_status
return false , @message = "bill requested"
end
@@ -79,8 +77,6 @@ class Api::OrdersController < Api::ApiController
end
else
sale_status = check_order_with_table(params[:table_id])
puts "OOOOOOOOO"
puts sale_status
if sale_status
return false , @message = "bill requested"
end
@@ -88,14 +84,12 @@ class Api::OrdersController < Api::ApiController
end #booking exists
else
sale_status = check_order_with_table(params[:table_id])
puts "MMMMMMMM"
puts sale_status
if sale_status
return false , @message = "bill requested"
end
end
@status, @booking = @order.generate
@status, @booking = @order.generate
end
# render json for http status code 202
@@ -103,7 +97,7 @@ class Api::OrdersController < Api::ApiController
render status: code, json: {
message: msg,
booking_id: booking_id
}.to_json
}.to_json
end
def check_order_with_table(table_id)