diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index d77a3a6a..54e73fe1 100644
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -24,6 +24,81 @@ $(document).ready(function(){
 	//    window.location.reload(1);
 	// }, 10000);
 
+    $(".oqs_click").on("click", function(){
+
+       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();
+
+	  //Start Ajax
+	  $.ajax({      
+	    type: "GET",         
+	    url: url, 
+	    data: {},
+	    dataType: "json",
+	    success: function(data) {
+	        for(var field in data) {
+	          var price = parseFloat(data[field].price).toFixed(2);
+
+	          if (data[field]["options"] == "[]") {
+	           var options = "";
+	          }else{
+	           var options = data.options;
+	          }
+
+	          var date = data[field]["created_at"];
+	           
+	          row ='<div class="card queue_station">'
+	                  +'<div class="card-block">'
+	                      +'<h4 class="card-title">'
+	                        +'<span class="order-zone-type">'+data[field]["zone"]+'- </span>'
+	                        +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
+	                        +'<small class="pull-right">'+ data[field]["order_id"] +'- </small>'
+	                      +'</h4>'
+
+	                      +'<h4>'
+	                        +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
+	                        +'<span class="order-qty">'+ data[field]["qty"] +'- </span>'
+	                      +'</h4>'
+
+	                      +'<p class="card-text item-options">'+ options +'</p>'
+
+	                      +'<p class="card-text">'
+	                        +'<small class="text-muted">Order at'
+	                          +'<span class="order-at">'+ 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();
@@ -41,7 +116,6 @@ $(document).ready(function(){
 	    $('#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',
@@ -76,7 +150,7 @@ $(document).ready(function(){
 
   	// complete for queue item
  
-  		$(document).on('click', '.order-complete', function(event){ 
+  	$(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);
@@ -118,10 +192,13 @@ $(document).ready(function(){
   	});
 
   	// Print Order Item
-  	$('#print_order_item').on('click',function(){
+  	$(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 };
+  		console.log(assigned_item_id);
+  		console.log(options);
+  		console.log(params);
   		$.ajax({
 			type: 'GET',
 	     	url: '/oqs/print/print/'+assigned_item_id,
@@ -130,7 +207,8 @@ $(document).ready(function(){
   	});
 
   	// Print Order Summary
-  	$('#print_order_summary').on('click',function(){
+  	// $('#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 };
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 857d9cb7..5642e4f7 100644
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -144,82 +144,4 @@
 
   </div>
 </div>
-<script type="text/javascript">
-$(function(){
 
-  $(".oqs_click").on("click", function(){
-
-    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();
-
-  //Start Ajax
-  $.ajax({      
-    type: "GET",         
-    url: url, 
-    data: {},
-    dataType: "json",
-    success: function(data) {
-        for(var field in data) {
-          var price = parseFloat(data[field].price).toFixed(2);
-
-          if (data[field]["options"] == "[]") {
-            options = "";
-          }else{
-            options = data.options;
-          }
-
-          var date = data[field]["created_at"];
-           
-          row ='<div class="card queue_station">'
-                  +'<div class="card-block">'
-                      +'<h4 class="card-title">'
-                        +'<span class="order-zone-type">'+data[field]["zone"]+'- </span>'
-                        +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
-                        +'<small class="pull-right">'+ data[field]["order_id"] +'- </small>'
-                      +'</h4>'
-
-                      +'<h4>'
-                        +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
-                        +'<span class="order-qty">'+ data[field]["qty"] +'- </span>'
-                      +'</h4>'
-
-                      +'<p class="card-text item-options">'+ options +'</p>'
-
-                      +'<p class="card-text">'
-                        +'<small class="text-muted">Order at'
-                          +'<span class="order-at">'+ 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 
-
-}
-});
-</script>