update menu_sync

app/controllers/settings/menu_item_instances_controller.rb

@@ -21,12 +21,14 @@ class Settings::MenuItemInstancesController < ApplicationController
     id = MenuItemInstance.findParentCategory(@item)
     @category = MenuCategory.find(id)
     @settings_menu_item_instances = MenuItemInstance.new
+    @item_sets = ItemSet.all
   end
 
   # GET /settings/menu_item_instances/1/edit
   def edit
     id = MenuItemInstance.findParentCategory(@item)
     @category = MenuCategory.find(id)
+    @item_sets = ItemSet.all 
   end
 
   # POST /settings/menu_item_instances
@@ -45,6 +47,18 @@ class Settings::MenuItemInstancesController < ApplicationController
 
     id = MenuItemInstance.findParentCategory(catID)
     category = MenuCategory.find(id)
+
+    # Bind for Item Sets
+    if params[:menu_item_instance][:item_sets].count > 1
+      params[:menu_item_instance][:item_sets].delete_at(0)
+
+      sets = ItemSet.find(params[:menu_item_instance][:item_sets])
+
+      if sets.count > 0
+        @settings_menu_item.item_sets = sets
+      end
+    end
+
     respond_to do |format|
       if @settings_menu_item_instances.save
         @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
@@ -70,6 +84,18 @@ class Settings::MenuItemInstancesController < ApplicationController
 
     id = MenuItemInstance.findParentCategory(catID)
     category = MenuCategory.find(id)
+
+    # Bind for Item Sets
+    if params[:menu_item_instance][:item_sets].count > 1
+      params[:menu_item_instance][:item_sets].delete_at(0)
+
+      sets = ItemSet.find(params[:menu_item_instance][:item_sets])
+
+      if sets.count > 0
+        @settings_menu_item.item_sets = sets
+      end
+    end
+    
     respond_to do |format|
 
       if @settings_menu_item_instances.update(settings_menu_item_instance_params)
@@ -122,8 +148,6 @@ class Settings::MenuItemInstancesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_instance_params
-
-      params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :item_attributes, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id)
-
+      params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :item_attributes, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id, :is_default, :item_sets)
     end
 end

app/controllers/settings/set_menu_items_controller.rb

@@ -33,29 +33,30 @@ class Settings::SetMenuItemsController < ApplicationController
   def create
     @settings_menu_item = MenuItem.new(settings_menu_item_params)
 
-    # if params[:simple_menu_item][:menu_item_id] == ''
+    # if params[:set_menu_item][:menu_item_id] == ''
     @settings_menu_item.menu_category_id = params[:menu_category_id]
     # end
     @settings_menu_item.created_by = current_login_employee.name
 
+    # Remove "" default first 
+    params[:set_menu_item][:item_attributes].delete_at(0)
+    params[:set_menu_item][:item_options].delete_at(0)
+    
     # Bind for Item Sets
-    if params[:simple_menu_item][:item_sets].count > 1
-      params[:simple_menu_item][:item_sets].delete_at(0)
+    if params[:set_menu_item][:item_sets].count > 1
+      params[:set_menu_item][:item_sets].delete_at(0)
 
-      sets = ItemSet.find(params[:simple_menu_item][:item_sets])
+      sets = ItemSet.find(params[:set_menu_item][:item_sets])
 
       if sets.count > 0
         @settings_menu_item.item_sets = sets
       end
     end
-
-    # Remove "" default first 
-    params[:simple_menu_item][:item_attributes].delete_at(0)
-    params[:simple_menu_item][:item_options].delete_at(0)
+    
     respond_to do |format|
       if @settings_menu_item.save
         menu_item = MenuItem.find(@settings_menu_item.id)
-        menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options])
+        menu_item.update_attributes(item_attributes: params[:set_menu_item][:item_attributes], item_options: params[:set_menu_item][:item_options])
 
         format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully created.' }
         format.json { render :show, status: :created, location: @settings_menu_item }
@@ -70,14 +71,14 @@ class Settings::SetMenuItemsController < ApplicationController
   # PATCH/PUT /settings/menu_items/1.json
   def update
     # Remove "" default first 
-    params[:simple_menu_item][:item_attributes].delete_at(0)
-    params[:simple_menu_item][:item_options].delete_at(0)
+    params[:set_menu_item][:item_attributes].delete_at(0)
+    params[:set_menu_item][:item_options].delete_at(0)
 
     # Bind for Item Sets
-    if params[:simple_menu_item][:item_sets].count > 1
-      params[:simple_menu_item][:item_sets].delete_at(0)
+    if params[:set_menu_item][:item_sets].count > 1
+      params[:set_menu_item][:item_sets].delete_at(0)
 
-      sets = ItemSet.find(params[:simple_menu_item][:item_sets])
+      sets = ItemSet.find(params[:set_menu_item][:item_sets])
 
       if sets.count > 0
         @settings_menu_item.item_sets = sets
@@ -88,7 +89,7 @@ class Settings::SetMenuItemsController < ApplicationController
 
     respond_to do |format|
       if @settings_menu_item.update(settings_menu_item_params)
-        @settings_menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options])
+        @settings_menu_item.update_attributes(item_attributes: params[:set_menu_item][:item_attributes], item_options: params[:set_menu_item][:item_options])
 
         format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_menu_item }
@@ -131,6 +132,6 @@ class Settings::SetMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by)
+      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets)
     end
 end

app/controllers/settings/simple_menu_items_controller.rb

@@ -37,6 +37,34 @@ class Settings::SimpleMenuItemsController < ApplicationController
     # end
     @settings_menu_item.created_by = current_login_employee.name
 
+    # Remove "" default first 
+    params[:simple_menu_item][:item_attributes].delete_at(0)
+    params[:simple_menu_item][:item_options].delete_at(0)
+
+    # attr_format = []
+    # param_count = params[:simple_menu_item][:item_attributes].count
+    # # Format for attributes json    
+    # params[:simple_menu_item][:item_attributes].each do|attr_id|      
+    #   menu_attr = MenuItemAttribute.find(attr_id)
+    #   if attr_format.count == 0
+    #     attr_format.push({ type: menu_attr.attribute_type, value: [] })
+    #   end
+
+    #   attr_format.each do |af|
+    #     if menu_attr.attribute_type == af[:type]
+    #       af[:value].push(menu_attr.value)
+    #     else 
+    #       new_attr = {type: menu_attr.attribute_type, value: [ menu_attr.value ] }
+    #       attr_format.push(new_attr) 
+    #     end
+        
+    #     break if attr_format.count > param_count
+    #   end
+
+    #   param_count -= 1           
+    # end
+    # @settings_menu_item.item_attributes = attr_format
+
     # Bind for Item Sets
     if params[:simple_menu_item][:item_sets].count > 1
       params[:simple_menu_item][:item_sets].delete_at(0)
@@ -47,14 +75,11 @@ class Settings::SimpleMenuItemsController < ApplicationController
         @settings_menu_item.item_sets = sets
       end
     end
-
-    # Remove "" default first 
-    params[:simple_menu_item][:item_attributes].delete_at(0)
-    params[:simple_menu_item][:item_options].delete_at(0)
+    
     respond_to do |format|
       if @settings_menu_item.save
         menu_item = MenuItem.find(@settings_menu_item.id)
-        menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options])
+        menu_item.update_attributes(item_options: params[:simple_menu_item][:item_options])
 
         format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully created.' }
         format.json { render :show, status: :created, location: @settings_menu_item }
@@ -129,6 +154,6 @@ class Settings::SimpleMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by)
+      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets)
     end
 end