Merge pull request #10848 from firefly-iii/release-1756787147

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-09-02
2025-09-04 03:43:07 +00:00 · 2025-09-02 06:25:54 +02:00 · 2025-09-02 06:25:47 +02:00 · 2025-09-02 06:03:17 +02:00 · 2025-09-02 06:03:11 +02:00 · 2025-09-01 20:44:18 +02:00
22 changed files with 702 additions and 338 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -1253,16 +1253,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1"
+                "reference": "cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5f360ebc65c55265a74d23d7fe27f957870158a1",
-                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7",
+                "reference": "cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7",
                "shasum": ""
            },
            "require": {
@@ -1327,7 +1327,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.2"
+                "source": "https://github.com/symfony/console/tree/v7.3.3"
            },
            "funding": [
                {
@@ -1347,7 +1347,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-30T17:13:41+00:00"
+            "time": "2025-08-25T06:35:40+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -1418,16 +1418,16 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v7.3.0",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d"
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/497f73ac996a598c92409b44ac43b6690c4f666d",
-                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191",
                "shasum": ""
            },
            "require": {
@@ -1478,7 +1478,7 @@
            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.3"
            },
            "funding": [
                {
@@ -1489,12 +1489,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-22T09:11:45+00:00"
+            "time": "2025-08-13T11:49:31+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
@@ -1712,16 +1716,16 @@
        },
        {
            "name": "symfony/options-resolver",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "119bcf13e67dbd188e5dbc74228b1686f66acd37"
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/119bcf13e67dbd188e5dbc74228b1686f66acd37",
-                "reference": "119bcf13e67dbd188e5dbc74228b1686f66acd37",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
                "shasum": ""
            },
            "require": {
@@ -1759,7 +1763,7 @@
                "options"
            ],
            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.3.2"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.3.3"
            },
            "funding": [
                {
@@ -1779,7 +1783,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-15T11:36:08+00:00"
+            "time": "2025-08-05T10:16:07+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -2282,16 +2286,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v7.3.0",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af"
+                "reference": "32241012d521e2e8a9d713adb0812bb773b907f1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
-                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
+                "url": "https://api.github.com/repos/symfony/process/zipball/32241012d521e2e8a9d713adb0812bb773b907f1",
+                "reference": "32241012d521e2e8a9d713adb0812bb773b907f1",
                "shasum": ""
            },
            "require": {
@@ -2323,7 +2327,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.3.0"
+                "source": "https://github.com/symfony/process/tree/v7.3.3"
            },
            "funding": [
                {
@@ -2334,12 +2338,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-17T09:11:12+00:00"
+            "time": "2025-08-18T09:42:54+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -2488,16 +2496,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca"
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca",
+                "url": "https://api.github.com/repos/symfony/string/zipball/17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
                "shasum": ""
            },
            "require": {
@@ -2555,7 +2563,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.2"
+                "source": "https://github.com/symfony/string/tree/v7.3.3"
            },
            "funding": [
                {
@@ -2575,7 +2583,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-10T08:47:49+00:00"
+            "time": "2025-08-25T06:35:40+00:00"
        }
    ],
    "packages-dev": [],
--- a/app/Api/V1/Controllers/Controller.php
+++ b/app/Api/V1/Controllers/Controller.php
@@ -108,12 +108,7 @@ abstract class Controller extends BaseController
    {
        $bag      = new ParameterBag();
        $page     = (int)request()->get('page');
-        if ($page < 1) {
-            $page = 1;
-        }
-        if ($page > 2 ** 16) {
-            $page = 2 ** 16;
-        }
+        $page     = min(max(1, $page), 2 ** 16);
        $bag->set('page', $page);

        // some date fields:
@@ -131,19 +126,15 @@ abstract class Controller extends BaseController
            $obj  = null;
            if (null !== $date) {
                try {
-                    $obj = Carbon::parse((string)$date);
+                    $obj = Carbon::parse((string)$date, config('app.timezone'));
                } catch (InvalidFormatException $e) {
                    // don't care
-                    Log::warning(
-                        sprintf(
-                            'Ignored invalid date "%s" in API controller parameter check: %s',
-                            substr((string)$date, 0, 20),
-                            $e->getMessage()
-                        )
-                    );
+                    Log::warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', substr((string)$date, 0, 20), $e->getMessage()));
                }
            }
-            $bag->set($field, $obj);
+            if ($obj instanceof Carbon) {
+                $bag->set($field, $obj);
+            }
        }

        // integer fields:
--- a/app/Api/V1/Controllers/Models/Account/ShowController.php
+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php
@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\Account;

 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\Account\ShowRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -33,7 +34,6 @@ use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
@@ -71,34 +71,36 @@ class ShowController extends Controller
     *
     * @throws FireflyException
     */
-    public function index(Request $request): JsonResponse
+    public function index(ShowRequest $request): JsonResponse
    {
        $manager     = $this->getManager();
-        $type        = $request->get('type') ?? 'all';
-        $this->parameters->set('type', $type);
+        $params      = $request->getParameters();
+        $this->parameters->set('type', $params['type']);

        // types to get, page size:
-        $types       = $this->mapAccountTypes($this->parameters->get('type'));
-        $pageSize    = $this->parameters->get('limit');
+        $types       = $this->mapAccountTypes($params['type']);

        // get list of accounts. Count it and split it.
        $this->repository->resetAccountOrder();
-        $collection  = $this->repository->getAccountsByType($types, $this->parameters->get('sort') ?? []);
+        // TODO fix sort.
+        $collection  = $this->repository->getAccountsByType($types);
        $count       = $collection->count();

        // continue sort:
-        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $params['limit'], $params['limit']);

        // enrich
        /** @var User $admin */
        $admin       = auth()->user();
        $enrichment  = new AccountEnrichment();
        $enrichment->setDate($this->parameters->get('date'));
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
        $enrichment->setUser($admin);
        $accounts    = $enrichment->enrich($accounts);

        // make paginator:
-        $paginator   = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
+        $paginator   = new LengthAwarePaginator($accounts, $count, $params['limit'], $this->parameters->get('page'));
        $paginator->setPath(route('api.v1.accounts.index').$this->buildParams());

        /** @var AccountTransformer $transformer */
@@ -117,7 +119,7 @@ class ShowController extends Controller
     *
     * Show single instance.
     */
-    public function show(Account $account): JsonResponse
+    public function show(ShowRequest $request, Account $account): JsonResponse
    {
        // get list of accounts. Count it and split it.
        $this->repository->resetAccountOrder();
@@ -129,6 +131,8 @@ class ShowController extends Controller
        $admin       = auth()->user();
        $enrichment  = new AccountEnrichment();
        $enrichment->setDate($this->parameters->get('date'));
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
        $enrichment->setUser($admin);
        $account     = $enrichment->enrichSingle($account);

--- a/app/Api/V1/Controllers/Models/Recurrence/TriggerController.php
+++ b/app/Api/V1/Controllers/Models/Recurrence/TriggerController.php
@@ -0,0 +1,126 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * TriggerController.php
+ * Copyright (c) 2025 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Generic\SingleDateRequest;
+use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Jobs\CreateRecurringTransactions;
+use FireflyIII\Models\Recurrence;
+use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Support\Facades\Preferences;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
+use FireflyIII\Transformers\TransactionGroupTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+
+class TriggerController extends Controller
+{
+    private RecurringRepositoryInterface $repository;
+
+    /**
+     * RecurrenceController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(RecurringRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function trigger(SingleDateRequest $request, Recurrence $recurrence): JsonResponse
+    {
+        // find recurrence occurrence for this date and trigger it.
+        // grab the date from the last time the recurrence fired:
+        $backupDate                 = $recurrence->latest_date;
+        $date                       = $request->getDate();
+
+        // fire the recurring cron job on the given date, then post-date the created transaction.
+        Log::info(sprintf('Trigger: will now fire recurring cron job task for date "%s".', $date->format('Y-m-d H:i:s')));
+
+        /** @var CreateRecurringTransactions $job */
+        $job                        = app(CreateRecurringTransactions::class);
+        $job->setRecurrences(new Collection()->push($recurrence));
+        $job->setDate($date);
+        $job->setForce(false);
+        $job->handle();
+        Log::debug('Done with recurrence.');
+
+        $groups                     = $job->getGroups();
+        $this->repository->markGroupsAsNow($groups);
+        $recurrence->latest_date    = $backupDate;
+        $recurrence->latest_date_tz = $backupDate?->format('e');
+        $recurrence->save();
+        Preferences::mark();
+
+        // enrich groups and return them:
+
+        if (0 === $groups->count()) {
+            $paginator = new LengthAwarePaginator(new Collection(), 0, 1);
+        }
+        if ($groups->count() > 0) {
+            /** @var User $admin */
+            $admin     = auth()->user();
+
+            // use new group collector:
+            /** @var GroupCollectorInterface $collector */
+            $collector = app(GroupCollectorInterface::class);
+            $collector
+                ->setUser($admin)
+                ->setIds($groups->pluck('id')->toArray())
+                ->withAPIInformation()
+            ;
+            $paginator = $collector->getPaginatedGroups();
+        }
+
+        $manager                    = $this->getManager();
+        $paginator->setPath(route('api.v1.recurrences.trigger', [$recurrence->id]).$this->buildParams());
+
+        // enrich
+        $admin                      = auth()->user();
+        $enrichment                 = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions               = $enrichment->enrich($paginator->getCollection());
+
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer                = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource                   = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+}
--- a/app/Api/V1/Requests/Models/Account/ShowRequest.php
+++ b/app/Api/V1/Requests/Models/Account/ShowRequest.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * ShowRequest.php
+ * Copyright (c) 2025 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace FireflyIII\Api\V1\Requests\Models\Account;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Preference;
+use FireflyIII\Support\Facades\Preferences;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use FireflyIII\User;
+use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ShowRequest extends FormRequest
+{
+    use AccountFilter;
+    use ConvertsDataTypes;
+
+    public function getParameters(): array
+    {
+        $limit = $this->convertInteger('limit');
+        if (0 === $limit) {
+            // get default for user:
+            /** @var User $user */
+            $user  = auth()->user();
+
+            /** @var Preference $pageSize */
+            $limit = (int)Preferences::getForUser($user, 'listPageSize', 50)->data;
+        }
+
+        $page  = $this->convertInteger('page');
+        $page  = min(max(1, $page), 2 ** 16);
+
+        return [
+            'type'  => $this->convertString('type', 'all'),
+            'limit' => $limit,
+            'sort'  => $this->convertString('sort', 'order'),
+            'page'  => $page,
+        ];
+    }
+
+    public function rules(): array
+    {
+        $keys = implode(',', array_keys($this->types));
+
+        return [
+            'date'  => 'date',
+            'start' => 'date|present_with:end|before_or_equal:end|before:2038-01-17|after:1970-01-02',
+            'end'   => 'date|present_with:start|after_or_equal:start|before:2038-01-17|after:1970-01-02',
+            'sort'  => 'nullable|in:active,iban,name,order,-active,-iban,-name,-order', // TODO improve me.
+            'type'  => sprintf('in:%s', $keys),
+            'limit' => 'numeric|min:1|max:131337',
+            'page'  => 'numeric|min:1|max:131337',
+        ];
+    }
+
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator): void {
+                if ($validator->failed()) {
+                    return;
+                }
+                $data = $validator->getData();
+
+
+                if (array_key_exists('date', $data) && array_key_exists('start', $data) && array_key_exists('end', $data)) {
+                    // assume valid dates, before we got here.
+                    $start = Carbon::parse($data['start'], config('app.timezone'))->startOfDay();
+                    $end   = Carbon::parse($data['end'], config('app.timezone'))->endOfDay();
+                    $date  = Carbon::parse($data['date'], config('app.timezone'));
+                    if (!$date->between($start, $end)) {
+                        $validator->errors()->add('date', (string)trans('validation.between_date'));
+                    }
+                }
+            }
+        );
+    }
+}
--- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
+++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php
@@ -78,7 +78,7 @@ class StoreRequest extends FormRequest
            'object_group_id'           => 'numeric|belongsToUser:object_groups,id',
            'object_group_title'        => ['min:1', 'max:255'],
            'target_amount'             => ['required', new IsValidZeroOrMoreAmount()],
-            'start_date'                => 'date|nullable',
+            'start_date'                => 'required|date|after:1970-01-01|before:2038-01-17',
            'transaction_currency_id'   => 'exists:transaction_currencies,id|required_without:transaction_currency_code',
            'transaction_currency_code' => 'exists:transaction_currencies,code|required_without:transaction_currency_id',
            'target_date'               => 'date|nullable|after:start_date',
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -851,7 +851,7 @@ class GroupCollector implements GroupCollectorInterface
     */
    public function getPaginatedGroups(): LengthAwarePaginator
    {
-        $set = $this->getGroups();
+        $set   = $this->getGroups();
        if (0 === $this->limit) {
            $this->setLimit(50);
        }
@@ -861,8 +861,9 @@ class GroupCollector implements GroupCollectorInterface

            return new LengthAwarePaginator($set, $this->total, $total, 1);
        }
+        $limit = $this->limit ?? 1;

-        return new LengthAwarePaginator($set, $this->total, $this->limit, $this->page);
+        return new LengthAwarePaginator($set, $this->total, $limit, $this->page);
    }

    /**
--- a/app/Http/Controllers/Recurring/TriggerController.php
+++ b/app/Http/Controllers/Recurring/TriggerController.php
@@ -28,8 +28,7 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\TriggerRecurrenceRequest;
 use FireflyIII\Jobs\CreateRecurringTransactions;
 use FireflyIII\Models\Recurrence;
-use FireflyIII\Models\TransactionGroup;
-use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Support\Facades\Preferences;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Collection;

@@ -58,20 +57,11 @@ class TriggerController extends Controller
        app('log')->debug('Done with recurrence.');

        $groups                     = $job->getGroups();
-
-        /** @var TransactionGroup $group */
-        foreach ($groups as $group) {
-            /** @var TransactionJournal $journal */
-            foreach ($group->transactionJournals as $journal) {
-                app('log')->debug(sprintf('Set date of journal #%d to today!', $journal->id));
-                $journal->date = today(config('app.timezone'));
-                $journal->save();
-            }
-        }
+        $this->repository->markGroupsAsNow($groups);
        $recurrence->latest_date    = $backupDate;
        $recurrence->latest_date_tz = $backupDate?->format('e');
        $recurrence->save();
