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

Fix for custom fields in invoice templates

Browse Source
This commit is contained in:
Hillel Coren 2017-01-31 14:28:51 +02:00
parent 4739cc04c3
commit 7e7ee1d749
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Services/TemplateService.php
View File

@ -58,10 +58,10 @@ class TemplateService
'$viewButton' => Form::emailViewButton($invitation->getLink(), $invoice->getEntityType()).'$password', '$viewButton' => Form::emailViewButton($invitation->getLink(), $invoice->getEntityType()).'$password',
'$paymentLink' => $invitation->getLink('payment').'$password', '$paymentLink' => $invitation->getLink('payment').'$password',
'$paymentButton' => Form::emailPaymentButton($invitation->getLink('payment')).'$password', '$paymentButton' => Form::emailPaymentButton($invitation->getLink('payment')).'$password',
'$customClient1' => $account->custom_client_label1, '$customClient1' => $client->custom_value1,
'$customClient2' => $account->custom_client_label2, '$customClient2' => $client->custom_value2,
'$customInvoice1' => $account->custom_invoice_text_label1, '$customInvoice1' => $invoice->custom_text_value1,
'$customInvoice2' => $account->custom_invoice_text_label2, '$customInvoice2' => $invoice->custom_text_value2,
'$documents' => $documentsHTML, '$documents' => $documentsHTML,
'$autoBill' => empty($data['autobill'])?'':$data['autobill'], '$autoBill' => empty($data['autobill'])?'':$data['autobill'],
'$portalLink' => $invitation->contact->link, '$portalLink' => $invitation->contact->link,

2
resources/views/accounts/templates_and_reminders.blade.php
View File

@ -148,7 +148,7 @@
<li>$customInvoice1</li> <li>$customInvoice1</li>
@endif @endif
@if ($account->custom_invoice_text_label2) @if ($account->custom_invoice_text_label2)
<li>$customInvoice1</li> <li>$customInvoice2</li>
@endif @endif
@if (count($account->account_gateways) > 0) @if (count($account->account_gateways) > 0)
@foreach (\App\Models\Gateway::$gatewayTypes as $type) @foreach (\App\Models\Gateway::$gatewayTypes as $type)