From c975045c357682475da4c923d12b15cb9855585b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 28 Apr 2021 09:56:55 +1000 Subject: [PATCH 1/3] updated texts --- resources/lang/en/texts.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 449bb5abbe66..d98fb00c8977 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4275,12 +4275,12 @@ $LANG = array( 'amount_greater_than_balance_v5' => 'The amount is greater than the invoice balance. You cannot overpay an invoice.', 'click_to_continue' => 'Click to continue', - 'notification_invoice_sent_subject' => 'Invoice :invoice was created to :client', - 'notification_invoice_viewed_subject' => 'Invoice :invoice was created for :client', - 'notification_quote_sent_subject' => 'Quote :invoice was created to :client', - 'notification_quote_viewed_subject' => 'Quote :invoice was created for :client', - 'notification_credit_sent_subject' => 'Credit :invoice was created to :client', - 'notification_credit_viewed_subject' => 'Credit :invoice was created for :client', + 'notification_invoice_created_subject' => 'Invoice :invoice was created to :client', + 'notification_invoice_created_subject' => 'Invoice :invoice was created for :client', + 'notification_quote_created_subject' => 'Quote :invoice was created to :client', + 'notification_quote_created_subject' => 'Quote :invoice was created for :client', + 'notification_credit_created_subject' => 'Credit :invoice was created to :client', + 'notification_credit_created_subject' => 'Credit :invoice was created for :client', ); From f395434f2a2adfce5052b75a1d52ae3b1d29bf15 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 29 Apr 2021 12:31:09 +1000 Subject: [PATCH 2/3] Improve migration flow for hosted users --- .../Controllers/Migration/StepsController.php | 9 ++++++++- resources/lang/en/texts.php | 1 + resources/views/migration/auth.blade.php | 12 +++++++----- resources/views/migration/start.blade.php | 18 ++++++++++-------- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/Migration/StepsController.php b/app/Http/Controllers/Migration/StepsController.php index 001f8040aa98..8c4cbd42ed4d 100644 --- a/app/Http/Controllers/Migration/StepsController.php +++ b/app/Http/Controllers/Migration/StepsController.php @@ -66,9 +66,16 @@ class StepsController extends BaseController session()->put('MIGRATION_TYPE', $request->option); if ($request->option == 0) { + + session()->put('MIGRATION_ENDPOINT', 'https://invoicing.co'); + return redirect( - url('/migration/endpoint') + url('/migration/auth') ); + + // return redirect( + // url('/migration/endpoint') + // ); } return redirect( diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 0958cc603992..e5440485fcf4 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4271,6 +4271,7 @@ $LANG = array( 'activity_82' => ':user archived subscription :subscription', 'activity_83' => ':user deleted subscription :subscription', 'activity_84' => ':user restored subscription :subscription', + 'lang_Russian' => 'Russian', ); return $LANG; diff --git a/resources/views/migration/auth.blade.php b/resources/views/migration/auth.blade.php index b96404e08ce7..0b383de983ea 100644 --- a/resources/views/migration/auth.blade.php +++ b/resources/views/migration/auth.blade.php @@ -25,11 +25,13 @@ -
- - - {!! trans('texts.migration_api_secret_notice') !!} -
+ @if(!Utils::isNinjaProd()) +
+ + + {!! trans('texts.migration_api_secret_notice') !!} +
+ @endif
diff --git a/resources/views/migration/start.blade.php b/resources/views/migration/start.blade.php index 83a7708ce679..ce52121938e4 100644 --- a/resources/views/migration/start.blade.php +++ b/resources/views/migration/start.blade.php @@ -12,13 +12,15 @@

In order to start the migration, we need to know where do you want to migrate.


{{ csrf_field() }} - + @if(Utils::isNinjaProd()) +
+ + +

Migrate to version 5 of Invoice Ninja

+
+ @else

By choosing the 'self-hosted', you are the one in charge of servers.

-
+ @endif
From d3e44b779c2500940bc3e59f722fa9fb7227ac05 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 29 Apr 2021 12:35:56 +1000 Subject: [PATCH 3/3] Fixes for hosted migration --- resources/lang/en/texts.php | 2 +- resources/views/migration/auth.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index d98fb00c8977..42c66fa2fb4e 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4281,7 +4281,7 @@ $LANG = array( 'notification_quote_created_subject' => 'Quote :invoice was created for :client', 'notification_credit_created_subject' => 'Credit :invoice was created to :client', 'notification_credit_created_subject' => 'Credit :invoice was created for :client', - + 'migration_create_account_notice' => 'Please ensure you have created an account on the new platform first here , please ensure that the credentials are identical to your v4 credentials. Once the account has been created, you can start the migration process here.', ); return $LANG; diff --git a/resources/views/migration/auth.blade.php b/resources/views/migration/auth.blade.php index 0b383de983ea..9e4c208c708f 100644 --- a/resources/views/migration/auth.blade.php +++ b/resources/views/migration/auth.blade.php @@ -11,7 +11,7 @@

{!! trans('texts.welcome_to_the_new_version') !!}

-

{!! trans('texts.migration_auth_label') !!}


+

{!! trans('texts.migration_create_account_notice') !!}


{{ csrf_field() }}