1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 12:12:48 +01:00

Removed deleted records from system export

This commit is contained in:
Hillel Coren 2015-11-16 14:53:02 +02:00
parent 03a904c4f8
commit 019196c60f
4 changed files with 52 additions and 46 deletions

View File

@ -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

View File

@ -25,31 +25,33 @@
</tr>
@foreach ($invoices as $invoice)
<tr>
<td>{{ $invoice->present()->client }}</td>
@if ($multiUser)
<td>{{ $invoice->present()->user }}</td>
@endif
<td>{{ $invoice->invoice_number }}</td>
<td>{{ $invoice->present()->balance }}</td>
<td>{{ $invoice->present()->amount }}</td>
<td>{{ $invoice->po_number }}</td>
<td>{{ $invoice->present()->status }}</td>
<td>{{ $invoice->present()->invoice_date }}</td>
<td>{{ $invoice->present()->due_date }}</td>
@if ($account->custom_invoice_label1)
<td>{{ $invoice->custom_value1 }}</td>
@endif
@if ($account->custom_invoice_label2)
<td>{{ $invoice->custom_value2 }}</td>
@endif
@if ($account->custom_invoice_label1)
<td>{{ $invoice->custom_text_value1 }}</td>
@endif
@if ($account->custom_invoice_label2)
<td>{{ $invoice->custom_text_value2 }}</td>
@endif
</tr>
@if (!$invoice->client->is_deleted)
<tr>
<td>{{ $invoice->present()->client }}</td>
@if ($multiUser)
<td>{{ $invoice->present()->user }}</td>
@endif
<td>{{ $invoice->invoice_number }}</td>
<td>{{ $invoice->present()->balance }}</td>
<td>{{ $invoice->present()->amount }}</td>
<td>{{ $invoice->po_number }}</td>
<td>{{ $invoice->present()->status }}</td>
<td>{{ $invoice->present()->invoice_date }}</td>
<td>{{ $invoice->present()->due_date }}</td>
@if ($account->custom_invoice_label1)
<td>{{ $invoice->custom_value1 }}</td>
@endif
@if ($account->custom_invoice_label2)
<td>{{ $invoice->custom_value2 }}</td>
@endif
@if ($account->custom_invoice_label1)
<td>{{ $invoice->custom_text_value1 }}</td>
@endif
@if ($account->custom_invoice_label2)
<td>{{ $invoice->custom_text_value2 }}</td>
@endif
</tr>
@endif
@endforeach
<tr><td></td></tr>

View File

@ -11,17 +11,19 @@
</tr>
@foreach ($payments as $payment)
<tr>
<td>{{ $payment->present()->client }}</td>
@if ($multiUser)
<td>{{ $payment->user->getDisplayName() }}</td>
@endif
<td>{{ $payment->invoice->invoice_number }}</td>
<td>{{ $payment->present()->amount }}</td>
<td>{{ $payment->present()->payment_date }}</td>
<td>{{ $payment->present()->method }}</td>
<td>{{ $payment->transaction_reference }}</td>
</tr>
@if (!$payment->client->is_deleted)
<tr>
<td>{{ $payment->present()->client }}</td>
@if ($multiUser)
<td>{{ $payment->user->getDisplayName() }}</td>
@endif
<td>{{ $payment->invoice->invoice_number }}</td>
<td>{{ $payment->present()->amount }}</td>
<td>{{ $payment->present()->payment_date }}</td>
<td>{{ $payment->present()->method }}</td>
<td>{{ $payment->transaction_reference }}</td>
</tr>
@endif
@endforeach
<tr><td></td></tr>

View File

@ -9,15 +9,17 @@
</tr>
@foreach ($tasks as $task)
<tr>
<td>{{ $task->present()->client }}</td>
@if ($multiUser)
<td>{{ $task->present()->user }}</td>
@endif
<td>{{ $task->getStartTime() }}</td>
<td>{{ $task->getDuration() }}</td>
<td>{{ $task->description }}</td>
</tr>
@if (!$task->client || !$task->client->is_deleted)
<tr>
<td>{{ $task->present()->client }}</td>
@if ($multiUser)
<td>{{ $task->present()->user }}</td>
@endif
<td>{{ $task->getStartTime() }}</td>
<td>{{ $task->getDuration() }}</td>
<td>{{ $task->description }}</td>
</tr>
@endif
@endforeach
<tr><td></td></tr>