From c608336c0493c14e490afdcafce79f4d4ce280b8 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 16 Mar 2021 09:01:41 +1100
Subject: [PATCH 1/4] Fixes for missing translations

---
 resources/lang/en/texts.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 81bd21dc5725..a34826375926 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4174,6 +4174,9 @@ $LANG = array(
      'zoho' => 'Zoho',
      'accounting' => 'Accounting',
      'required_files_missing' => 'Please provide all CSVs.',
+      'migration_auth_label' => 'Let\'s continue by authenticating.',
+     'api_secret' => 'API secret',
+     'migration_api_secret_notice' => 'You can find API_SECRET in the .env file or Invoice Ninja v5. If property is missing, leave field blank.',
 );
 
 return $LANG;

From b94e4c602eb3a85bb8cbc1727c7c5cb201938633 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 16 Mar 2021 09:04:27 +1100
Subject: [PATCH 2/4] rtrim trailing slash

---
 app/Http/Controllers/Migration/StepsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Migration/StepsController.php b/app/Http/Controllers/Migration/StepsController.php
index b0011db0333b..cdbe544f81c7 100644
--- a/app/Http/Controllers/Migration/StepsController.php
+++ b/app/Http/Controllers/Migration/StepsController.php
@@ -94,7 +94,7 @@ class StepsController extends BaseController
             );
         }
 
-        session()->put('MIGRATION_ENDPOINT', $request->endpoint);
+        session()->put('MIGRATION_ENDPOINT', rtrim($request->endpoint,'/'));
 
         return redirect(
             url('/migration/auth')

From 60e0154ac695ae9473cde376b880627b52a77530 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 16 Mar 2021 10:32:12 +1100
Subject: [PATCH 3/4] Adjust counter frequency in migration

---
 app/Traits/GenerateMigrationResources.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index b6b61a9f3c84..58c98b3f1eae 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -159,7 +159,8 @@ info("get company");
             'payment_number_pattern' => '',
             'payment_number_counter' => 0,
             'payment_terms' => $this->account->payment_terms ?: '',
-            'reset_counter_frequency_id' => $this->account->reset_counter_frequency_id ? (string) $this->account->reset_counter_frequency_id : '0',
+            'reset_counter_frequency_id' => $this->account->reset_counter_frequency_id ? (string) $this->transformFrequencyId
+            ($this->account->reset_counter_frequency_id) : '0',
             'payment_type_id' => $this->account->payment_type_id ? (string) $this->account->payment_type_id : '1',
             'reset_counter_date' => $this->account->reset_counter_date ?: '',
             'tax_name1' => $this->account->tax_name1 ?: '',
@@ -555,7 +556,7 @@ info("get company");
                 'updated_at' => $invoice->updated_at ? Carbon::parse($invoice->updated_at)->toDateString() : null,
                 'deleted_at' => $invoice->deleted_at ? Carbon::parse($invoice->deleted_at)->toDateString() : null,
                 'next_send_date' => $this->getNextSendDateForMigration($invoice),
-                'frequency_id' => $this->transformFrequencyId($invoice),
+                'frequency_id' => $this->transformFrequencyId($invoice->frequency_id),
                 'due_date_days' => $this->transformDueDate($invoice),
                 'remaining_cycles' => $this->getRemainingCycles($invoice),
                 'invitations' => $this->getResourceInvitations($invoice->invitations, 'recurring_invoice_id'),
@@ -679,9 +680,9 @@ info("get company");
     // const FREQUENCY_THREE_YEARS = 12;
 
 
-    private function transformFrequencyId($invoice)
+    private function transformFrequencyId($frequency_id)
     {
-        switch ($invoice->frequency_id) {
+        switch ($frequency_id) {
             case 1:
                 return 2;
                 break;

From 59a1596732521e5d7162cd2dfce9b86fdec05cb0 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 17 Mar 2021 20:42:17 +1100
Subject: [PATCH 4/4] Fixes for migration

---
 app/Traits/GenerateMigrationResources.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index 58c98b3f1eae..a0b966b3e785 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -132,6 +132,7 @@ info("get company");
             'font_size' => $this->account->font_size ?: 9,
             'invoice_labels' => $this->account->invoice_labels ?: '',
             'military_time' => $this->account->military_time ? (bool) $this->account->military_time : false,
+            'invoice_number_counter' => $this->account->invoice_number_counter ?: 0,
             'invoice_number_pattern' => $this->account->invoice_number_pattern ?: '',
             'quote_number_pattern' => $this->account->quote_number_pattern ?: '',
             'quote_terms' => $this->account->quote_terms ?: '',