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

Improve IBAN uniqueness.

Browse Source
This commit is contained in:
James Cole
2018-03-19 08:16:54 +01:00
parent 3fdb782321
commit 6ab03bb228
2 changed files with 64 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/AccountFormRequest.php
View File

@@ -75,7 +75,7 @@ class AccountFormRequest extends Request
'name' => 'required|min:1|uniqueAccountForUser',
'openingBalance' => 'numeric|required_with:openingBalanceDate|nullable',
'openingBalanceDate' => 'date|required_with:openingBalance|nullable',
'iban' => ['iban', 'nullable', new UniqueIban(null)],
'iban' => ['iban', 'nullable', new UniqueIban(null, $this->string('what'))],
'BIC' => 'bic|nullable',
'virtualBalance' => 'numeric|nullable',
'currency_id' => 'exists:transaction_currencies,id',
@@ -95,7 +95,7 @@ class AccountFormRequest extends Request
// add rules:
$rules['id'] = 'belongsToUser:accounts';
$rules['name'] = 'required|min:1|uniqueAccountForUser:' . intval($this->get('id'));
$rules['iban'] = ['iban', 'nullable', new UniqueIban($account)];
$rules['iban'] = ['iban', 'nullable', new UniqueIban($account, $account->accountType->type)];
}
return $rules;