Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5556 from turbo124/master

Browse Source 
Hosted migration
This commit is contained in:
David Bomba 2021-04-29 12:36:19 +10:00 committed by GitHub
commit 4e04e2af28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 22 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); 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(

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

@ -4275,13 +4275,13 @@ $LANG = array(
'amount_greater_than_balance_v5' => 'The amount is greater than the invoice balance. You cannot overpay an invoice.', 'amount_greater_than_balance_v5' => 'The amount is greater than the invoice balance. You cannot overpay an invoice.',
'click_to_continue' => 'Click to continue', 'click_to_continue' => 'Click to continue',
'notification_invoice_sent_subject' => 'Invoice :invoice was created to :client', 'notification_invoice_created_subject' => 'Invoice :invoice was created to :client',
'notification_invoice_viewed_subject' => 'Invoice :invoice was created for :client', 'notification_invoice_created_subject' => 'Invoice :invoice was created for :client',
'notification_quote_sent_subject' => 'Quote :invoice was created to :client', 'notification_quote_created_subject' => 'Quote :invoice was created to :client',
'notification_quote_viewed_subject' => 'Quote :invoice was created for :client', 'notification_quote_created_subject' => 'Quote :invoice was created for :client',
'notification_credit_sent_subject' => 'Credit :invoice was created to :client', 'notification_credit_created_subject' => 'Credit :invoice was created to :client',
'notification_credit_viewed_subject' => 'Credit :invoice was created for :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 <a href="https://invoicing.co">here</a> , please ensure that the credentials are <b>identical</b> to your v4 credentials. Once the account has been created, you can start the migration process here.',
); );
return $LANG; return $LANG;

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

@ -11,7 +11,7 @@
<h3 class="panel-title">{!! trans('texts.welcome_to_the_new_version') !!}</h3> <h3 class="panel-title">{!! trans('texts.welcome_to_the_new_version') !!}</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<h4>{!! trans('texts.migration_auth_label') !!}</h4><br/> <h4>{!! trans('texts.migration_create_account_notice') !!}</h4><br/>
<form action="{{ url('/migration/auth') }}" method="post" id="auth-form"> <form action="{{ url('/migration/auth') }}" method="post" id="auth-form">
{{ csrf_field() }} {{ csrf_field() }}
@ -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">

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/> <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">