NEW search on key code "enter" if defined in cash desk

This commit is contained in:
VESSILLER 2020-03-10 14:08:28 +01:00
parent 9c683fb951
commit cef2685368

View File

@ -446,28 +446,36 @@ function New() {
*/ */
function Search2(keyCodeForEnter) { function Search2(keyCodeForEnter) {
console.log("Search2 Call ajax search to replace products"); console.log("Search2 Call ajax search to replace products");
if(window.event.keyCode == keyCodeForEnter) var key=13;
pageproducts=0; var search = false;
jQuery(".wrapper2 .catwatermark").hide(); var eventKeyCode = window.event.keyCode;
$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term='+$('#search').val(), function(data) { if (typeof keyCodeForEnter === 'undefined' || eventKeyCode == keyCodeForEnter) {
for (i = 0; i < <?php echo $MAXPRODUCT ?>; i++) { search = true;
if (typeof (data[i]) == "undefined"){ }
$("#prodesc"+i).text("");
$("#proimg"+i).attr("src","genimg/empty.png"); if (search === true) {
$("#prodiv"+i).data("rowid",""); pageproducts = 0;
continue; jQuery(".wrapper2 .catwatermark").hide();
$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term=' + $('#search').val(), function (data) {
for (i = 0; i < <?php echo $MAXPRODUCT ?>; i++) {
if (typeof (data[i]) == "undefined") {
$("#prodesc" + i).text("");
$("#proimg" + i).attr("src", "genimg/empty.png");
$("#prodiv" + i).data("rowid", "");
continue;
}
var titlestring = '<?php echo dol_escape_js($langs->transnoentities('Ref') . ': '); ?>' + data[i]['ref'];
$("#prodesc" + i).text(data[i]['label']);
$("#prodivdesc" + i).show();
$("#proimg" + i).attr("title", titlestring);
$("#proimg" + i).attr("src", "genimg/index.php?query=pro&id=" + data[i]['rowid']);
$("#prodiv" + i).data("rowid", data[i]['rowid']);
$("#prodiv" + i).data("iscat", 0);
} }
var titlestring = '<?php echo dol_escape_js($langs->transnoentities('Ref').': '); ?>'+data[i]['ref']; }).always(function (data) {
$("#prodesc"+i).text(data[i]['label']); if (eventKeyCode == keyCodeForEnter && data.length == 1) ClickProduct(0);
$("#prodivdesc"+i).show(); });
$("#proimg"+i).attr("title", titlestring); }
$("#proimg"+i).attr("src", "genimg/index.php?query=pro&id="+data[i]['rowid']);
$("#prodiv"+i).data("rowid", data[i]['rowid']);
$("#prodiv"+i).data("iscat", 0);
}
}).always(function(data) {
if(key==13 && data.length==1) ClickProduct(0);
});
} }
function Edit(number) { function Edit(number) {
@ -655,7 +663,7 @@ $( document ).ready(function() {
<body class="bodytakepos" style="overflow: hidden;"> <body class="bodytakepos" style="overflow: hidden;">
<?php <?php
print '<div class="hidden" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>'; print '<div class="hidden" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
$keyCodeForEnter = $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} > 0 ? $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} : 13; $keyCodeForEnter = $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} > 0 ? $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} : '';
?> ?>
<div class="container"> <div class="container">