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/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; 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), 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;