menu ui update

2017-08-16 18:26:30 +06:30
parent e791ce8809
commit 0eee1fd0af
19 changed files with 260 additions and 96 deletions
--- a/app/controllers/settings/set_menu_items_controller.rb
+++ b/app/controllers/settings/set_menu_items_controller.rb
@@ -1,6 +1,8 @@
 class Settings::SetMenuItemsController < ApplicationController
  before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy]
  before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update]
+  before_action :set_settings_item_attribute, only: [:index, :show, :edit, :new, :update ,:create]
+  before_action :set_settings_item_option, only: [:index, :show, :edit, :new, :update ,:create]
  # GET /settings/menu_items
  # GET /settings/menu_items.json
  def index
@@ -18,22 +20,43 @@ class Settings::SetMenuItemsController < ApplicationController
  def new
    @settings_menu_item = MenuItem.new
    @settings_menu_item.type = "SetMenuItem"
+    @item_sets = ItemSet.all 
  end

  # GET /settings/menu_items/1/edit
  def edit
+    @item_sets = ItemSet.all 
  end

  # POST /settings/menu_items
  # POST /settings/menu_items.json
  def create
    @settings_menu_item = MenuItem.new(settings_menu_item_params)
-    if params[:simple_menu_item][:menu_item_id] == ''
-      @settings_menu_item.menu_category_id = params[:menu_category_id]
-    end
+
+    # if params[:simple_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
+
+    # Bind for Item Sets
+    if params[:simple_menu_item][:item_sets].count > 1
+      params[:simple_menu_item][:item_sets].delete_at(0)
+
+      sets = ItemSet.find(params[:simple_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])
+
        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 }
      else
@@ -46,8 +69,27 @@ class Settings::SetMenuItemsController < ApplicationController
  # PATCH/PUT /settings/menu_items/1
  # 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)
+
+    # Bind for Item Sets
+    if params[:simple_menu_item][:item_sets].count > 1
+      params[:simple_menu_item][:item_sets].delete_at(0)
+
+      sets = ItemSet.find(params[:simple_menu_item][:item_sets])
+
+      if sets.count > 0
+        @settings_menu_item.item_sets = sets
+      end
+    end
+
+    @settings_menu_item.menu_category_id = params[:menu_category_id]
+
    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])
+
        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 }
      else
@@ -79,8 +121,16 @@ class Settings::SetMenuItemsController < ApplicationController
      @category = MenuCategory.find(params[:menu_category_id])
    end

+    def set_settings_item_attribute
+      @item_attributes = MenuItemAttribute.all.order("id asc").map{|a| [a.name, a.value]}     
+    end
+
+    def set_settings_item_option
+      @item_options = MenuItemOption.all
+    end
+
    # 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 , :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :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)
    end
 end
--- a/app/controllers/settings/simple_menu_items_controller.rb
+++ b/app/controllers/settings/simple_menu_items_controller.rb
@@ -1,6 +1,8 @@
 class Settings::SimpleMenuItemsController < ApplicationController
  before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy ]
  before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update ,:create]
+  before_action :set_settings_item_attribute, only: [:index, :show, :edit, :new, :update ,:create]
+  before_action :set_settings_item_option, only: [:index, :show, :edit, :new, :update ,:create]
  # GET /settings/menu_items
  # GET /settings/menu_items.json
  def index
@@ -16,11 +18,13 @@ class Settings::SimpleMenuItemsController < ApplicationController

  # GET /settings/menu_items/new
  def new
-    @settings_menu_item = MenuItem.new    
+    @settings_menu_item = MenuItem.new     
+    @item_sets = ItemSet.all 
  end

  # GET /settings/menu_items/1/edit
-  def edit
+  def edit 
+    @item_sets = ItemSet.all 
  end

  # POST /settings/menu_items
@@ -28,13 +32,30 @@ class Settings::SimpleMenuItemsController < ApplicationController
  def create
    @settings_menu_item = MenuItem.new(settings_menu_item_params)

-    if params[:simple_menu_item][:menu_item_id] == ''
-      @settings_menu_item.menu_category_id = params[:menu_category_id]
-    end
+    # if params[:simple_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

+    # Bind for Item Sets
+    if params[:simple_menu_item][:item_sets].count > 1
+      params[:simple_menu_item][:item_sets].delete_at(0)
+
+      sets = ItemSet.find(params[:simple_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])
+
        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 }
      else
@@ -47,8 +68,26 @@ class Settings::SimpleMenuItemsController < ApplicationController
  # PATCH/PUT /settings/menu_items/1
  # 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)
+
+    # Bind for Item Sets
+    if params[:simple_menu_item][:item_sets].count > 1
+      params[:simple_menu_item][:item_sets].delete_at(0)
+
+      sets = ItemSet.find(params[:simple_menu_item][:item_sets])
+
+      if sets.count > 0
+        @settings_menu_item.item_sets = sets
+      end
+    end
+
+    @settings_menu_item.menu_category_id = params[:menu_category_id]
+
    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])
        format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully updated.' }
        format.json { render :show, status: :ok, location: @settings_menu_item }
      else
@@ -80,8 +119,16 @@ class Settings::SimpleMenuItemsController < ApplicationController
      @category = MenuCategory.find(params[:menu_category_id])
    end

+    def set_settings_item_attribute
+      @item_attributes = MenuItemAttribute.all.order("id asc")   #.map{|a| [a.name, a.value]}     
+    end
+
+    def set_settings_item_option
+      @item_options = MenuItemOption.all
+    end
+
    # 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, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :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)
    end
 end