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

Code cleanup

Browse Source
This commit is contained in:
James Cole
2024-12-22 08:43:12 +01:00
parent 5751f7e5a3
commit 565bd87959
574 changed files with 4600 additions and 4604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Validation/CurrencyValidation.php
View File

@@ -57,7 +57,7 @@ trait CurrencyValidation
continue;
}
$foreignAmount = (string)($transaction['foreign_amount'] ?? '');
$foreignAmount = (string) ($transaction['foreign_amount'] ?? '');
$foreignId = $transaction['foreign_currency_id'] ?? null;
$foreignCode = $transaction['foreign_currency_code'] ?? null;
if ('' === $foreignAmount) {
@@ -66,9 +66,9 @@ trait CurrencyValidation
(array_key_exists('foreign_currency_id', $transaction) || array_key_exists('foreign_currency_code', $transaction))
&& (null !== $foreignId || null !== $foreignCode)
) {
$validator->errors()->add('transactions.'.$index.'.foreign_amount', (string)trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_currency_id', (string)trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_currency_code', (string)trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_amount', (string) trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_currency_id', (string) trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_currency_code', (string) trans('validation.require_currency_amount'));
}
continue;
@@ -79,14 +79,14 @@ trait CurrencyValidation
Log::debug('validateForeignCurrencyInformation: array contains foreign amount info.');
if (!array_key_exists('foreign_currency_id', $transaction) && !array_key_exists('foreign_currency_code', $transaction)) {
Log::debug('validateForeignCurrencyInformation: array contains NO foreign currency info.');
$validator->errors()->add('transactions.'.$index.'.foreign_amount', (string)trans('validation.require_currency_info'));
$validator->errors()->add('transactions.'.$index.'.foreign_amount', (string) trans('validation.require_currency_info'));
}
}
if (0 === $compare && ('' !== (string)$foreignId || '' !== (string)$foreignCode)) {
if (0 === $compare && ('' !== (string) $foreignId || '' !== (string) $foreignCode)) {
Log::debug('validateForeignCurrencyInformation: array contains foreign currency info, but zero amount.');
$validator->errors()->add('transactions.'.$index.'.foreign_currency_id', (string)trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_currency_code', (string)trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_amount', (string)trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_currency_id', (string) trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_currency_code', (string) trans('validation.require_currency_amount'));
$validator->errors()->add('transactions.'.$index.'.foreign_amount', (string) trans('validation.require_currency_amount'));
}
}
}