Merge remote-tracking branch 'upstream/master'

readme.md

@@ -11,7 +11,7 @@ If you'd like to use our code to sell your own invoicing app email us for detail
 
 ### Installation Options
 * [Self-Host Zip](https://www.invoiceninja.com/knowledgebase/self-host/) - Free
-* [Docker File](https://github.com/lalop/invoice-ninja-docker/blob/master/Dockerfile) - Free
+* [Docker File](https://github.com/invoiceninja/dockerfiles) - Free
 * [Bitnami](https://bitnami.com/stack/invoice-ninja) - Free
 * [Softaculous](https://www.softaculous.com/apps/ecommerce/Invoice_Ninja) - $30
 

resources/views/export/invoices.blade.php

@@ -25,6 +25,7 @@
 </tr>
 
 @foreach ($invoices as $invoice)
+    @if (!$invoice->client->is_deleted)
         <tr>
             <td>{{ $invoice->present()->client }}</td>
             @if ($multiUser)
@@ -50,6 +51,7 @@
                 <td>{{ $invoice->custom_text_value2 }}</td>
             @endif
         </tr>
+    @endif
 @endforeach
 
 <tr><td></td></tr>

resources/views/export/payments.blade.php

@@ -11,6 +11,7 @@
 </tr>
 
 @foreach ($payments as $payment)
+    @if (!$payment->client->is_deleted)
         <tr>
             <td>{{ $payment->present()->client }}</td>
             @if ($multiUser)
@@ -22,6 +23,7 @@
             <td>{{ $payment->present()->method }}</td>
             <td>{{ $payment->transaction_reference }}</td>
         </tr>
+    @endif
 @endforeach
 
 <tr><td></td></tr>

resources/views/export/tasks.blade.php

@@ -9,6 +9,7 @@
 </tr>
 
 @foreach ($tasks as $task)
+    @if (!$task->client || !$task->client->is_deleted)
         <tr>
             <td>{{ $task->present()->client }}</td>
             @if ($multiUser)
@@ -18,6 +19,7 @@
             <td>{{ $task->getDuration() }}</td>
             <td>{{ $task->description }}</td>
         </tr>
+    @endif
 @endforeach
 
 <tr><td></td></tr>