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:47:11 +06:30
parent be9218dd79
commit 2d73e63e7b
12 changed files with 634 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,9 +48,9 @@
<!--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%>" 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>
@@ -85,9 +85,6 @@
</ul>
</div>
</div>
<div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
<div class="card">
<div class="card-block" style="">

18
app/views/origami/addorders/get_item_instance.json.jbuilder
View File

@@ -1,5 +1,5 @@
if(@id)
menu_item = MenuItem.find(@id.menu_item_id)
if(@instance)
menu_item = MenuItem.find(@instance.menu_item_id)
# Format for option json
opt_format = []
# Format for attributes json
@@ -24,14 +24,14 @@ if(@id)
end
json.success true
json.id @id.id
json.name @id.item_instance_name
json.code @id.item_instance_code
json.id @instance.id
json.name @instance.item_instance_name
json.code @instance.item_instance_code
json.item_id @id.menu_item_id
json.attributes @id.item_attributes
json.price @id.price
json.is_default @id.is_default
json.item_id @instance.menu_item_id
json.attributes @instance.item_attributes
json.price @instance.price
json.is_default @instance.is_default
json.options opt_format
else

24
app/views/origami/dashboard/_menu.json.jbuilder Normal file
View File

@@ -0,0 +1,24 @@
json.id menu.id
json.name menu.name
json.is_active menu.is_active
json.valid_time_from menu.valid_time_from.strftime("%H:%M")
json.valid_time_to menu.valid_time_to.strftime("%H:%M")
if (menu.menu_categories)
json.categories menu.menu_categories do |category|
json.id category.id
json.code category.code
json.order_by category.order_by
json.name category.name
json.alt_name category.alt_name
json.order_by category.order_by
json.parent_id category.menu_category_id
json.is_available category.is_available
if category.menu_items
json.items category.menu_items do |item|
json.partial! 'origami/addorders/menu_item', item: item
end
end
end
end

15
app/views/origami/dashboard/get_all_menu.json.jbuilder Normal file
View File

@@ -0,0 +1,15 @@
menu_json = json.array! @menus do |menu|
json.id menu.id
json.name menu.name
json.valid_days menu.valid_days
json.valid_time_from menu.valid_time_from.strftime("%H:%M")
json.valid_time_to menu.valid_time_to.strftime("%H:%M")
json.partial! 'origami/dashboard/menu', menu: menu
# if (@current_menu)
# json.current_menu do
# json.partial! 'api/restaurant/menu/menu', menu: @current_menu
# end
# end
end

14
app/views/origami/dashboard/index.html.erb
View File

@@ -207,6 +207,16 @@
<button type="button" data-href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect second_view hidden" style="height: 45px">Customer View</button>
<input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
<script>
$(function() {
localStorage.removeItem("menus");
$.ajax({
type: "GET",
url: 'get_all_menu',
data: {},
success:function(result){
localStorage.setItem("menus", JSON.stringify(result));
}
});
$(".cashier_view").on('click', function() {
window.location.href = '/origami';
@@ -223,9 +233,9 @@
window.location.href = '/origami/order_reservation';
});
$("#second_view").on('click', function () {
$("#second_view").on('click', function () {
var url = $(this).attr("data-href");
window.open(url,'_blank');
});
});
</script>

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

@@ -1010,7 +1010,27 @@
$('#add_order').on('click', function () {
var dining_id = "<%= @dining.id %>";
window.location.href = '/origami/addorders/' + 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) {
}
});
//window.location.href = '/origami/addorders/' + dining_id+'/'+data;
});
/* check in process */