diff --git a/.gitignore b/.gitignore index 665ff72faf..8333193216 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ npm-debug.log yarn-error.log .env -.php-cs-fixer.cache +/.ci/php-cs-fixer/vendor diff --git a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php index 76e082047b..29d4fa9f77 100644 --- a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php @@ -97,8 +97,6 @@ class DestroyController extends Controller $this->groupRepository->destroy($transactionGroup); - // trigger just after destruction - event(new DestroyedTransactionGroup($transactionGroup)); app('preferences')->mark(); /** @var Account $account */ diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php index 7e36632269..a6cd7d7cfe 100644 --- a/app/Http/Controllers/Transaction/DeleteController.php +++ b/app/Http/Controllers/Transaction/DeleteController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; +use FireflyIII\Events\DestroyedTransactionGroup; use FireflyIII\Events\UpdatedAccount; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; @@ -131,9 +132,6 @@ class DeleteController extends Controller $this->repository->destroy($group); - app('preferences')->mark(); - - /** @var Account $account */ foreach ($accounts as $account) { Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id)); diff --git a/app/Services/Internal/Destroy/TransactionGroupDestroyService.php b/app/Services/Internal/Destroy/TransactionGroupDestroyService.php index 2edc6840d6..886118eeaf 100644 --- a/app/Services/Internal/Destroy/TransactionGroupDestroyService.php +++ b/app/Services/Internal/Destroy/TransactionGroupDestroyService.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Destroy; use Exception; +use FireflyIII\Events\DestroyedTransactionGroup; use FireflyIII\Models\TransactionGroup; /** @@ -48,5 +49,7 @@ class TransactionGroupDestroyService } catch (Exception $e) { // @ignoreException } + // trigger just after destruction + event(new DestroyedTransactionGroup($transactionGroup)); } }