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

update cache menu

Browse Source
This commit is contained in:
Aung Myo
2018-05-08 15:54:15 +06:30
parent 2d73e63e7b
commit 42a15d3023
4 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,14 +19,13 @@ class Origami::AddordersController < BaseOrigamiController
@webview = true
end
if params[:menus].present?
@menus = JSON.parse(params[:menus], object_class: OpenStruct)
puts @menus.to_json
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
else
# if params[:menus].present?
# @menus = JSON.parse(params[:menus], object_class: OpenStruct)
# @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
# else
@menus = Menu.all
@menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
end
# end
@table_id = params[:id]
@table = DiningFacility.find(@table_id)
@@ -48,10 +47,6 @@ class Origami::AddordersController < BaseOrigamiController
else
@booking = nil
end
respond_to do |format|
format.html { redirect_to origami_addorders_detail_path }
end
end
def get_menu_category ()

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

@@ -60,18 +60,18 @@
<% 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%> " data-sub-id="<%=menu.get_sub_category%>">
<li class="nav-item ">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<a class="nav-link menu_category sub_click first_<%=menu.id%>" data-toggle="tab" href="" role="tab" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <%= menu.name%>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>
</li>
<% end%>
<% else %>
<li class="nav-item menu_category sub_click first_<%=menu.id%>" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>">
<li class="nav-item ">
<p class="hidden menu-id"><%= menu.id %></p>
<a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
<a class="nav-link menu_category sub_click first_<%=menu.id%>" data-toggle="tab" href="" role="tab" data-id="<%=menu.id%>" data-sub-id="<%=menu.get_sub_category%>"> <%= menu.name%>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>

40
app/views/origami/home/show.html.erb
View File

@@ -1010,27 +1010,27 @@
$('#add_order').on('click', function () {
var dining_id = "<%= @dining.id %>";
var menus = JSON.parse(localStorage.getItem("menus"));
var menu_arr = [];
if (menus != null) {
for(var i in menus) {
var arr = {};
arr.id = menus[i]["id"];
arr.name = menus[i]["name"];
menu_arr.push(arr);
}
}
menu_arr = JSON.stringify(menu_arr);
console.log(menu_arr)
$.ajax({
type: 'POST',
data: {menus: menu_arr},
url: '/origami/addorders/' + dining_id,
success: function(data) {
// var menus = JSON.parse(localStorage.getItem("menus"));
// var menu_arr = [];
// if (menus != null) {
// for(var i in menus) {
// var arr = {};
// arr.id = menus[i]["id"];
// arr.name = menus[i]["name"];
// menu_arr.push(arr);
// }
// }
// menu_arr = JSON.stringify(menu_arr);
// console.log(menu_arr)
// $.ajax({
// type: 'POST',
// data: {menus: menu_arr},
// url: '/origami/addorders/' + dining_id,
// success: function(data) {
}
});
//window.location.href = '/origami/addorders/' + dining_id+'/'+data;
// }
// });
window.location.href = '/origami/addorders/' + dining_id;
});
/* check in process */

2
config/routes.rb
View File

@@ -238,7 +238,7 @@ scope "(:locale)", locale: /en|mm/ do
get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' }
get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
post '/:addorders/:id' => "addorders#detail", as: 'addorders_detail'
get '/:addorders/:id' => "addorders#detail"
post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' }