From 9b678b8523576cb9c7c9708c56cf6a5bbcec9124 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 27 Jul 2017 16:40:35 +0630
Subject: [PATCH] update add order menu category api

---
 .../menu_categories/show.json.jbuilder        | 24 ++++++++---------
 app/views/origami/addorders/show.html.erb     | 27 ++++++++-----------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/app/views/api/restaurant/menu_categories/show.json.jbuilder b/app/views/api/restaurant/menu_categories/show.json.jbuilder
index c175be67..d7a6d581 100644
--- a/app/views/api/restaurant/menu_categories/show.json.jbuilder
+++ b/app/views/api/restaurant/menu_categories/show.json.jbuilder
@@ -13,22 +13,22 @@ if @menu.menu_items
 		if item.menu_item_instances.count == 1 then
 
 		  item_instance = item.menu_item_instances[0]
-		  json.price = item_instance.price
-		  json.is_available = item_instance.is_available
-		  json.is_on_promotion = item_instance.is_on_promotion
-		  json.promotion_price = item_instance.promotion_price
-		  json.item_attributes = item_instance.item_attributes
+		  json.price  item_instance.price
+		  json.is_available  item_instance.is_available
+		  json.is_on_promotion  item_instance.is_on_promotion
+		  json.promotion_price  item_instance.promotion_price
+		  json.item_attributes  item_instance.item_attributes
 
 		elsif item.menu_item_instances.count > 1 then
 
 		  json.item_instances item.menu_item_instances do |is|
-		    json.item_instance_item_code = is.item_instance_code
-		    json.item_instance_name = is.item_instance_name
-		    json.price = is.price
-		    json.is_available = is.is_available
-		    json.is_on_promotion = is.is_on_promotion
-		    json.promotion_price = is.promotion_price
-		    json.item_attributes = is.item_attributes
+		    json.item_instance_item_code  is.item_instance_code
+		    json.item_instance_name  is.item_instance_name
+		    json.price  is.price
+		    json.is_available  is.is_available
+		    json.is_on_promotion  is.is_on_promotion
+		    json.promotion_price  is.promotion_price
+		    json.item_attributes  is.item_attributes
 		  end
 
 		end
diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb
index 07103225..3dff858e 100644
--- a/app/views/origami/addorders/show.html.erb
+++ b/app/views/origami/addorders/show.html.erb
@@ -15,18 +15,7 @@
   </div>
   <div class="col-md-6 col-lg-6">
     <div class="card-columns menu_items_list" style="column-gap: 10px;">
-
-        <!-- <div class="card">
-          <div class="card-header">
-             <small>Menu Name</small>
-          </div>
-          <div class="card-block">
-            <%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>
-          </div>
-          <div class="card-footer">
-           <small>Price : 3000</small>
-          </div>
-        </div> -->
+       <!-- append data -->
     </div>
   </div>
 
@@ -96,14 +85,14 @@ function show_details(url_item){
 
         for(var field in menu_items) {  
             if (menu_items[field].item_instances){
-              console.log(menu_items[field].item_instances.price);
-              var price = parseFloat(menu_items[field].item_instances[0]).toFixed(2);
+              console.log(menu_items[field].item_instances[0]);
+              var price = parseFloat(menu_items[field].item_instances[0].price).toFixed(2);
             }else{
               var price = parseFloat(menu_items[field].price).toFixed(2);
             }
             
             row = '<div class="card">'
-                    +'<div class="card-header">'
+                    +'<div class="card-head" style="line-height:14px;">'
                       +'<small>'+ menu_items[field].name +'</small>'
                     +'</div>'
 
@@ -112,7 +101,7 @@ function show_details(url_item){
                     +'</div>'
 
                     +'<div class="card-footer">'
-                      +'<small>'+ menu_items[field].price +'</small>'
+                      +'<small>'+ price +'</small>'
                     +'</div>'; 
             $('.menu_items_list').append(row);
         }
@@ -127,6 +116,12 @@ function show_details(url_item){
 
 
 <style type="text/css">
+  .card-head{
+    height: 40px;
+    background-color: #54A5AF;
+    padding:5px;
+    color :#fff;
+  }
    .card-block {
     padding: 0.3rem !important;
   }