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

update new request fixed

Browse Source
This commit is contained in:
Aung Myo
2018-07-01 17:14:08 +06:30
parent ecf9134b04
commit a69128da0d
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/api/restaurant/zones/index.json.jbuilder
View File

@@ -6,21 +6,25 @@ if @zones
#List all tables
json.tables zone.tables do |table|
if table.is_active
booking = table.get_current_booking_status
json.id table.id
json.name table.name
json.status table.status
json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
json.current_booking table.get_current_booking.booking_id rescue ""
json.current_booking booking.booking_id rescue ""
json.sale_id booking.sale_id rescue ""
end
end
json.rooms zone.rooms do |room|
if room.is_active
booking = room.get_current_booking_status
json.id room.id
json.name room.name
json.status room.status
json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
json.current_booking room.get_current_booking.booking_id rescue ""
json.current_booking booking.booking_id rescue ""
json.sale_id booking.sale_id rescue ""
end
end
end
@@ -28,21 +32,25 @@ if @zones
else #list all tables and rooms with out zones
json.tables @all_tables do |table|
if table.is_active
booking = table.get_current_booking_status
json.id table.id
json.name table.name
json.status table.status
json.zone_id table.zone_id #Add this zone_id to keep data structure consistance
json.current_booking table.get_current_booking.booking_id rescue ""
json.current_booking booking.booking_id rescue ""
json.sale_id booking.sale_id rescue ""
end
end
json.rooms @all_rooms do |room|
if room.is_active
booking = room.get_current_booking_status
json.id room.id
json.name room.name
json.status room.status
json.zone_id room.zone_id #Add this zone_id to keep data structure consistance
json.current_booking room.get_current_booking.booking_id rescue ""
json.current_booking booking.booking_id rescue ""
json.sale_id booking.sale_id rescue ""
end
end
end