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

Option to show the n first line of desc into the basket

Browse Source
This commit is contained in:
Laurent Destailleur 2020-03-11 23:56:48 +01:00
parent efeda2e747
commit 54da1e73ff
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/takepos/invoice.php
View File

@ -845,11 +845,18 @@ if ($placeid > 0)
if (empty($line->product_type)) $htmlforlines .= img_object('', 'product').' '; if (empty($line->product_type)) $htmlforlines .= img_object('', 'product').' ';
else $htmlforlines .= img_object('', 'service').' '; else $htmlforlines .= img_object('', 'service').' ';
} }
if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) {
$tooltiptext = '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';
$tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>';
$tooltiptext .= '<br>';
$tooltiptext .= $line->desc;
$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : $line->product_ref, $tooltiptext);
} else {
if ($line->product_label) $htmlforlines .= $line->product_label; if ($line->product_label) $htmlforlines .= $line->product_label;
if ($line->product_label && $line->desc) $htmlforlines .= '<br>'; if ($line->product_label && $line->desc) $htmlforlines .= '<br>';
if ($line->product_label != $line->desc) if ($line->product_label != $line->desc)
{ {
$firstline = dolGetFirstLineOfText($line->desc); $firstline = dolGetFirstLineOfText($line->desc, $conf->global->TAKEPOS_SHOW_N_FIRST_LINES);
if ($firstline != $line->desc) if ($firstline != $line->desc)
{ {
$htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc); $htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
@ -859,6 +866,7 @@ if ($placeid > 0)
$htmlforlines .= $line->desc; $htmlforlines .= $line->desc;
} }
} }
}
if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")"; if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";
if ($_SESSION["basiclayout"] != 1) if ($_SESSION["basiclayout"] != 1)
{ {