From ba68682cedc010fdcb8b59c2df80084ae31b8c72 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 3 May 2023 09:59:53 +1000 Subject: [PATCH] Fixes for portal - hide deleted invoice from payment view --- app/Http/Controllers/ClientPortal/InvoiceController.php | 2 +- resources/views/portal/ninja2020/payments/show.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index 351d23f36fb4..838bf1dd1b09 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -60,7 +60,7 @@ class InvoiceController extends Controller $invitation->markViewed(); event(new InvitationWasViewed($invoice, $invitation, $invoice->company, Ninja::eventVars())); - event(new InvoiceWasViewed($invitation, $invitation->company, Ninja::eventVars())); + event(new InvoiceWasViewed($invitation, $invoice->company, Ninja::eventVars())); } $data = [ diff --git a/resources/views/portal/ninja2020/payments/show.blade.php b/resources/views/portal/ninja2020/payments/show.blade.php index 91f68b79dbbc..a0604b92efe8 100644 --- a/resources/views/portal/ninja2020/payments/show.blade.php +++ b/resources/views/portal/ninja2020/payments/show.blade.php @@ -123,7 +123,7 @@
@foreach($payment->invoices as $invoice) - @if(!$invoice->is_proforma) + @if(!$invoice->is_proforma && !$invoice->is_deleted)
{{ ctrans('texts.invoice_number') }}