Merge branch 'master' into oqs

2017-06-23 19:22:07 +06:30
parent 9ed6b510c4 1f6a0eb1f6
commit 30df25d78a
35 changed files with 739 additions and 393 deletions
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -37,7 +37,7 @@ $(document).ready(function(){
 		control_button(order_status);

 		var customer_id=$(this).find(".customer-id").text();
-		//show_customer_details(customer_id);
+		show_customer_details(customer_id);

 		$("#re-print").val(unique_id);