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

Merge branch 'foodcourt' of gitlab.com:code2lab/SXRestaurant into foodcourt

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2020-03-04 10:03:25 +06:30
parent 91825dd0f3 2febc60058
commit 7394ca7e8d
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/foodcourt/food_court_controller.rb
View File

@@ -8,6 +8,7 @@ class Foodcourt::FoodCourtController < ApplicationController
end end
def index def index
@product = Product.all
if params[:sale_id].present? if params[:sale_id].present?
sale =Sale.find(params[:sale_id]) sale =Sale.find(params[:sale_id])
if sale if sale

31
app/views/foodcourt/addorders/detail.html.erb
View File

@@ -81,7 +81,7 @@
<div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_cache"> <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_cache">
<li class="list-menu"> <li class="list-menu">
<a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style=""> <a href="javascript:void(0);" id="menu_dropdown" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
<span class="main_menu menu_cache_name" id="main_menu menu_cache_name"></span> <span class="main_menu menu_cache_name" id="main_menu menu_cache_name"></span>
</a> </a>
<ul class="ml-menu menu_list aria-hidden menu_cache_list" style="border-top: 1px solid #fff"> <ul class="ml-menu menu_list aria-hidden menu_cache_list" style="border-top: 1px solid #fff">
@@ -89,9 +89,11 @@
</li> </li>
<div id="menu-slimscroll" data-height="0"> <div id="menu-slimscroll" data-height="0">
<ul class="nav nav-tabs flex-column category_list category_cache_list" role="tablist" id="ul-navbar"> <ul class="nav nav-tabs flex-column category_list category_cache_list" role="tablist" id="ul-navbar">
<%if @product%>
<li class="nav-item product" data-ref="<%= foodcourt_get_all_product_path %>"> <li class="nav-item product" data-ref="<%= foodcourt_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a> <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li> </li>
<%end%>
</ul> </ul>
</div> </div>
</div> </div>
@@ -414,10 +416,11 @@ $(document).ready(function () {
if (window.location.href.indexOf('#') != -1) { if (window.location.href.indexOf('#') != -1) {
getAllMenu(); getAllMenu();
} }
else{
var menus = JSON.parse(localStorage.getItem("menus")); var menus = JSON.parse(localStorage.getItem("menus"));
if (menus != null) { if (menus != null) {
menu_cache_append(menus); menu_cache_append(menus);
}
} }
$(".tables").on('click', function () { $(".tables").on('click', function () {
@@ -478,9 +481,21 @@ function getAllMenu(){
function menu_cache_append(menus){ function menu_cache_append(menus){
$("#menu_cache").removeClass("hidden"); $("#menu_cache").removeClass("hidden");
$(".menu_cache_name").text(menus[0]["name"]) if(menus.length == 1){
$("#menu_dropdown").remove();
$(".list-menu").append("<span class='main_menu menu_cache_name' id='main_menu menu_cache_name' style='margin-left:10px;font-weight:bold'>"+menus[0]["name"]+"</span>")
}
else{
$(".menu_cache_name").text(menus[0]["name"])
}
for(var i in menus) { 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("<span class='main_menu menu_cache_name' id='main_menu menu_cache_name' style='margin-left:10px;font-weight:bold'>"+menu_name+"</span>")
} }
var category = menus[0]["categories"]; var category = menus[0]["categories"];
@@ -512,7 +527,7 @@ function menu_click_cache_append(name,menus,menu_id) {
menu_list.empty(); menu_list.empty();
var menu_cat = $('.category_list'); var menu_cat = $('.category_list');
menu_cat.empty(); $('.category_list li:not(.product)').remove();
$(".main_menu").text(name); $(".main_menu").text(name);