diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 87124f55..c079377f 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -102,7 +102,6 @@ $(function() {
     $('.sub_category_list').addClass("hidden");
     var menu_id = $(this).attr("data-id");
     var url     = "get_menu_category/"+menu_id;
-    console.log(menu_id);
     show_menu_item_list(url,menu_id);
     var sub_id  = $(this).attr("data-sub-id");
     if (sub_id == "true") {
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 46847924..36861d05 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -77,56 +77,14 @@
       <div class="col-lg-2 col-md-2 col-sm-2 hidden" id="menu_cache">
         <li class="list-menu">
           <a href="javascript:void(0);" class="menu-toggle dropdown-toggle toggled my-toggle " style="">
-            <span class="main_menu" id="main_menu menu_cache_name" ><%= @menus[0].name %></span>
+            <span class="main_menu menu_cache_name" id="main_menu menu_cache_name"></span>
           </a>
           <ul class="ml-menu menu_list aria-hidden menu_cache_list" style="border-top: 1px solid #fff">
           </ul>
         </li> 
         <div id="menu-slimscroll" data-height="0">
-          <ul class="nav nav-tabs flex-column category_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>
-            <% @menu.each do |menu| %>
-              <% if !menu.valid_time.nil? %>
-                <% if menu.menu_category_id.nil? %>
-                <!--if type quick_service or cashier for table -->
-                  <% if type %>
-                    <% if !menu.code.include? "SPL" %>
-                      <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%>
-                         <ul class="sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                         </ul>
-                       </a>
-                      </li>
-                    <% end%>
-                  <!-- else quick_service or cashier for table -->
-                  <% else %>
-                    <% if @table.get_current_checkout_booking.nil? %>
-                      <% if !menu.code.include? "SPL" %>
-                        <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%>
-                           <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%>
-                         <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                         </ul>
-                       </a>
-                      </li>
-                    <% end%>
-                    <!-- end quick_service or cashier for table -->
-                  <% end %>
-                <% end%>
-              <% end %>
-            <%end %>
+          <ul class="nav nav-tabs flex-column category_list category_cache_list" role="tablist" id="ul-navbar">
+            
           </ul>
         </div>
       </div>
@@ -212,43 +170,43 @@
           <br>
           <div class="card-header" style="padding: 0.12rem 0.25rem">
             <% if type %>
-            <div class="row clearfix">
-             <div class="col-md-6 col-lg-6 col-sm-12">
-               <strong id="order-title" class="font-13">ORDER DETAILS </strong>
-             </div>
+              <div class="row clearfix">
+                <div class="col-md-6 col-lg-6 col-sm-12">
+                 <strong id="order-title" class="font-13">ORDER DETAILS </strong>
+                </div>
 
-             <% if modify_order %>
-             <% if @table.nil? %>
-             <div class="col-md-5 col-lg-5 col-sm-5">Table : </div>
-             <p class="hidden" id="table_id"><%=@table_id%></p>
-             <p class="hidden" id="table_type"></p>
-             <% else%>
-             <div class="col-md-5 col-lg-5 col-sm-5">Table : <%=@table.name%></div>
-             <p class="hidden" id="table_id"><%=@table_id%></p>
-             <p class="hidden" id="table_type"><%=@table.type%></p>
-             <% end%>
+                <% if modify_order %>
+                   <% if @table.nil? %>
+                     <div class="col-md-5 col-lg-5 col-sm-5">Table : </div>
+                     <p class="hidden" id="table_id"><%=@table_id%></p>
+                     <p class="hidden" id="table_type"></p>
+                     <p class="hidden" id="table_get_current"></p>
+                   <% else%>
+                     <div class="col-md-5 col-lg-5 col-sm-5">Table : <%=@table.name%></div>
+                     <p class="hidden" id="table_id"><%=@table_id%></p>
+                     <p class="hidden" id="table_type"><%=@table.type%></p>
+                       <p class="hidden" id="table_get_current"><%=@table.get_current_checkout_booking%></p>
+                   <% end%>
 
-             <p class="hidden" id="booking_id"><%=@booking_id%></p>
-             <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : '---'%></p>
-             <p class="hidden" id="sale_id"><%=@sale_id%></p>
+                   <p class="hidden" id="booking_id"><%=@booking_id%></p>
+                   <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : '---'%></p>
+                   <p class="hidden" id="sale_id"><%=@sale_id%></p>
 
-             <div class="col-md-1 col-lg-1 col-sm-1">
-              <button type="button" class="btn btn-xs btn-danger waves-effect float-left" id='clear_all'>   Clear
-              </button>
-            </div>  
-            <% else%>
-            <p class="hidden" id="table_type"></p>
-            <div class="col-md-2 col-lg-2 col-sm-2">
+                   <div class="col-md-1 col-lg-1 col-sm-1">
+                    <button type="button" class="btn btn-xs btn-danger waves-effect float-left" id='clear_all'>   Clear
+                    </button>
+                   </div>  
+                <% else%>
+                  <p class="hidden" id="table_type"></p>
+                  <div class="col-md-2 col-lg-2 col-sm-2">
 
-            </div>
-            <div class="col-md-3 col-lg-3 col-sm-3">
-              <button type="button" class="btn btn-xs btn-danger waves-effect float-left" id='clear_all'>   Clear
-              </button>
-            </div>  
-            <% end%>
-
-
-          </div>
+                  </div>
+                  <div class="col-md-3 col-lg-3 col-sm-3">
+                    <button type="button" class="btn btn-xs btn-danger waves-effect float-left" id='clear_all'>   Clear
+                    </button>
+                  </div>  
+                <% end%>
+              </div>
           <% else %>
           <div class="row ">
            <div class="col-md-9 col-lg-9 col-sm-9 ">
@@ -259,6 +217,7 @@
              <p class="hidden" id="table_type"><%=@table.type%></p>
              <p class="hidden" id="booking_id"><%=@booking_id%></p>
              <p class="hidden" id="customer_id"><%=@customer ? @customer.customer_id : ''%></p>
+               <p class="hidden" id="table_get_current"><%=@table.get_current_checkout_booking%></p>
            </div>
            <div class="col-md-3 col-lg-3 col-sm-3">
              <button type="button" class="btn btn-xs btn-danger waves-effect" id='clear_all'>Clear
@@ -583,35 +542,65 @@
     });
 
     $(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"];
+        
+//         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");
+      // }
 
-      var menus = JSON.parse(localStorage.getItem("menus"));
-      var menu_arr = [];
-      var category_arr = [];
-      if (menus != null) {
-        $("#menu_cache").removeClass("hidden");
-        $("#menu_cache_name").text(menus[0]["name"])
-       
-        for(var i in menus) {
-          console.log(menus[i])
-          menu_list_template(menus[i]);
-        }
+      function category_list_template(menu) {
 
-        var category = menus[0]["categories"];
-        for(var ii in category) {
-
-        }
+        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+''
+                  +'<ul class="sub_category_list hidden fadeInTop animated" '
+                  +'id="sub_category_list">'
+                  +'</ul>'
+                +'</a>'
+             +' </li>';
+        $(".category_cache_list").append(row);           
       }
 
       function menu_list_template(menu) {
-
-        row = '<li class="nav-item menu_click" data-name="<%=menu.name%>" '
-                +' data-id="<%=menu.id%>" style="">'
+        row = '<li class="nav-item menu_click" data-name="'+menu.name+'" '
+                +' data-id="'+menu.id+'" style="">'
             +' <a class="nav-link" data-toggle="tab" href="" role="tab"'
             +' style="text-transform: lowercase;">'+menu.name+'</a>'
            +'</li>';
-
-        $("#menu_cache_list").append(row); 
-            
+        $(".menu_cache_list").append(row);           
       } 
 
       $(".tables").on('click', function () {
diff --git a/app/views/origami/dashboard/_menu.json.jbuilder b/app/views/origami/dashboard/_menu.json.jbuilder
index 946ebe49..852b1f62 100644
--- a/app/views/origami/dashboard/_menu.json.jbuilder
+++ b/app/views/origami/dashboard/_menu.json.jbuilder
@@ -6,6 +6,16 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 
 if (menu.menu_categories)
   json.categories  menu.menu_categories do |category|
+
+    menu_category = MenuCategory.find_by_menu_category_id(category.id)
+    if !menu_category.nil?
+      json.sub_category "true"
+    else
+      json.sub_category "false"
+    end
+    valid_time = category.valid_time
+    json.valid_time valid_time
+
     json.id category.id
     json.code category.code
     json.order_by category.order_by
@@ -15,6 +25,8 @@ if (menu.menu_categories)
     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