git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Menu Item instances and OQS json saving

Browse Source
This commit is contained in:
PhyoTheingi
2017-06-03 17:09:56 +06:30
parent 2716b913f2
commit a01c4bd9cf
12 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/controllers/settings/menu_item_instances_controller.rb
View File

@@ -16,22 +16,12 @@ class Settings::MenuItemInstancesController < ApplicationController
# GET /settings/menu_item_instances/new
def new
if params[:simple_menu_item_id]
@aa = MenuItem.find(params[:simple_menu_item_id])
else
@aa = MenuItem.find(params[:set_menu_item_id])
end
@category = MenuCategory.find(@item.menu_category_id)
@settings_menu_item_instances = MenuItemInstance.new
end
# GET /settings/menu_item_instances/1/edit
def edit
if params[:simple_menu_item_id]
@aa = MenuItem.find(params[:simple_menu_item_id])
else
@aa = MenuItem.find(params[:set_menu_item_id])
end
@category = MenuCategory.find(@item.menu_category_id)
end
@@ -51,6 +41,8 @@ class Settings::MenuItemInstancesController < ApplicationController
category = MenuCategory.find(catID.menu_category_id)
respond_to do |format|
if @settings_menu_item_instances.save
@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes]
@settings_menu_item_instances.save
format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully created.' }
format.json { render :show, status: :created, location: @settings_menu_item_instances }
else
@@ -63,6 +55,8 @@ class Settings::MenuItemInstancesController < ApplicationController
# PATCH/PUT /settings/menu_item_instances/1
# PATCH/PUT /settings/menu_item_instances/1.json
def update
puts "params[:menu_item_instance][:item_attributes]"
puts params[:menu_item_instance][:item_attributes]
if params[:simple_menu_item_id]
catID = MenuItem.find(params[:simple_menu_item_id])
else
@@ -70,7 +64,10 @@ class Settings::MenuItemInstancesController < ApplicationController
end
category = MenuCategory.find(catID.menu_category_id)
respond_to do |format|
if @settings_menu_item_instances.update(settings_menu_item_instance_params)
@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
@settings_menu_item_instances.save
format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_menu_item_instances }
else
@@ -112,6 +109,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, :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)
end
end

3
app/controllers/settings/order_queue_stations_controller.rb
View File

@@ -4,7 +4,7 @@ class Settings::OrderQueueStationsController < ApplicationController
# GET /settings/order_queue_stations
# GET /settings/order_queue_stations.json
def index
@settings_order_queue_stations = OrderQueueStation.all
@settings_order_queue_stations = OrderQueueStation.all.active
end
# GET /settings/order_queue_stations/1
@@ -40,6 +40,7 @@ class Settings::OrderQueueStationsController < ApplicationController
# PATCH/PUT /settings/order_queue_stations/1
# PATCH/PUT /settings/order_queue_stations/1.json
def update
params[:order_queue_station][:processing_items] = params[:order_queue_station][:processing_items].split(/,/).inspect
respond_to do |format|
if @settings_order_queue_station.update(settings_order_queue_station_params)
format.html { redirect_to settings_order_queue_station_path(@settings_order_queue_station), notice: 'Order queue station was successfully updated.' }

2
app/controllers/settings/simple_menu_items_controller.rb
View File

@@ -78,6 +78,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, :menu_category_id, :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, :menu_category_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
end
end