diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 3de713c7..da50ac34 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -68,11 +68,14 @@ $(document).on('turbolinks:load', function() {
 	            var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
 	            var set_menu_items = data[field]["set_menu_items"];
 	            var set_instance_items = "";
-	            if(set_menu_items.length > 0){
-					$.each(set_menu_items, function(k,val){
-						set_instance_items += '<br><span class="font-12">'+val+'</span>';
-					});
-				}
+	            if(set_menu_items!=null){
+	            	if(set_menu_items.length > 0){
+						$.each(set_menu_items, function(k,val){
+							set_instance_items += '<br><span class="font-12">'+val+'</span>';
+						});
+					}
+	            }
+	            	
 	            row ='<div class="card queue_station animated " data-order-no="'+data[field]["order_id"]+'">'
 	                    +'<div class="card-block">'
 	                         +'<div class="row">'
@@ -146,10 +149,12 @@ $(document).on('turbolinks:load', function() {
         			var parse_data = JSON.parse(data); 
         			var set_menu_items = parse_data.set_menu_items;
         			var set_instance_items = "";
-        			if(set_menu_items.length > 0){
-        				$.each(set_menu_items, function(k,val){
-							set_instance_items += '<br><span class="font-12">'+val+'</span>';
-						});
+        			if(set_menu_items!=null){
+        				if(set_menu_items.length > 0){
+	        				$.each(set_menu_items, function(k,val){
+								set_instance_items += '<br><span class="font-12">'+val+'</span>';
+							});
+	        			}
         			}
 	    			var order_item_row = "<tr>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 8217a9b8..0d22d199 100755
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -14,7 +14,7 @@ class Oqs::HomeController < BaseOqsController
     @queue_completed_item = completed_order(@filter)
     if !@queue_completed_item.empty?
       @queue_completed_item.each do |queue_item|
-        if !queue_item.set_menu_items.empty?
+        if !queue_item.set_menu_items.nil?
           instance_item_sets = JSON.parse(queue_item.set_menu_items)
           arr_instance_item_sets = Array.new
           instance_item_sets.each do |instance_item|
@@ -88,13 +88,15 @@ class Oqs::HomeController < BaseOqsController
 
     if !items.empty?
       items.each do |item|
-        instance_item_sets = JSON.parse(item.set_menu_items)
-        arr_instance_item_sets = Array.new
-        instance_item_sets.each do |instance_item|
-          item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-          arr_instance_item_sets.push(item_instance_name)
+        if !item.set_menu_items.nil?
+          instance_item_sets = JSON.parse(item.set_menu_items)
+          arr_instance_item_sets = Array.new
+          instance_item_sets.each do |instance_item|
+            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+            arr_instance_item_sets.push(item_instance_name)
+          end
+          item.set_menu_items = arr_instance_item_sets
         end
-        item.set_menu_items = arr_instance_item_sets
       end
     end
 
@@ -107,13 +109,15 @@ class Oqs::HomeController < BaseOqsController
     items  = queue_items_query(false,oqs_id,filter)
     if !items.empty?
       items.each do |item|
-        instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
-        arr_instance_item_sets = Array.new
-        instance_item_sets.each do |instance_item|
-          item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-          arr_instance_item_sets.push(item_instance_name)
+        if !item.set_menu_items.nil?
+          instance_item_sets = JSON.parse(JSON.parse(item.set_menu_items))
+          arr_instance_item_sets = Array.new
+          instance_item_sets.each do |instance_item|
+            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+            arr_instance_item_sets.push(item_instance_name)
+          end
+          item.set_menu_items = arr_instance_item_sets
         end
-        item.set_menu_items = arr_instance_item_sets
       end
     end
     render :json => items.to_json
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 8af0759d..536defe7 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -41,7 +41,7 @@ class Origami::HomeController < BaseOrigamiController
                 @date = order.created_at
                 @booking= booking
                 order.order_items.each do |item|
-                  if !item.set_menu_items.empty?
+                  if !item.set_menu_items.nil?
                     instance_item_sets = JSON.parse(item.set_menu_items)
                     arr_instance_item_sets = Array.new
                     instance_item_sets.each do |instance_item|
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 60f93d85..bd375d63 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -35,7 +35,7 @@ class Origami::RoomsController < BaseOrigamiController
                 @date = order.created_at
                 @booking = booking
                 order.order_items.each do |item|
-                  if !item.set_menu_items.empty?
+                  if !item.set_menu_items.nil?
                     instance_item_sets = JSON.parse(item.set_menu_items)
                     arr_instance_item_sets = Array.new
                     instance_item_sets.each do |instance_item|
diff --git a/app/models/order.rb b/app/models/order.rb
index 5b696e20..13e0e62b 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -145,6 +145,9 @@ class Order < ApplicationRecord
                 set_order_items.push({"item_instance_code"=>si[:item_instance_code], "quantity"=>si[:quantity], "price"=>set_item[:price]})
               end
             end
+            set_order_items = set_order_items.to_json
+          else
+            set_order_items = nil
           end
 
           # not insert with price 0
@@ -157,7 +160,7 @@ class Order < ApplicationRecord
           # end
 
           OrderItem.processs_item(menu_item[:item_code], item[:item_instance_code], menu_item[:name], menu_item[:alt_name], menu_item[:account_id],
-                          item[:quantity],menu_item[:price], item[:options], set_order_items.to_json, self.id,
+                          item[:quantity],menu_item[:price], item[:options], set_order_items, self.id,
                           self.employee_name, menu_item[:taxable])
 
         #end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index d9a94f79..b5026a9c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -98,7 +98,7 @@ class Sale < ApplicationRecord
 
         order.order_items.each do |item|
           add_item(item)
-          if item.set_menu_items != "[]"
+          if !item.set_menu_items.nil?
             add_sub_item(item.set_menu_items)
           end
         end
@@ -147,7 +147,7 @@ class Sale < ApplicationRecord
 
     items.each do |item|
       add_item(item)
-      if item.set_menu_items != "[]"
+      if !item.set_menu_items.nil?
         add_sub_item(item.set_menu_items)
       end
       
diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb
index 1851e93a..30a800b4 100644
--- a/app/pdf/order_set_item_pdf.rb
+++ b/app/pdf/order_set_item_pdf.rb
@@ -114,7 +114,7 @@ class OrderSetItemPdf < Prawn::Document
     end
 
     #add set menu items
-    if !order_set_item.set_menu_items.empty?
+    if !order_set_item.set_menu_items.nil?
       set_menu_items = JSON.parse(order_set_item.set_menu_items)
       if !set_menu_items.empty?
         # json_item_instance_code = nil
diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb
index 5a72901c..baab15b8 100644
--- a/app/pdf/order_summary_set_pdf.rb
+++ b/app/pdf/order_summary_set_pdf.rb
@@ -132,7 +132,7 @@ class OrderSummarySetPdf < Prawn::Document
         end
 
         #add set menu items
-        if !odi.set_menu_items.empty?
+        if !odi.set_menu_items.nil?
           set_menu_items = JSON.parse(odi.set_menu_items)
           if !set_menu_items.empty?
             # json_item_instance_code = nil
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 2f851919..1f25e275 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -83,7 +83,7 @@
                   <span class="order-qty">
                     <%= qid.qty %>
                   </span> ]  
-                  <% if !qid.set_menu_items.empty? 
+                  <% if !qid.set_menu_items.nil? 
                       qid.set_menu_items.each do |item_instance|%>
                     <br><span class="font-12">
                       <%= item_instance %>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0bad6857..1f387be9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -257,7 +257,7 @@
                                     <td><%= count %></td>
                                     <td class='item-name'>
                                       <%= order_item.item_name %>
-                                      <% if !order_item.set_menu_items.empty?  
+                                      <% if !order_item.set_menu_items.nil?  
                                         order_item.set_menu_items.each do |item_instance| %> 
                                         <br><span class="font-13"><%= item_instance %></span> 
                                       <% end 
@@ -337,7 +337,7 @@
                               <td><%= count %>
                               <td class='item-name'>
                                 <%= order_item.item_name %>
-                                <% if !order_item.set_menu_items.empty?  
+                                <% if !order_item.set_menu_items.nil?  
                                   order_item.set_menu_items.each do |item_instance| %> 
                                   <br><span class="font-13"><%= item_instance %></span> 
                                 <% end 
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 4dc92c53..c6c749cd 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -246,7 +246,7 @@
                    <td><%= count %></td>
                    <td class='item-name'>
                     <%= order_item.item_name %>
-                    <% if !order_item.set_menu_items.empty?  
+                    <% if !order_item.set_menu_items.nil?  
                       order_item.set_menu_items.each do |item_instance| %> 
                       <br><span class="font-13"><%= item_instance %></span> 
                     <% end 
@@ -315,7 +315,7 @@
                     <td><%= count %>
                     <td class='item-name'>
                       <%= order_item.item_name %>
-                      <% if !order_item.set_menu_items.empty?  
+                      <% if !order_item.set_menu_items.nil?  
                         order_item.set_menu_items.each do |item_instance| %> 
                         <br><span class="font-13"><%= item_instance %></span> 
                       <% end