From f395434f2a2adfce5052b75a1d52ae3b1d29bf15 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 29 Apr 2021 12:31:09 +1000
Subject: [PATCH] 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 @@
                     <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">
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 @@
             <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">