lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix search in TakePOS

Browse Source
This commit is contained in:
Laurent Destailleur 2022-10-11 22:08:26 +02:00
parent 6eecb93f05
commit 7ebda11ad0
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/errors.lang
View File

@ -14,6 +14,7 @@ ErrorLoginAlreadyExists=Login %s already exists.
ErrorGroupAlreadyExists=Group %s already exists. ErrorGroupAlreadyExists=Group %s already exists.
ErrorEmailAlreadyExists=Email %s already exists. ErrorEmailAlreadyExists=Email %s already exists.
ErrorRecordNotFound=Record not found. ErrorRecordNotFound=Record not found.
ErrorRecordNotFoundShort=Not found
ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'. ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'. ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'. ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.

2
htdocs/takepos/admin/terminal.php
View File

@ -363,7 +363,7 @@ $htmltext .= '</i>';
print '<br>'; print '<br>';
print load_fiche_titre($langs->trans('FreeLegalTextOnInvoices'), '', ''); print load_fiche_titre($langs->trans('FreeLegalTextOnInvoices'), '', '');
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans('Value').'</td>'; print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans('Value').'</td>';

17
htdocs/takepos/index.php
View File

@ -585,7 +585,9 @@ function New() {
* return {void} * return {void}
*/ */
function Search2(keyCodeForEnter, moreorless) { function Search2(keyCodeForEnter, moreorless) {
console.log("Search2 Call ajax search to replace products keyCodeForEnter="+keyCodeForEnter); var eventKeyCode = window.event.keyCode;
console.log("Search2 Call ajax search to replace products keyCodeForEnter="+keyCodeForEnter+", eventKeyCode="+eventKeyCode);
var search_term = $('#search').val(); var search_term = $('#search').val();
var search_start = 0; var search_start = 0;
@ -608,20 +610,19 @@ function Search2(keyCodeForEnter, moreorless) {
} }
var search = false; var search = false;
var eventKeyCode = window.event.keyCode; if (keyCodeForEnter != '' || eventKeyCode == keyCodeForEnter) {
if (keyCodeForEnter == '' || eventKeyCode == keyCodeForEnter) {
search = true; search = true;
} }
if (search === true) { if (search === true) {
// if a timer has been already started (search2_timer is a global js variable), we cancel it now
// temporization time to give time to type // we click onto another key, we will restart another timer just after
if (search2_timer) { if (search2_timer) {
clearTimeout(search2_timer); clearTimeout(search2_timer);
} }
// temporization time to give time to type
search2_timer = setTimeout(function(){ search2_timer = setTimeout(function(){
pageproducts = 0; pageproducts = 0;
jQuery(".wrapper2 .catwatermark").hide(); jQuery(".wrapper2 .catwatermark").hide();
var nbsearchresults = 0; var nbsearchresults = 0;
@ -693,8 +694,8 @@ function Search2(keyCodeForEnter, moreorless) {
if (data.length == 0) { if (data.length == 0) {
$('#search').val('<?php $('#search').val('<?php
$langs->load('errors'); $langs->load('errors');
echo dol_escape_js($langs->trans("ErrorRecordNotFound")); echo dol_escape_js($langs->transnoentitiesnoconv("ErrorRecordNotFoundShort"));
?>'); ?> ('+search_term+')');
$('#search').select(); $('#search').select();
} }
else ClearSearch(); else ClearSearch();