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'>"
                       +"<i class='fa fa-bars material-icons'>"
                       +'view_list</i>'
@@ -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+"'>"
 
                     // +"<div class='card-block custom-card-block'>"
                     //   +"<img id='logo' height='125px' src='"+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 = '<div class="col-md-4 " >'
-                          +"<div class='card custom-card instance_box' data-name='"+result[iv]["name"]
-                              +"' data-code='"+result[iv]["code"]
-                              +"' data-price='"+result[iv]["price"]
+                          +"<div class='card custom-card instance_box' data-name='"+result[v]["name"]
+                              +"' data-code='"+result[v]["code"]
+                              +"' data-price='"+result[v]["price"]
                               +"' data-option='"+JSON.stringify(items[iii]["options"])
                               +"' data-min-qty='"+item_sets[field]["min_selectable_qty"]
                               +"' data-max-qty='"+item_sets[field]["max_selectable_qty"]
@@ -212,14 +218,14 @@ $(function() {
                               +"' data-sub-item='true"
                               +"'>"
                             +'<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 class="card-block custom-card-block">'
                               +'<img id="" src="/image/logo.png" height="40px">'
                               +' <small style="float:" id="instance_option"></small>'
                             +'</div>'
                             +'<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>'
                             +'</div>'
                           +'</div>'
@@ -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 @@
                       <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);           
       }
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 @@
  <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',