kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Update meta files for new release.

Browse Source
This commit is contained in:
James Cole
2024-01-06 07:42:00 +01:00
parent 2e0d90c685
commit 8ad27e0eda
141 changed files with 2091 additions and 1980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Rules/UniqueAccountNumber.php
View File

@@ -42,7 +42,8 @@ class UniqueAccountNumber implements ValidationRule
public function __construct(?Account $account, ?string $expectedType)
{
app('log')
->debug('Constructed UniqueAccountNumber');
->debug('Constructed UniqueAccountNumber')
;
$this->account = $account;
$this->expectedType = $expectedType;
// a very basic fix to make sure we get the correct account type:
@@ -126,11 +127,12 @@ class UniqueAccountNumber implements ValidationRule
private function countHits(string $type, string $accountNumber): int
{
$query = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id')
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('accounts.user_id', auth()->user()->id)
->where('account_types.type', $type)
->where('account_meta.name', '=', 'account_number')
->where('account_meta.data', json_encode($accountNumber));
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('accounts.user_id', auth()->user()->id)
->where('account_types.type', $type)
->where('account_meta.name', '=', 'account_number')
->where('account_meta.data', json_encode($accountNumber))
;
if (null !== $this->account) {
$query->where('accounts.id', '!=', $this->account->id);