kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-24 04:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	config/firefly.php
#	frontend/src/i18n/nb_NO/index.js
#	frontend/src/i18n/nl_NL/index.js
#	frontend/src/i18n/ru_RU/index.js
This commit is contained in:
James Cole
2022-07-17 08:18:18 +02:00
parent 1406abe7ae b4feb27118
commit 6b6107fb00
38 changed files with 937 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Validation/FireflyValidator.php
View File

@@ -589,22 +589,40 @@ class FireflyValidator extends Validator
$query = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id')
->whereNull('accounts.deleted_at')
->where('accounts.user_id', auth()->user()->id)
->where('account_meta.name', 'account_number');
->where('account_meta.name', 'account_number')
->where('account_meta.data', json_encode($value));
if ($accountId > 0) {
// exclude current account from check.
$query->where('account_meta.account_id', '!=', $accountId);
}
$set = $query->get(['account_meta.*']);
$set = $query->get(['account_meta.*']);
$count = $set->count();
if (0 === $count) {
return true;
}
if ($count > 1) {
// pretty much impossible but still.
return false;
}
$type = $this->data['objectType'] ?? 'unknown';
if ('expense' !== $type && 'revenue' !== $type) {
Log::warning(sprintf('Account number "%s" is not unique and account type "%s" cannot share its account number.', $value, $type));
return false;
}
Log::debug(sprintf('Account number "%s" is not unique but account type "%s" may share its account number.', $value, $type));
// one other account with this account number.
/** @var AccountMeta $entry */
foreach ($set as $entry) {
if ($entry->data === $value) {
return false;
$otherAccount = $entry->account;
$otherType = (string) config(sprintf('firefly.shortNamesByFullName.%s', $otherAccount->accountType->type));
if (('expense' === $otherType || 'revenue' === $otherType) && $otherType !== $type) {
Log::debug(sprintf('The other account with this account number is a "%s" so return true.', $otherType));
return true;
}
Log::debug(sprintf('The other account with this account number is a "%s" so return false.', $otherType));
}
return true;
return false;
}
/**