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

Add IBAN to account validator.

Browse Source
This commit is contained in:
James Cole
2020-03-31 07:04:00 +02:00
parent 144bc29eb3
commit 9e4b7f8bb4
9 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Services/Internal/Support/RecurringTransactionTrait.php
View File

@@ -98,11 +98,11 @@ trait RecurringTransactionTrait
$validator = app(AccountValidator::class);
$validator->setUser($recurrence->user);
$validator->setTransactionType($recurrence->transactionType->type);
if (!$validator->validateSource($source->id, null)) {
if (!$validator->validateSource($source->id, null, null)) {
throw new FireflyException(sprintf('Source invalid: %s', $validator->sourceError)); // @codeCoverageIgnore
}
if (!$validator->validateDestination($destination->id, null)) {
if (!$validator->validateDestination($destination->id, null, null)) {
throw new FireflyException(sprintf('Destination invalid: %s', $validator->destError)); // @codeCoverageIgnore
}

4
app/Services/Internal/Update/JournalUpdateService.php
View File

@@ -359,7 +359,7 @@ class JournalUpdateService
$validator->source = $this->getValidSourceAccount();
$result = $validator->validateDestination($destId, $destName);
$result = $validator->validateDestination($destId, $destName, null);
Log::debug(sprintf('hasValidDestinationAccount(%d, "%s") will return %s', $destId, $destName, var_export($result, true)));
// validate submitted info:
@@ -391,7 +391,7 @@ class JournalUpdateService
$validator->setTransactionType($expectedType);
$validator->setUser($this->transactionJournal->user);
$result = $validator->validateSource($sourceId, $sourceName);
$result = $validator->validateSource($sourceId, $sourceName, null);
Log::debug(sprintf('hasValidSourceAccount(%d, "%s") will return %s', $sourceId, $sourceName, var_export($result, true)));
// validate submitted info: