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

Merge export fix w/custom fields

Browse Source
This commit is contained in:
Hillel Coren 2018-01-17 13:36:35 +02:00
parent 270ba42493
commit f5363cd012
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/export/invoices.blade.php
View File

@ -77,10 +77,10 @@
@if ($account->custom_invoice_label2)
<td>{{ $invoice->custom_value2 }}</td>
@endif
@if ($account->custom_invoice_label1)
@if ($account->custom_invoice_text_label1)
<td>{{ $invoice->custom_text_value1 }}</td>
@endif
@if ($account->custom_invoice_label2)
@if ($account->custom_invoice_text_label2)
<td>{{ $invoice->custom_text_value2 }}</td>
@endif
<td>{{ $item->product_key }}</td>

4
resources/views/export/recurring_invoices.blade.php
View File

@ -61,10 +61,10 @@
@if ($account->custom_invoice_label2)
<td>{{ $invoice->custom_value2 }}</td>
@endif
@if ($account->custom_invoice_label1)
@if ($account->custom_invoice_text_label1)
<td>{{ $invoice->custom_text_value1 }}</td>
@endif
@if ($account->custom_invoice_label2)
@if ($account->custom_invoice_text_label2)
<td>{{ $invoice->custom_text_value2 }}</td>
@endif
<td>{{ $item->product_key }}</td>