diff --git a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php index fe511f137e..3a0ba982db 100644 --- a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php @@ -25,11 +25,16 @@ namespace FireflyIII\Api\V1\Controllers\Models\Transaction; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Events\DestroyedTransactionGroup; +use FireflyIII\Events\UpdatedAccount; +use FireflyIII\Models\Account; +use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepository; use FireflyIII\User; use Illuminate\Http\JsonResponse; +use Log; /** * Class DestroyController @@ -37,6 +42,7 @@ use Illuminate\Http\JsonResponse; class DestroyController extends Controller { private JournalRepositoryInterface $repository; + private TransactionGroupRepository $groupRepository; /** * TransactionController constructor. @@ -54,6 +60,9 @@ class DestroyController extends Controller $this->repository = app(JournalRepositoryInterface::class); $this->repository->setUser($admin); + $this->groupRepository = app(TransactionGroupRepository::class); + $this->groupRepository->setUser($admin); + return $next($request); } ); @@ -72,11 +81,32 @@ class DestroyController extends Controller */ public function destroy(TransactionGroup $transactionGroup): JsonResponse { - $this->repository->destroyGroup($transactionGroup); + // grab asset account(s) from group: + $accounts = []; + /** @var TransactionJournal $journal */ + foreach($transactionGroup->transactionJournals as $journal) { + /** @var Transaction $transaction */ + foreach($journal->transactions as $transaction) { + $type = $transaction->account->accountType->type; + // if is valid liability, trigger event! + if(in_array($type, config('firefly.valid_liabilities'))) { + $accounts[] = $transaction->account; + } + } + } + + $this->groupRepository->destroy($transactionGroup); + // trigger just after destruction event(new DestroyedTransactionGroup($transactionGroup)); 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)); + event(new UpdatedAccount($account)); + } + return response()->json([], 204); } diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php index c62c7bb5c9..4e26cef71e 100644 --- a/app/Http/Controllers/Transaction/DeleteController.php +++ b/app/Http/Controllers/Transaction/DeleteController.php @@ -23,8 +23,12 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; +use FireflyIII\Events\UpdatedAccount; use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\Account; +use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionGroup; +use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; @@ -111,10 +115,32 @@ class DeleteController extends Controller $objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); session()->flash('success', (string) trans('firefly.deleted_' . strtolower($objectType), ['description' => $group->title ?? $journal->description])); + // grab asset account(s) from group: + $accounts = []; + /** @var TransactionJournal $journal */ + foreach($group->transactionJournals as $journal) { + /** @var Transaction $transaction */ + foreach($journal->transactions as $transaction) { + $type = $transaction->account->accountType->type; + // if is valid liability, trigger event! + if(in_array($type, config('firefly.valid_liabilities'))) { + $accounts[] = $transaction->account; + } + } + } + $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)); + event(new UpdatedAccount($account)); + } + + return redirect($this->getPreviousUrl('transactions.delete.url')); } } diff --git a/app/Support/Http/Controllers/GetConfigurationData.php b/app/Support/Http/Controllers/GetConfigurationData.php index dd931499cb..8ee87faca6 100644 --- a/app/Support/Http/Controllers/GetConfigurationData.php +++ b/app/Support/Http/Controllers/GetConfigurationData.php @@ -147,6 +147,16 @@ trait GetConfigurationData $index = (string) trans('firefly.last_thirty_days'); $ranges[$index] = [$thirty, new Carbon]; + // month to date: + $monthBegin = Carbon::now()->startOfMonth(); + $index = (string) trans('firefly.month_to_date'); + $ranges[$index] = [$monthBegin, new Carbon]; + + // year to date: + $yearBegin = Carbon::now()->startOfYear(); + $index = (string) trans('firefly.year_to_date'); + $ranges[$index] = [$yearBegin, new Carbon]; + // everything $index = (string) trans('firefly.everything'); $ranges[$index] = [$first, new Carbon]; diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 138eca49d5..df8e7ab4bb 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -35,6 +35,8 @@ return [ 'last_seven_days' => 'Last seven days', 'last_thirty_days' => 'Last thirty days', 'last_180_days' => 'Last 180 days', + 'month_to_date' => 'Month to date', + 'year_to_date' => 'Year to date', 'YTD' => 'YTD', 'welcome_back' => 'What\'s playing?', 'everything' => 'Everything',