From f872524419463342bcce6a0d13344af8ec836810 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 8 Jul 2018 16:38:45 +0300 Subject: [PATCH] Bug fixes --- app/Ninja/Reports/InvoiceReport.php | 2 ++ resources/views/clients/show.blade.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Ninja/Reports/InvoiceReport.php b/app/Ninja/Reports/InvoiceReport.php index 9c192be544ed..53d1052be0be 100644 --- a/app/Ninja/Reports/InvoiceReport.php +++ b/app/Ninja/Reports/InvoiceReport.php @@ -23,6 +23,7 @@ class InvoiceReport extends AbstractReport 'due_date' => ['columnSelector-false'], 'po_number' => ['columnSelector-false'], 'private_notes' => ['columnSelector-false'], + 'vat_number' => ['columnSelector-false'], 'user' => ['columnSelector-false'], ]; @@ -103,6 +104,7 @@ class InvoiceReport extends AbstractReport $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 index d748ef5cc449..dbeca1dfdfd9 100644 --- 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()']) !!}