mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 15:35:15 +00:00
Merge branch 'develop' into 5.8-dev
# 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:
@@ -83,6 +83,7 @@ class JournalDestroyService
|
||||
$journal->notes()->delete();
|
||||
|
||||
// update events
|
||||
// TODO move to repository
|
||||
$journal->piggyBankEvents()->update(['transaction_journal_id' => null]);
|
||||
|
||||
$journal->delete();
|
||||
|
Reference in New Issue
Block a user