From c9070aadb060e6ff5686c88938b28472b9125627 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 21 Jul 2017 13:47:26 +0300
Subject: [PATCH] Fix expense include documents

---
 app/Ninja/Mailers/ContactMailer.php     |  4 +++-
 app/Services/TemplateService.php        |  6 ++++--
 resources/views/invoices/view.blade.php | 10 +++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index 9c3b15d861fa..a9803550ebfe 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -71,7 +71,9 @@ class ContactMailer extends Mailer
             $documents = $invoice->documents;
 
             foreach ($invoice->expenses as $expense) {
-                $documents = $documents->merge($expense->documents);
+                if ($expense->invoice_documents) {
+                    $documents = $documents->merge($expense->documents);
+                }
             }
 
             $documents = $documents->sortBy('size');
diff --git a/app/Services/TemplateService.php b/app/Services/TemplateService.php
index 6d778b79aa23..6d9b1a66c8b2 100644
--- a/app/Services/TemplateService.php
+++ b/app/Services/TemplateService.php
@@ -38,8 +38,10 @@ class TemplateService
                 $documentsHTML .= '<li><a href="'.HTML::entities($document->getClientUrl($invitation)).'">'.HTML::entities($document->name).'</a></li>';
             }
             foreach ($invoice->expenses as $expense) {
-                foreach ($expense->documents as $document) {
-                    $documentsHTML .= '<li><a href="'.HTML::entities($document->getClientUrl($invitation)).'">'.HTML::entities($document->name).'</a></li>';
+                if ($expense->invoice_documents) {
+                    foreach ($expense->documents as $document) {
+                        $documentsHTML .= '<li><a href="'.HTML::entities($document->getClientUrl($invitation)).'">'.HTML::entities($document->name).'</a></li>';
+                    }
                 }
             }
             $documentsHTML .= '</ul>';
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index f2633f66df47..41997b451704 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -154,12 +154,12 @@
             @foreach ($invoice->documents as $document)
                 <li><a target="_blank" href="{{ $document->getClientUrl($invitation) }}">{{$document->name}} ({{Form::human_filesize($document->size)}})</a></li>
             @endforeach
-            @foreach ($invoice->expenses as $expense)
-                @foreach ($expense->documents as $document)
-					@if ($expense->invoice_documents)
+			@foreach ($invoice->expenses as $expense)
+				@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>
-					@endif
-                @endforeach
+                	@endforeach
+				@endif
             @endforeach
             </ul>
             </div>