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

Merge pull request #6384 from beganovich/v5-revert-pdf-spacing

Browse Source 
Revert markdown changes
This commit is contained in:
Benjamin Beganović 2021-08-04 11:50:47 +02:00 committed by GitHub
commit 3ca8b88f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -95,7 +95,7 @@ trait PdfMakerUtilities
$child['content'] = $this->commonmark->convertToHtml($child['content'] ?? ''); $child['content'] = $this->commonmark->convertToHtml($child['content'] ?? '');
} }
$child['content'] = array_key_exists('content', $child) ? nl2br($child['content']) : ''; // $child['content'] = array_key_exists('content', $child) ? nl2br($child['content']) : '';
if (isset($child['content'])) { if (isset($child['content'])) {
if (isset($child['is_empty']) && $child['is_empty'] === true) { if (isset($child['is_empty']) && $child['is_empty'] === true) {