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

update addorder get menu and sub menu

Browse Source
This commit is contained in:
Aung Myo
2018-04-27 10:39:29 +06:30
parent 9aabed8ad5
commit eb61e94909
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/addorder.js
View File

@@ -101,6 +101,13 @@ $(function() {
var menu_id = $(this).attr("data-id");
var url = "get_menu_category/"+menu_id;
show_menu_item_list(url);
var sub_id = $(this).attr("data-sub-id");
if (sub_id) {
var sub_url = "get_menu_sub_category/"+menu_id;
sub_category = $(this).find('.sub_category_list');
show_sub_category_list(sub_url,sub_category);
}
});
//End menu category Click
@@ -1232,7 +1239,7 @@ console.log(d_option)
//click menu sidebar menu category
$(document).on('click', '.sub_click', function(event){
$(document).on('click', '.sub_clickssss', function(event){
event.preventDefault();
var menu_id = $(this).attr("data-id");
var url = "get_menu_sub_category/"+menu_id;
@@ -1267,11 +1274,11 @@ console.log(d_option)
data = data.sub_category;
if (data.length>0) {
if ((sub_category.hasClass('hidden'))) {
// if ((sub_category.hasClass('hidden'))) {
$(sub_category).removeClass('hidden');
}else{
$(sub_category).addClass('hidden');
}
// }else{
// $(sub_category).addClass('hidden');
// }
for(var i in data) {

2
app/controllers/origami/addorders_controller.rb
View File

@@ -23,6 +23,8 @@ class Origami::AddordersController < BaseOrigamiController
day = Date.today.wday
@menus = Menu.all
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
puts "ssssssssssssssssssssssss"
puts @menu.to_json
@table_id = params[:id]
@table = DiningFacility.find(@table_id)
@booking = @table.get_booking

8
app/models/menu_category.rb
View File

@@ -78,6 +78,14 @@ class MenuCategory < ApplicationRecord
end
end
def get_sub_category
menu_category = MenuCategory.find_by_menu_category_id(self.id)
if menu_category
return true
end
return false
end
private
# def generate_menu_category_code

6
app/views/origami/addorders/detail.html.erb
View File

@@ -46,7 +46,7 @@
<!--if type quick_service or cashier for table -->
<% if type %>
<% if !menu.code.include? "SPL" %>
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
@@ -58,7 +58,7 @@
<% else %>
<% if @table.get_current_checkout_booking.nil? %>
<% if !menu.code.include? "SPL" %>
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%> " data-sub-id="<%=menu.get_sub_category%>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
@@ -67,7 +67,7 @@
</li>
<% end%>
<% else %>
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>">
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">