From b0452030b0389c1207ca9c03805d0292a211d3d6 Mon Sep 17 00:00:00 2001
From: Thein Lin Kyaw <theinlinkyaw@code2lab.com>
Date: Tue, 10 Dec 2019 16:34:58 +0630
Subject: [PATCH] fix menu attributes error

---
 .../addorders/_menu_item.json.jbuilder        |  6 ++--
 .../origami/dashboard/_menu.json.jbuilder     | 32 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/views/origami/addorders/_menu_item.json.jbuilder b/app/views/origami/addorders/_menu_item.json.jbuilder
index 2768fa9c..d6b72535 100755
--- a/app/views/origami/addorders/_menu_item.json.jbuilder
+++ b/app/views/origami/addorders/_menu_item.json.jbuilder
@@ -31,15 +31,13 @@ json.is_sub_item  item.is_sub_item
 json.unit         item.unit
 
 # Item Sets of Menu Item
-json.item_sets item.item_sets.includes(:menu_item_instances) do |its|
+json.item_sets item.item_sets do |its|
   json.id                 its.id
   json.name               its.name
   json.alt_name           its.alt_name
   json.min_selectable_qty its.min_selectable_qty
   json.max_selectable_qty its.max_selectable_qty
-  json.instances its.menu_item_instances do |i|
-    json.id  i.id
-  end
+  json.instances          its.menu_item_instances.map { |i| {id: i.id} }
 end
 
 json.attributes attr_format
diff --git a/app/views/origami/dashboard/_menu.json.jbuilder b/app/views/origami/dashboard/_menu.json.jbuilder
index 6d1ec624..6539ffee 100644
--- a/app/views/origami/dashboard/_menu.json.jbuilder
+++ b/app/views/origami/dashboard/_menu.json.jbuilder
@@ -8,7 +8,7 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 if (menu.menu_categories)
   order_by = Lookup.find_by_lookup_type("order_by")
   # if !order_by.nil? && order_by.value == "name"
-  #   categories = MenuCategory.unscoped.where("menu_id ='#{menu.id}'").order("name asc")
+  #   categories = MenuCategory.unscope(:order).where("menu_id ='#{menu.id}'").order("name asc")
   # else
   #   categories = menu.menu_categories
   # end
@@ -41,21 +41,21 @@ if (menu.menu_categories)
             attr_format = []
             # Format for attributes json
             if item.item_attributes.count > 0
-              item_attributes = @item_attributes.select{ |x| item.item_attributes.include?(x.id.to_s) }
-              attr_format = item_attributes.group_by {|att| att.attribute_type }.map { |type, values| {type: type, values: values.map(&:name)} }
+              item_attributes = item.item_attributes.map(&:to_s)
+              attr_format = @item_attributes.select { |x| item_attributes.include?(x.id.to_s) }.group_by {|att| att.attribute_type.strip }.map { |type, values| {type: type, values: values.map { |x| x.name.strip } } }
             end
 
             # Format for option json
             opt_format = []
             # Format for attributes json
             if item.item_options.count > 0
-              item_options = @item_options.select{ |x| item.item_options.include?(x.id.to_s) }
-              opt_format = item_options.group_by {|opt| opt.option_type }.map { |type, values| {type: type, values: values.map(&:name)} }
+              item_options = item.item_options.map(&:to_s)
+              opt_format = @item_options.select { |x| item_options.include?(x.id.to_s) }.group_by {|opt| opt.option_type.strip }.map { |type, values| {type: type, values: values.map { |x| x.name.strip } } }
             end
 
             #Menu Item Information
             json.id           item.id
-            json.code    item.item_code
+            json.code         item.item_code
             json.name         item.name
             json.alt_name     item.alt_name
             json.image        item.image_path.url
@@ -69,15 +69,14 @@ if (menu.menu_categories)
             json.unit         item.unit
 
             # Item Sets of Menu Item
-            json.item_sets item.item_sets.map { |its|
-              { id: its.id,
-                name: its.name,
-                alt_name: its.alt_name,
-                min_selectable_qty: its.min_selectable_qty,
-                max_selectable_qty: its.max_selectable_qty,
-                instances: its.menu_item_instances.map { |i| {id: i.id} }
-              }
-            }
+            json.item_sets item.item_sets do |its|
+              json.id                 its.id
+              json.name               its.name
+              json.alt_name           its.alt_name
+              json.min_selectable_qty its.min_selectable_qty
+              json.max_selectable_qty its.max_selectable_qty
+              json.instances          its.menu_item_instances.map { |i| {id: i.id} }
+            end
 
             json.attributes attr_format
             json.options opt_format
@@ -85,7 +84,8 @@ if (menu.menu_categories)
             json.instances item.menu_item_instances do |is|
               if is.is_available
                 # Convert id to name for attributes
-                instance_attr = @item_attributes.select{ |x| item.item_attributes.include?(x.id) }.pluck(:name)
+                item_attributes = is.item_attributes.map(&:to_s)
+                instance_attr = @item_attributes.select{ |x| item_attributes.include?(x.id.to_s) }.pluck(:name)
 
                 json.id is.id
                 json.code is.item_instance_code