update addorder

app/assets/javascripts/addorder.js

@@ -23,10 +23,31 @@ $(function(){
         var menu_items_list = $('.menu_items_list');
         menu_items_list.empty();
         menu_items = data.menu_items;
-        console.log(url_item);
+
+
         for(var field in menu_items) {  
           if (menu_items[field].is_sub_item == false) {
             instances = menu_items[field].instances ;
+            qty = 1;
+            options = [];
+
+            if (JSON.stringify(menu_items[field].item_sets)!='[]') {
+              fa_plus = '';
+              menu_item_box = 'set_item_box';
+              data_target = 'sx_item_set_detailModal';
+
+                 code            =  menu_items[field].code;
+                 name            =  menu_items[field].name;
+                 price           = 0;//parseFloat( menu_items[field].price).toFixed(2);
+                 is_available    = menu_items[field].is_available ;
+                 is_on_promotion = 0;
+                 item_attributes = menu_items[field].attributes;
+                 promotion_price =  menu_items[field].promotion_price;
+            }else{
+              fa_plus = 'fa-plus';
+              menu_item_box = 'menu_item_box';
+              data_target = 'sx_item_detailModal';
+
               $(instances).each(function(i){
                 if (instances[i].is_default === true) {
                  code            = instances[i].code;
@@ -40,17 +61,6 @@ $(function(){
                }
               });
 
-            qty = 1;
-            options = [];
-
-            if (JSON.stringify(menu_items[field].item_sets)!='[]') {
-              fa_plus = '';
-              menu_item_box = 'set_item_box';
-              data_target = 'sx_item_set_detailModal';
-            }else{
-              fa_plus = 'fa-plus';
-              menu_item_box = 'menu_item_box';
-              data_target = 'sx_item_detailModal'
             }
 
             if (menu_items[field].image) {
@@ -115,7 +125,6 @@ $(function(){
 
       value = item_sets[field]["instances"];
       $(value).each(function(i){
-        console.log(value);
         $.ajax({
           type: "GET",
             url: '../../api/restaurant/menu_item_instances/'+value[i]["id"],
@@ -625,6 +634,9 @@ $(function(){
     $(".item_box").removeAttr("data-active");
   });
 
+  $('#sx_item_set_detailModal').on('click','#close', function(){ 
+    $("#sx_item_set_detailModal").css({ 'display': "none" });
+  });
   //click save buttom after change qty
   $('#sx_itemModal').on('click','#save', function(){  
     summary_items_filter(); 

app/controllers/origami/addorders_controller.rb

@@ -36,6 +36,7 @@ class Origami::AddordersController < BaseOrigamiController
     if (params[:id])
       #Pull this menu
       @menu = MenuCategory.find_by_id(params[:id])
+      puts @menu.menu_items[1].item_attributes.to_json
       return @menu
     else
       MenuCategory.current_menu

app/controllers/settings/set_menu_items_controller.rb

@@ -125,7 +125,8 @@ class Settings::SetMenuItemsController < ApplicationController
     end
 
     def set_settings_item_attribute
-      @item_attributes = MenuItemAttribute.all.order("id asc").map{|a| [a.name, a.value]}     
+      @item_attributes = MenuItemAttribute.all.order("id asc")#.map{|a| [a.name, a.value]}     
+
     end
 
     def set_settings_item_option

app/views/origami/addorders/detail.html.erb

@@ -62,7 +62,7 @@
       <div class="modal-dialog custom-modal-dialog" role="document">
         <div class="modal-content">
           <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true">&times;</button>
             <h4 class="modal-title"></h4>
           </div>
           <div class="modal-body">
@@ -97,12 +97,12 @@
 
     <!-- Menu Item modal -->
 
-    <div class="item-modal modal sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+    <div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
       <div class="modal-dialog custom-modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header" style="background-color: #54A5AF;">
             <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
-               <button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
                 
             </div>
             <div class="modal-body">
@@ -159,12 +159,12 @@
 
 
      <!-- Large modal -->
-    <div class=" modal sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true" >
+    <div class=" modal sx_item_set_detailModal" id="sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true" >
       <div class="modal-dialog custom-modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header" style="background-color: #54A5AF;">
             <h4 class="modal-title" style="color:#fff;" id="set_name"></h4>
-               <button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+               <button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
                 
             </div>
             <div class="modal-body">