Merge pull request #12953 from andreubisquerra/develop

Wait search finished before add product with enter
Dolibarr · Jan 29, 2020 · 2ce3ea8 · 2ce3ea8
2 parents 6cccce3 + 0beb78a
commit 2ce3ea8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
@@ -440,7 +440,7 @@ function New() {
 
 function Search2() {
 	console.log("Search2 Call ajax search to replace products");
-	if(window.event.keyCode == 13) ClickProduct(0);
+	if(window.event.keyCode == 13) var key=13;
 	pageproducts=0;
 	jQuery(".wrapper2 .catwatermark").hide();
 	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term='+$('#search').val(), function(data) {
@@ -459,7 +459,9 @@ function Search2() {
 			$("#prodiv"+i).data("rowid", data[i]['rowid']);
 			$("#prodiv"+i).data("iscat", 0);
 		}
-	});
+	}).always(function() {
+		if(key==13) ClickProduct(0);
+  });
 }
 
 function Edit(number) {