kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-16 00:28:12 -07:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-03-01

Browse Source
This commit is contained in:
JC5
2026-03-01 08:08:15 +01:00
parent 6bae8ab70a
commit bb51baaa38
15 changed files with 133 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Support/Http/Controllers/ResolvesJournalAmountAndCurrency.php
+2 -7
View File
@@ -42,11 +42,7 @@ trait ResolvesJournalAmountAndCurrency
$currencyDecimalPlaces = (int) ($journal['currency_decimal_places'] ?? $currency['currency_decimal_places'] ?? 2);
$amount = (string) $journal['amount'];
if (
$this->convertToPrimary
&& null !== $this->primaryCurrency
&& $currencyId !== $this->primaryCurrency->id
) {
if ($this->convertToPrimary && null !== $this->primaryCurrency && $currencyId !== $this->primaryCurrency->id) {
$currencyId = $this->primaryCurrency->id;
$currencyName = $this->primaryCurrency->name;
$currencySymbol = $this->primaryCurrency->symbol;
@@ -54,8 +50,7 @@ trait ResolvesJournalAmountAndCurrency
$currencyDecimalPlaces = $this->primaryCurrency->decimal_places;
$amount = (int) ($journal['foreign_currency_id'] ?? 0) === $this->primaryCurrency->id
? (string) ($journal['foreign_amount'] ?? '0')
: (string) ($journal['pc_amount'] ?? '0')
;
: (string) ($journal['pc_amount'] ?? '0');
}
return [