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

Merge pull request #7216 from firefly-iii/fix-7214

Browse Source 
Possible fix for #7214
This commit is contained in:
James Cole
2023-03-12 16:06:31 +01:00
committed by GitHub
parent e0a31d29a4 e36675e232
commit 1d3da33e1d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Validation/TransactionValidation.php
View File

@@ -200,8 +200,11 @@ trait TransactionValidation
Log::debug('Both accounts have the same currency, continue.'); Log::debug('Both accounts have the same currency, continue.');
return; return;
} }
Log::debug(sprintf('Source account expects %s', $sourceCurrency->code));
Log::debug(sprintf('Destination account expects %s', $destinationCurrency->code));
if (TransactionType::DEPOSIT === ucfirst($transactionType)) { if (TransactionType::DEPOSIT === ucfirst($transactionType)) {
Log::debug(sprintf('Processing as a "%s"', $transactionType));
// use case: deposit from liability account to an asset account // use case: deposit from liability account to an asset account
// the foreign amount must be in the currency of the source // the foreign amount must be in the currency of the source
// the amount must be in the currency of the destination // the amount must be in the currency of the destination
@@ -214,12 +217,15 @@ trait TransactionValidation
// wrong currency information is present // wrong currency information is present
$foreignCurrencyCode = $transaction['foreign_currency_code'] ?? false; $foreignCurrencyCode = $transaction['foreign_currency_code'] ?? false;
if ($foreignCurrencyCode !== $sourceCurrency->code) { $foreignCurrencyId = (int)($transaction['foreign_currency_id'] ?? 0);
Log::debug(sprintf('Foreign currency code seems to be #%d "%s"', $foreignCurrencyId, $foreignCurrencyCode), $transaction);
if ($foreignCurrencyCode !== $sourceCurrency->code && $foreignCurrencyId !== $sourceCurrency->id) {
$validator->errors()->add(sprintf('transactions.%d.foreign_currency_code', $index), (string)trans('validation.require_foreign_src')); $validator->errors()->add(sprintf('transactions.%d.foreign_currency_code', $index), (string)trans('validation.require_foreign_src'));
return; return;
} }
} }
if (TransactionType::TRANSFER === ucfirst($transactionType) || TransactionType::WITHDRAWAL === ucfirst($transactionType)) { if (TransactionType::TRANSFER === ucfirst($transactionType) || TransactionType::WITHDRAWAL === ucfirst($transactionType)) {
Log::debug(sprintf('Processing as a "%s"', $transactionType));
// use case: withdrawal from asset account to a liability account. // use case: withdrawal from asset account to a liability account.
// the foreign amount must be in the currency of the destination // the foreign amount must be in the currency of the destination
// the amount must be in the currency of the source // the amount must be in the currency of the source
@@ -236,8 +242,10 @@ trait TransactionValidation
// wrong currency information is present // wrong currency information is present
$foreignCurrencyCode = $transaction['foreign_currency_code'] ?? false; $foreignCurrencyCode = $transaction['foreign_currency_code'] ?? false;
if ($foreignCurrencyCode !== $destinationCurrency->code) { $foreignCurrencyId = (int)($transaction['foreign_currency_id'] ?? 0);
$validator->errors()->add(sprintf('transactions.%d.foreign_currency_code', $index), (string)trans('validation.require_foreign_dest')); Log::debug(sprintf('Foreign currency code seems to be #%d "%s"', $foreignCurrencyId, $foreignCurrencyCode), $transaction);
if ($foreignCurrencyCode !== $destinationCurrency->code && $foreignCurrencyId !== $destinationCurrency->id) {
$validator->errors()->add(sprintf('transactions.%d.foreign_amount', $index), (string)trans('validation.require_foreign_dest'));
} }
} }
} }