diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index d039425c..35e08b4f 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -25,6 +25,7 @@
 //= require custom.js
 
 $(document).on('turbolinks:load', function() {
+	var oqs_id = "";
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
        $(".oqs_append").addClass('hide')
@@ -37,8 +38,8 @@ $(document).on('turbolinks:load', function() {
        $(".oqs_append").removeClass('hide');
        $(this).addClass('oqs_active');
        $(".queue_station").addClass('queue_station_box');
-       var oqs_id = $(this).find(".oqs-id").text();
-       console.log(oqs_id)
+       oqs_id = $(this).find(".oqs-id").text();
+       console.log(oqs_id);
        var url    = 'oqs/get_items/'+oqs_id;
       
        show_details(url);
@@ -143,8 +144,7 @@ $(document).on('turbolinks:load', function() {
 	    	type: 'GET',
 	    	url: '/oqs/' + orderNo,
 	    	data: { 'status' : order_status },
-	    	success: function(res){	    	
-
+	    	success: function(res){
 	    		for (i = 0; i < res.length; i++) {	    			
 	    			var data = JSON.stringify(res[i]);	
         			var parse_data = JSON.parse(data); 
@@ -157,10 +157,19 @@ $(document).on('turbolinks:load', function() {
 							});
 	        			}
         			}
-	    			var order_item_row = "<tr>" +
+
+        			if (oqs_id > 0){
+        				var order_item_row = "<tr id='edit_"+assigned_item_id+"' class='order-item-edit'>" +
 							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</td>" +
 							                "<td class='order-qty' style='width:20%; text-align:right'>" + parse_data.qty + "</td>" +
               						 	 "</tr>";
+				 	}else{
+				 		var order_item_row = "<tr>" +
+							                "<td class='order-items' style='width:80%; text-align:left'>" + parse_data.item_name + set_instance_items + "</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);
 	    		}	    		
 	    	}