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

Fix expense include documents

Browse Source
This commit is contained in:
Hillel Coren 2017-07-21 13:47:26 +03:00
parent a466338f87
commit c9070aadb0
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ninja/Mailers/ContactMailer.php
View File

@ -71,8 +71,10 @@ class ContactMailer extends Mailer
$documents = $invoice->documents; $documents = $invoice->documents;
foreach ($invoice->expenses as $expense) { foreach ($invoice->expenses as $expense) {
if ($expense->invoice_documents) {
$documents = $documents->merge($expense->documents); $documents = $documents->merge($expense->documents);
} }
}
$documents = $documents->sortBy('size'); $documents = $documents->sortBy('size');

2
app/Services/TemplateService.php
View File

@ -38,10 +38,12 @@ class TemplateService
$documentsHTML .= '<li><a href="'.HTML::entities($document->getClientUrl($invitation)).'">'.HTML::entities($document->name).'</a></li>'; $documentsHTML .= '<li><a href="'.HTML::entities($document->getClientUrl($invitation)).'">'.HTML::entities($document->name).'</a></li>';
} }
foreach ($invoice->expenses as $expense) { foreach ($invoice->expenses as $expense) {
if ($expense->invoice_documents) {
foreach ($expense->documents as $document) { foreach ($expense->documents as $document) {
$documentsHTML .= '<li><a href="'.HTML::entities($document->getClientUrl($invitation)).'">'.HTML::entities($document->name).'</a></li>'; $documentsHTML .= '<li><a href="'.HTML::entities($document->getClientUrl($invitation)).'">'.HTML::entities($document->name).'</a></li>';
} }
} }
}
$documentsHTML .= '</ul>'; $documentsHTML .= '</ul>';
} }

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

@ -155,11 +155,11 @@
<li><a target="_blank" href="{{ $document->getClientUrl($invitation) }}">{{$document->name}} ({{Form::human_filesize($document->size)}})</a></li> <li><a target="_blank" href="{{ $document->getClientUrl($invitation) }}">{{$document->name}} ({{Form::human_filesize($document->size)}})</a></li>
@endforeach @endforeach
@foreach ($invoice->expenses as $expense) @foreach ($invoice->expenses as $expense)
@foreach ($expense->documents as $document)
@if ($expense->invoice_documents) @if ($expense->invoice_documents)
@foreach ($expense->documents as $document)
<li><a target="_blank" href="{{ $document->getClientUrl($invitation) }}">{{$document->name}} ({{Form::human_filesize($document->size)}})</a></li> <li><a target="_blank" href="{{ $document->getClientUrl($invitation) }}">{{$document->name}} ({{Form::human_filesize($document->size)}})</a></li>
@endif
@endforeach @endforeach
@endif
@endforeach @endforeach
</ul> </ul>
</div> </div>