From 2399f1d494081e51b94696aa9be282edeac68b77 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Thu, 31 Aug 2017 11:41:38 +0630
Subject: [PATCH] update form attr name to attr id to instances

---
 app/models/menu_item_attribute.rb                     |  3 ++-
 .../api/restaurant/menu/_menu_item.json.jbuilder      | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/models/menu_item_attribute.rb b/app/models/menu_item_attribute.rb
index e57085cb..1939120b 100644
--- a/app/models/menu_item_attribute.rb
+++ b/app/models/menu_item_attribute.rb
@@ -1,6 +1,7 @@
 class MenuItemAttribute < ApplicationRecord
   validates_presence_of :attribute_type, :name, :value
   def self.collection
-    MenuItemAttribute.select("name").map { |e| [e.name, e.name] }
+  	MenuItemAttribute.select("id, name").map { |e| [e.name, e.id] }
+    # MenuItemAttribute.select("name").map { |e| [e.name, e.name] }
   end
 end
diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
index 3f8b5358..66cebece 100644
--- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
@@ -89,7 +89,14 @@ json.options opt_format
 #   json.promotion_price = item_instance.promotion_price
 #   json.item_attributes = item_instance.item_attributes
 
-  json.instances item.menu_item_instances do |is|
+json.instances item.menu_item_instances do |is|
+  # Convert id to name for attributes
+  instance_attr = []
+  is.item_attributes do |ia|
+    mItemAttr = MenuItemAttribute.find(is)
+    instance_attr.push(ia.name)
+  end
+  
     json.id is.id
     json.code is.item_instance_code
     json.name is.item_instance_name
@@ -98,7 +105,7 @@ json.options opt_format
     json.is_default is.is_default
     json.is_on_promotion is.is_on_promotion
     json.promotion_price is.promotion_price
-    json.values is.item_attributes
+    json.values instance_attr
     # json.item_sets is.item_sets
 end