-        app('preferences')->mark();
+        Preferences::mark();

        if (0 === $groups->count()) {
            $request->session()->flash('info', (string) trans('firefly.no_new_transaction_in_recurrence'));
--- a/app/Repositories/Recurring/RecurringRepository.php
+++ b/app/Repositories/Recurring/RecurringRepository.php
@@ -35,6 +35,7 @@ use FireflyIII\Models\RecurrenceMeta;
 use FireflyIII\Models\RecurrenceRepetition;
 use FireflyIII\Models\RecurrenceTransaction;
 use FireflyIII\Models\RecurrenceTransactionMeta;
+use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionJournalMeta;
 use FireflyIII\Services\Internal\Destroy\RecurrenceDestroyService;
@@ -582,4 +583,17 @@ class RecurringRepository implements RecurringRepositoryInterface, UserGroupInte

        return $service->update($recurrence, $data);
    }
+
+    public function markGroupsAsNow(Collection $groups): void
+    {
+        /** @var TransactionGroup $group */
+        foreach ($groups as $group) {
+            /** @var TransactionJournal $journal */
+            foreach ($group->transactionJournals as $journal) {
+                Log::debug(sprintf('Set date of journal #%d to today!', $journal->id));
+                $journal->date = now(config('app.timezone'));
+                $journal->save();
+            }
+        }
+    }
 }
--- a/app/Repositories/Recurring/RecurringRepositoryInterface.php
+++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php
@@ -139,6 +139,8 @@ interface RecurringRepositoryInterface
     */
    public function getXOccurrencesSince(RecurrenceRepetition $repetition, Carbon $date, Carbon $afterDate, int $count): array;

+    public function markGroupsAsNow(Collection $groups): void;
+
    /**
     * Parse the repetition in a string that is user readable.
     */
--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php
@@ -67,8 +67,12 @@ class AccountEnrichment implements EnrichmentInterface
    private UserGroup           $userGroup;
    private array               $lastActivities  = [];
    private ?Carbon             $date            = null;
+    private ?Carbon             $start           = null;
+    private ?Carbon             $end             = null;
    private bool                $convertToPrimary;
    private array               $balances        = [];
+    private array               $startBalances   = [];
+    private array               $endBalances     = [];
    private array               $objectGroups    = [];
    private array               $mappedObjects   = [];

@@ -256,7 +260,7 @@ class AccountEnrichment implements EnrichmentInterface
            // add object group if available
            if (array_key_exists($id, $this->mappedObjects)) {
                $key                        = $this->mappedObjects[$id];
-                $meta['object_group_id']    = (string) $this->objectGroups[$key]['id'];
+                $meta['object_group_id']    = (string)$this->objectGroups[$key]['id'];
                $meta['object_group_title'] = $this->objectGroups[$key]['title'];
                $meta['object_group_order'] = $this->objectGroups[$key]['order'];
            }
@@ -292,6 +296,7 @@ class AccountEnrichment implements EnrichmentInterface
            $date                         = $this->getDate();
            // $finalBalance            = Steam::finalAccountBalance($item, $date, $this->primaryCurrency, $this->convertToPrimary);
            $finalBalance                 = $this->balances[$id];
+            $balanceDifference            = $this->getBalanceDifference($id, $currency);
            Log::debug(sprintf('Call finalAccountBalance(%s) with date/time "%s"', var_export($this->convertToPrimary, true), $date->toIso8601String()), $finalBalance);

            // collect current balances:
@@ -305,21 +310,24 @@ class AccountEnrichment implements EnrichmentInterface
            $pcOpeningBalance             = null;
            $pcVirtualBalance             = null;
            $pcDebtAmount                 = null;
+            $pcBalanceDifference          = null;

            // convert to primary currency if needed:
            if ($this->convertToPrimary && $currency->id !== $this->primaryCurrency->id) {
                Log::debug(sprintf('Convert to primary, from %s to %s', $currency->code, $this->primaryCurrency->code));
-                $converter        = new ExchangeRateConverter();
-                $pcCurrentBalance = $converter->convert($currency, $this->primaryCurrency, $date, $currentBalance);
-                $pcOpeningBalance = $converter->convert($currency, $this->primaryCurrency, $date, $openingBalance);
-                $pcVirtualBalance = $converter->convert($currency, $this->primaryCurrency, $date, $virtualBalance);
-                $pcDebtAmount     = null === $debtAmount ? null : $converter->convert($currency, $this->primaryCurrency, $date, $debtAmount);
+                $converter           = new ExchangeRateConverter();
+                $pcCurrentBalance    = $converter->convert($currency, $this->primaryCurrency, $date, $currentBalance);
+                $pcOpeningBalance    = $converter->convert($currency, $this->primaryCurrency, $date, $openingBalance);
+                $pcVirtualBalance    = $converter->convert($currency, $this->primaryCurrency, $date, $virtualBalance);
+                $pcBalanceDifference = null === $balanceDifference ? null : $converter->convert($currency, $this->primaryCurrency, $date, $balanceDifference);
+                $pcDebtAmount        = null === $debtAmount ? null : $converter->convert($currency, $this->primaryCurrency, $date, $debtAmount);
            }
            if ($this->convertToPrimary && $currency->id === $this->primaryCurrency->id) {
-                $pcCurrentBalance = $currentBalance;
-                $pcOpeningBalance = $openingBalance;
-                $pcVirtualBalance = $virtualBalance;
-                $pcDebtAmount     = $debtAmount;
+                $pcCurrentBalance    = $currentBalance;
+                $pcOpeningBalance    = $openingBalance;
+                $pcVirtualBalance    = $virtualBalance;
+                $pcBalanceDifference = $balanceDifference;
+                $pcDebtAmount        = $debtAmount;
            }

            // set opening balance(s) to NULL if the date is null
