From d3a1c76723a6a478f15ebe10cd91f26dd01aa3e4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 3 Jan 2022 11:12:03 +1100 Subject: [PATCH] Show cancellation dialogue --- resources/lang/en/texts.php | 2 +- .../portal/ninja2020/recurring_invoices/show.blade.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index ffc0229a03fd..762ca47142bb 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -3981,7 +3981,7 @@ $LANG = array( 'list_of_recurring_invoices' => 'List of recurring invoices', 'details_of_recurring_invoice' => 'Here are some details about recurring invoice', 'cancellation' => 'Cancellation', - 'about_cancellation' => 'In case you want to stop the recurring invoice, please click the request the cancellation.', + 'about_cancellation' => 'In case you want to stop the recurring invoice, please click to request the cancellation.', 'cancellation_warning' => 'Warning! You are requesting a cancellation of this service. Your service may be cancelled with no further notification to you.', 'cancellation_pending' => 'Cancellation pending, we\'ll be in touch!', 'list_of_payments' => 'List of payments', diff --git a/resources/views/portal/ninja2020/recurring_invoices/show.blade.php b/resources/views/portal/ninja2020/recurring_invoices/show.blade.php index a2debf49c5b8..7f2bc97c6a53 100644 --- a/resources/views/portal/ninja2020/recurring_invoices/show.blade.php +++ b/resources/views/portal/ninja2020/recurring_invoices/show.blade.php @@ -76,10 +76,10 @@ @endif - {{-- @if(is_null($invoice->subscription_id) || optional($invoice->subscription)->allow_cancellation) --}} + @if($invoice->subscription && optional($invoice->subscription)->allow_cancellation) {{-- INV2-591 --}} - @if(false) -