kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-02-05 03:49:04 +00:00
Code Issues Projects Releases Wiki Activity

Clean up more events.

Browse Source
This commit is contained in:
James Cole
2026-02-03 21:04:07 +01:00
parent 0b33e1ff09
commit c46aca0594
10 changed files with 372 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -24,7 +24,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Events\UpdatedTransactionGroup;
use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;
use FireflyIII\Events\Model\TransactionGroup\UpdatedSingleTransactionGroup;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\BulkEditJournalRequest;
use FireflyIII\Models\TransactionJournal;
@@ -56,7 +57,7 @@ class BulkController extends Controller
$this->middleware(function ($request, $next) {
$this->repository = app(JournalRepositoryInterface::class);
app('view')->share('title', (string) trans('firefly.transactions'));
app('view')->share('title', (string)trans('firefly.transactions'));
app('view')->share('mainTitleIcon', 'fa-exchange');
return $next($request);
@@ -70,9 +71,9 @@ class BulkController extends Controller
*
* @return Factory|View
*/
public function edit(array $journals): Factory|\Illuminate\Contracts\View\View
public function edit(array $journals): Factory | \Illuminate\Contracts\View\View
{
$subTitle = (string) trans('firefly.mass_bulk_journals');
$subTitle = (string)trans('firefly.mass_bulk_journals');
$this->rememberPreviousUrl('transactions.bulk-edit.url');
@@ -83,7 +84,7 @@ class BulkController extends Controller
$budgetRepos = app(BudgetRepositoryInterface::class);
$budgetList = app('expandedform')->makeSelectListWithEmpty($budgetRepos->getActiveBudgets());
return view('transactions.bulk.edit', ['journals' => $journals, 'subTitle' => $subTitle, 'budgetList' => $budgetList]);
return view('transactions.bulk.edit', ['journals' => $journals, 'subTitle' => $subTitle, 'budgetList' => $budgetList]);
}
/**
@@ -91,18 +92,18 @@ class BulkController extends Controller
*
* @return Application|Redirector|RedirectResponse
*/
public function update(BulkEditJournalRequest $request): Redirector|RedirectResponse
public function update(BulkEditJournalRequest $request): Redirector | RedirectResponse
{
$journalIds = $request->get('journals');
$journalIds = is_array($journalIds) ? $journalIds : [];
$ignoreCategory = 1 === (int) $request->get('ignore_category');
$ignoreBudget = 1 === (int) $request->get('ignore_budget');
$ignoreCategory = 1 === (int)$request->get('ignore_category');
$ignoreBudget = 1 === (int)$request->get('ignore_budget');
$tagsAction = $request->get('tags_action');
$collection = new Collection();
$count = 0;
foreach ($journalIds as $journalId) {
$journalId = (int) $journalId;
$journalId = (int)$journalId;
$journal = $this->repository->find($journalId);
if (null !== $journal) {
$resultA = $this->updateJournalBudget($journal, $ignoreBudget, $request->integer('budget_id'));
@@ -115,10 +116,11 @@ class BulkController extends Controller
}
}
$flags = new TransactionGroupEventFlags();
// run rules on changed journals:
/** @var TransactionJournal $journal */
foreach ($collection as $journal) { // @phpstan-ignore-line
event(new UpdatedTransactionGroup($journal->transactionGroup, true, true, false));
foreach ($collection as $journal) {
event(new UpdatedSingleTransactionGroup($journal->transactionGroup, $flags));
}
Preferences::mark();