Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Code Issues Releases Activity

Merge pull request #7078 from turbo124/v5-develop

Browse Source 
Show cancellation dialogue
This commit is contained in:
David Bomba 2022-01-03 11:12:20 +11:00 committed by GitHub
commit 0dfb0351d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en/texts.php
View File

@ -3981,7 +3981,7 @@ $LANG = array(
'list_of_recurring_invoices' => 'List of recurring invoices', 'list_of_recurring_invoices' => 'List of recurring invoices',
'details_of_recurring_invoice' => 'Here are some details about recurring invoice', 'details_of_recurring_invoice' => 'Here are some details about recurring invoice',
'cancellation' => 'Cancellation', '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_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!', 'cancellation_pending' => 'Cancellation pending, we\'ll be in touch!',
'list_of_payments' => 'List of payments', 'list_of_payments' => 'List of payments',

6
resources/views/portal/ninja2020/recurring_invoices/show.blade.php
View File

@ -76,10 +76,10 @@
</div> </div>
@endif @endif
{{-- @if(is_null($invoice->subscription_id) || optional($invoice->subscription)->allow_cancellation) --}} @if($invoice->subscription && optional($invoice->subscription)->allow_cancellation)
{{-- INV2-591 --}} {{-- INV2-591 --}}
@if(false) {{-- @if(false) --}}
<div class="bg-white shadow sm:rounded-lg mt-4 hidden"> <div class="bg-white shadow sm:rounded-lg mt-4">
<div class="px-4 py-5 sm:p-6"> <div class="px-4 py-5 sm:p-6">
<div class="sm:flex sm:items-start sm:justify-between"> <div class="sm:flex sm:items-start sm:justify-between">
<div> <div>