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

Clean up a little bit.

Browse Source
This commit is contained in:
James Cole
2020-03-19 15:16:59 +01:00
parent d889e39aad
commit 2cee008e4a
1 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Validation/TransactionValidation.php
View File

@@ -34,7 +34,6 @@ use Log;
*/
trait TransactionValidation
{
/**
* Validates the given account information. Switches on given transaction type.
*
@@ -422,16 +421,7 @@ trait TransactionValidation
private function validateEqualAccounts(Validator $validator): void
{
Log::debug('Now in validateEqualAccounts()');
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
if (!is_countable($transactions)) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
$transactions = $this->getTransactionsArray($validator);
// needs to be split
if (count($transactions) < 2) {
@@ -473,16 +463,7 @@ trait TransactionValidation
private function validateEqualAccountsForUpdate(Validator $validator, TransactionGroup $transactionGroup): void
{
Log::debug('Now in validateEqualAccountsForUpdate()');
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
if (!is_countable($transactions)) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
$transactions = $this->getTransactionsArray($validator);
// needs to be split
if (count($transactions) < 2) {
@@ -566,16 +547,7 @@ trait TransactionValidation
private function validateJournalIds(Validator $validator, TransactionGroup $transactionGroup): void
{
Log::debug('Now in validateJournalIds()');
$data = $validator->getData();
$transactions = $data['transactions'] ?? [];
if (!is_countable($transactions)) {
$validator->errors()->add(
'transactions.0.description', (string)trans('validation.filled', ['attribute' => (string)trans('validation.attributes.description')])
);
return;
}
$transactions = $this->getTransactionsArray($validator);
if (count($transactions) < 2) {
return;