From ff888e8cf222d64a6c8b8d44ee4e77ec36956a7b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 3 May 2021 13:53:57 +1000 Subject: [PATCH 1/3] fixes for migration --- app/Traits/GenerateMigrationResources.php | 2 ++ resources/lang/en/texts.php | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index 21ff2e0e5391..ee13478bd696 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -889,6 +889,8 @@ info("get company"); 'created_at' => $invitation->created_at ? Carbon::parse($invitation->created_at)->toDateString() : null, 'updated_at' => $invitation->updated_at ? Carbon::parse($invitation->updated_at)->toDateString() : null, 'deleted_at' => $invitation->deleted_at ? Carbon::parse($invitation->deleted_at)->toDateString() : null, + 'email_status' => '', + 'email_error' => '', ]; } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 89eb1dea148f..062a1828dc4b 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4282,6 +4282,10 @@ $LANG = array( 'notification_credit_created_subject' => 'Credit :invoice was created to :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 here , please ensure that the credentials are identical to your v4 credentials. Once the account has been created, you can start the migration process here.', + 'auth' => 'Authentication', + 'companies' => 'Select companies for migration', + + ); return $LANG; From 64ac8299e4cc0357695a34395705a77fc86ea432 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 3 May 2021 13:57:33 +1000 Subject: [PATCH 2/3] minor fixes --- app/Traits/GenerateMigrationResources.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index ee13478bd696..fbd98d267c84 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -880,7 +880,7 @@ info("get company"); 'key' => $invitation->invitation_key, 'transaction_reference' => $invitation->transaction_reference, 'message_id' => $invitation->message_id, - 'email_error' => $invitation->email_error, + 'email_error' => $invitation->email_error ?: '', 'signature_base64' => $invitation->signature_base64, 'signature_date' => $invitation->signature_date, 'sent_date' => $invitation->sent_date, @@ -890,7 +890,6 @@ info("get company"); 'updated_at' => $invitation->updated_at ? Carbon::parse($invitation->updated_at)->toDateString() : null, 'deleted_at' => $invitation->deleted_at ? Carbon::parse($invitation->deleted_at)->toDateString() : null, 'email_status' => '', - 'email_error' => '', ]; } From 22178f94764fa2b8c1a3a12719ce51d27bb8ab47 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 3 May 2021 21:25:14 +1000 Subject: [PATCH 3/3] Code of Conduct --- CODE_OF_CONDUCT.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000000..8aab1edc58db --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,4 @@ +# Invoice Ninja Code of Conduct + +The development team has invested a tremendous amount of time and energy into this project. While we appreciate that bugs can be frustrating we ask that our community refrain from insults and snide remarks. We're happy to provide support to both our hosted and selfhosted communities but ask that feedback is always polite. +