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

Fix click on "C" on pad, reset correctly pad edition.

Browse Source
This commit is contained in:
Laurent Destailleur 2021-12-06 02:13:15 +01:00
parent d62b3cafe4
commit eb60e3c16d
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/takepos/index.php
View File

@ -627,18 +627,24 @@ function Search2(keyCodeForEnter) {
} }
function Edit(number) { function Edit(number) {
console.log("We click on PAD on number="+number);
if (typeof(selectedtext) == "undefined") return; // We click on an action on the number pad but there is no line selected if (typeof(selectedtext) == "undefined") {
return; // We click on an action on the number pad but there is no line selected
}
var text=selectedtext+"<br> "; var text=selectedtext+"<br> ";
if (number=='c'){ if (number=='c'){
editnumber=""; editnumber="";
Refresh(); Refresh();
$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
$("#price").html("<?php echo $langs->trans("Price"); ?>");
$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
return; return;
} }
else if (number=='qty'){ else if (number=='qty'){
console.log("Edit "+number);
if (editaction=='qty' && editnumber!=""){ if (editaction=='qty' && editnumber!=""){
$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() { $("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
editnumber=""; editnumber="";
@ -654,7 +660,6 @@ function Edit(number) {
} }
} }
else if (number=='p'){ else if (number=='p'){
console.log("Edit "+number);
if (editaction=='p' && editnumber!=""){ if (editaction=='p' && editnumber!=""){
$("#poslines").load("invoice.php?action=updateprice&place="+place+"&idline="+selectedline+"&number="+editnumber, function() { $("#poslines").load("invoice.php?action=updateprice&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
editnumber=""; editnumber="";
@ -670,7 +675,6 @@ function Edit(number) {
} }
} }
else if (number=='r'){ else if (number=='r'){
console.log("Edit "+number);
if (editaction=='r' && editnumber!=""){ if (editaction=='r' && editnumber!=""){
$("#poslines").load("invoice.php?action=updatereduction&place="+place+"&idline="+selectedline+"&number="+editnumber, function() { $("#poslines").load("invoice.php?action=updatereduction&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
editnumber=""; editnumber="";
@ -709,6 +713,7 @@ function Edit(number) {
$('#'+selectedline).find("td:first").html(text+editnumber); $('#'+selectedline).find("td:first").html(text+editnumber);
} }
function TakeposPrintingOrder(){ function TakeposPrintingOrder(){
console.log("TakeposPrintingOrder"); console.log("TakeposPrintingOrder");
$("#poslines").load("invoice.php?action=order&place="+place, function() { $("#poslines").load("invoice.php?action=order&place="+place, function() {

7
htdocs/takepos/invoice.php
View File

@ -1241,10 +1241,11 @@ if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
$label = $obj->label; $label = $obj->label;
$floor = $obj->floor; $floor = $obj->floor;
} }
// In phone version only show when is invoice page
if ($mobilepage == "invoice" || $mobilepage == "") { if ($mobilepage == "invoice" || $mobilepage == "") {
print '<span class="opacitymedium">'.$langs->trans('Place')."</span> <b>".$label."</b><br>"; // If not on smartphone version or if it is the invoice page
print '<span class="opacitymedium">'.$langs->trans('Floor')."</span> <b>".$floor."</b>"; //print 'mobilepage='.$mobilepage;
print '<span class="opacitymedium">'.$langs->trans('Place')."</span> <b>".($label ? $label : '?')."</b><br>";
print '<span class="opacitymedium">'.$langs->trans('Floor')."</span> <b>".($floor ? $floor : '?')."</b>";
} elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) { } elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
print $mysoc->name; print $mysoc->name;
} elseif ($mobilepage == "cats") { } elseif ($mobilepage == "cats") {