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

-

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2020-01-15 12:19:27 +06:30
parent 0d2bc27792
commit bad510c6b4
2 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,7 @@ class Api::OrdersController < Api::ApiController
end end
} }
#end extra time #end extra time
Order.transaction do
# begin # begin
@order = Order.new @order = Order.new
@order.source = params[:order_source] @order.source = params[:order_source]
@@ -134,12 +134,7 @@ class Api::OrdersController < Api::ApiController
from = getCloudDomain #get sub domain in cloud mode from = getCloudDomain #get sub domain in cloud mode
ActionCable.server.broadcast "order_channel",table: table,type:type,from:from ActionCable.server.broadcast "order_channel",table: table,type:type,from:from
end end
# # for parallel order end
# remoteIP = ""
# begin
# @status, @booking = @order.generate
# remoteIP = request.remote_ip
# end while request.remote_ip != remoteIP
else else
return return_json_status_with_code(406, "Checkout time is over!") return return_json_status_with_code(406, "Checkout time is over!")
end end

2
app/models/sale.rb
View File

@@ -159,7 +159,7 @@ class Sale < ApplicationRecord
}) })
end end
end end
puts sale.sale_items.to_json
sale.orders << booking.orders sale.orders << booking.orders
sale.customer_id = booking.orders[0].customer_id sale.customer_id = booking.orders[0].customer_id