Bug fixes

invoiceninja · Jul 8, 2018 · f872524 · f872524
1 parent d90223c
commit f872524
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/Ninja/Reports/InvoiceReport.php b/app/Ninja/Reports/InvoiceReport.php
@@ -23,6 +23,7 @@ public function getColumns()
             'due_date' => ['columnSelector-false'],
             'po_number' => ['columnSelector-false'],
             'private_notes' => ['columnSelector-false'],
+            'vat_number' => ['columnSelector-false'],
             'user' => ['columnSelector-false'],
         ];
 
@@ -103,6 +104,7 @@ public function run()
                         $invoice->present()->due_date,
                         $invoice->po_number,
                         $invoice->private_notes,
+                        $client->vat_number,
                         $invoice->user->getDisplayName(),
                     ];
 

diff --git a/resources/views/clients/show.blade.php b/resources/views/clients/show.blade.php
@@ -68,7 +68,7 @@
 
                 @if ($client->trashed())
                     @can('edit', $client)
-                        @if (auth()->user()->is_admin)
+                        @if (auth()->user()->is_admin && $client->is_deleted)
                             {!! Button::danger(trans('texts.purge_client'))
                                     ->appendIcon(Icon::create('warning-sign'))
                                     ->withAttributes(['onclick' => 'onPurgeClick()']) !!}