rake
This commit is contained in:
@@ -118,11 +118,11 @@ class Foodcourt::AddordersController < BaseFoodcourtController
|
||||
end
|
||||
items_arr.push(items)
|
||||
}
|
||||
# begin
|
||||
|
||||
if params[:order_source] == "quick_service" && params[:table_id].to_i == 0
|
||||
customer_id = "CUS-000000000002" # for no customer id from mobile
|
||||
customer_id = takeaway.customer_id # for no customer id from mobile
|
||||
else
|
||||
customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
|
||||
customer_id = params[:customer_id].present? ? params[:customer_id] : walkin.customer_id # for no customer id from mobile
|
||||
end
|
||||
|
||||
@order = Order.new
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
class Foodcourt::DashboardController < BaseFoodcourtController
|
||||
def get_all_menu
|
||||
@menus = Menu.includes(:menu_categories => {:menu_items => :menu_item_instances}).includes(:menu_categories => {:menu_items => :item_sets }).active.shop
|
||||
@menus = Menu.includes(:menu_categories => {:menu_items => :menu_item_instances}).includes(:menu_categories => {:menu_items => :item_sets }).active
|
||||
@item_attributes = MenuItemAttribute.all.load
|
||||
@item_options = MenuItemOption.all.load
|
||||
end
|
||||
|
||||
@@ -5,7 +5,7 @@ class Settings::MenusController < ApplicationController
|
||||
# GET /settings/menus
|
||||
# GET /settings/menus.json
|
||||
def index
|
||||
|
||||
|
||||
@settings_menus = Menu.all.page(params[:page]).per(10)
|
||||
respond_to do |format|
|
||||
format.html
|
||||
@@ -31,7 +31,7 @@ class Settings::MenusController < ApplicationController
|
||||
# POST /settings/menus
|
||||
# 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|
|
||||
@@ -75,7 +75,7 @@ class Settings::MenusController < ApplicationController
|
||||
end
|
||||
|
||||
def export
|
||||
|
||||
|
||||
@settings_menus = Menu.all.page(params[:page]).per(10)
|
||||
menu = Menu.find(params[:id])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user