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

Merge pull request #20687 from fred1201/fred01dev

Browse Source 
Fix display in take post  when special caracter are store in database
This commit is contained in:
Laurent Destailleur 2022-04-29 18:02:49 +02:00 committed by GitHub
commit d00a4baeab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/takepos/index.php
View File

@ -232,7 +232,7 @@ function PrintCategories(first) {
continue; continue;
} }
$("#catdivdesc"+i).show(); $("#catdivdesc"+i).show();
$("#catdesc"+i).text(categories[parseInt(i)+parseInt(first)]['label']); $("#catdesc"+i).html(categories[parseInt(i)+parseInt(first)]['label']);
$("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[parseInt(i)+parseInt(first)]['rowid']); $("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[parseInt(i)+parseInt(first)]['rowid']);
$("#catdiv"+i).data("rowid",categories[parseInt(i)+parseInt(first)]['rowid']); $("#catdiv"+i).data("rowid",categories[parseInt(i)+parseInt(first)]['rowid']);
$("#catdiv"+i).attr('class', 'wrapper'); $("#catdiv"+i).attr('class', 'wrapper');
@ -266,7 +266,7 @@ function MoreCategories(moreorless) {
continue; continue;
} }
$("#catdivdesc"+i).show(); $("#catdivdesc"+i).show();
$("#catdesc"+i).text(categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['label']); $("#catdesc"+i).html(categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['label']);
$("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']); $("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
$("#catdiv"+i).data("rowid",categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']); $("#catdiv"+i).data("rowid",categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
$("#catwatermark"+i).show(); $("#catwatermark"+i).show();
@ -295,8 +295,8 @@ function LoadProducts(position, issubcat) {
jQuery.each(subcategories, function(i, val) { jQuery.each(subcategories, function(i, val) {
if (currentcat==val.fk_parent) { if (currentcat==val.fk_parent) {
$("#prodivdesc"+ishow).show(); $("#prodivdesc"+ishow).show();
$("#prodesc"+ishow).text(val.label); $("#prodesc"+ishow).html(val.label);
$("#probutton"+ishow).text(val.label); $("#probutton"+ishow).html(val.label);
$("#probutton"+ishow).show(); $("#probutton"+ishow).show();
$("#proprice"+ishow).attr("class", "hidden"); $("#proprice"+ishow).attr("class", "hidden");
$("#proprice"+ishow).html(""); $("#proprice"+ishow).html("");
@ -343,13 +343,13 @@ function LoadProducts(position, issubcat) {
if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) { if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) {
echo '$("#prodesc"+ishow).html(data[parseInt(idata)][\'ref\'].bold() + \' - \' + data[parseInt(idata)][\'label\']);'; echo '$("#prodesc"+ishow).html(data[parseInt(idata)][\'ref\'].bold() + \' - \' + data[parseInt(idata)][\'label\']);';
} else { } else {
echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);'; echo '$("#prodesc"+ishow).html(data[parseInt(idata)][\'label\']);';
} }
echo '$("#proimg"+ishow).attr("title", titlestring);'; echo '$("#proimg"+ishow).attr("title", titlestring);';
echo '$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata][\'id\']);'; echo '$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata][\'id\']);';
} else { } else {
echo '$("#probutton"+ishow).show();'; echo '$("#probutton"+ishow).show();';
echo '$("#probutton"+ishow).text(data[parseInt(idata)][\'label\']);'; echo '$("#probutton"+ishow).html(data[parseInt(idata)][\'label\']);';
} }
?> ?>
if (data[parseInt(idata)]['price_formated']) { if (data[parseInt(idata)]['price_formated']) {
@ -417,9 +417,9 @@ function MoreProducts(moreorless) {
if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) { ?> if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) { ?>
$("#prodesc"+ishow).html(data[parseInt(idata)]['ref'].bold() + ' - ' + data[parseInt(idata)]['label']); $("#prodesc"+ishow).html(data[parseInt(idata)]['ref'].bold() + ' - ' + data[parseInt(idata)]['label']);
<?php } else { ?> <?php } else { ?>
$("#prodesc"+ishow).text(data[parseInt(idata)]['label']); $("#prodesc"+ishow).html(data[parseInt(idata)]['label']);
<?php } ?> <?php } ?>
$("#probutton"+ishow).text(data[parseInt(idata)]['label']); $("#probutton"+ishow).html(data[parseInt(idata)]['label']);
$("#probutton"+ishow).show(); $("#probutton"+ishow).show();
if (data[parseInt(idata)]['price_formated']) { if (data[parseInt(idata)]['price_formated']) {
$("#proprice"+ishow).attr("class", "productprice"); $("#proprice"+ishow).attr("class", "productprice");
@ -609,10 +609,10 @@ function Search2(keyCodeForEnter, moreorless) {
if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) { ?> if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) { ?>
$("#prodesc" + i).html(data[i]['ref'].bold() + ' - ' + data[i]['label']); $("#prodesc" + i).html(data[i]['ref'].bold() + ' - ' + data[i]['label']);
<?php } else { ?> <?php } else { ?>
$("#prodesc" + i).text(data[i]['label']); $("#prodesc" + i).html(data[i]['label']);
<?php } ?> <?php } ?>
$("#prodivdesc" + i).show(); $("#prodivdesc" + i).show();
$("#probutton" + i).text(data[i]['label']); $("#probutton" + i).html(data[i]['label']);
$("#probutton" + i).show(); $("#probutton" + i).show();
if (data[i]['price_formated']) { if (data[i]['price_formated']) {
$("#proprice" + i).attr("class", "productprice"); $("#proprice" + i).attr("class", "productprice");