From 5d870df7f50a30acd9d438799092e016df872703 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 9 May 2018 18:59:37 +0630 Subject: [PATCH] update addorder cache --- app/assets/javascripts/addorder.js | 44 +++++++----- app/views/origami/addorders/detail.html.erb | 80 ++++++++++----------- app/views/origami/dashboard/index.html.erb | 1 - 3 files changed, 66 insertions(+), 59 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index c079377f..18b98f1a 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -63,8 +63,8 @@ $(function() { +JSON.stringify(item_attributes)+"' data-id = '" +JSON.stringify(item_attributes)+"' data-item = '" +JSON.stringify(item_attributes)+"' data-option = '" - +JSON.stringify(menu_items[field].options)+"'data-opt = '" - +JSON.stringify(menu_items[field].options)+"' data-item-sets = '" + +JSON.stringify(product[field].options)+"'data-opt = '" + +JSON.stringify(product[field].options)+"' data-item-sets = '" +JSON.stringify(item_attributes)+"' data-image='"+image_path+"' data-toggle='modal' data-target='.sx_item_detailModal'>" +"" +'view_list' @@ -77,8 +77,8 @@ $(function() { + product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '" + product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '" + JSON.stringify(item_attributes) +"' data-options = '" - + JSON.stringify(menu_items[field].options) +"' data-opt = '" - + JSON.stringify(menu_items[field].options) +"' data-image='"+image_path+"'>" + + JSON.stringify(product[field].options) +"' data-opt = '" + + JSON.stringify(product[field].options) +"' data-image='"+image_path+"'>" // +"
" // +"" @@ -97,8 +97,8 @@ $(function() { } //end show list function //click menu sidebar menu category - $('.menu_category').on("click", function(){ - // event.preventDefault(); + $(document).on('click', '.menu_category', function(e){ + e.preventDefault(); $('.sub_category_list').addClass("hidden"); var menu_id = $(this).attr("data-id"); var url = "get_menu_category/"+menu_id; @@ -106,7 +106,7 @@ $(function() { var sub_id = $(this).attr("data-sub-id"); if (sub_id == "true") { 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); } }); @@ -114,9 +114,11 @@ $(function() { //click menu sidebar menu category $(document).on('click', '.menu_sub_category', function(event){ - event.preventDefault(); + // event.preventDefault(); + // $(".menu_sub_category").on("click", function(){ $('.sub_category_list').addClass("hidden"); var menu_id = $(this).attr("data-id"); + console.log(menu_id); var url = "get_menu_category/"+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"]); value = item_sets[field]["instances"]; - $(value).each(function(i){ + $(value).each(function(i){ menus = JSON.parse(localStorage.getItem("menus")); if (menus != null) { - for(var i in menus) { - var categories = menus[i]["categories"]; + for(var j in menus) { + var categories = menus[j]["categories"]; for(var ii in categories) { var items = categories[ii]["items"]; for(var iii in items) { var result = items[iii]["instances"]; - for(var iv in result) { - if (value[i]["id"] == result[iv]["id"]) { + for(var v in result) { + + if (value[i]["id"] == result[v]["id"]) { + + console.log("ssssssss") + row = '
' - +"
" +'
' - +''+result[iv]["name"]+'' + +''+result[v]["name"]+'' +'
' +'
' +'' +' ' +'
' +'
' - +' '+result[iv]["price"]+'' + +' '+result[v]["price"]+'' // +' ' +'
' +'
' @@ -231,6 +237,8 @@ $(function() { } } }else{ + type = window.location.href.indexOf("quick_service"); + modify_order = window.location.href.indexOf("modify_order"); if (type != -1 && modify_order != -1) { url = '../../../addorders/get_item_instance/'+value[i]["id"]; console.log("ssssssss") diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 36861d05..76b18ca1 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -38,9 +38,9 @@
  • <%= menu.name%> + -
    • <% end%> @@ -50,18 +50,18 @@
  • <%= menu.name%> + -
    • <% end%> <% else %>
  • <%= menu.name%> + -
    • <% end%> @@ -84,7 +84,9 @@
    @@ -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) { -// //
  • -// // Products -// //
    • -// 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) { + //
  • + // Products + //
    • + 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 = '
  • ' +' ' +''+menu.name+'' + +'' +'' - +'' + +'
    • '; $(".category_cache_list").append(row); } diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index baf543e6..4712a481 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -208,7 +208,6 @@ " id="server_mode">