mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-19 16:01:34 +02:00
Improve migration flow for hosted users
This commit is contained in:
parent
f3927861bc
commit
f395434f2a
@ -66,9 +66,16 @@ class StepsController extends BaseController
|
|||||||
session()->put('MIGRATION_TYPE', $request->option);
|
session()->put('MIGRATION_TYPE', $request->option);
|
||||||
|
|
||||||
if ($request->option == 0) {
|
if ($request->option == 0) {
|
||||||
|
|
||||||
|
session()->put('MIGRATION_ENDPOINT', 'https://invoicing.co');
|
||||||
|
|
||||||
return redirect(
|
return redirect(
|
||||||
url('/migration/endpoint')
|
url('/migration/auth')
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// return redirect(
|
||||||
|
// url('/migration/endpoint')
|
||||||
|
// );
|
||||||
}
|
}
|
||||||
|
|
||||||
return redirect(
|
return redirect(
|
||||||
|
@ -4271,6 +4271,7 @@ $LANG = array(
|
|||||||
'activity_82' => ':user archived subscription :subscription',
|
'activity_82' => ':user archived subscription :subscription',
|
||||||
'activity_83' => ':user deleted subscription :subscription',
|
'activity_83' => ':user deleted subscription :subscription',
|
||||||
'activity_84' => ':user restored subscription :subscription',
|
'activity_84' => ':user restored subscription :subscription',
|
||||||
|
'lang_Russian' => 'Russian',
|
||||||
);
|
);
|
||||||
|
|
||||||
return $LANG;
|
return $LANG;
|
||||||
|
@ -25,11 +25,13 @@
|
|||||||
<input type="password" name="password" class="form form-control">
|
<input type="password" name="password" class="form form-control">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group">
|
@if(!Utils::isNinjaProd())
|
||||||
<label for="api_secret">{!! trans('texts.api_secret') !!}</label>
|
<div class="form-group">
|
||||||
<input type="api_secret" name="api_secret" class="form form-control">
|
<label for="api_secret">{!! trans('texts.api_secret') !!}</label>
|
||||||
<small>{!! trans('texts.migration_api_secret_notice') !!}</small>
|
<input type="api_secret" name="api_secret" class="form form-control">
|
||||||
</div>
|
<small>{!! trans('texts.migration_api_secret_notice') !!}</small>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-footer text-right">
|
<div class="panel-footer text-right">
|
||||||
|
@ -12,13 +12,15 @@
|
|||||||
<h4>In order to start the migration, we need to know where do you want to migrate.</h4><br/>
|
<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">
|
<form action="{{ url('migration/type') }}" method="post" id="select-type-form">
|
||||||
{{ csrf_field() }}
|
{{ csrf_field() }}
|
||||||
<!-- <div class="form-check">
|
@if(Utils::isNinjaProd())
|
||||||
<input class="form-check-input" type="radio" name="option" id="option1" value="0" checked>
|
<div class="form-check">
|
||||||
<label class="form-check-label" for="option1">
|
<input class="form-check-input" type="radio" name="option" id="option1" value="0" checked>
|
||||||
Hosted
|
<label class="form-check-label" for="option1">
|
||||||
</label>
|
Hosted
|
||||||
<p>If you chose 'hosted', we will migrate your data to official Invoice Ninja servers & take care of server handling.</p>
|
</label>
|
||||||
</div> -->
|
<p>Migrate to version 5 of Invoice Ninja</p>
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
<div class="form-check">
|
<div class="form-check">
|
||||||
<input class="form-check-input" type="radio" name="option" id="option2" value="1" checked">
|
<input class="form-check-input" type="radio" name="option" id="option2" value="1" checked">
|
||||||
<label class="form-check-label" for="option2">
|
<label class="form-check-label" for="option2">
|
||||||
@ -26,7 +28,7 @@
|
|||||||
</label>
|
</label>
|
||||||
<p>By choosing the 'self-hosted', you are the one in charge of servers.</p>
|
<p>By choosing the 'self-hosted', you are the one in charge of servers.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
@endif
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-footer text-right">
|
<div class="panel-footer text-right">
|
||||||
|
Loading…
Reference in New Issue
Block a user