kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	app/Factory/TransactionJournalFactory.php
#	app/Providers/EventServiceProvider.php
#	app/Repositories/PiggyBank/ModifiesPiggyBanks.php
#	app/Support/Search/OperatorQuerySearch.php
#	app/Support/Steam.php
#	app/TransactionRules/Actions/UpdatePiggybank.php
#	composer.json
#	composer.lock
#	config/search.php
#	frontend/yarn.lock
#	resources/lang/en_US/firefly.php
This commit is contained in:
James Cole
2022-12-11 07:37:33 +01:00
parent 60d8bb2aab 86243131cd
commit 9529721368
30 changed files with 802 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/Twig/TransactionGroupTwig.php
View File

@@ -219,7 +219,7 @@ class TransactionGroupTwig extends AbstractExtension
/** @var Transaction $first */
$first = $journal->transactions()->where('amount', '<', 0)->first();
return null !== $first->foreign_amount;
return '' !== $first->foreign_amount;
}
/**
@@ -235,7 +235,7 @@ class TransactionGroupTwig extends AbstractExtension
/** @var Transaction $first */
$first = $journal->transactions()->where('amount', '<', 0)->first();
$currency = $first->foreignCurrency;
$amount = $first->foreign_amount ?? '0';
$amount = '' === $first->foreign_amount ? '0' : $first->foreign_amount;
$colored = true;
$sourceType = $first->account()->first()->accountType()->first()->type;