@@ -329,14 +337,16 @@ class AccountEnrichment implements EnrichmentInterface
            }
            $meta['current_balance_date'] = $this->getDate();
            $meta['balances']             = [
-                'current_balance'    => $currentBalance,
-                'pc_current_balance' => $pcCurrentBalance,
-                'opening_balance'    => $openingBalance,
-                'pc_opening_balance' => $pcOpeningBalance,
-                'virtual_balance'    => $virtualBalance,
-                'pc_virtual_balance' => $pcVirtualBalance,
-                'debt_amount'        => $debtAmount,
-                'pc_debt_amount'     => $pcDebtAmount,
+                'current_balance'       => $currentBalance,
+                'pc_current_balance'    => $pcCurrentBalance,
+                'opening_balance'       => $openingBalance,
+                'pc_opening_balance'    => $pcOpeningBalance,
+                'virtual_balance'       => $virtualBalance,
+                'pc_virtual_balance'    => $pcVirtualBalance,
+                'debt_amount'           => $debtAmount,
+                'pc_debt_amount'        => $pcDebtAmount,
+                'balance_difference'    => $balanceDifference,
+                'pc_balance_difference' => $pcBalanceDifference,
            ];
            // end add balances
            $item->meta                   = $meta;
@@ -353,6 +363,10 @@ class AccountEnrichment implements EnrichmentInterface
    private function collectBalances(): void
    {
        $this->balances = Steam::accountsBalancesOptimized($this->collection, $this->getDate(), $this->primaryCurrency, $this->convertToPrimary);
+        if (null !== $this->start && null !== $this->end) {
+            $this->startBalances = Steam::accountsBalancesOptimized($this->collection, $this->start, $this->primaryCurrency, $this->convertToPrimary);
+            $this->endBalances   = Steam::accountsBalancesOptimized($this->collection, $this->end, $this->primaryCurrency, $this->convertToPrimary);
+        }
    }

    private function collectObjectGroups(): void
@@ -394,4 +408,30 @@ class AccountEnrichment implements EnrichmentInterface

        return $this->date;
    }
+
+    public function setStart(?Carbon $start): void
+    {
+        $this->start = $start;
+    }
+
+    public function setEnd(?Carbon $end): void
+    {
+        $this->end = $end;
+    }
+
+    private function getBalanceDifference(int $id, TransactionCurrency $currency): ?string
+    {
+        if (null === $this->start || null === $this->end) {
+            return null;
+        }
+        $startBalance = $this->startBalances[$id] ?? [];
+        $endBalance   = $this->endBalances[$id] ?? [];
+        if (0 === count($startBalance) || 0 === count($endBalance)) {
+            return null;
+        }
+        $start        = $startBalance[$currency->code] ?? '0';
+        $end          = $endBalance[$currency->code] ?? '0';
+
+        return bcsub($end, $start);
+    }
 }
--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php
@@ -59,7 +59,7 @@ class RecurringEnrichment implements EnrichmentInterface
    private Collection          $collection;
    private array               $ids                   = [];
    private array               $transactionTypeIds    = [];
-    private array               $transactionTypes      = [];
+    // private array               $transactionTypes      = [];
    private array               $notes                 = [];
    private array               $repetitions           = [];
    private array               $transactions          = [];
@@ -128,14 +128,14 @@ class RecurringEnrichment implements EnrichmentInterface
            $this->ids[]                   = $id;
            $this->transactionTypeIds[$id] = $typeId;
        }
-        $this->ids        = array_unique($this->ids);
+        $this->ids = array_unique($this->ids);

        // collect transaction types.
-        $transactionTypes = TransactionType::whereIn('id', array_unique($this->transactionTypeIds))->get();
-        foreach ($transactionTypes as $transactionType) {
-            $id                          = (int)$transactionType->id;
-            $this->transactionTypes[$id] = TransactionTypeEnum::from($transactionType->type);
-        }
+        //        $transactionTypes = TransactionType::whereIn('id', array_unique($this->transactionTypeIds))->get();
+        //        foreach ($transactionTypes as $transactionType) {
+        //            $id                          = (int)$transactionType->id;
+        //            $this->transactionTypes[$id] = TransactionTypeEnum::from($transactionType->type);
+        //        }
    }

    private function collectRepetitions(): void
