diff --git a/app/controllers/foodcourt/food_court_controller.rb b/app/controllers/foodcourt/food_court_controller.rb index 0549d253..f6a94b9c 100644 --- a/app/controllers/foodcourt/food_court_controller.rb +++ b/app/controllers/foodcourt/food_court_controller.rb @@ -8,6 +8,7 @@ class Foodcourt::FoodCourtController < ApplicationController end def index + @product = Product.all if params[:sale_id].present? sale =Sale.find(params[:sale_id]) if sale diff --git a/app/views/foodcourt/addorders/detail.html.erb b/app/views/foodcourt/addorders/detail.html.erb index 703206a1..2a2fdabc 100644 --- a/app/views/foodcourt/addorders/detail.html.erb +++ b/app/views/foodcourt/addorders/detail.html.erb @@ -81,7 +81,7 @@ @@ -414,10 +416,11 @@ $(document).ready(function () { if (window.location.href.indexOf('#') != -1) { getAllMenu(); } - - var menus = JSON.parse(localStorage.getItem("menus")); - if (menus != null) { - menu_cache_append(menus); + else{ + var menus = JSON.parse(localStorage.getItem("menus")); + if (menus != null) { + menu_cache_append(menus); + } } $(".tables").on('click', function () { @@ -478,9 +481,21 @@ function getAllMenu(){ function menu_cache_append(menus){ $("#menu_cache").removeClass("hidden"); - $(".menu_cache_name").text(menus[0]["name"]) + if(menus.length == 1){ + $("#menu_dropdown").remove(); + $(".list-menu").append(""+menus[0]["name"]+"") + } + else{ + $(".menu_cache_name").text(menus[0]["name"]) + } for(var i in menus) { - menu_list_template(menus[i]); + if (menus[i].categories.length) + menu_list_template(menus[i]); + } + if ( $('.menu_click').length < 2 ) { + var menu_name = $('.menu_click').data("name"); + $("#menu_dropdown").remove(); + $(".list-menu").append(""+menu_name+"") } var category = menus[0]["categories"]; @@ -512,7 +527,7 @@ function menu_click_cache_append(name,menus,menu_id) { menu_list.empty(); var menu_cat = $('.category_list'); - menu_cat.empty(); + $('.category_list li:not(.product)').remove(); $(".main_menu").text(name);