Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2018-07-08 16:38:45 +03:00
parent d90223cb3e
commit f872524419
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Ninja/Reports/InvoiceReport.php
View File

@ -23,6 +23,7 @@ class InvoiceReport extends AbstractReport
'due_date' => ['columnSelector-false'], 'due_date' => ['columnSelector-false'],
'po_number' => ['columnSelector-false'], 'po_number' => ['columnSelector-false'],
'private_notes' => ['columnSelector-false'], 'private_notes' => ['columnSelector-false'],
'vat_number' => ['columnSelector-false'],
'user' => ['columnSelector-false'], 'user' => ['columnSelector-false'],
]; ];
@ -103,6 +104,7 @@ class InvoiceReport extends AbstractReport
$invoice->present()->due_date, $invoice->present()->due_date,
$invoice->po_number, $invoice->po_number,
$invoice->private_notes, $invoice->private_notes,
$client->vat_number,
$invoice->user->getDisplayName(), $invoice->user->getDisplayName(),
]; ];

2
resources/views/clients/show.blade.php
View File

@ -68,7 +68,7 @@
@if ($client->trashed()) @if ($client->trashed())
@can('edit', $client) @can('edit', $client)
@if (auth()->user()->is_admin) @if (auth()->user()->is_admin && $client->is_deleted)
{!! Button::danger(trans('texts.purge_client')) {!! Button::danger(trans('texts.purge_client'))
->appendIcon(Icon::create('warning-sign')) ->appendIcon(Icon::create('warning-sign'))
->withAttributes(['onclick' => 'onPurgeClick()']) !!} ->withAttributes(['onclick' => 'onPurgeClick()']) !!}