Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6436 from beganovich/v5-markdown-spacing

Browse Source 
(v5) Fixes for markdown spacing
This commit is contained in:
Benjamin Beganović 2021-08-09 16:49:53 +02:00 committed by GitHub
commit ad7440bc84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/PdfMaker/Design.php
View File

@ -348,6 +348,8 @@ class Design extends BaseDesign
$items = $this->transformLineItems($this->entity->line_items, $type); $items = $this->transformLineItems($this->entity->line_items, $type);
$this->processNewLines($items);
if (count($items) == 0) { if (count($items) == 0) {
return []; return [];
} }

13
app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
View File

@ -331,7 +331,7 @@ document.addEventListener('DOMContentLoaded', function() {
return $converter->convertToHtml($markdown); return $converter->convertToHtml($markdown);
} }
public function processMarkdownOnLineItems(array &$items) public function processMarkdownOnLineItems(array &$items): void
{ {
foreach ($items as $key => $item) { foreach ($items as $key => $item) {
foreach ($item as $variable => $value) { foreach ($item as $variable => $value) {
@ -341,4 +341,15 @@ document.addEventListener('DOMContentLoaded', function() {
$items[$key] = $item; $items[$key] = $item;
} }
} }
public function processNewLines(array &$items): void
{
foreach ($items as $key => $item) {
foreach ($item as $variable => $value) {
$item[$variable] = nl2br($value);
}
$items[$key] = $item;
}
}
} }

2
app/Services/PdfMaker/PdfMakerUtilities.php
View File

@ -94,8 +94,6 @@ trait PdfMakerUtilities
if ($child['element'] !== 'script') { if ($child['element'] !== 'script') {
if (array_key_exists('process_markdown', $this->data) && $this->data['process_markdown']) { if (array_key_exists('process_markdown', $this->data) && $this->data['process_markdown']) {
$child['content'] = $this->commonmark->convertToHtml($child['content'] ?? ''); $child['content'] = $this->commonmark->convertToHtml($child['content'] ?? '');
} else {
$child['content'] = array_key_exists('content', $child) ? nl2br($child['content']) : '';
} }
} }