ソースを参照

FIX Autosearch on takepos was broken

Laurent Destailleur 2 年 前
コミット
f038cca39e
2 ファイル変更7 行追加4 行削除
  1. 6 3
      htdocs/takepos/index.php
  2. 1 1
      htdocs/takepos/invoice.php

+ 6 - 3
htdocs/takepos/index.php

@@ -581,8 +581,9 @@ function New() {
 /**
  * Search products
  *
- * @param   {int}			keyCodeForEnter     Key code for "enter"
- * return   {void}
+ * @param   string			keyCodeForEnter     Key code for "enter" or '' if not
+ * @param   int				moreorless          ??
+ * return   void
  */
 function Search2(keyCodeForEnter, moreorless) {
 	var eventKeyCode = window.event.keyCode;
@@ -597,6 +598,8 @@ function Search2(keyCodeForEnter, moreorless) {
 		search_start = $('#search_start_'+moreorless).val();
 	}
 
+	console.log("search_term="+search_term);
+
 	if (search_term == '') {
 		$("[id^=prowatermark]").html("");
 		$("[id^=prodesc]").text("");
@@ -610,7 +613,7 @@ function Search2(keyCodeForEnter, moreorless) {
 	}
 
 	var search = false;
-	if (keyCodeForEnter != '' || eventKeyCode == keyCodeForEnter) {
+	if (keyCodeForEnter == '' || eventKeyCode == keyCodeForEnter) {
 		search = true;
 	}
 

+ 1 - 1
htdocs/takepos/invoice.php

@@ -1655,7 +1655,7 @@ if (($action == "valid" || $action == "history") && $invoice->type != Facture::T
 
 if ($action == "search") {
 	print '<center>
-	<input type="text" id="search" class="input-search-takepos" name="search" onkeyup="Search2();" style="width: 80%; font-size: 150%;" placeholder="'.dol_escape_htmltag($langs->trans('Search')).'">
+	<input type="text" id="search" class="input-search-takepos" name="search" onkeyup="Search2(\'\', null);" style="width: 80%; font-size: 150%;" placeholder="'.dol_escape_htmltag($langs->trans('Search')).'">
 	</center>';
 }