Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

2017-12-04 19:36:23 +06:30
parent c9f49d38cf 3354733e41
commit 765e08fd15
13 changed files with 157 additions and 13 deletions
--- a/app/views/api/call_waiters/index.json.jbuilder
+++ b/app/views/api/call_waiters/index.json.jbuilder
@@ -0,0 +1,6 @@
+if (@table)
+  json.table_id @table.id
+  json.name @table.name
+  json.type @table.type
+  json.time @time
+end