Browse Source

CSS Makes clear you have to click OK.

Laurent Destailleur 3 years ago
parent
commit
ec52502089
2 changed files with 31 additions and 28 deletions
  1. 3 1
      htdocs/takepos/css/pos.css.php
  2. 28 27
      htdocs/takepos/index.php

+ 3 - 1
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;
 }

+ 28 - 27
htdocs/takepos/index.php

@@ -205,6 +205,9 @@ if(localStorage.hasKeyboard) {
 function ClearSearch() {
 	console.log("ClearSearch");
 	$("#search").val('');
+	$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
+	$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
+	$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
 	<?php if ($conf->browser->layout == 'classic') { ?>
 	setFocusOnSearchField();
 	<?php } ?>
@@ -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+"<br> ";
 
 
-	if (number=='c'){
-		editnumber="";
+	if (number=='c') {
+		editnumber='';
 		Refresh();
-		$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
-		$("#price").html("<?php echo $langs->trans("Price"); ?>");
-		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+		$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
+		$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
+		$("#reduction").html("<?php echo $langs->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("<?php echo $langs->trans("Qty"); ?>");
+				$("#qty").html("<?php echo $langs->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("<?php echo $langs->trans("Price"); ?>");
+				$("#price").html("<?php echo $langs->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("<?php echo $langs->trans("ReductionShort"); ?>");
+				$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
 			});
 
 			ClearSearch();
@@ -788,21 +789,21 @@ function Edit(number) {
 	}
 	if (editaction=='qty'){
 		text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("Qty").": "; ?>";
-		$("#qty").html("OK");
-		$("#price").html("<?php echo $langs->trans("Price"); ?>");
-		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+		$("#qty").html("OK").addClass("clicked");
+		$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
+		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
 	}
 	if (editaction=='p'){
 		text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("Price").": "; ?>";
-		$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
-		$("#price").html("OK");
-		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+		$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
+		$("#price").html("OK").addClass("clicked");
+		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
 	}
 	if (editaction=='r'){
 		text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("ReductionShort").": "; ?>";
-		$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
-		$("#price").html("<?php echo $langs->trans("Price"); ?>");
-		$("#reduction").html("OK");
+		$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
+		$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
+		$("#reduction").html("OK").addClass("clicked");
 	}
 	$('#'+selectedline).find("td:first").html(text+editnumber);
 }