cahnge empty json to NIL

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

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|

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|

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

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
       

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

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

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 %>

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 

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