diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 28bbb7c6..f615a28d 100644
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -79,7 +79,8 @@ $(function(){
   //click menu sidebar menu category
   $(".menu_category").on("click", function(){
     var menu_id = $(this).find(".menu-id").text();
-    var url = $(this).attr('data-ref');
+    var url = "get_menu_category/"+menu_id;
+    console.log(url)
     show_menu_item_list(url); 
   }); 
   //End menu category Click
@@ -100,7 +101,6 @@ $(function(){
         menu_items_list.empty();
         menu_items = data.menu_items;
 
-
         for(var field in menu_items) {  
           if (menu_items[field].is_sub_item == false) {
             instances = menu_items[field].instances ;
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e355c13c..84958b8d 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -75,7 +75,7 @@ $(function(){
   });
 
   $('#order-detail-slimscroll').slimScroll({
-    height: height-180,
+    height: height-160,
     size: '5px',
     color: 'rgba(0,0,0,0.5)',
     alwaysVisible: false,
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 35567356..0f1026a2 100644
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -34,6 +34,8 @@ class Origami::AddordersController < BaseOrigamiController
 
   def get_menu_category ()
     if (params[:id])
+      puts "sssssssssssss"
+      puts params[:id]
       #Pull this menu
       @menu = MenuCategory.find_by_id(params[:id])
       # puts @menu.menu_items[1].item_attributes.to_json
diff --git a/app/views/oqs/edit/index.html.erb b/app/views/oqs/edit/index.html.erb
index 15d48144..385a6b68 100644
--- a/app/views/oqs/edit/index.html.erb
+++ b/app/views/oqs/edit/index.html.erb
@@ -1,17 +1,28 @@
+
+<div class="page-header">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
+    <li class="breadcrumb-item active">OQS</li>
+    <span class="float-right">
+      <%= link_to 'Back', oqs_root_path %>
+    </span>
+  </ol>
+</div>
 <div class="row">
   <div class="col-md-12">
     <div class="card">
       <div class="card-header">Update Quantity</div>
       <div class="card-body">
-        <div class="col-md-12">
-          <h3><%= @order_item[0].item_name + " - [" + @order_item[0].qty.to_s + "]" %></h3>
+
+        <!-- <div class="col-md-12">
+          <h6><%= @order_item[0].item_name + " - [" + @order_item[0].qty.to_s + "]" %></h6>
           <div class="form-group">
             <label class="col-md-1">Quantity: </label>
-            <input type="text" name="qty_weight" class="text-right" value="<%= @order_item[0].qty %>" />
+            <input type="text" name="qty_weight" class="text-right form-control" value="<%= @order_item[0].qty %>" />
           </div>
           <div class="form-group">
             <label class="col-md-1">Remark: </label>
-            <textarea rows="2" cols="22" name="remarks"></textarea>
+            <textarea rows="2" cols="22" name="remarks" class="form-control"></textarea>
           </div>
           <div class="form-group">
             <a href="<%= oqs_root_path %>" class="btn btn-primary">
@@ -19,9 +30,32 @@
             </a>
             <button id="qty-update" class="btn btn-info" data-id="<%= @order_item[0].order_items_id %>">Update</button>
           </div>
+        </div> -->
+        <div class="row clearfix">
+          <div class="col-lg-2 col-md-2 col-sm-4 col-xs-5 form-control-label">
+          <label for="">Quantity :</label>
+          </div>
+          <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
+            
+              <input type="text" name="qty_weight" class="text-right form-control" value="<%= @order_item[0].qty %>" /> 
+               <!--  <input type="text" id="email_address_2" class="form-control" placeholder="Enter your email address"> -->
+              
+          </div>
+        </div>
+        <div class="row clearfix">
+          <div class="col-lg-2 col-md-2 col-sm-4 col-xs-5 form-control-label">
+          <label for="">Remark :</label>
+          </div>
+          <div class="col-lg-10 col-md-10 col-sm-8 col-xs-7">
+            
+               <textarea  name="remarks" class="form-control"></textarea>
+               <!--  <input type="text" id="email_address_2" class="form-control" placeholder="Enter your email address"> -->
+             
+          </div>
         </div>
       </div>      
     </div>
   </div>
 </div>
 
+
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 61c9f3bc..afa90efd 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -17,11 +17,8 @@
         <%= form_tag oqs_root_path, :method => :get do %>
         <div class="row clearfix">
           <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
-            <div class="form-group">
-              <div class="form-line">
-                <input type="text" name="filter" class="form-control" placeholder="Search">
-              </div>
-            </div>
+             <input type="text" name="filter" class="form-control" placeholder="Search">
+            
           </div>
           <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
             <button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button>
@@ -75,7 +72,7 @@
        <!-- Nav tabs - End -->
        <p class="hidden filter"><%= @filter %></p>
 
-       <div class="tab-content" style="max-height:670px; overflow:auto">
+       <div class="tab-content" id="custom-slimscroll" style="max-height:; overflow:">
         <!--- Panel 0 - Completed -->
 
         <div class="tab-pane fade in active" id="completed" role="tabpanel">
@@ -160,7 +157,7 @@
                   </tbody>
                 </table>                  
               </div>
-              <div class="card-text" style="min-height:360px; max-height:360px; overflow:auto">
+              <div class="card-text" id="order-detail-slimscroll" style="min-height:; max-height:; overflow:">
                 <table class="table" id="oqs-order-details-table">
                   <thead>
                     <tr>
@@ -189,4 +186,230 @@
     </div>
   </div>
 </div>
+<script type="text/javascript">
+  $(document).ready(function(){
 
+  $(".nav-completed").on("click", function(){
+       $("#completed").removeClass('hide')
+       $(".oqs_append").addClass('hide')
+    });
+
+    $(".oqs_click").on("click", function(){
+       $(".oqs_click").removeClass('oqs_active');
+       $(".queue_station").removeClass('queue_station_box');
+       $("#completed").addClass('hide');
+       $(".oqs_append").removeClass('hide');
+       $(this).addClass('oqs_active');
+       $(".queue_station").addClass('queue_station_box');
+       var oqs_id = $(this).find(".oqs-id").text();
+       var url    = 'oqs/get_items/'+oqs_id;
+      
+       show_details(url);
+
+    }); //End Click
+ 
+  function show_details(url){  
+     var oqs_append = $('.oqs_append');
+     oqs_append.empty();
+     var filter = $('.filter').text();
+    //Start Ajax
+    $.ajax({      
+      type: "GET",         
+      url: url, 
+      data: {'filter':filter},
+      dataType: "json",
+      success: function(data) {
+          for(var field in data) {
+            var price = parseFloat(data[field].price).toFixed(2);
+
+            if (data[field]["options"] == "[]" || data[field]["options"] == "") {
+             var options = "";
+            }else{
+             var options = data.options;
+            }
+
+            var date = new Date(data[field]["created_at"]); 
+          var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' +  date.getHours()+ ':' +  date.getMinutes();
+             
+            row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
+                    +'<div class="card-block">'
+                        +'<h6 class="card-">'
+                          +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
+                          +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
+                          +'<small class="float-right">'+ data[field]["order_id"] +'</small>'
+                        +'</h6>'
+
+                        +'<h6>'
+                          +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
+                          +'<span class="order-qty">'+ data[field]["qty"] +' </span>'
+                        +'</h6>'
+
+                        +'<p class="card-text item-options">'+ options +'</p>'
+
+                        +'<p class="card-text">'
+                          +'<small class="text-muted">Order at'
+                            +'<span class="order-at">'+ show_date +'</span> - '
+
+                            +'<span class="order-by">'+ data[field]["item_order_by"] +'</span> '
+                            +'</small> '
+                        +'</p>'
+
+                        +'<p class="hidden order-customer">'+ data[field]["customer_name"] +'</p> '
+                        +'<p class="hidden assigned-order-item">'+ data[field]["assigned_order_item_id"] +'</p> '
+                    +'</div>'
+
+                    +'<div class="card-footer">'
+                        +'<button id="edit_'+ data[field]["assigned_order_item_id"]+'" class="btn btn-warning order-item order-item-edit">EDIT</button>'
+                        +' <button id="assigned_queue_' + data[field]["assigned_order_item_id"] +'" class="btn btn-primary order-item order-complete">COMPLETE</button>'
+                    +'</div>'
+
+                +'</div>'; 
+                    
+                   
+                   
+              $('.oqs_append').append(row);
+          }
+          
+       }
+    });
+    //end Ajax 
+
+  }
+
+  $(document).on('click', '.queue_station', function(event){ 
+      var orderZone=$(this).children().children().children('.order-zone').text().trim();
+      // var orderItem=$(this).children().children().children('.order-item').text();
+      var assigned_item_id = $(this).children().find(".assigned-order-item").text();
+      var orderQty = $(this).children().children().children('.order-qty').text();   
+      var orderBy = $(this).children().children().children().children('.order-by').text();
+      var orderAt = $(this).children().children().children().children('.order-at').text();
+      var orderCustomer = $(this).children().children('.order-customer').text();
+      var order_status = $(this).children().children('.order-status').text();
+
+      $('#order-title').text("ORDER DETAILS - " + orderZone);
+      $('#order-by').text(orderBy);
+      $('#order-at').text(orderAt);
+      $('#order-customer').text(orderCustomer);
+      $('#order-from').text(orderZone);
+      // clear order items
+    $("#oqs-order-details-table").children("tbody").empty();
+      // Call get_order_items() for Order Items by dining
+      $.ajax({
+        type: 'GET',
+        url: '/oqs/' + orderZone,
+        data: { 'status' : order_status },
+        success: function(res){         
+          for (i = 0; i < res.length; i++) {            
+            var data = JSON.stringify(res[i]);  
+              var parse_data = JSON.parse(data); 
+              
+            var order_item_row = "<tr>" +
+                              "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + "</td>" +
+                              "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
+                             "</tr>";
+                  $("#oqs-order-details-table").children("tbody").append(order_item_row);
+          }         
+        }
+      })
+
+      // $('#order-items').text(orderItem);
+      // $('#order-qty').text(orderQty);
+
+      $('.queue_station').removeClass('selected-item');
+      $(this).addClass('selected-item');
+  });
+
+    $(document).on('click', '.order-item-edit', function(event){ 
+    var _self = $(this);  // To know in ajax return
+      var assigned_item_id=$(this).attr('id').substr(5);
+      window.location.href = '/oqs/'+ assigned_item_id  + "/edit"
+  });
+
+    // complete for queue item
+ 
+    $(document).on('click', '.order-complete', function(event){ 
+      //e.preventDefault();
+      var _self = $(this);  // To know in ajax return
+      var assigned_item_id=$(this).attr('id').substr(15);
+      var params = { 'id':assigned_item_id };
+      
+      // Call update_delivery_status() for changed delivery and move to delivery   
+      $.ajax({
+        type: 'POST',
+        url: '/oqs/update_delivery',
+        data: params,
+        dataType: 'json',
+        success: function(data){
+          for (i = 0; i < data.length; i++) {
+            var queue_station = $('#assigned_queue_' + data[i]).parent().parent(".queue_station");
+            var station = queue_station.parent().parent().attr('id');
+
+            // Remove a queue card from current station
+            queue_station.remove();
+
+            // Remove a queue card from current station
+            queue_station.children('.card-footer').remove();
+
+            // Add removed queue card from station to completed
+            $("#completed").children('.card-columns').append(queue_station);
+
+            // update queue item count in each station
+            var station_count=parseInt($("#"+station+"_count").text()) - 1;
+            $("#"+station+"_count").text(station_count);
+          }
+
+          // update queue item count in completed station
+          $("#completed_count").text(parseInt($("#completed_count").text()) + data.length);
+
+          alert("updated!");
+          // Page reload
+        location.reload();
+        }
+      });
+    });
+
+    // Print Order Item
+    $(document).on('click', '#print_order_item', function(event){ 
+      var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
+      var options = $('.selected-item').children('.card-block').find('.item-options').text();
+      var params = { 'options':options };
+
+      $.ajax({
+      type: 'GET',
+        url: '/oqs/print/print/'+assigned_item_id,
+        success: function(data){  }
+      });
+    });
+
+    // Print Order Summary
+    // $('#print_order_summary').on('click',function(){
+    $(document).on('click', '#print_order_summary', function(event){
+      var table_name=$('.selected-item').children().children().children('.order-zone').text().trim();
+      var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
+      var params = { 'table_name':table_name };
+      $.ajax({
+      type: 'GET',
+        url: '/oqs/print/print_order_summary/'+assigned_item_id,
+        data: params,
+        success: function(data){  }
+      });
+    });
+
+  // Qty update for OQS Edit Controller
+  $('#qty-update').on('click', function(){
+    var qty_weight = $("input[name='qty_weight']").val();
+    var remarks = $("textarea[name='remarks']").val();
+    var order_items_id = $(this).attr('data-id');
+    var params = { 'order_items_id': order_items_id, 'qty_weight': qty_weight, 'remarks': remarks }
+    $.ajax({
+      type: 'POST',
+      url: '/oqs/' + order_items_id,
+      data: params,
+      success: function(result){
+        alert("Updated!");
+        window.location.href = '/oqs';
+      }
+    });
+  });
+});
+</script>
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 3195c45d..078d10f4 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -4,7 +4,9 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
-            <li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>">
+            <!-- <li class="nav-item menu_category" data-ref="<%= origami_get_menu_category_path menu.id%>">
+             -->
+             <li class="nav-item menu_category">
               <p class="hidden menu-id"><%= menu.id  %></p> 
               <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%></a>
             </li>
diff --git a/config/routes.rb b/config/routes.rb
index 7ee7da3e..1fbaba2f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -178,11 +178,12 @@ scope "(:locale)", locale: /en|mm/ do
 
     post '/:sale_id/get_customer' => "customers#get_customer"
 
-    get '/:addorders/:id' => "addorders#detail"
-    post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' }
     get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
     get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
 
+    get '/:addorders/:id' => "addorders#detail"
+    post '/:addorders/create' => "addorders#create", :defaults => { :format => 'json' }
+    
     resources :commissions
     resources :commissioners