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

Refactor group validation

Browse Source
This commit is contained in:
James Cole
2020-03-21 06:01:27 +01:00
parent c15b72b6b0
commit 62757812ff
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Validation/CurrencyValidation.php
View File

@@ -39,7 +39,7 @@ trait CurrencyValidation
* @return array
*/
abstract protected function getTransactionsArray(Validator $validator): array;
/**
* If the transactions contain foreign amounts, there must also be foreign currency information.
*

16
app/Validation/GroupValidation.php
View File

@@ -113,4 +113,20 @@ trait GroupValidation
}
/**
* @param Validator $validator
*/
protected function validateGroupDescription(Validator $validator): void
{
Log::debug('Now in validateGroupDescription()');
$data = $validator->getData();
$transactions = $this->getTransactionsArray($validator);
$groupTitle = $data['group_title'] ?? '';
if ('' === $groupTitle && count($transactions) > 1) {
$validator->errors()->add('group_title', (string) trans('validation.group_title_mandatory'));
}
}
}

15
app/Validation/TransactionValidation.php
View File

@@ -160,21 +160,6 @@ trait TransactionValidation
}
}
/**
* @param Validator $validator
*/
public function validateGroupDescription(Validator $validator): void
{
Log::debug('Now in validateGroupDescription()');
$data = $validator->getData();
$transactions = $this->getTransactionsArray($validator);
$groupTitle = $data['group_title'] ?? '';
if ('' === $groupTitle && count($transactions) > 1) {
$validator->errors()->add('group_title', (string)trans('validation.group_title_mandatory'));
}
}
/**
* Adds an error to the validator when there are no transactions in the array of data.
*