diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php index 1b8ef0bdcc2..acb195af15c 100644 --- a/htdocs/takepos/css/pos.css.php +++ b/htdocs/takepos/css/pos.css.php @@ -141,7 +141,9 @@ button.calcbutton2 { margin: 1px; border-radius: 3px; } - +button.calcbutton2.clicked { + background-color: #8855AA; +} button.calcbutton2 .iconwithlabel { padding-bottom: 10px; } diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index ac4492f4e1d..ee6a6c85d80 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -205,6 +205,9 @@ if(localStorage.hasKeyboard) { function ClearSearch() { console.log("ClearSearch"); $("#search").val(''); + $("#qty").html("trans("Qty"); ?>").removeClass('clicked'); + $("#price").html("trans("Price"); ?>").removeClass('clicked'); + $("#reduction").html("trans("ReductionShort"); ?>").removeClass('clicked'); browser->layout == 'classic') { ?> setFocusOnSearchField(); @@ -720,8 +723,9 @@ function Search2(keyCodeForEnter, moreorless) { } +/* Function called on an action into the PAD */ function Edit(number) { - console.log("We click on PAD on number="+number); + console.log("We click on PAD on key="+number); if (typeof(selectedtext) == "undefined") { return; // We click on an action on the number pad but there is no line selected @@ -730,20 +734,19 @@ function Edit(number) { var text=selectedtext+"
"; - if (number=='c'){ - editnumber=""; + if (number=='c') { + editnumber=''; Refresh(); - $("#qty").html("trans("Qty"); ?>"); - $("#price").html("trans("Price"); ?>"); - $("#reduction").html("trans("ReductionShort"); ?>"); + $("#qty").html("trans("Qty"); ?>").removeClass('clicked'); + $("#price").html("trans("Price"); ?>").removeClass('clicked'); + $("#reduction").html("trans("ReductionShort"); ?>").removeClass('clicked'); return; - } - else if (number=='qty'){ - if (editaction=='qty' && editnumber!=""){ + } else if (number=='qty') { + if (editaction=='qty' && editnumber != '') { $("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() { editnumber=""; //$('#poslines').scrollTop($('#poslines')[0].scrollHeight); - $("#qty").html("trans("Qty"); ?>"); + $("#qty").html("trans("Qty"); ?>").removeClass('clicked'); }); setFocusOnSearchField(); @@ -752,13 +755,12 @@ function Edit(number) { else { editaction="qty"; } - } - else if (number=='p'){ - if (editaction=='p' && editnumber!=""){ + } else if (number=='p') { + if (editaction=='p' && editnumber!="") { $("#poslines").load("invoice.php?action=updateprice&place="+place+"&idline="+selectedline+"&number="+editnumber, function() { editnumber=""; //$('#poslines').scrollTop($('#poslines')[0].scrollHeight); - $("#price").html("trans("Price"); ?>"); + $("#price").html("trans("Price"); ?>").removeClass('clicked'); }); ClearSearch(); @@ -767,13 +769,12 @@ function Edit(number) { else { editaction="p"; } - } - else if (number=='r'){ - if (editaction=='r' && editnumber!=""){ + } else if (number=='r') { + if (editaction=='r' && editnumber!="") { $("#poslines").load("invoice.php?action=updatereduction&place="+place+"&idline="+selectedline+"&number="+editnumber, function() { editnumber=""; //$('#poslines').scrollTop($('#poslines')[0].scrollHeight); - $("#reduction").html("trans("ReductionShort"); ?>"); + $("#reduction").html("trans("ReductionShort"); ?>").removeClass('clicked'); }); ClearSearch(); @@ -788,21 +789,21 @@ function Edit(number) { } if (editaction=='qty'){ text=text+"trans("Modify")." -> ".$langs->trans("Qty").": "; ?>"; - $("#qty").html("OK"); - $("#price").html("trans("Price"); ?>"); - $("#reduction").html("trans("ReductionShort"); ?>"); + $("#qty").html("OK").addClass("clicked"); + $("#price").html("trans("Price"); ?>").removeClass('clicked'); + $("#reduction").html("trans("ReductionShort"); ?>").removeClass('clicked'); } if (editaction=='p'){ text=text+"trans("Modify")." -> ".$langs->trans("Price").": "; ?>"; - $("#qty").html("trans("Qty"); ?>"); - $("#price").html("OK"); - $("#reduction").html("trans("ReductionShort"); ?>"); + $("#qty").html("trans("Qty"); ?>").removeClass('clicked'); + $("#price").html("OK").addClass("clicked"); + $("#reduction").html("trans("ReductionShort"); ?>").removeClass('clicked'); } if (editaction=='r'){ text=text+"trans("Modify")." -> ".$langs->trans("ReductionShort").": "; ?>"; - $("#qty").html("trans("Qty"); ?>"); - $("#price").html("trans("Price"); ?>"); - $("#reduction").html("OK"); + $("#qty").html("trans("Qty"); ?>").removeClass('clicked'); + $("#price").html("trans("Price"); ?>").removeClass('clicked'); + $("#reduction").html("OK").addClass("clicked"); } $('#'+selectedline).find("td:first").html(text+editnumber); }