Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure we do not lose converted variables

This commit is contained in:
David Bomba 2025-02-13 07:15:07 +11:00
parent 719273fa11
commit 005aff7dc9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Livewire/PdfSlot.php
View File

@ -162,8 +162,8 @@ class PdfSlot extends Component
(new VendorHtmlEngine($this->invitation()))->generateLabelsAndValues() : (new VendorHtmlEngine($this->invitation()))->generateLabelsAndValues() :
(new HtmlEngine($this->invitation()))->generateLabelsAndValues(); (new HtmlEngine($this->invitation()))->generateLabelsAndValues();
$this->entity()->terms = $this->entity()->parseHtmlVariables('terms', $this->html_variables); $terms = $this->entity()->parseHtmlVariables('terms', $this->html_variables);
$this->entity()->public_notes = $this->entity()->parseHtmlVariables('public_notes', $this->html_variables); $public_notes = $this->entity()->parseHtmlVariables('public_notes', $this->html_variables);
return render('components.livewire.pdf-slot', [ return render('components.livewire.pdf-slot', [
'invitation' => $this->invitation(), 'invitation' => $this->invitation(),
@ -182,6 +182,8 @@ class PdfSlot extends Component
'entity_details' => $this->getEntityDetails(), 'entity_details' => $this->getEntityDetails(),
'user_details' => $this->getUserDetails(), 'user_details' => $this->getUserDetails(),
'user_name' => $this->getUserName(), 'user_name' => $this->getUserName(),
'terms' => $terms,
'public_notes' => $public_notes,
]); ]);
} }

4
resources/views/portal/ninja2020/components/html-viewer.blade.php
View File

@ -170,7 +170,7 @@ span {
</button> </button>
<div id="notes" class="py-10 border-b-2 border-fuschia-600" x-show="show_notes"> <div id="notes" class="py-10 border-b-2 border-fuschia-600" x-show="show_notes">
{!! html_entity_decode(e($entity->public_notes)) !!} {!! html_entity_decode(e($public_notes)) !!}
</div> </div>
</div> </div>
@ -185,7 +185,7 @@ span {
</button> </button>
<div id="terms" class="py-10 border-b-2 border-fuschia-600" x-show="show_terms"> <div id="terms" class="py-10 border-b-2 border-fuschia-600" x-show="show_terms">
{!! html_entity_decode($entity->terms) !!} {!! html_entity_decode($terms) !!}
</div> </div>
</div> </div>