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

Improve migration flow for hosted users

Browse Source
This commit is contained in:
David Bomba 2021-04-29 12:31:09 +10:00
parent f3927861bc
commit f395434f2a
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Migration/StepsController.php
View File

@ -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(

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

@ -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;

12
resources/views/migration/auth.blade.php
View File

@ -25,11 +25,13 @@
<input type="password" name="password" class="form form-control">
</div>
<div class="form-group">
<label for="api_secret">{!! trans('texts.api_secret') !!}</label>
<input type="api_secret" name="api_secret" class="form form-control">
<small>{!! trans('texts.migration_api_secret_notice') !!}</small>
</div>
@if(!Utils::isNinjaProd())
<div class="form-group">
<label for="api_secret">{!! trans('texts.api_secret') !!}</label>
<input type="api_secret" name="api_secret" class="form form-control">
<small>{!! trans('texts.migration_api_secret_notice') !!}</small>
</div>
@endif
</form>
</div>
<div class="panel-footer text-right">

18
resources/views/migration/start.blade.php
View File

@ -12,13 +12,15 @@
<h4>In order to start the migration, we need to know where do you want to migrate.</h4><br/>
<form action="{{ url('migration/type') }}" method="post" id="select-type-form">
{{ csrf_field() }}
<!-- <div class="form-check">
<input class="form-check-input" type="radio" name="option" id="option1" value="0" checked>
<label class="form-check-label" for="option1">
Hosted
</label>
<p>If you chose 'hosted', we will migrate your data to official Invoice Ninja servers & take care of server handling.</p>
</div> -->
@if(Utils::isNinjaProd())
<div class="form-check">
<input class="form-check-input" type="radio" name="option" id="option1" value="0" checked>
<label class="form-check-label" for="option1">
Hosted
</label>
<p>Migrate to version 5 of Invoice Ninja</p>
</div>
@else
<div class="form-check">
<input class="form-check-input" type="radio" name="option" id="option2" value="1" checked">
<label class="form-check-label" for="option2">
@ -26,7 +28,7 @@
</label>
<p>By choosing the 'self-hosted', you are the one in charge of servers.</p>
</div>
</div>
@endif
</form>
</div>
<div class="panel-footer text-right">