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

Code cleanup and new translations.

Browse Source
This commit is contained in:
James Cole
2024-01-04 15:42:00 +01:00
parent 1873be8d95
commit 0a5d62605a
113 changed files with 7797 additions and 7504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Validation/CurrencyValidation.php
View File

@@ -53,11 +53,8 @@ trait CurrencyValidation
if (!array_key_exists('foreign_amount', $transaction)) {
continue;
}
$foreignAmount = '';
if (array_key_exists('foreign_amount', $transaction)) {
$foreignAmount = (string) $transaction['foreign_amount'];
}
if('' === $foreignAmount) {
$foreignAmount = (string) $transaction['foreign_amount'];
if ('' === $foreignAmount) {
continue;
}
// if foreign amount is present, then the currency must be as well.
@@ -65,15 +62,8 @@ trait CurrencyValidation
$validator->errors()->add('transactions.'.$index.'.foreign_amount', (string) trans('validation.require_currency_info'));
}
// if the currency is present, then the amount must be present as well.
if ((array_key_exists('foreign_currency_id', $transaction) || array_key_exists('foreign_currency_code', $transaction))
&& !array_key_exists(
'foreign_amount',
$transaction
)) {
$validator->errors()->add(
'transactions.'.$index.'.foreign_amount',
(string) trans('validation.require_currency_amount')
);
if (array_key_exists('foreign_currency_id', $transaction) || array_key_exists('foreign_currency_code', $transaction)) {
$validator->errors()->add('transactions.'.$index.'.foreign_amount', (string) trans('validation.require_currency_amount'));
}
}
}