Merge branch 'adminbsb_material_ui'

2018-04-02 14:36:14 +06:30
parent d29b7a9d49 3e0742c660
commit f5be9661c4
3 changed files with 5 additions and 5 deletions
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -370,7 +370,7 @@
                          <% end %>
                        <% end %>

-                        <% if !order_item.set_menu_items.nil?  
+                       <% if !order_item.set_menu_items.nil?  && order_item.set_menu_items != '[]'
                          JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
                          <br><span class="font-13">
                            <%= item_instance["item_instance_name"] %>