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

edit json builder booking order

Browse Source
This commit is contained in:
Wathon Aung
2017-04-20 17:56:00 +06:30
parent 0a97947259
commit 95b7f7b80d
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.ruby-version Normal file
View File

@@ -0,0 +1 @@
2.3.3

9
app/views/api/bookings/show.json.jbuilder
View File

@@ -12,10 +12,14 @@ if (@booking)
@total_tax = 0.00 @total_tax = 0.00
if @booking.booking_orders if @booking.booking_orders
order_items = []
@booking.booking_orders.each do |bo| @booking.booking_orders.each do |bo|
order = Order.find(bo.order_id) order = Order.find(bo.order_id)
if (order.status == "new") if (order.status == "new")
order_items = order.order_items order_items = order_items + order.order_items
end
end
json.order_items order_items do |item| json.order_items order_items do |item|
json.item_instance_code item.item_code json.item_instance_code item.item_code
json.item_name item.item_name json.item_name item.item_name
@@ -26,8 +30,7 @@ if (@booking)
json.item_status item.order_item_status json.item_status item.order_item_status
@total_amount = @total_amount + (item.price * item.qty) @total_amount = @total_amount + (item.price * item.qty)
end end
end
end
end end
json.sub_total @total_amount json.sub_total @total_amount

BIN
dump.rdb Normal file
View File

Binary file not shown.