From 54e3f2932d0a5253dd00419ae2ed0989efe8b37d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Mar 2025 23:34:14 +0100 Subject: [PATCH 1/2] Fix function name --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 36a5efd1ff0..c7c517a5d2f 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -12577,7 +12577,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = ' // TODO: add hook // escape all attribute - $attr = array_map('dolPrintHtmlForAttribute', $attr); + $attr = array_map('dolPrintHTMLForAttribute', $attr); $TCompiledAttr = array(); foreach ($attr as $key => $value) { From dad235f6d909e81a5d0585e8e40680307ce6fd45 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Mar 2025 02:39:21 +0100 Subject: [PATCH 2/2] Fix POS has some product unvisible when using smartphone --- htdocs/takepos/index.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index f3a7faf2532..eae73b45091 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -309,7 +309,7 @@ function MoreCategories(moreorless) { // LoadProducts function LoadProducts(position, issubcat) { console.log("LoadProducts position="+position+" issubcat="+issubcat); - var maxproduct = ; + var maxproduct = ; if (position=="supplements") { currentcat="supplements"; @@ -346,8 +346,9 @@ function LoadProducts(position, issubcat) { $("#proimg"+ishow).attr("src","genimg/index.php?query=cat&id="+val.rowid); $("#prodiv"+ishow).data("rowid",val.rowid); $("#prodiv"+ishow).attr("data-rowid",val.rowid); - $("#prodiv"+ishow).data("iscat",1); - $("#prodiv"+ishow).attr("data-iscat",1); + $("#prodiv"+ishow).data("iscat", 1); + $("#prodiv"+ishow).attr("data-iscat", 1); + $("#prodiv"+ishow).removeClass("divempty"); $("#prowatermark"+ishow).show(); ishow++; } @@ -356,7 +357,7 @@ function LoadProducts(position, issubcat) { idata=0; //product data counter var limit = 0; if (maxproduct >= 1) { - limit = maxproduct-1; + limit = maxproduct - 1; } // Only show products for sale (tosell=1) $.getJSON('/takepos/ajax/ajax.php?action=getProducts&token=&thirdpartyid=' + jQuery('#thirdpartyid').val() + '&category='+currentcat+'&tosell=1&limit='+limit+'&offset=0', function(data) { @@ -383,6 +384,9 @@ function LoadProducts(position, issubcat) { $("#prodiv"+ishow).data("rowid",""); $("#prodiv"+ishow).attr("data-rowid",""); + $("#prodiv"+ishow).data("iscat","0"); + $("#prodiv"+ishow).attr("data-iscat","0"); + $("#prodiv"+ishow).attr("class","wrapper2 divempty"); } else { "> + print '
onclick="MoreProducts('less')"