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

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

@@ -63,8 +63,8 @@ $(function() {
+JSON.stringify(item_attributes)+"' data-id = '" +JSON.stringify(item_attributes)+"' data-id = '"
+JSON.stringify(item_attributes)+"' data-item = '" +JSON.stringify(item_attributes)+"' data-item = '"
+JSON.stringify(item_attributes)+"' data-option = '" +JSON.stringify(item_attributes)+"' data-option = '"
+JSON.stringify(menu_items[field].options)+"'data-opt = '" +JSON.stringify(product[field].options)+"'data-opt = '"
+JSON.stringify(menu_items[field].options)+"' data-item-sets = '" +JSON.stringify(product[field].options)+"' data-item-sets = '"
+JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>" +JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>"
+"<i class='fa fa-bars material-icons'>" +"<i class='fa fa-bars material-icons'>"
+'view_list</i>' +'view_list</i>'
@@ -77,8 +77,8 @@ $(function() {
+ product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '" + product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '"
+ product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '" + product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '" + JSON.stringify(item_attributes) +"' data-options = '"
+ JSON.stringify(menu_items[field].options) +"' data-opt = '" + JSON.stringify(product[field].options) +"' data-opt = '"
+ JSON.stringify(menu_items[field].options) +"' data-image='"+image_path+"'>" + JSON.stringify(product[field].options) +"' data-image='"+image_path+"'>"
// +"<div class='card-block custom-card-block'>" // +"<div class='card-block custom-card-block'>"
// +"<img id='logo' height='125px' src='"+image_path+"'>" // +"<img id='logo' height='125px' src='"+image_path+"'>"
@@ -97,8 +97,8 @@ $(function() {
} }
//end show list function //end show list function
//click menu sidebar menu category //click menu sidebar menu category
$('.menu_category').on("click", function(){ $(document).on('click', '.menu_category', function(e){
// event.preventDefault(); e.preventDefault();
$('.sub_category_list').addClass("hidden"); $('.sub_category_list').addClass("hidden");
var menu_id = $(this).attr("data-id"); var menu_id = $(this).attr("data-id");
var url = "get_menu_category/"+menu_id; var url = "get_menu_category/"+menu_id;
@@ -106,7 +106,7 @@ $(function() {
var sub_id = $(this).attr("data-sub-id"); var sub_id = $(this).attr("data-sub-id");
if (sub_id == "true") { if (sub_id == "true") {
var sub_url = "get_menu_sub_category/"+menu_id; var sub_url = "get_menu_sub_category/"+menu_id;
sub_category = $(this).find('.sub_category_list'); sub_category = $(this).siblings('.sub_category_list');
show_sub_category_list(sub_url,sub_category,menu_id); show_sub_category_list(sub_url,sub_category,menu_id);
} }
}); });
@@ -114,9 +114,11 @@ $(function() {
//click menu sidebar menu category //click menu sidebar menu category
$(document).on('click', '.menu_sub_category', function(event){ $(document).on('click', '.menu_sub_category', function(event){
event.preventDefault(); // event.preventDefault();
// $(".menu_sub_category").on("click", function(){
$('.sub_category_list').addClass("hidden"); $('.sub_category_list').addClass("hidden");
var menu_id = $(this).attr("data-id"); var menu_id = $(this).attr("data-id");
console.log(menu_id);
var url = "get_menu_category/"+menu_id; var url = "get_menu_category/"+menu_id;
show_menu_item_list(url,menu_id); show_menu_item_list(url,menu_id);
}); });
@@ -188,22 +190,26 @@ $(function() {
$('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]); $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
value = item_sets[field]["instances"]; value = item_sets[field]["instances"];
$(value).each(function(i){
$(value).each(function(i){
menus = JSON.parse(localStorage.getItem("menus")); menus = JSON.parse(localStorage.getItem("menus"));
if (menus != null) { if (menus != null) {
for(var i in menus) { for(var j in menus) {
var categories = menus[i]["categories"]; var categories = menus[j]["categories"];
for(var ii in categories) { for(var ii in categories) {
var items = categories[ii]["items"]; var items = categories[ii]["items"];
for(var iii in items) { for(var iii in items) {
var result = items[iii]["instances"]; var result = items[iii]["instances"];
for(var iv in result) { for(var v in result) {
if (value[i]["id"] == result[iv]["id"]) {
if (value[i]["id"] == result[v]["id"]) {
console.log("ssssssss")
row = '<div class="col-md-4 " >' row = '<div class="col-md-4 " >'
+"<div class='card custom-card instance_box' data-name='"+result[iv]["name"] +"<div class='card custom-card instance_box' data-name='"+result[v]["name"]
+"' data-code='"+result[iv]["code"] +"' data-code='"+result[v]["code"]
+"' data-price='"+result[iv]["price"] +"' data-price='"+result[v]["price"]
+"' data-option='"+JSON.stringify(items[iii]["options"]) +"' data-option='"+JSON.stringify(items[iii]["options"])
+"' data-min-qty='"+item_sets[field]["min_selectable_qty"] +"' data-min-qty='"+item_sets[field]["min_selectable_qty"]
+"' data-max-qty='"+item_sets[field]["max_selectable_qty"] +"' data-max-qty='"+item_sets[field]["max_selectable_qty"]
@@ -212,14 +218,14 @@ $(function() {
+"' data-sub-item='true" +"' data-sub-item='true"
+"'>" +"'>"
+'<div class="custom-card-head card-head" style="line-height:14px;">' +'<div class="custom-card-head card-head" style="line-height:14px;">'
+'<span class="">'+result[iv]["name"]+'</span>' +'<span class="">'+result[v]["name"]+'</span>'
+'</div>' +'</div>'
+'<div class="card-block custom-card-block">' +'<div class="card-block custom-card-block">'
+'<img id="" src="/image/logo.png" height="40px">' +'<img id="" src="/image/logo.png" height="40px">'
+' <small style="float:" id="instance_option"></small>' +' <small style="float:" id="instance_option"></small>'
+'</div>' +'</div>'
+'<div class="card-footer custom-card-footer">' +'<div class="card-footer custom-card-footer">'
+' <span>'+result[iv]["price"]+'</span>' +' <span>'+result[v]["price"]+'</span>'
// +' <small style="float:right" id="instance_option"></small>' // +' <small style="float:right" id="instance_option"></small>'
+'</div>' +'</div>'
+'</div>' +'</div>'
@@ -231,6 +237,8 @@ $(function() {
} }
} }
}else{ }else{
type = window.location.href.indexOf("quick_service");
modify_order = window.location.href.indexOf("modify_order");
if (type != -1 && modify_order != -1) { if (type != -1 && modify_order != -1) {
url = '../../../addorders/get_item_instance/'+value[i]["id"]; url = '../../../addorders/get_item_instance/'+value[i]["id"];
console.log("ssssssss") console.log("ssssssss")

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

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