Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 05:17:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6376 from beganovich/v5-610

Browse Source 
(v5) Process markdown on global level instead of line items
This commit is contained in:
Benjamin Beganović 2021-08-03 11:59:44 +02:00 committed by GitHub
commit ec518b23e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,7 +347,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 [];

9
app/Services/PdfMaker/PdfMaker.php
View File

@ -12,6 +12,8 @@
namespace App\Services\PdfMaker; namespace App\Services\PdfMaker;
use League\CommonMark\CommonMarkConverter;
class PdfMaker class PdfMaker
{ {
use PdfMakerUtilities; use PdfMakerUtilities;
@ -36,6 +38,9 @@ class PdfMaker
private $options; private $options;
/** @var CommonMarkConverter */
protected $commonmark;
public function __construct(array $data) public function __construct(array $data)
{ {
$this->data = $data; $this->data = $data;
@ -43,6 +48,10 @@ class PdfMaker
if (array_key_exists('options', $data)) { if (array_key_exists('options', $data)) {
$this->options = $data['options']; $this->options = $data['options'];
} }
$this->commonmark = new CommonMarkConverter([
'allow_unsafe_links' => false,
]);
} }
public function design(Design $design) public function design(Design $design)

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

@ -91,6 +91,10 @@ trait PdfMakerUtilities
foreach ($children as $child) { foreach ($children as $child) {
$contains_html = false; $contains_html = false;
if ($child['element'] !== 'script') {
$child['content'] = $this->commonmark->convertToHtml($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) {
continue; continue;