From 0350590da4effe7d7b3613b52c10ce40935656d9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 09:24:00 +1100 Subject: [PATCH 1/4] V5.1.0 RC2 --- VERSION.txt | 2 +- config/ninja.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index aec0ea1d292f..acf69b48b843 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.0.56 \ No newline at end of file +5.1.0 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 02aeeb4e0cb9..e54f673dc6ae 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -13,7 +13,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.0.56', + 'app_version' => '5.1.0', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false), From b546d54c2e2dde65033dde8584c9a715d786997f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 11:07:21 +1100 Subject: [PATCH 2/4] Fix for migrations --- app/Jobs/Util/Import.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index dcfaaa1a0237..b100e457712b 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -265,13 +265,14 @@ class Import implements ShouldQueue $validator = Validator::make($data, $rules); - if ($validator->fails()) { + if ($validator->fails()) throw new MigrationValidatorFailed(json_encode($validator->errors())); - } - - if (isset($data['account_id'])) { + + if (isset($data['account_id'])) unset($data['account_id']); - } + + if(isset($data['version'])) + unset($data['version']); if (isset($data['referral_code'])) { $account = $this->company->account; From d347a344ba48e8db03b32d9daba7ab05619d0259 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 13:24:54 +1100 Subject: [PATCH 3/4] Texts upate --- resources/lang/en/texts.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index df9560565a5a..6f6df8a58ed8 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4136,6 +4136,8 @@ $LANG = array( 'online_payments_minimum_note' => 'Note: Online payments are supported only if amount is bigger than $1 or currency equivalent.', 'payment_token_not_found' => 'Payment token not found, please try again. If an issue still persist, try with another payment method', + ///////////////////////////////////////////////// + 'start_migration' => 'Start Migration', ); return $LANG; From 66d51a5fb15a4b2e2fccb6887f55363644266cf8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Feb 2021 13:25:33 +1100 Subject: [PATCH 4/4] Version bump --- VERSION.txt | 2 +- config/ninja.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index acf69b48b843..3bff059174b8 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.1.0 \ No newline at end of file +5.1.1 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index e54f673dc6ae..9dad10d7515f 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -13,7 +13,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.1.0', + 'app_version' => '5.1.1', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),