diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 9ad540ab..8e252749 100644
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -23,21 +23,42 @@ $(document).ready(function(){
 	// }, 10000);
 
 	$('.queue_station').on('click',function(){    
-	    var orderZone=$(this).children().children().children('.order-zone').text();
-	    var orderItem=$(this).children().children().children('.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 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();
 
 	    $('#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();
 
-	    $('#order-items').text(orderItem);
-	    $('#order-qty').text(orderQty);
+	    // Call get_order_items() for Order Items by dining
+	    $.ajax({
+	    	type: 'GET',
+	    	url: '/oqs/' + orderZone,
+	    	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');
@@ -49,7 +70,8 @@ $(document).ready(function(){
   		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',
@@ -84,6 +106,7 @@ $(document).ready(function(){
 	    });  	    
   	});
 
+  	// Print Order Item
   	$('#print_order_item').on('click',function(){
   		var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text(); 
   		var params = { 'id':assigned_item_id };
@@ -94,6 +117,7 @@ $(document).ready(function(){
   		});
   	});
 
+  	// Print Order Summary
   	$('#print_order_summary').on('click',function(){
   		var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text(); 
   		var params = { 'id':assigned_item_id };
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index 7af42166..67f96a26 100644
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -22,6 +22,22 @@ class Oqs::HomeController < BaseOqsController
     @queue_stations_items
   end
 
+  # Get Order items
+  def get_order_items
+    items = []
+    table_name = params[:table_id]
+    dining = DiningFacility.find_by_name(table_name);
+    booking_id = dining.get_current_booking
+    BookingOrder.where("booking_id='#{ booking_id }'").find_each do |bo|
+        order=Order.find(bo.order_id);
+        order.order_items.each do |oi|
+          items.push(oi)
+        end
+    end
+
+    render :json => items.to_json
+  end
+
   def show
   end
 
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index f2120cde..1f13383d 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -133,7 +133,7 @@
   <div class="col-lg-3 col-md-3 col-sm-3">
     <div class="card"  >
       <div class="card-header">
-        <div><strong id="order-title">ORDER DETAILS -</strong></div>
+        <div><strong id="order-title">ORDER DETAILS - Table</strong></div>
       </div>
       <div class="card-block">
         <div class="card-title">
@@ -159,7 +159,7 @@
           </table>                  
         </div>
         <div class="card-text" style="min-height:400px; max-height:400px; overflow:auto">
-          <table class="table">
+          <table class="table" id="oqs-order-details-table">
             <thead>
               <tr>
                 <th style="width:80%; text-align:left">Items</th>
@@ -167,17 +167,7 @@
               </tr>
             </thead>
             <tbody>              
-              <tr>
-                <td id="order-items" style="width:80%; text-align:left">
-                  <!-- Menu Items Name <br/>
-                  Less Sweet, No MSG -->
-                </td>
-                <td id="order-qty" style="width:20%; text-align:right">
-                  <!-- 5 -->
-                </td>
-              </tr>
-
-
+              <!-- Bind With JS -->
             </tbody>
           </table>
         </div>
diff --git a/config/routes.rb b/config/routes.rb
index 19b07979..3a1e5295 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -129,6 +129,7 @@ Rails.application.routes.draw do
   #--------- Order Queue Station ------------#
   namespace :oqs do
     root "home#index"
+    get "/:table_id", to: "home#get_order_items"
 
     post 'update_delivery', to: "home#update_delivery_status"