kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 01:06:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
James Cole
2022-11-01 19:34:12 +01:00
parent ebcf9b3be1 0c6e00666b
commit a702662e88
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -6,4 +6,4 @@
npm-debug.log npm-debug.log
yarn-error.log yarn-error.log
.env .env
.php-cs-fixer.cache /.ci/php-cs-fixer/vendor

2
app/Api/V1/Controllers/Models/Transaction/DestroyController.php
View File

@@ -97,8 +97,6 @@ class DestroyController extends Controller
$this->groupRepository->destroy($transactionGroup); $this->groupRepository->destroy($transactionGroup);
// trigger just after destruction
event(new DestroyedTransactionGroup($transactionGroup));
app('preferences')->mark(); app('preferences')->mark();
/** @var Account $account */ /** @var Account $account */

4
app/Http/Controllers/Transaction/DeleteController.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction; namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Events\DestroyedTransactionGroup;
use FireflyIII\Events\UpdatedAccount; use FireflyIII\Events\UpdatedAccount;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
@@ -131,9 +132,6 @@ class DeleteController extends Controller
$this->repository->destroy($group); $this->repository->destroy($group);
app('preferences')->mark();
/** @var Account $account */ /** @var Account $account */
foreach ($accounts as $account) { foreach ($accounts as $account) {
Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id)); Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id));

3
app/Services/Internal/Destroy/TransactionGroupDestroyService.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Services\Internal\Destroy; namespace FireflyIII\Services\Internal\Destroy;
use Exception; use Exception;
use FireflyIII\Events\DestroyedTransactionGroup;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
/** /**
@@ -48,5 +49,7 @@ class TransactionGroupDestroyService
} catch (Exception $e) { } catch (Exception $e) {
// @ignoreException // @ignoreException
} }
// trigger just after destruction
event(new DestroyedTransactionGroup($transactionGroup));
} }
} }