From 6ccf3152429ddd1d1daab92a464c05c3834443e3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 15 Mar 2018 16:14:15 +0630
Subject: [PATCH] remove JSON parse in set item options

---
 app/views/origami/home/show.html.erb  | 14 +++++++-------
 app/views/origami/rooms/show.html.erb |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index accbd5d9..54b0e956 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -304,13 +304,13 @@
                                           JSON.parse(order_item.set_menu_items).each do |item_instance| %> 
                                           <br><span class="font-13">
                                             <%= item_instance["item_instance_name"] %>
-                                              <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
-                                                <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
-                                                  <br><span class="font-13">
-                                                    <%= set_item_option %>
-                                                  </span>
-                                                <% end %>
+                                            <% if !item_instance["options"].nil? && !item_instance["options"].empty? %>
+                                              <% (item_instance["options"]).each do |set_item_option| %>
+                                                <br><span class="font-13">
+                                                  <%= set_item_option %>
+                                                </span>
                                               <% end %>
+                                            <% end %>
                                             </span> 
                                         <% end 
                                         end %>
@@ -401,7 +401,7 @@
                                 <br><span class="font-13">
                                   <%= item_instance["item_instance_name"] %>
                                     <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
-                                      <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                      <% (item_instance["options"]).each do |set_item_option| %>
                                         <br><span class="font-13">
                                           <%= set_item_option %>
                                         </span>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 4a21fb24..d98a3fe2 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -290,7 +290,7 @@
                           <br><span class="font-13">
                             <%= item_instance["item_instance_name"] %>
                               <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
-                                <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                <% (item_instance["options"]).each do |set_item_option| %>
                                   <br><span class="font-13">
                                     <%= set_item_option %>
                                   </span>
@@ -375,7 +375,7 @@
                           <br><span class="font-13">
                             <%= item_instance["item_instance_name"] %>
                               <% if !item_instance["options"].nil? && item_instance["options"] != "undefined" %>
-                                <% JSON.parse(item_instance["options"]).each do |set_item_option| %>
+                                <% (item_instance["options"]).each do |set_item_option| %>
                                   <br><span class="font-13">
                                     <%= set_item_option %>
                                   </span>