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

Merge pull request #19521 from altairis-melina/displaysku

Browse Source 
NEW : Show product reference in Takepos
This commit is contained in:
Laurent Destailleur 2022-01-19 02:32:51 +01:00 committed by GitHub
commit 49f0e2f765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/takepos/index.php
View File

@ -335,7 +335,11 @@ function LoadProducts(position, issubcat) {
var titlestring = <?php echo $titlestring; ?>; var titlestring = <?php echo $titlestring; ?>;
<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) { <?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
echo '$("#prodivdesc"+ishow).show();'; echo '$("#prodivdesc"+ishow).show();';
echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);'; if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) {
echo '$("#prodesc"+ishow).html(data[parseInt(idata)][\'ref\'].bold() + \' - \' + data[parseInt(idata)][\'label\']);';
} else {
echo '$("#prodesc"+ishow).text(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 {
@ -401,7 +405,12 @@ function MoreProducts(moreorless) {
else if ((data[idata]['status']) == "1") { else if ((data[idata]['status']) == "1") {
//Only show products with status=1 (for sell) //Only show products with status=1 (for sell)
$("#prodivdesc"+ishow).show(); $("#prodivdesc"+ishow).show();
$("#prodesc"+ishow).text(data[parseInt(idata)]['label']); <?php
if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { ?>
$("#prodesc"+ishow).html(data[parseInt(idata)]['ref'].bold() + ' - ' + data[parseInt(idata)]['label']);
<?php } else { ?>
$("#prodesc"+ishow).text(data[parseInt(idata)]['label']);
<?php } ?>
$("#probutton"+ishow).text(data[parseInt(idata)]['label']); $("#probutton"+ishow).text(data[parseInt(idata)]['label']);
$("#probutton"+ishow).show(); $("#probutton"+ishow).show();
if (data[parseInt(idata)]['price_formated']) { if (data[parseInt(idata)]['price_formated']) {
@ -579,7 +588,12 @@ function Search2(keyCodeForEnter) {
$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[i]['barcode']"; $titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[i]['barcode']";
?> ?>
var titlestring = <?php echo $titlestring; ?>; var titlestring = <?php echo $titlestring; ?>;
$("#prodesc" + i).text(data[i]['label']); <?php
if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { ?>
$("#prodesc" + i).html(data[i]['ref'].bold() + ' - ' + data[i]['label']);
<?php } else { ?>
$("#prodesc" + i).text(data[i]['label']);
<?php } ?>
$("#prodivdesc" + i).show(); $("#prodivdesc" + i).show();
$("#probutton" + i).text(data[i]['label']); $("#probutton" + i).text(data[i]['label']);
$("#probutton" + i).show(); $("#probutton" + i).show();

6
htdocs/takepos/invoice.php
View File

@ -1473,7 +1473,11 @@ if ($placeid > 0) {
$tooltiptext .= $line->desc; $tooltiptext .= $line->desc;
} }
} }
$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext); if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) {
$htmlforlines .= $form->textwithpicto($line->product_label ? '<b>' . $line->product_ref . '</b> - ' . $line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
} else {
$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
}
} else { } else {
if ($line->product_label) { if ($line->product_label) {
$htmlforlines .= $line->product_label; $htmlforlines .= $line->product_label;