Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4832 from turbo124/v5-stable

Browse Source 
Fixes for migration
This commit is contained in:
David Bomba 2021-02-04 13:26:02 +11:00 committed by GitHub
commit 3863b7f02f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.1.0 5.1.1

9
app/Jobs/Util/Import.php
View File

@ -265,13 +265,14 @@ class Import implements ShouldQueue
$validator = Validator::make($data, $rules); $validator = Validator::make($data, $rules);
if ($validator->fails()) { if ($validator->fails())
throw new MigrationValidatorFailed(json_encode($validator->errors())); throw new MigrationValidatorFailed(json_encode($validator->errors()));
}
if (isset($data['account_id'])) { if (isset($data['account_id']))
unset($data['account_id']); unset($data['account_id']);
}
if(isset($data['version']))
unset($data['version']);
if (isset($data['referral_code'])) { if (isset($data['referral_code'])) {
$account = $this->company->account; $account = $this->company->account;

2
config/ninja.php
View File

@ -13,7 +13,7 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', ''), 'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.1.0', 'app_version' => '5.1.1',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),

2
resources/lang/en/texts.php
View File

@ -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.', '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', '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; return $LANG;