Merge pull request #4130 from beganovich/fix-migration-urls

(v4) Fixed migration urls

resources/lang/en/texts.php

@@ -3536,7 +3536,7 @@ $LANG = array(
     'email_subject_payment_partial' => 'Email Partial Payment Subject',
     'is_approved' => 'Is Approved',
     'migration_went_wrong' => 'Oops, something went wrong! Make sure you did proper setup with V2 of Invoice Ninja, before starting migration.',
-    'cross_migration_message' => 'Cross account migration is not allowed. Please read more about it here: <a href="https://invoiceninja.github.io/cross-site-migration.html">https://invoiceninja.github.io/cross-site-migration.html</a>',
+    'cross_migration_message' => 'Cross account migration is not allowed. Make sure e-mail address is same on V4 and V5.',
     'email_credit' => 'Email Credit',
     'client_email_not_set' => 'Client does not have an email address set',
     'ledger' => 'Ledger',

resources/views/migration/auth.blade.php

@@ -12,7 +12,7 @@
         </div>
         <div class="panel-body">
             <h4>Let's continue with authentication.</h4><br/>
-            <form action="/migration/auth" method="post" id="auth-form">
+            <form action="{{ url('/migration/auth') }}" method="post" id="auth-form">
                 {{ csrf_field() }}
                 <div class="form-group">
                     <label for="email">E-mail address</label>
@@ -26,7 +26,7 @@
             </form>
         </div>
         <div class="panel-footer text-right">
-            <button onclick="document.getElementById('auth-form').submit();" class="btn btn-primary">{!! trans('texts.continue') !!}</button>
+            <button form="auth-form" class="btn btn-primary">{!! trans('texts.continue') !!}</button>
         </div>
     </div>
 @stop

resources/views/migration/companies.blade.php

@@ -12,7 +12,7 @@
         </div>
         <div class="panel-body">
             <h4>Awesome! Please select the company you would like to apply migration.</h4>
-            <form action="/migration/companies" method="post" id="auth-form">
+            <form action="{{ url('/migration/companies') }}" method="post" id="auth-form">
                 {{ csrf_field() }}
                 <input type="hidden" name="account_key" value="{{ auth()->user()->account->account_key }}">
                     
@@ -32,7 +32,7 @@
             </form>
         </div>
         <div class="panel-footer text-right">
-            <button onclick="document.getElementById('auth-form').submit();" class="btn btn-primary">{!! trans('texts.continue') !!}</button>
+            <button form="auth-form" class="btn btn-primary">{!! trans('texts.continue') !!}</button>
         </div>
     </div>
 @stop

resources/views/migration/download.blade.php

@@ -10,13 +10,13 @@
         </div>
         <div class="panel-body">
             <h4>{!! trans('texts.download_data') !!}</h4>
-            <form action="/migration/download" method="post">
+            <form action="{{ url('/migration/download') }}" method="post">
                 {!! csrf_field() !!}
-                <button class="btn btn-primary">Download</button>
+                <button class="btn btn-primary">{!! trans('texts.download') !!}</button>
             </form>
         </div>
         <div class="panel-footer text-right">
-            <a href="/migration/import" class="btn btn-primary">{!! trans('texts.continue') !!}</a>
+            <a href="{{ url('/migration/import') }}" class="btn btn-primary">{!! trans('texts.continue') !!}</a>
         </div>
     </div>
 @stop

resources/views/migration/endpoint.blade.php

@@ -12,7 +12,7 @@
         </div>
         <div class="panel-body">
             <h4>We need to know the link of your application.</h4><br/>
-            <form action="/migration/endpoint" method="post" id="input-endpoint-form">
+            <form action="{{ url('/migration/endpoint') }}" method="post" id="input-endpoint-form">
                 {{ csrf_field() }}
                 <div class="form-check">
                     <div class="form-group">
@@ -23,7 +23,7 @@
             </form>
         </div>
         <div class="panel-footer text-right">
-            <button onclick="document.getElementById('input-endpoint-form').submit();" class="btn btn-primary">{!! trans('texts.continue') !!}</button>
+            <button form="input-endpoint-form" class="btn btn-primary">{!! trans('texts.continue') !!}</button>
         </div>
     </div>
 

resources/views/migration/start.blade.php

@@ -10,7 +10,7 @@
         </div>
         <div class="panel-body">
             <h4>In order to start the migration, we need to know where do you want to migrate.</h4><br/>
-            <form action="/migration/type" method="post" id="select-type-form">
+            <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>
@@ -30,7 +30,7 @@
             </form>
         </div>
         <div class="panel-footer text-right">
-            <button onclick="document.getElementById('select-type-form').submit();" class="btn btn-primary">{!! trans('texts.continue') !!}</button>
+            <button form="select-type-form" class="btn btn-primary">{!! trans('texts.continue') !!}</button>
         </div>
     </div>