origin pull master

This commit is contained in:
Aung Myo
2017-06-03 13:44:10 +06:30
parent 7529d23147
commit 138850fb24
119 changed files with 2531 additions and 462 deletions

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 }

View File

@@ -0,0 +1,79 @@
class Settings::MenuItemInstancesController < ApplicationController
before_action :set_settings_menu_item_instance, only: [:show, :edit, :update, :destroy]
before_action :set_settings_menu_item, only: [:index, :show, :edit, :new, :update]
# GET /settings/menu_item_instances
# GET /settings/menu_item_instances.json
def index
@settings_menu_item_instances = MenuItemInstance.all
end
# GET /settings/menu_item_instances/1
# GET /settings/menu_item_instances/1.json
def show
end
# GET /settings/menu_item_instances/new
def new
@settings_menu_item_instance = MenuItemInstance.new
end
# GET /settings/menu_item_instances/1/edit
def edit
end
# POST /settings/menu_item_instances
# POST /settings/menu_item_instances.json
def create
@settings_menu_item_instance = MenuItemInstance.new(settings_menu_item_instance_params)
respond_to do |format|
if @settings_menu_item_instance.save
format.html { redirect_to settings_menu_item_instances_path, notice: 'Menu item instance was successfully created.' }
format.json { render :show, status: :created, location: @settings_menu_item_instance }
else
format.html { render :new }
format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity }
end
end
end
# PATCH/PUT /settings/menu_item_instances/1
# PATCH/PUT /settings/menu_item_instances/1.json
def update
respond_to do |format|
if @settings_menu_item_instance.update(settings_menu_item_instance_params)
format.html { redirect_to settings_menu_item_instance_path(@settings_menu_item_instance), notice: 'Menu item instance was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_menu_item_instance }
else
format.html { render :edit }
format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity }
end
end
end
# DELETE /settings/menu_item_instances/1
# DELETE /settings/menu_item_instances/1.json
def destroy
# @settings_menu_item_instance.destroy
respond_to do |format|
format.html { redirect_to settings_menu_item_instances_path, notice: 'Menu item instance was successfully destroyed.' }
format.json { head :no_content }
end
end
private
# Use callbacks to share common setup or constraints between actions.
def set_settings_menu_item_instance
@set_settings_menu_item_instances = MenuItemInstance.find(params[:id])
end
def set_settings_menu_item
@item = MenuItem.find(params[:menu_item_id])
end
# 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)
end
end

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 }

View File

@@ -1,5 +1,5 @@
class Settings::OrderQueueStationsController < ApplicationController
before_action :set_settings_order_queue_station, only: [:show, :edit,:new, :update, :destroy]
before_action :set_settings_order_queue_station, only: [:show, :edit, :update, :destroy]
# GET /settings/order_queue_stations
# GET /settings/order_queue_stations.json
@@ -25,10 +25,10 @@ class Settings::OrderQueueStationsController < ApplicationController
# POST /settings/order_queue_stations.json
def create
@settings_order_queue_station = OrderQueueStation.new(settings_order_queue_station_params)
@settings_order_queue_station.created_by = current_login_employee.name
respond_to do |format|
if @settings_order_queue_station.save
format.html { redirect_to @settings_order_queue_station, notice: 'Order queue station was successfully created.' }
format.html { redirect_to settings_order_queue_stations_path, notice: 'Order queue station was successfully created.' }
format.json { render :show, status: :created, location: @settings_order_queue_station }
else
format.html { render :new }

View File

@@ -1,20 +1,22 @@
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
@settings_menu_items = @category.menu_items.page(params[:page]).per(10)
end
# GET /settings/menu_items/1
# GET /settings/menu_items/1.json
def show
@sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
end
# GET /settings/menu_items/new
def new
@settings_menu_item = MenuItem.new
@settings_menu_item.type = "SetMenuItem"
end
# GET /settings/menu_items/1/edit
@@ -25,10 +27,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 +47,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 +59,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 +78,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

View File

@@ -1,15 +1,17 @@
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_item, only: [:show, :edit, :update, :destroy ]
before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update ,:create]
# GET /settings/menu_items
# GET /settings/menu_items.json
def index
@settings_menu_items = @category.menu_items
@settings_menu_items = @category.menu_items.page(params[:page]).per(10)
end
# GET /settings/menu_items/1
# GET /settings/menu_items/1.json
def show
@sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
@menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
end
# GET /settings/menu_items/new
@@ -25,10 +27,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 +47,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 +59,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