Browse Source

Fix dark mode for TakePOS. Clean log

Laurent Destailleur 1 year ago
parent
commit
400e831d82
3 changed files with 11 additions and 5 deletions
  1. 2 1
      htdocs/takepos/css/pos.css.php
  2. 8 3
      htdocs/takepos/index.php
  3. 1 1
      htdocs/theme/eldy/global.inc.php

+ 2 - 1
htdocs/takepos/css/pos.css.php

@@ -80,7 +80,7 @@ html,body {
 }
 
 .bodytakepos {
-	background-color: #EEE;
+	background-color: var(--colorbackgrey);
 }
 
 .center {
@@ -184,6 +184,7 @@ button.productbutton {
 
 button.actionbutton {
 	background: #EABCA6;
+	color: #222;
 	border: 2px solid #EEE;
 	min-height: 40px;
 	border-radius: 3px;

+ 8 - 3
htdocs/takepos/index.php

@@ -349,9 +349,11 @@ function LoadProducts(position, issubcat) {
 	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&token=<?php echo newToken();?>&thirdpartyid=' + jQuery('#thirdpartyid').val() + '&category='+currentcat+'&tosell=1&limit='+limit+'&offset=0', function(data) {
 		console.log("Call ajax.php (in LoadProducts) to get Products of category "+currentcat+" then loop on result to fill image thumbs");
 		console.log(data);
+
 		while (ishow < maxproduct) {
-			//console.log("ishow"+ishow+" idata="+idata);
-			console.log(data[idata]);
+			console.log("ishow"+ishow+" idata="+idata);
+			//console.log(data[idata]);
+
 			if (typeof (data[idata]) == "undefined") {
 				<?php if (!getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) {
 					echo '$("#prodivdesc"+ishow).hide();';
@@ -364,8 +366,10 @@ function LoadProducts(position, issubcat) {
 				}?>
 				$("#proprice"+ishow).attr("class", "hidden");
 				$("#proprice"+ishow).html("");
+
 				$("#prodiv"+ishow).data("rowid","");
 				$("#prodiv"+ishow).attr("data-rowid","");
+
 				$("#prodiv"+ishow).attr("class","wrapper2 divempty");
 			} else  {
 				<?php
@@ -404,13 +408,14 @@ function LoadProducts(position, issubcat) {
 					?>
 				}
 				console.log("#prodiv"+ishow+".data(rowid)="+data[idata]['id']);
-				console.log($("#prodiv"+ishow));
 
 				$("#prodiv"+ishow).data("rowid", data[idata]['id']);
 				$("#prodiv"+ishow).attr("data-rowid", data[idata]['id']);
 				console.log($('#prodiv4').data('rowid'));
+
 				$("#prodiv"+ishow).data("iscat", 0);
 				$("#prodiv"+ishow).attr("data-iscat", 0);
+
 				$("#prodiv"+ishow).attr("class","wrapper2");
 
 				<?php

+ 1 - 1
htdocs/theme/eldy/global.inc.php

@@ -2184,7 +2184,7 @@ div.vmenu, td.vmenu {
 
 	.menuhider { display: block !important; }
 	.dropdown-user-image { display: none; }
-	.user-header { height: auto !important; color: var(--colorbackbody); }
+	.user-header { height: auto !important; color: var(--colortextbackhmenu); }
 
 	#id-container {
 		width: 100%;