jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

prevent whitespace on line endings in created docx invoices (#2756)

Browse Source
This commit is contained in:
Input-BDF
2021-09-24 15:02:01 +02:00
committed by GitHub
parent 204e0bc179
commit dd881bb856
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Invoice/Renderer/DocxRenderer.php
View File

@@ -35,7 +35,7 @@ final class DocxRenderer extends AbstractRenderer implements RendererInterface
foreach ($model->toArray() as $search => $replace) { foreach ($model->toArray() as $search => $replace) {
$replace = $xmlEscaper->escape($replace); $replace = $xmlEscaper->escape($replace);
$replace = str_replace(PHP_EOL, '</w:t><w:br /><w:t xml:space="preserve">', $replace); $replace = preg_replace('/\n|\r\n?/', '</w:t><w:br /><w:t xml:space="preserve">', $replace);
$template->setValue($search, $replace); $template->setValue($search, $replace);
} }
@@ -57,7 +57,7 @@ final class DocxRenderer extends AbstractRenderer implements RendererInterface
$values = $model->itemToArray($entry); $values = $model->itemToArray($entry);
foreach ($values as $search => $replace) { foreach ($values as $search => $replace) {
$replace = $xmlEscaper->escape($replace); $replace = $xmlEscaper->escape($replace);
$replace = str_replace(PHP_EOL, '</w:t><w:br /><w:t xml:space="preserve">', $replace); $replace = preg_replace('/\n|\r\n?/', '</w:t><w:br /><w:t xml:space="preserve">', $replace);
$template->setValue($search . '#' . $i, $replace); $template->setValue($search . '#' . $i, $replace);
} }