Pull from master

This commit is contained in:
San Wai Lwin
2018-04-02 18:10:47 +06:30
parent c53276f21c
commit 650eb53f51
19 changed files with 351 additions and 163 deletions

View File

@@ -300,7 +300,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"] %>

View File

@@ -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"] %>