fixed conflict

2017-06-12 17:32:38 +06:30
parent d1ae734f50 e6647dd494
commit ddf85905ef
9 changed files with 34 additions and 22 deletions
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -181,7 +181,6 @@ $(document).ready(function(){
 		}else{
 			var sale_id = $(".selected-item").find(".order-cid").text();
 		}
-		alert(sale_id);
 		window.location.href = '/origami/'+ sale_id  + "/add_customer"

 		return false;