@@ -400,7 +400,7 @@ class RecurringEnrichment implements EnrichmentInterface
    private function collectTransactionMetaData(): void
    {
        $ids           = array_keys($this->transactions);
-        $meta          = RecurrenceTransactionMeta::whereIn('rt_id', $ids)->get();
+        $meta          = RecurrenceTransactionMeta::whereNull('deleted_at')->whereIn('rt_id', $ids)->get();
        // other meta-data to be collected:
        $billIds       = [];
        $piggyBankIds  = [];
@@ -410,8 +410,15 @@ class RecurringEnrichment implements EnrichmentInterface
        foreach ($meta as $entry) {
            $id            = (int)$entry->id;
            $transactionId = (int)$entry->rt_id;
-            $recurrenceId  = $this->recurrenceIds[$transactionId];
-            $name          = (string)$entry->name;
+
+            // this should refer to another array, were rtIds can be used to find the recurrence.
+            $recurrenceId  = $this->recurrenceIds[$transactionId] ?? 0;
+            $name          = (string)$entry->name ?? '';
+            if (0 === $recurrenceId) {
+                Log::error(sprintf('Could not find recurrence ID for recurrence transaction ID %d', $transactionId));
+
+                continue;
+            }

            switch ($name) {
                default:
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -66,13 +66,13 @@ class AccountTransformer extends AbstractTransformer
        }

        // get account type:
-        $accountType                           = (string) config(sprintf('firefly.shortNamesByFullName.%s', $account->full_account_type));
-        $liabilityType                         = (string) config(sprintf('firefly.shortLiabilityNameByFullName.%s', $account->full_account_type));
+        $accountType                           = (string)config(sprintf('firefly.shortNamesByFullName.%s', $account->full_account_type));
+        $liabilityType                         = (string)config(sprintf('firefly.shortLiabilityNameByFullName.%s', $account->full_account_type));
        $liabilityType                         = '' === $liabilityType ? null : strtolower($liabilityType);
        $liabilityDirection                    = $account->meta['liability_direction'] ?? null;
        $accountRole                           = $this->getAccountRole($account, $accountType);
        $hasCurrencySettings                   = null !== $account->meta['currency'];
-        $includeNetWorth                       = 1 === (int) ($account->meta['include_net_worth'] ?? 0);
+        $includeNetWorth                       = 1 === (int)($account->meta['include_net_worth'] ?? 0);
        $longitude                             = $account->meta['location']['longitude'] ?? null;
        $latitude                              = $account->meta['location']['latitude'] ?? null;
        $zoomLevel                             = $account->meta['location']['zoom_level'] ?? null;
@@ -95,7 +95,7 @@ class AccountTransformer extends AbstractTransformer
        [$interest, $interestPeriod]           = $this->getInterest($account, $accountType);

        return [
-            'id'                              => (string) $account->id,
+            'id'                              => (string)$account->id,
            'created_at'                      => $account->created_at->toAtomString(),
            'updated_at'                      => $account->updated_at->toAtomString(),
            'active'                          => $account->active,
@@ -112,13 +112,13 @@ class AccountTransformer extends AbstractTransformer
            'object_has_currency_setting'     => $hasCurrencySettings,

            // currency is object specific or primary, already determined above.
-            'currency_id'                     => (string) $currency['id'],
+            'currency_id'                     => (string)$currency['id'],
            'currency_name'                   => $currency['name'],
            'currency_code'                   => $currency['code'],
            'currency_symbol'                 => $currency['symbol'],
            'currency_decimal_places'         => $currency['decimal_places'],

-            'primary_currency_id'             => (string) $this->primary->id,
+            'primary_currency_id'             => (string)$this->primary->id,
            'primary_currency_name'           => $this->primary->name,
            'primary_currency_code'           => $this->primary->code,
            'primary_currency_symbol'         => $this->primary->symbol,
@@ -137,6 +137,9 @@ class AccountTransformer extends AbstractTransformer
            'debt_amount'                     => $account->meta['balances']['debt_amount'],
            'pc_debt_amount'                  => $account->meta['balances']['pc_debt_amount'],

+            'balance_difference'              => $account->meta['balances']['balance_difference'],
+            'pc_balance_difference'           => $account->meta['balances']['pc_balance_difference'],
+
            'current_balance_date'            => $account->meta['current_balance_date']->toAtomString(),
            'notes'                           => $account->meta['notes'] ?? null,
            'monthly_payment_date'            => $monthlyPaymentDate,
@@ -166,7 +169,7 @@ class AccountTransformer extends AbstractTransformer
    private function getAccountRole(Account $account, string $accountType): ?string
    {
        $accountRole = $account->meta['account_role'] ?? null;
-        if ('asset' !== $accountType || '' === (string) $accountRole) {
+        if ('asset' !== $accountType || '' === (string)$accountRole) {
            return null;
        }

@@ -202,7 +205,7 @@ class AccountTransformer extends AbstractTransformer
                }
                $monthlyPaymentDate = $object->toAtomString();
            }
-            if (10 !== strlen((string) $monthlyPaymentDate)) {
+            if (10 !== strlen((string)$monthlyPaymentDate)) {
                $monthlyPaymentDate = Carbon::parse($monthlyPaymentDate, config('app.timezone'))->toAtomString();
            }
        }
--- a/changelog.md
+++ b/changelog.md
@@ -36,6 +36,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Issue 10806](https://github.com/firefly-iii/firefly-iii/issues/10806) (API: `/v1/chart/balance/balance` has undocumented `period` parameter) reported by @dreautall
 - [Issue 10807](https://github.com/firefly-iii/firefly-iii/issues/10807) (API: `/v1/bills` field `object_group_id` returns int, should be string) reported by @dreautall
 - [Issue 10815](https://github.com/firefly-iii/firefly-iii/issues/10815) (API: `/v1/accounts` balance is off by a day) reported by @dreautall
+- [Issue 10827](https://github.com/firefly-iii/firefly-iii/issues/10827) (Trigger Recurrence by API) reported by @MexerSam

 ## 6.3.2 - 2025-08-20

--- a/composer.lock
+++ b/composer.lock
@@ -1878,16 +1878,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v12.26.3",
+            "version": "v12.26.4",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "1a8e961a1801794c36c243bb610210d0a2bd61cb"
+                "reference": "085a367a32ba86fcfa647bfc796098ae6f795b09"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/1a8e961a1801794c36c243bb610210d0a2bd61cb",
-                "reference": "1a8e961a1801794c36c243bb610210d0a2bd61cb",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/085a367a32ba86fcfa647bfc796098ae6f795b09",
+                "reference": "085a367a32ba86fcfa647bfc796098ae6f795b09",
                "shasum": ""
            },
            "require": {
@@ -1997,7 +1997,7 @@
                "league/flysystem-read-only": "^3.25.1",
                "league/flysystem-sftp-v3": "^3.25.1",
                "mockery/mockery": "^1.6.10",
-                "orchestra/testbench-core": "^10.6.0",
+                "orchestra/testbench-core": "^10.6.3",
                "pda/pheanstalk": "^5.0.6|^7.0.0",
                "php-http/discovery": "^1.15",
                "phpstan/phpstan": "^2.0",
@@ -2091,7 +2091,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-08-27T13:51:06+00:00"
+            "time": "2025-08-29T14:15:53+00:00"
        },
        {
            "name": "laravel/passport",
@@ -6664,16 +6664,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1"
+                "reference": "cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5f360ebc65c55265a74d23d7fe27f957870158a1",
-                "reference": "5f360ebc65c55265a74d23d7fe27f957870158a1",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7",
+                "reference": "cb0102a1c5ac3807cf3fdf8bea96007df7fdbea7",
                "shasum": ""
            },
            "require": {
@@ -6738,7 +6738,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.2"
+                "source": "https://github.com/symfony/console/tree/v7.3.3"
            },
            "funding": [
                {
@@ -6758,7 +6758,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-30T17:13:41+00:00"
+            "time": "2025-08-25T06:35:40+00:00"
        },
        {
            "name": "symfony/css-selector",
@@ -6975,16 +6975,16 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v7.3.0",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d"
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/497f73ac996a598c92409b44ac43b6690c4f666d",
-                "reference": "497f73ac996a598c92409b44ac43b6690c4f666d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191",
                "shasum": ""
            },
            "require": {
@@ -7035,7 +7035,7 @@
            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.3"
            },
            "funding": [
                {
@@ -7046,12 +7046,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-22T09:11:45+00:00"
+            "time": "2025-08-13T11:49:31+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
@@ -7267,16 +7271,16 @@
        },
        {
            "name": "symfony/http-client",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-client.git",
-                "reference": "1c064a0c67749923483216b081066642751cc2c7"
+                "reference": "333b9bd7639cbdaecd25a3a48a9d2dcfaa86e019"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/1c064a0c67749923483216b081066642751cc2c7",
-                "reference": "1c064a0c67749923483216b081066642751cc2c7",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/333b9bd7639cbdaecd25a3a48a9d2dcfaa86e019",
+                "reference": "333b9bd7639cbdaecd25a3a48a9d2dcfaa86e019",
                "shasum": ""
            },
            "require": {
@@ -7284,6 +7288,7 @@
                "psr/log": "^1|^2|^3",
                "symfony/deprecation-contracts": "^2.5|^3",
                "symfony/http-client-contracts": "~3.4.4|^3.5.2",
+                "symfony/polyfill-php83": "^1.29",
                "symfony/service-contracts": "^2.5|^3"
            },
            "conflict": {
@@ -7342,7 +7347,7 @@
                "http"
            ],
            "support": {
-                "source": "https://github.com/symfony/http-client/tree/v7.3.2"
+                "source": "https://github.com/symfony/http-client/tree/v7.3.3"
            },
            "funding": [
                {
@@ -7362,7 +7367,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-15T11:36:08+00:00"
+            "time": "2025-08-27T07:45:05+00:00"
        },
        {
            "name": "symfony/http-client-contracts",
@@ -7444,16 +7449,16 @@
        },
        {
            "name": "symfony/http-foundation",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6"
+                "reference": "7475561ec27020196c49bb7c4f178d33d7d3dc00"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6877c122b3a6cc3695849622720054f6e6fa5fa6",
-                "reference": "6877c122b3a6cc3695849622720054f6e6fa5fa6",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7475561ec27020196c49bb7c4f178d33d7d3dc00",
+                "reference": "7475561ec27020196c49bb7c4f178d33d7d3dc00",
                "shasum": ""
            },
            "require": {
@@ -7503,7 +7508,7 @@
            "description": "Defines an object-oriented layer for the HTTP specification",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.3.2"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.3.3"
            },
            "funding": [
                {
@@ -7523,20 +7528,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-10T08:47:49+00:00"
+            "time": "2025-08-20T08:04:18+00:00"
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c"
+                "reference": "72c304de37e1a1cec6d5d12b81187ebd4850a17b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6ecc895559ec0097e221ed2fd5eb44d5fede083c",
-                "reference": "6ecc895559ec0097e221ed2fd5eb44d5fede083c",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/72c304de37e1a1cec6d5d12b81187ebd4850a17b",
+                "reference": "72c304de37e1a1cec6d5d12b81187ebd4850a17b",
                "shasum": ""
            },
            "require": {
@@ -7621,7 +7626,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.3.2"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.3.3"
            },
            "funding": [
                {
@@ -7641,20 +7646,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-31T10:45:04+00:00"
+            "time": "2025-08-29T08:23:45+00:00"
        },
        {
            "name": "symfony/mailer",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/mailer.git",
-                "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b"
+                "reference": "a32f3f45f1990db8c4341d5122a7d3a381c7e575"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/d43e84d9522345f96ad6283d5dfccc8c1cfc299b",
-                "reference": "d43e84d9522345f96ad6283d5dfccc8c1cfc299b",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/a32f3f45f1990db8c4341d5122a7d3a381c7e575",
+                "reference": "a32f3f45f1990db8c4341d5122a7d3a381c7e575",
                "shasum": ""
            },
            "require": {
@@ -7705,7 +7710,7 @@
            "description": "Helps sending emails",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.3.2"
+                "source": "https://github.com/symfony/mailer/tree/v7.3.3"
            },
            "funding": [
                {
@@ -7725,7 +7730,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-15T11:36:08+00:00"
+            "time": "2025-08-13T11:49:31+00:00"
        },
        {
            "name": "symfony/mailgun-mailer",
@@ -7886,16 +7891,16 @@
        },
        {
            "name": "symfony/options-resolver",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "119bcf13e67dbd188e5dbc74228b1686f66acd37"
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/119bcf13e67dbd188e5dbc74228b1686f66acd37",
-                "reference": "119bcf13e67dbd188e5dbc74228b1686f66acd37",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
                "shasum": ""
            },
            "require": {
@@ -7933,7 +7938,7 @@
                "options"
            ],
            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.3.2"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.3.3"
            },
            "funding": [
                {
@@ -7953,7 +7958,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-15T11:36:08+00:00"
+            "time": "2025-08-05T10:16:07+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -8786,16 +8791,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v7.3.0",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af"
+                "reference": "32241012d521e2e8a9d713adb0812bb773b907f1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
-                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
+                "url": "https://api.github.com/repos/symfony/process/zipball/32241012d521e2e8a9d713adb0812bb773b907f1",
+                "reference": "32241012d521e2e8a9d713adb0812bb773b907f1",
                "shasum": ""
            },
            "require": {
@@ -8827,7 +8832,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.3.0"
+                "source": "https://github.com/symfony/process/tree/v7.3.3"
            },
            "funding": [
                {
@@ -8838,12 +8843,16 @@
                    "url": "https://github.com/fabpot",
                    "type": "github"
                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                {
                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                    "type": "tidelift"
                }
            ],
-            "time": "2025-04-17T09:11:12+00:00"
+            "time": "2025-08-18T09:42:54+00:00"
        },
        {
            "name": "symfony/psr-http-message-bridge",
@@ -9098,16 +9107,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca"
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca",
+                "url": "https://api.github.com/repos/symfony/string/zipball/17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
                "shasum": ""
            },
            "require": {
@@ -9165,7 +9174,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.2"
+                "source": "https://github.com/symfony/string/tree/v7.3.3"
            },
            "funding": [
                {
@@ -9185,20 +9194,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-10T08:47:49+00:00"
+            "time": "2025-08-25T06:35:40+00:00"
        },
        {
            "name": "symfony/translation",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/translation.git",
-                "reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90"
+                "reference": "e0837b4cbcef63c754d89a4806575cada743a38d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/81b48f4daa96272efcce9c7a6c4b58e629df3c90",
-                "reference": "81b48f4daa96272efcce9c7a6c4b58e629df3c90",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/e0837b4cbcef63c754d89a4806575cada743a38d",
+                "reference": "e0837b4cbcef63c754d89a4806575cada743a38d",
                "shasum": ""
            },
            "require": {
@@ -9265,7 +9274,7 @@
            "description": "Provides tools to internationalize your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.3.2"
+                "source": "https://github.com/symfony/translation/tree/v7.3.3"
            },
            "funding": [
                {
@@ -9285,7 +9294,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-30T17:31:46+00:00"
+            "time": "2025-08-01T21:02:37+00:00"
        },
        {
            "name": "symfony/translation-contracts",
@@ -9441,16 +9450,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "53205bea27450dc5c65377518b3275e126d45e75"
+                "reference": "34d8d4c4b9597347306d1ec8eb4e1319b1e6986f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/53205bea27450dc5c65377518b3275e126d45e75",
-                "reference": "53205bea27450dc5c65377518b3275e126d45e75",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/34d8d4c4b9597347306d1ec8eb4e1319b1e6986f",
+                "reference": "34d8d4c4b9597347306d1ec8eb4e1319b1e6986f",
                "shasum": ""
            },
            "require": {
@@ -9504,7 +9513,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.3.2"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.3.3"
            },
            "funding": [
                {
@@ -9524,20 +9533,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-29T20:02:46+00:00"
+            "time": "2025-08-13T11:49:31+00:00"
        },
        {
            "name": "symfony/var-exporter",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "05b3e90654c097817325d6abd284f7938b05f467"
+                "reference": "d4dfcd2a822cbedd7612eb6fbd260e46f87b7137"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/05b3e90654c097817325d6abd284f7938b05f467",
-                "reference": "05b3e90654c097817325d6abd284f7938b05f467",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/d4dfcd2a822cbedd7612eb6fbd260e46f87b7137",
+                "reference": "d4dfcd2a822cbedd7612eb6fbd260e46f87b7137",
                "shasum": ""
            },
            "require": {
@@ -9585,7 +9594,7 @@
                "serialize"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.3.2"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.3.3"
            },
            "funding": [
                {
@@ -9605,7 +9614,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-10T08:47:49+00:00"
+            "time": "2025-08-18T13:10:53+00:00"
        },
        {
            "name": "thecodingmachine/safe",
@@ -11474,34 +11483,34 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "12.3.3",
+            "version": "12.3.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "733025d94635a001f67db71a2ed1bab4e7e4a9dc"
+                "reference": "96dc0466673e215bf5536301039017f03cd45c6b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/733025d94635a001f67db71a2ed1bab4e7e4a9dc",
-                "reference": "733025d94635a001f67db71a2ed1bab4e7e4a9dc",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/96dc0466673e215bf5536301039017f03cd45c6b",
+                "reference": "96dc0466673e215bf5536301039017f03cd45c6b",
                "shasum": ""
            },
            "require": {
                "ext-dom": "*",
                "ext-libxml": "*",
                "ext-xmlwriter": "*",
-                "nikic/php-parser": "^5.4.0",
+                "nikic/php-parser": "^5.6.1",
                "php": ">=8.3",
                "phpunit/php-file-iterator": "^6.0",
                "phpunit/php-text-template": "^5.0",
                "sebastian/complexity": "^5.0",
-                "sebastian/environment": "^8.0",
+                "sebastian/environment": "^8.0.3",
                "sebastian/lines-of-code": "^4.0",
                "sebastian/version": "^6.0",
                "theseer/tokenizer": "^1.2.3"
            },
            "require-dev": {
-                "phpunit/phpunit": "^12.1"
+                "phpunit/phpunit": "^12.3.7"
            },
            "suggest": {
                "ext-pcov": "PHP extension that provides line coverage",
@@ -11539,7 +11548,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.3"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.3.5"
            },
            "funding": [
                {
@@ -11559,7 +11568,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-08-27T14:43:48+00:00"
+            "time": "2025-09-01T08:07:42+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -12401,16 +12410,16 @@
        },
        {
            "name": "sebastian/global-state",
-            "version": "8.0.1",
+            "version": "8.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "912dd568677a6e13c67c08321710ad6ac81e6dca"
+                "reference": "ef1377171613d09edd25b7816f05be8313f9115d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/912dd568677a6e13c67c08321710ad6ac81e6dca",
-                "reference": "912dd568677a6e13c67c08321710ad6ac81e6dca",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/ef1377171613d09edd25b7816f05be8313f9115d",
+                "reference": "ef1377171613d09edd25b7816f05be8313f9115d",
                "shasum": ""
            },
            "require": {
@@ -12451,7 +12460,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/global-state/issues",
                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/8.0.1"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/8.0.2"
            },
            "funding": [
                {
@@ -12471,7 +12480,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-08-28T09:13:48+00:00"
+            "time": "2025-08-29T11:29:25+00:00"
        },
        {
            "name": "sebastian/lines-of-code",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2025-08-29',
-    'build_time'                   => 1756444897,
+    'version'                      => 'develop/2025-09-02',
+    'build_time'                   => 1756787029,
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 26,

@@ -232,6 +232,13 @@ return [
        'image/png',
        'image/heic',
        'image/heic-sequence',
+        'image/webp',
+        'image/gif',
+        'image/tiff',
+        'image/bmp',
+        'image/x-icon',
+        'image/vnd.microsoft.icon',
+

        // PDF
        'application/pdf',
--- a/package-lock.json
+++ b/package-lock.json
@@ -2592,9 +2592,9 @@
            }
        },
        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.49.0.tgz",
-            "integrity": "sha512-rlKIeL854Ed0e09QGYFlmDNbka6I3EQFw7iZuugQjMb11KMpJCLPFL4ZPbMfaEhLADEL1yx0oujGkBQ7+qW3eA==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.50.0.tgz",
+            "integrity": "sha512-lVgpeQyy4fWN5QYebtW4buT/4kn4p4IJ+kDNB4uYNT5b8c8DLJDg6titg20NIg7E8RWwdWZORW6vUFfrLyG3KQ==",
            "cpu": [
                "arm"
            ],
@@ -2606,9 +2606,9 @@
            ]
        },
        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.49.0.tgz",
-            "integrity": "sha512-cqPpZdKUSQYRtLLr6R4X3sD4jCBO1zUmeo3qrWBCqYIeH8Q3KRL4F3V7XJ2Rm8/RJOQBZuqzQGWPjjvFUcYa/w==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.50.0.tgz",
+            "integrity": "sha512-2O73dR4Dc9bp+wSYhviP6sDziurB5/HCym7xILKifWdE9UsOe2FtNcM+I4xZjKrfLJnq5UR8k9riB87gauiQtw==",
            "cpu": [
                "arm64"
            ],
@@ -2620,9 +2620,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.49.0.tgz",
-            "integrity": "sha512-99kMMSMQT7got6iYX3yyIiJfFndpojBmkHfTc1rIje8VbjhmqBXE+nb7ZZP3A5skLyujvT0eIUCUsxAe6NjWbw==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.50.0.tgz",
+            "integrity": "sha512-vwSXQN8T4sKf1RHr1F0s98Pf8UPz7pS6P3LG9NSmuw0TVh7EmaE+5Ny7hJOZ0M2yuTctEsHHRTMi2wuHkdS6Hg==",
            "cpu": [
                "arm64"
            ],
@@ -2634,9 +2634,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.49.0.tgz",
-            "integrity": "sha512-y8cXoD3wdWUDpjOLMKLx6l+NFz3NlkWKcBCBfttUn+VGSfgsQ5o/yDUGtzE9HvsodkP0+16N0P4Ty1VuhtRUGg==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.50.0.tgz",
+            "integrity": "sha512-cQp/WG8HE7BCGyFVuzUg0FNmupxC+EPZEwWu2FCGGw5WDT1o2/YlENbm5e9SMvfDFR6FRhVCBePLqj0o8MN7Vw==",
            "cpu": [
                "x64"
            ],
@@ -2648,9 +2648,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.49.0.tgz",
-            "integrity": "sha512-3mY5Pr7qv4GS4ZvWoSP8zha8YoiqrU+e0ViPvB549jvliBbdNLrg2ywPGkgLC3cmvN8ya3za+Q2xVyT6z+vZqA==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.50.0.tgz",
+            "integrity": "sha512-UR1uTJFU/p801DvvBbtDD7z9mQL8J80xB0bR7DqW7UGQHRm/OaKzp4is7sQSdbt2pjjSS72eAtRh43hNduTnnQ==",
            "cpu": [
                "arm64"
            ],
@@ -2662,9 +2662,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.49.0.tgz",
-            "integrity": "sha512-C9KzzOAQU5gU4kG8DTk+tjdKjpWhVWd5uVkinCwwFub2m7cDYLOdtXoMrExfeBmeRy9kBQMkiyJ+HULyF1yj9w==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.50.0.tgz",
+            "integrity": "sha512-G/DKyS6PK0dD0+VEzH/6n/hWDNPDZSMBmqsElWnCRGrYOb2jC0VSupp7UAHHQ4+QILwkxSMaYIbQ72dktp8pKA==",
            "cpu": [
                "x64"
            ],
@@ -2676,9 +2676,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.49.0.tgz",
-            "integrity": "sha512-OVSQgEZDVLnTbMq5NBs6xkmz3AADByCWI4RdKSFNlDsYXdFtlxS59J+w+LippJe8KcmeSSM3ba+GlsM9+WwC1w==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.50.0.tgz",
+            "integrity": "sha512-u72Mzc6jyJwKjJbZZcIYmd9bumJu7KNmHYdue43vT1rXPm2rITwmPWF0mmPzLm9/vJWxIRbao/jrQmxTO0Sm9w==",
            "cpu": [
                "arm"
            ],
@@ -2690,9 +2690,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.49.0.tgz",
-            "integrity": "sha512-ZnfSFA7fDUHNa4P3VwAcfaBLakCbYaxCk0jUnS3dTou9P95kwoOLAMlT3WmEJDBCSrOEFFV0Y1HXiwfLYJuLlA==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.50.0.tgz",
+            "integrity": "sha512-S4UefYdV0tnynDJV1mdkNawp0E5Qm2MtSs330IyHgaccOFrwqsvgigUD29uT+B/70PDY1eQ3t40+xf6wIvXJyg==",
            "cpu": [
                "arm"
            ],
@@ -2704,9 +2704,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.49.0.tgz",
-            "integrity": "sha512-Z81u+gfrobVK2iV7GqZCBfEB1y6+I61AH466lNK+xy1jfqFLiQ9Qv716WUM5fxFrYxwC7ziVdZRU9qvGHkYIJg==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.50.0.tgz",
+            "integrity": "sha512-1EhkSvUQXJsIhk4msxP5nNAUWoB4MFDHhtc4gAYvnqoHlaL9V3F37pNHabndawsfy/Tp7BPiy/aSa6XBYbaD1g==",
            "cpu": [
                "arm64"
            ],
@@ -2718,9 +2718,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.49.0.tgz",
-            "integrity": "sha512-zoAwS0KCXSnTp9NH/h9aamBAIve0DXeYpll85shf9NJ0URjSTzzS+Z9evmolN+ICfD3v8skKUPyk2PO0uGdFqg==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.50.0.tgz",
+            "integrity": "sha512-EtBDIZuDtVg75xIPIK1l5vCXNNCIRM0OBPUG+tbApDuJAy9mKago6QxX+tfMzbCI6tXEhMuZuN1+CU8iDW+0UQ==",
            "cpu": [
                "arm64"
            ],
@@ -2732,9 +2732,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.49.0.tgz",
-            "integrity": "sha512-2QyUyQQ1ZtwZGiq0nvODL+vLJBtciItC3/5cYN8ncDQcv5avrt2MbKt1XU/vFAJlLta5KujqyHdYtdag4YEjYQ==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.50.0.tgz",
+            "integrity": "sha512-BGYSwJdMP0hT5CCmljuSNx7+k+0upweM2M4YGfFBjnFSZMHOLYR0gEEj/dxyYJ6Zc6AiSeaBY8dWOa11GF/ppQ==",
            "cpu": [
                "loong64"
            ],
@@ -2746,9 +2746,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.49.0.tgz",
-            "integrity": "sha512-k9aEmOWt+mrMuD3skjVJSSxHckJp+SiFzFG+v8JLXbc/xi9hv2icSkR3U7uQzqy+/QbbYY7iNB9eDTwrELo14g==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.50.0.tgz",
+            "integrity": "sha512-I1gSMzkVe1KzAxKAroCJL30hA4DqSi+wGc5gviD0y3IL/VkvcnAqwBf4RHXHyvH66YVHxpKO8ojrgc4SrWAnLg==",
            "cpu": [
                "ppc64"
            ],
@@ -2760,9 +2760,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.49.0.tgz",
-            "integrity": "sha512-rDKRFFIWJ/zJn6uk2IdYLc09Z7zkE5IFIOWqpuU0o6ZpHcdniAyWkwSUWE/Z25N/wNDmFHHMzin84qW7Wzkjsw==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.50.0.tgz",
+            "integrity": "sha512-bSbWlY3jZo7molh4tc5dKfeSxkqnf48UsLqYbUhnkdnfgZjgufLS/NTA8PcP/dnvct5CCdNkABJ56CbclMRYCA==",
            "cpu": [
                "riscv64"
            ],
@@ -2774,9 +2774,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.49.0.tgz",
-            "integrity": "sha512-FkkhIY/hYFVnOzz1WeV3S9Bd1h0hda/gRqvZCMpHWDHdiIHn6pqsY3b5eSbvGccWHMQ1uUzgZTKS4oGpykf8Tw==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.50.0.tgz",
+            "integrity": "sha512-LSXSGumSURzEQLT2e4sFqFOv3LWZsEF8FK7AAv9zHZNDdMnUPYH3t8ZlaeYYZyTXnsob3htwTKeWtBIkPV27iQ==",
            "cpu": [
                "riscv64"
            ],
@@ -2788,9 +2788,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.49.0.tgz",
-            "integrity": "sha512-gRf5c+A7QiOG3UwLyOOtyJMD31JJhMjBvpfhAitPAoqZFcOeK3Kc1Veg1z/trmt+2P6F/biT02fU19GGTS529A==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.50.0.tgz",
+            "integrity": "sha512-CxRKyakfDrsLXiCyucVfVWVoaPA4oFSpPpDwlMcDFQvrv3XY6KEzMtMZrA+e/goC8xxp2WSOxHQubP8fPmmjOQ==",
            "cpu": [
                "s390x"
            ],
@@ -2802,9 +2802,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.49.0.tgz",
-            "integrity": "sha512-BR7+blScdLW1h/2hB/2oXM+dhTmpW3rQt1DeSiCP9mc2NMMkqVgjIN3DDsNpKmezffGC9R8XKVOLmBkRUcK/sA==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.50.0.tgz",
+            "integrity": "sha512-8PrJJA7/VU8ToHVEPu14FzuSAqVKyo5gg/J8xUerMbyNkWkO9j2ExBho/68RnJsMGNJq4zH114iAttgm7BZVkA==",
            "cpu": [
                "x64"
            ],
@@ -2816,9 +2816,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.49.0.tgz",
-            "integrity": "sha512-hDMOAe+6nX3V5ei1I7Au3wcr9h3ktKzDvF2ne5ovX8RZiAHEtX1A5SNNk4zt1Qt77CmnbqT+upb/umzoPMWiPg==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.50.0.tgz",
+            "integrity": "sha512-SkE6YQp+CzpyOrbw7Oc4MgXFvTw2UIBElvAvLCo230pyxOLmYwRPwZ/L5lBe/VW/qT1ZgND9wJfOsdy0XptRvw==",
            "cpu": [
                "x64"
            ],
@@ -2829,10 +2829,24 @@
                "linux"
            ]
        },
+        "node_modules/@rollup/rollup-openharmony-arm64": {
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.50.0.tgz",
+            "integrity": "sha512-PZkNLPfvXeIOgJWA804zjSFH7fARBBCpCXxgkGDRjjAhRLOR8o0IGS01ykh5GYfod4c2yiiREuDM8iZ+pVsT+Q==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openharmony"
+            ]
+        },
        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.49.0.tgz",
-            "integrity": "sha512-wkNRzfiIGaElC9kXUT+HLx17z7D0jl+9tGYRKwd8r7cUqTL7GYAvgUY++U2hK6Ar7z5Z6IRRoWC8kQxpmM7TDA==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.50.0.tgz",
+            "integrity": "sha512-q7cIIdFvWQoaCbLDUyUc8YfR3Jh2xx3unO8Dn6/TTogKjfwrax9SyfmGGK6cQhKtjePI7jRfd7iRYcxYs93esg==",
            "cpu": [
                "arm64"
            ],
@@ -2844,9 +2858,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.49.0.tgz",
-            "integrity": "sha512-gq5aW/SyNpjp71AAzroH37DtINDcX1Qw2iv9Chyz49ZgdOP3NV8QCyKZUrGsYX9Yyggj5soFiRCgsL3HwD8TdA==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.50.0.tgz",
+            "integrity": "sha512-XzNOVg/YnDOmFdDKcxxK410PrcbcqZkBmz+0FicpW5jtjKQxcW1BZJEQOF0NJa6JO7CZhett8GEtRN/wYLYJuw==",
            "cpu": [
                "ia32"
            ],
@@ -2858,9 +2872,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.49.0.tgz",
-            "integrity": "sha512-gEtqFbzmZLFk2xKh7g0Rlo8xzho8KrEFEkzvHbfUGkrgXOpZ4XagQ6n+wIZFNh1nTb8UD16J4nFSFKXYgnbdBg==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.50.0.tgz",
+            "integrity": "sha512-xMmiWRR8sp72Zqwjgtf3QbZfF1wdh8X2ABu3EaozvZcyHJeU0r+XAnXdKgs4cCAp6ORoYoCygipYP1mjmbjrsg==",
            "cpu": [
                "x64"
            ],
@@ -4486,9 +4500,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001737",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001737.tgz",
-            "integrity": "sha512-BiloLiXtQNrY5UyF0+1nSJLXUENuhka2pzy2Fx5pGxqavdrxSCW4U6Pn/PoG3Efspi2frRbHpBV2XsrPE6EDlw==",
+            "version": "1.0.30001739",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001739.tgz",
+            "integrity": "sha512-y+j60d6ulelrNSwpPyrHdl+9mJnQzHBr08xm48Qno0nSk4h3Qojh+ziv2qE6rXf4k3tadF4o1J/1tAbVm1NtnA==",
            "dev": true,
            "funding": [
                {
@@ -10123,9 +10137,9 @@
            }
        },
        "node_modules/rollup": {
-            "version": "4.49.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.49.0.tgz",
-            "integrity": "sha512-3IVq0cGJ6H7fKXXEdVt+RcYvRCt8beYY9K1760wGQwSAHZcS9eot1zDG5axUbcp/kWRi5zKIIDX8MoKv/TzvZA==",
+            "version": "4.50.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.50.0.tgz",
+            "integrity": "sha512-/Zl4D8zPifNmyGzJS+3kVoyXeDeT/GrsJM94sACNg9RtUE0hrHa1bNPtRSrfHTMH5HjRzce6K7rlTh3Khiw+pw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -10139,26 +10153,27 @@
                "npm": ">=8.0.0"
            },
            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.49.0",
-                "@rollup/rollup-android-arm64": "4.49.0",
-                "@rollup/rollup-darwin-arm64": "4.49.0",
-                "@rollup/rollup-darwin-x64": "4.49.0",
-                "@rollup/rollup-freebsd-arm64": "4.49.0",
-                "@rollup/rollup-freebsd-x64": "4.49.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.49.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.49.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.49.0",
-                "@rollup/rollup-linux-arm64-musl": "4.49.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.49.0",
-                "@rollup/rollup-linux-ppc64-gnu": "4.49.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.49.0",
-                "@rollup/rollup-linux-riscv64-musl": "4.49.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.49.0",
-                "@rollup/rollup-linux-x64-gnu": "4.49.0",
-                "@rollup/rollup-linux-x64-musl": "4.49.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.49.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.49.0",
-                "@rollup/rollup-win32-x64-msvc": "4.49.0",
+                "@rollup/rollup-android-arm-eabi": "4.50.0",
+                "@rollup/rollup-android-arm64": "4.50.0",
+                "@rollup/rollup-darwin-arm64": "4.50.0",
+                "@rollup/rollup-darwin-x64": "4.50.0",
+                "@rollup/rollup-freebsd-arm64": "4.50.0",
+                "@rollup/rollup-freebsd-x64": "4.50.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.50.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.50.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.50.0",
+                "@rollup/rollup-linux-arm64-musl": "4.50.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.50.0",
+                "@rollup/rollup-linux-ppc64-gnu": "4.50.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.50.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.50.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.50.0",
+                "@rollup/rollup-linux-x64-gnu": "4.50.0",
+                "@rollup/rollup-linux-x64-musl": "4.50.0",
+                "@rollup/rollup-openharmony-arm64": "4.50.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.50.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.50.0",
+                "@rollup/rollup-win32-x64-msvc": "4.50.0",
                "fsevents": "~2.3.2"
            }
        },
@@ -11531,9 +11546,9 @@
            }
        },
        "node_modules/vite": {
-            "version": "7.1.3",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.3.tgz",
-            "integrity": "sha512-OOUi5zjkDxYrKhTV3V7iKsoS37VUM7v40+HuwEmcrsf11Cdx9y3DIr2Px6liIcZFwt3XSRpQvFpL3WVy7ApkGw==",
+            "version": "7.1.4",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.4.tgz",
+            "integrity": "sha512-X5QFK4SGynAeeIt+A7ZWnApdUyHYm+pzv/8/A57LqSGcI88U6R6ipOs3uCesdc6yl7nl+zNO0t8LmqAdXcQihw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
--- a/resources/assets/v2/src/pages/accounts/index.js
+++ b/resources/assets/v2/src/pages/accounts/index.js
@@ -32,6 +32,7 @@ import {showWizardButton} from "../../support/page-settings/show-wizard-button.j
 import {setVariable} from "../../store/set-variable.js";
 import {getVariables} from "../../store/get-variables.js";
 import pageNavigation from "../../support/page-navigation.js";
+import {getVariable} from "../../store/get-variable.js";


 // set type from URL
@@ -56,12 +57,12 @@ if(sortingColumn[0] === '-') {

 page = parseInt(params.page ?? 1);

-
 showInternalsButton();
 showWizardButton();

 // TODO currency conversion
 // TODO page cleanup and recycle for transaction lists.
+// TODO process startPeriod and endPeriod.

 let index = function () {
    return {
@@ -73,9 +74,9 @@ let index = function () {
                show: false, text: '', url: '',
            }, wait: {
                show: false, text: '',
-
            }
        },
+        convertToPrimary: false,
        totalPages: 1,
        page: 1,
        pageUrl: '',
@@ -259,6 +260,7 @@ let index = function () {
                {name: this.getPreferenceKey('sd'), default: ''},
                {name: this.getPreferenceKey('filters'), default: this.filters},
                {name: this.getPreferenceKey('grouped'), default: true},
+                {name: 'convert_to_primary', default: false},
            ]).then((res) => {
                // process columns:
                for (let k in res[0]) {
@@ -283,6 +285,9 @@ let index = function () {
                // group accounts
                this.pageOptions.groupedAccounts = res[4];

+                // convert to primary?
+                this.convertToPrimary = res[5];
+
                this.loadAccounts();
            });
        },
@@ -348,7 +353,6 @@ let index = function () {
            if('asc' === this.pageOptions.sortDirection && '' !== sorting) {
                sorting = '-' + sorting;
            }
-            //const sorting = [{column: this.pageOptions.sortingColumn, direction: this.pageOptions.sortDirection}];

            // filter instructions
            let filters = {};
@@ -371,20 +375,20 @@ let index = function () {
                sort: sorting,
                filter: filters,
                active: active,
-                currentMoment: today,
+                date: format(today,'yyyy-MM-dd'),
                type: type,
                page: this.page,
-                startPeriod: start,
-                endPeriod: end
+                start: start,
+                end: end
            };

            if (!this.tableColumns.balance_difference.enabled) {
-                delete params.startPeriod;
-                delete params.endPeriod;
+                // delete params.startPeriod;
+                // delete params.endPeriod;
            }
            this.accounts = [];
            let groupedAccounts = {};
-            // one page only.o
+            // one page only
            (new Get()).index(params).then(response => {
                this.totalPages = response.meta.pagination.total_pages;
                for (let i = 0; i < response.data.length; i++) {
@@ -399,17 +403,26 @@ let index = function () {
                            role: current.attributes.account_role,
                            iban: null === current.attributes.iban ? '' : current.attributes.iban.match(/.{1,4}/g).join(' '),
                            account_number: null === current.attributes.account_number ? '' : current.attributes.account_number,
-                            current_balance: current.attributes.current_balance,
-                            currency_code: current.attributes.currency_code,
                            last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), i18next.t('config.month_and_day_fns')),
                            liability_type: current.attributes.liability_type,
                            liability_direction: current.attributes.liability_direction,
                            interest: current.attributes.interest,
                            interest_period: current.attributes.interest_period,
-                            balance: current.attributes.balance,
-                            pc_balance: current.attributes.pc_balance,
-                            balances: current.attributes.balances,
+
+                            // currency info
+                            currency_code: current.attributes.currency_code,
+                            primary_currency_code: current.attributes.primary_currency_code,
+
+
+                            // balances.
+                            current_balance: current.attributes.current_balance,
+                            pc_current_balance: current.attributes.pc_current_balance,
+                            balance_difference: current.attributes.balance_difference,
+                            pc_balance_difference: current.attributes.pc_balance_difference,
+                            debt_amount: current.attributes.debt_amount,
+                            pc_debt_amount: current.attributes.debt_amount,
                        };
+                        console.log(account);
                        // get group info:
                        let groupId = current.attributes.object_group_id;
                        if(!this.pageOptions.groupedAccounts) {
@@ -426,10 +439,9 @@ let index = function () {
                            }
                        }
                        groupedAccounts[groupId].accounts.push(account);
-
-                        //this.accounts.push(account);
                    }
                }
+
                // order grouped accounts by order.
                let sortable = [];
                for (let set in groupedAccounts) {
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -119,6 +119,7 @@ return [
    'between.file'               => 'The :attribute must be between :min and :max kilobytes.',
    'between.string'             => 'The :attribute must be between :min and :max characters.',
    'between.array'              => 'The :attribute must have between :min and :max items.',
+    'between_date'              => 'The date must be between the given start and end date.',
    'boolean'                    => 'The :attribute field must be true or false.',
    'confirmed'                  => 'The :attribute confirmation does not match.',
    'date'                       => 'The :attribute is not a valid date.',
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -441,7 +441,7 @@
                                    <td>
                                        {% for tag in journal.tags %}
                                            <h4 style="display: inline;"><a class="label label-success"
-                                                                            href="{{ route('tags.show', tag.id) }}">
+                                                                            href="{{ route('tags.show', [tag.id]) }}">
                                                    <span class="fa fa-fw fa-tag"></span>{{ tag.tag }}</a>
                                            </h4>
                                        {% endfor %}
--- a/resources/views/v2/accounts/index.blade.php
+++ b/resources/views/v2/accounts/index.blade.php
@@ -10,7 +10,7 @@
                            <h3 class="card-title">{{ __('firefly.net_worth') }}</h3>
                        </div>
                        <div class="card-body">
-                            TODO
+                            Not yet implemented.
                        </div>
                    </div>
                </div>
@@ -20,17 +20,17 @@
                            <h3 class="card-title">{{ __('firefly.in_out_period') }}</h3>
                        </div>
                        <div class="card-body">
-                            TODO
+                            Not yet implemented.
                        </div>
                    </div>
                </div>
                <div class="col-xl-4 col-lg-6 col-md-12 col-sm-12 col-xs-12">
                    <div class="card">
                        <div class="card-header">
-                            <h3 class="card-title">TODO</h3>
+                            <h3 class="card-title">Not yet implemented.</h3>
                        </div>
                        <div class="card-body">
-                            TODO
+                            Not yet implemented.
                        </div>
                    </div>
                </div>
@@ -262,43 +262,75 @@
                                            </template>
                                        </td>
                                        <td x-show="tableColumns.current_balance.visible && tableColumns.current_balance.enabled">
-                                            <template x-if="null !== account.balance">
-                                            <template x-for="balance in account.balance">
-                                                <span>
-                                                <span x-show="parseFloat(balance.balance) < 0.0" class="text-danger"
-                                                      x-text="formatMoney(balance.balance, balance.currency_code)"></span>
-                                                <span x-show="parseFloat(balance.balance) === 0.0" class="text-muted"
-                                                      x-text="formatMoney(balance.balance, balance.currency_code)"></span>
-                                                <span x-show="parseFloat(balance.balance) > 0.0" class="text-success"
-                                                      x-text="formatMoney(balance.balance, balance.currency_code)"></span>
-                                                    </span>
-                                            </template>
+                                                <span x-show="parseFloat(account.current_balance) < 0.0" class="text-danger"
+                                                      x-text="formatMoney(account.current_balance, account.primary_currency_code)"></span>
+                                                <span x-show="parseFloat(account.current_balance) === 0.0" class="text-muted"
+                                                      x-text="formatMoney(account.current_balance, account.primary_currency_code)"></span>
+                                                <span x-show="parseFloat(account.current_balance) > 0.0" class="text-success"
+                                                      x-text="formatMoney(account.current_balance, account.primary_currency_code)"></span>
+                                            <template x-if="null !== account.pc_current_balance">
+                                                <span>(
+                                                <span x-show="parseFloat(account.pc_current_balance) < 0.0" class="text-danger"
+                                                      x-text="formatMoney(account.pc_current_balance, account.primary_currency_code)"></span>
+                                                <span x-show="parseFloat(account.pc_current_balance) === 0.0" class="text-muted"
+                                                      x-text="formatMoney(account.pc_current_balance, account.primary_currency_code)"></span>
+                                                <span x-show="parseFloat(account.pc_current_balance) > 0.0" class="text-success"
+                                                      x-text="formatMoney(account.pc_current_balance, account.primary_currency_code)"></span>
+                                                )
+                                                </span>
                                            </template>
                                        </td>
                                        <td x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled">
-                                            <!--
-                                            <template x-if="null !== account.current_debt">
-                                                <span class="text-info"
-                                                    x-text="formatMoney(account.current_debt, account.currency_code)"></span>
+                                            <template x-if="null !== account.debt_amount">
+                                                <span>
+                                                <span x-show="null != account.debt_amount && account.debt_amount < 0" class="text-danger"
+                                                      x-text="formatMoney(account.debt_amount, account.currency_code)"></span>
+                                                <span x-show="null != account.debt_amount && account.debt_amount == 0" class="text-muted"
+                                                      x-text="formatMoney(account.debt_amount, account.currency_code)"></span>
+                                                <span x-show="null != account.debt_amount && account.debt_amount > 0" class="text-success"
+                                                      x-text="formatMoney(account.debt_amount, account.currency_code)"></span>
+                                                </span>
+
+                                                <template x-if="null !== account.pc_debt_amount">
+                                                <span>(
+                                                <span x-show="parseFloat(account.pc_debt_amount) < 0.0" class="text-danger"
+                                                      x-text="formatMoney(account.pc_debt_amount, account.primary_currency_code)"></span>
+                                                <span x-show="parseFloat(account.pc_debt_amount) === 0.0" class="text-muted"
+                                                      x-text="formatMoney(account.pc_debt_amount, account.primary_currency_code)"></span>
+                                                <span x-show="parseFloat(account.pc_debt_amount) > 0.0" class="text-success"
+                                                      x-text="formatMoney(account.pc_debt_amount, account.primary_currency_code)"></span>
+                                                )
+                                                </span>
+                                                </template>
                                            </template>
-                                            -->
-                                            FIXME
+
                                        </td>
                                        <td x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled">
                                            <span x-text="account.last_activity"></span>
                                        </td>
                                        <td x-show="tableColumns.balance_difference.visible && tableColumns.balance_difference.enabled">
-                                            <template x-if="null !== account.balance">
-                                            <template x-for="balance in account.balance">
+                                            <template x-if="null !== account.balance_difference">
                                                <span>
-                                                <span x-show="null != balance.balance_difference && balance.balance_difference < 0" class="text-danger"
-                                                      x-text="formatMoney(balance.balance_difference, balance.currency_code)"></span>
-                                                <span x-show="null != balance.balance_difference && balance.balance_difference == 0" class="text-muted"
-                                                      x-text="formatMoney(balance.balance_difference, balance.currency_code)"></span>
-                                                <span x-show="null != balance.balance_difference && balance.balance_difference > 0" class="text-success"
-                                                      x-text="formatMoney(balance.balance_difference, balance.currency_code)"></span>
+                                                <span x-show="null != account.balance_difference && account.balance_difference < 0" class="text-danger"
+                                                      x-text="formatMoney(account.balance_difference, account.currency_code)"></span>
+                                                <span x-show="null != account.balance_difference && account.balance_difference == 0" class="text-muted"
+                                                      x-text="formatMoney(account.balance_difference, account.currency_code)"></span>
+                                                <span x-show="null != account.balance_difference && account.balance_difference > 0" class="text-success"
+                                                      x-text="formatMoney(account.balance_difference, account.currency_code)"></span>
                                                </span>
-                                            </template>
+
+                                                <template x-if="null !== account.pc_balance_difference">
+                                                <span>(
+                                                <span x-show="parseFloat(account.pc_balance_difference) < 0.0" class="text-danger"
+                                                      x-text="formatMoney(account.pc_balance_difference, account.primary_currency_code)"></span>
+                                                <span x-show="parseFloat(account.pc_balance_difference) === 0.0" class="text-muted"
+                                                      x-text="formatMoney(account.pc_balance_difference, account.primary_currency_code)"></span>
+                                                <span x-show="parseFloat(account.pc_balance_difference) > 0.0" class="text-success"
+                                                      x-text="formatMoney(account.pc_balance_difference, account.primary_currency_code)"></span>
+                                                )
+                                                </span>
+                                                </template>
+
                                            </template>
                                        </td>
                                        <td x-show="tableColumns.menu.visible && tableColumns.menu.enabled">
--- a/routes/api.php
+++ b/routes/api.php
@@ -505,6 +505,7 @@ Route::group(
        Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
        Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
        Route::get('{recurrence}', ['uses' => 'ShowController@show', 'as' => 'show']);
+        Route::post('{recurrence}/trigger', ['uses' => 'TriggerController@trigger', 'as' => 'trigger']);
        Route::put('{recurrence}', ['uses' => 'UpdateController@update', 'as' => 'update']);
        Route::delete('{recurrence}', ['uses' => 'DestroyController@destroy', 'as' => 'delete']);
Author	SHA1	Message	Date
github-actions[bot]	fb97910a34	Merge pull request #10848 from firefly-iii/release-1756787147 🤖 Automatically merge the PR into the develop branch.	2025-09-02 06:25:54 +02:00
JC5	66b4d14129	🤖 Auto commit for release 'develop' on 2025-09-02	2025-09-02 06:25:47 +02:00
James Cole	fd53047dbc	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-09-02 06:03:17 +02:00
James Cole	5f6fc1bab4	Fix #10846	2025-09-02 06:03:11 +02:00
github-actions[bot]	cd0b64bd24	Merge pull request #10845 from firefly-iii/release-1756752249 🤖 Automatically merge the PR into the develop branch.	2025-09-01 20:44:18 +02:00
JC5	91b26bce0e	🤖 Auto commit for release 'develop' on 2025-09-01	2025-09-01 20:44:09 +02:00
James Cole	26a8bd921d	Fix columns, improve views.	2025-09-01 20:39:40 +02:00
github-actions[bot]	ad77d55c16	Merge pull request #10844 from firefly-iii/release-1756729274 🤖 Automatically merge the PR into the develop branch.	2025-09-01 14:21:21 +02:00
JC5	445a383dd0	🤖 Auto commit for release 'develop' on 2025-09-01	2025-09-01 14:21:14 +02:00
Sander Dorigo	1666af939e	Fix null	2025-09-01 14:03:21 +02:00
github-actions[bot]	35447f5eee	Merge pull request #10843 from firefly-iii/release-1756727799 🤖 Automatically merge the PR into the develop branch.	2025-09-01 13:56:46 +02:00
JC5	7c6fcb5731	🤖 Auto commit for release 'develop' on 2025-09-01	2025-09-01 13:56:39 +02:00
Sander Dorigo	fabd9bf765	Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop	2025-09-01 13:38:39 +02:00
Sander Dorigo	6352d26633	fix argument	2025-09-01 13:38:32 +02:00
github-actions[bot]	ebef145bd6	Merge pull request #10842 from firefly-iii/release-1756723300 🤖 Automatically merge the PR into the develop branch.	2025-09-01 12:41:48 +02:00
JC5	acc89eb5f9	🤖 Auto commit for release 'develop' on 2025-09-01	2025-09-01 12:41:40 +02:00
Sander Dorigo	6523596415	fix bad call	2025-09-01 12:36:36 +02:00
github-actions[bot]	b6c2d23116	Merge pull request #10838 from firefly-iii/release-1756697534 🤖 Automatically merge the PR into the develop branch.	2025-09-01 05:32:22 +02:00
JC5	2a123354f9	🤖 Auto commit for release 'develop' on 2025-09-01	2025-09-01 05:32:14 +02:00
James Cole	1e7ea4b76c	Improve account list and view.	2025-08-31 19:20:02 +02:00
James Cole	d959526eb3	Fix #10837	2025-08-31 19:07:45 +02:00
James Cole	8846ee9091	Fix #10827	2025-08-30 07:51:28 +02:00