Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
This commit is contained in:
@@ -104,7 +104,6 @@ $(function() {
|
|||||||
|
|
||||||
var sub_id = $(this).attr("data-sub-id");
|
var sub_id = $(this).attr("data-sub-id");
|
||||||
if (sub_id == "true") {
|
if (sub_id == "true") {
|
||||||
console.log("hhhhhhhhhhhhhhhhh")
|
|
||||||
var sub_url = "get_menu_sub_category/"+menu_id;
|
var sub_url = "get_menu_sub_category/"+menu_id;
|
||||||
sub_category = $(this).find('.sub_category_list');
|
sub_category = $(this).find('.sub_category_list');
|
||||||
show_sub_category_list(sub_url,sub_category);
|
show_sub_category_list(sub_url,sub_category);
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ class Origami::AddordersController < BaseOrigamiController
|
|||||||
day = Date.today.wday
|
day = Date.today.wday
|
||||||
@menus = Menu.all
|
@menus = Menu.all
|
||||||
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
|
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
|
||||||
puts "ssssssssssssssssssssssss"
|
|
||||||
puts @menu.to_json
|
|
||||||
@table_id = params[:id]
|
@table_id = params[:id]
|
||||||
@table = DiningFacility.find(@table_id)
|
@table = DiningFacility.find(@table_id)
|
||||||
@booking = @table.get_booking
|
@booking = @table.get_booking
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user