diff --git a/app/Constants.php b/app/Constants.php index 2f7a161b34a8..0231b54d38a5 100644 --- a/app/Constants.php +++ b/app/Constants.php @@ -361,7 +361,7 @@ if (! defined('APP_NAME')) { define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest')); define('NINJA_DATE', '2000-01-01'); - define('NINJA_VERSION', '4.5.37' . env('NINJA_VERSION_SUFFIX')); + define('NINJA_VERSION', '4.5.38' . env('NINJA_VERSION_SUFFIX')); define('NINJA_TERMS_VERSION', '1.0.1'); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); diff --git a/app/Models/User.php b/app/Models/User.php index 9c0550d05ae1..b7255d721b86 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -496,11 +496,6 @@ class User extends Authenticatable public function eligibleForMigration() { - // Not ready to show to hosted users - if (Utils::isNinjaProd()) { - return false; - } - return is_null($this->public_id) || $this->public_id == 0; } } diff --git a/docs/conf.py b/docs/conf.py index 20c1e9374293..01a27935488e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,7 +59,7 @@ author = u'Invoice Ninja' # The short X.Y version. version = u'4.5' # The full version, including alpha/beta/rc tags. -release = u'4.5.37' +release = u'4.5.38' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index e5440485fcf4..d98fb00c8977 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4271,7 +4271,17 @@ $LANG = array( 'activity_82' => ':user archived subscription :subscription', 'activity_83' => ':user deleted subscription :subscription', 'activity_84' => ':user restored subscription :subscription', - 'lang_Russian' => 'Russian', + + '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_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', + ); return $LANG; diff --git a/resources/views/accounts/management.blade.php b/resources/views/accounts/management.blade.php index 2822382ff851..4c1358bb3390 100644 --- a/resources/views/accounts/management.blade.php +++ b/resources/views/accounts/management.blade.php @@ -238,27 +238,29 @@ -
-
-

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

-
-
-
- -
-
{{ trans('texts.migrate_intro_text')}}

- @if(Auth::user()->eligibleForMigration()) - {!! trans('texts.start_migration') !!} - @else - {{ trans('texts.not_allowed') }} - @endif -
- {{ trans('texts.learn_more') }} + @if (Utils::isSelfHost() || request()->show_migration) +
+
+

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

+
+
+
+ +
+
{{ trans('texts.migrate_intro_text')}}

+ @if(Auth::user()->eligibleForMigration()) + {!! trans('texts.start_migration') !!} + @else + {{ trans('texts.not_allowed') }} + @endif +
+ {{ trans('texts.learn_more') }} +
-
+ @endif {!! Former::close() !!}