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

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-07-01 15:55:39 +06:30
parent 8afb2e7c5e 985604cd1f
commit 4750f03ea8
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ if @zones
#List all tables
json.tables zone.tables do |table|
if table.is_active
booking = table.get_current_booking_status
booking = table.get_current_booking
json.id table.id
json.name table.name
json.status table.status
@@ -18,7 +18,7 @@ if @zones
json.rooms zone.rooms do |room|
if room.is_active
booking = room.get_current_booking_status
booking = room.get_current_booking
json.id room.id
json.name room.name
json.status room.status
@@ -32,7 +32,7 @@ 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
booking = table.get_current_booking
json.id table.id
json.name table.name
json.status table.status
@@ -44,7 +44,7 @@ else #list all tables and rooms with out zones
json.rooms @all_rooms do |room|
if room.is_active
booking = room.get_current_booking_status
booking = room.get_current_booking
json.id room.id
json.name room.name
json.status room.status

2
app/views/origami/home/show.html.erb
View File

@@ -146,7 +146,7 @@
<div class="card-block">
<%
order_status = ""
sale_order = SaleOrder.find_by_order_id(order)
sale_order = order.sale_orders.first
if sale_order
unless sale_order.sale_id.nil?
sale = Sale.find(sale_order.sale_id)