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

update addorder cache

Browse Source
This commit is contained in:
Aung Myo
2018-05-09 18:59:37 +06:30
parent efa5350883
commit 5d870df7f5
3 changed files with 66 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,9 +38,9 @@
<li class="nav-item">
<p class="hidden menu-id"><%= menu.id %></p>
<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%>
</a>
<ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>
</li>
<% end%>
<!-- else quick_service or cashier for table -->
@@ -50,18 +50,18 @@
<li class="nav-item ">
<p class="hidden menu-id"><%= menu.id %></p>
<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%>
</a>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>
</li>
<% end%>
<% else %>
<li class="nav-item ">
<p class="hidden menu-id"><%= menu.id %></p>
<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%>
</a>
<ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
</ul>
</a>
</li>
<% end%>
<!-- end quick_service or cashier for table -->
@@ -84,7 +84,9 @@
</li>
<div id="menu-slimscroll" data-height="0">
<ul class="nav nav-tabs flex-column category_list category_cache_list" role="tablist" id="ul-navbar">
<li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
</li>
</ul>
</div>
</div>
@@ -542,54 +544,52 @@
});
$(document).ready(function () {
// localStorage.removeItem("menus")
// var menus = JSON.parse(localStorage.getItem("menus"));
// if (menus != null) {
// $("#menu_cache").removeClass("hidden");
// $(".menu_cache_name").text(menus[0]["name"])
// for(var i in menus) {
// menu_list_template(menus[i]);
// }
// var category = menus[0]["categories"];
var menus = JSON.parse(localStorage.getItem("menus"));
if (menus != null) {
$("#menu_cache").removeClass("hidden");
$(".menu_cache_name").text(menus[0]["name"])
for(var i in menus) {
menu_list_template(menus[i]);
}
var category = menus[0]["categories"];
// for(var ii in category) {
// // <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
// // <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
// // </li>
// if (category[ii]["valid_time"]== true){
// if (category[ii]["parent_id"] == null ){
// if(type){
// if (category[ii]["code"].includes("SPL") != true) {
// category_list_template(category[ii]);
// }
// }else{
// if ($("#table_get_current").text()) {
// if (category[ii]["code"].includes("SPL") != true) {
// category_list_template(category[ii]);
// }else {
// category_list_template(category[ii]);
// }
// }
// }
// }
// }
// }
// }else{
for(var ii in category) {
// <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">
// <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
// </li>
if (category[ii]["valid_time"]== true){
if (category[ii]["parent_id"] == null ){
if(type){
if (category[ii]["code"].includes("SPL") != true) {
category_list_template(category[ii]);
}
}else{
if ($("#table_get_current").text()) {
if (category[ii]["code"].includes("SPL") != true) {
category_list_template(category[ii]);
}else {
category_list_template(category[ii]);
}
}
}
}
}
}
}else{
$("#menu_data").removeClass("hidden");
// }
}
function category_list_template(menu) {
row = '<li class="nav-item">'
+'<p class="hidden menu-id">'+menu.id+'</p> '
+'<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.sub_category+'">'+menu.name+''
+'</a>'
+'<ul class="sub_category_list hidden fadeInTop animated" '
+'id="sub_category_list">'
+'</ul>'
+'</a>'
+' </li>';
$(".category_cache_list").append(row);
}

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

@@ -208,7 +208,6 @@
<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',