fixed conflict

2017-06-06 09:43:16 +06:30
parent faca7295f7 d9f7b391ec
commit 0cc378f318
50 changed files with 331 additions and 106 deletions
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -80,4 +80,14 @@ $(document).ready(function(){
 	     	success: function(data){	}
  		});
  	});
+
+  	$('#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 };
+  		$.ajax({
+			type: 'GET',
+	     	url: '/oqs/print/print_order_summary/'+assigned_item_id,	      
+	     	success: function(data){	}
+  		});
+  	});
 });