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

Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-06-01 10:09:22 +06:30
parent 6b2a496830 03bf799708
commit 2d511cc63e
14 changed files with 92 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/settings/menu_categories_controller.rb
View File

@@ -5,7 +5,7 @@ class Settings::MenuCategoriesController < ApplicationController
# GET /settings/menu_categories
# GET /settings/menu_categories.json
def index
@settings_menu_categories = MenuCategory.all
@settings_menu_categories = MenuCategory.all.page(params[:page]).per(10)
end
# GET /settings/menu_categories/1
@@ -63,7 +63,7 @@ class Settings::MenuCategoriesController < ApplicationController
# DELETE /settings/menu_categories/1
# DELETE /settings/menu_categories/1.json
def destroy
@settings_menu_category.destroy
# @settings_menu_category.destroy
respond_to do |format|
format.html { redirect_to settings_menu_categories_path, notice: 'Menu category was successfully destroyed.' }
format.json { head :no_content }

7
app/controllers/settings/menus_controller.rb
View File

@@ -4,12 +4,13 @@ class Settings::MenusController < ApplicationController
# GET /settings/menus
# GET /settings/menus.json
def index
@settings_menus = Menu.all
@settings_menus = Menu.all.page(params[:page]).per(10)
end
# GET /settings/menus/1
# GET /settings/menus/1.json
def show
@settings_menu_categories = @settings_menu.menu_categories.page(params[:page]).per(10)
end
# GET /settings/menus/new
@@ -25,7 +26,7 @@ class Settings::MenusController < ApplicationController
# POST /settings/menus.json
def create
@settings_menu = Menu.new(settings_menu_params)
@settings_menu.created_by = current_login_employee.name
respond_to do |format|
if @settings_menu.save
format.html { redirect_to settings_menus_path, notice: 'Menu was successfully created.' }
@@ -42,7 +43,7 @@ class Settings::MenusController < ApplicationController
def update
respond_to do |format|
if @settings_menu.update(settings_menu_params)
format.html { redirect_to settings_menu_path(@settings_menu), notice: 'Menu was successfully updated.' }
format.html { redirect_to settings_menus_path, notice: 'Menu was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_menu }
else
format.html { render :edit }

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

@@ -1,12 +1,12 @@
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]
before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update]
# GET /settings/menu_items
# GET /settings/menu_items.json
def index
@settings_menu_items = @category.menu_items
end
# GET /settings/menu_items/1
# GET /settings/menu_items/1.json
def show
@@ -25,10 +25,13 @@ class Settings::SetMenuItemsController < ApplicationController
# 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
@settings_menu_item.created_by = current_login_employee.name
respond_to do |format|
if @settings_menu_item.save
format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully created.' }
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
format.html { render :new }
@@ -42,7 +45,7 @@ class Settings::SetMenuItemsController < ApplicationController
def update
respond_to do |format|
if @settings_menu_item.update(settings_menu_item_params)
format.html { redirect_to settings_menu_item_path(@settings_menu_item), notice: 'Menu item was successfully updated.' }
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
format.html { render :edit }
@@ -54,9 +57,9 @@ class Settings::SetMenuItemsController < ApplicationController
# DELETE /settings/menu_items/1
# DELETE /settings/menu_items/1.json
def destroy
@settings_menu_item.destroy
# @settings_menu_item.destroy
respond_to do |format|
format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully destroyed.' }
format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully destroyed.' }
format.json { head :no_content }
end
end
@@ -73,6 +76,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(: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(:set_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)
end
end

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

@@ -1,12 +1,12 @@
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]
before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update]
# GET /settings/menu_items
# GET /settings/menu_items.json
def index
@settings_menu_items = @category.menu_items
end
# GET /settings/menu_items/1
# GET /settings/menu_items/1.json
def show
@@ -25,10 +25,13 @@ class Settings::SimpleMenuItemsController < ApplicationController
# 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
@settings_menu_item.created_by = current_login_employee.name
respond_to do |format|
if @settings_menu_item.save
format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully created.' }
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
format.html { render :new }
@@ -42,7 +45,7 @@ class Settings::SimpleMenuItemsController < ApplicationController
def update
respond_to do |format|
if @settings_menu_item.update(settings_menu_item_params)
format.html { redirect_to settings_menu_item_path(@settings_menu_item), notice: 'Menu item was successfully updated.' }
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
format.html { render :edit }
@@ -54,9 +57,9 @@ class Settings::SimpleMenuItemsController < ApplicationController
# DELETE /settings/menu_items/1
# DELETE /settings/menu_items/1.json
def destroy
@settings_menu_item.destroy
# @settings_menu_item.destroy
respond_to do |format|
format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully destroyed.' }
format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully destroyed.' }
format.json { head :no_content }
end
end