Auto commit for release 'v6.1.23' on 2024-11-23

Update changelog for new release.
Merge branches 'develop' and 'develop' of github.com:firefly-iii/firefly-iii into develop
2025-08-16 10:54:39 +00:00 · 2024-11-23 19:19:46 +01:00 · 2024-11-23 19:14:15 +01:00 · 2024-11-23 16:15:00 +01:00 · 2024-11-23 16:14:47 +01:00 · 2024-11-23 09:45:53 +01:00
16 changed files with 336 additions and 234 deletions
--- a/THANKS.md
+++ b/THANKS.md
@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.

 ## 2024
+- Antônio Franco
 - yparitcher
 - Jhon Pedroza
 - mzhubail
--- a/app/Api/V2/Request/UserGroup/StoreRequest.php
+++ b/app/Api/V2/Request/UserGroup/StoreRequest.php
@@ -48,8 +48,19 @@ class StoreRequest extends FormRequest

    public function rules(): array
    {
+        $roles  = [];
+        foreach (UserRoleEnum::cases() as $role) {
+            $roles[] = $role->value;
+        }
+        $string = implode(',', $roles);
+
        return [
-            'title' => 'unique:user_groups,title|required|min:1|max:255',
+            'title'                => 'unique:user_groups,title|required|min:1|max:255',
+            'members'              => 'required|min:1',
+            'members.*.user_email' => 'email|missing_with:members.*.user_id',
+            'members.*.user_id'    => 'integer|exists:users,id|missing_with:members.*.user_email',
+            'members.*.roles'      => 'required|array|min:1',
+            'members.*.roles.*'    => sprintf('required|in:%s', $string),
        ];
    }
 }
--- a/app/Console/Commands/Integrity/AddTimezonesToDates.php
+++ b/app/Console/Commands/Integrity/AddTimezonesToDates.php
@@ -36,6 +36,7 @@ use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Log;
@@ -81,6 +82,8 @@ class AddTimezonesToDates extends Command
        foreach (self::$models as $model => $fields) {
            $this->addTimezoneToModel($model, $fields);
        }
+        // not yet in UTC mode
+        FireflyConfig::set('utc', false);
    }

    private function addTimezoneToModel(string $model, array $fields): void
--- a/app/Console/Commands/Integrity/ConvertDatesToUTC.php
+++ b/app/Console/Commands/Integrity/ConvertDatesToUTC.php
@@ -25,6 +25,7 @@ namespace FireflyIII\Console\Commands\Integrity;

 use Carbon\Carbon;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Collection;
@@ -39,7 +40,7 @@ class ConvertDatesToUTC extends Command
     *
     * @var string
     */
-    protected $signature   = 'firefly-iii:convert-dates-to-utc';
+    protected $signature   = 'firefly-iii:migrate-to-utc';

    /**
     * The console command description.
@@ -60,6 +61,8 @@ class ConvertDatesToUTC extends Command
        foreach (AddTimezonesToDates::$models as $model => $fields) {
            $this->ConvertModeltoUTC($model, $fields);
        }
+        // tell the system we are now in UTC mode.
+        FireflyConfig::set('utc', true);

        return Command::SUCCESS;
    }
--- a/app/Console/Commands/Integrity/ReportSum.php
+++ b/app/Console/Commands/Integrity/ReportSum.php
@@ -58,7 +58,7 @@ class ReportSum extends Command

        /** @var User $user */
        foreach ($userRepository->all() as $user) {
-            $sum = (string)$user->transactions()->sum('amount');
+            $sum = (string)$user->transactions()->selectRaw('SUM(amount) + SUM(foreign_amount) as total')->value('total');
            if (!is_numeric($sum)) {
                $message = sprintf('Error: Transactions for user #%d (%s) have an invalid sum ("%s").', $user->id, $user->email, $sum);
                $this->friendlyError($message);
--- a/app/Factory/TransactionJournalFactory.php
+++ b/app/Factory/TransactionJournalFactory.php
@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Factory;

 use Carbon\Carbon;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\DuplicateTransactionException;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
@@ -43,6 +44,7 @@ use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use FireflyIII\Services\Internal\Support\JournalServiceTrait;
+use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\User;
 use FireflyIII\Validation\AccountValidator;
@@ -157,7 +159,7 @@ class TransactionJournalFactory

        $this->errorIfDuplicate($row['import_hash_v2']);

-        /** Some basic fields */
+        // Some basic fields
        $type                  = $this->typeRepository->findTransactionType(null, $row['type']);
        $carbon                = $row['date'] ?? today(config('app.timezone'));
        $order                 = $row['order'] ?? 0;
@@ -170,6 +172,12 @@ class TransactionJournalFactory
        // Manipulate basic fields
        $carbon->setTimezone(config('app.timezone'));

+        // 2024-11-19, overrule timezone with UTC and store it as UTC.
+        if (FireflyConfig::get('utc', false)) {
+            $carbon->setTimezone('UTC');
+        }
+        // $carbon->setTimezone('UTC');
+
        try {
            // validate source and destination using a new Validator.
            $this->validateAccounts($row);
@@ -205,7 +213,7 @@ class TransactionJournalFactory
        app('log')->debug('Done with getAccount(2x)');

        // this is the moment for a reconciliation sanity check (again).
-        if (TransactionType::RECONCILIATION === $type->type) {
+        if (TransactionTypeEnum::RECONCILIATION->value === $type->type) {
            [$sourceAccount, $destinationAccount] = $this->reconciliationSanityCheck($sourceAccount, $destinationAccount);
        }

--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -40,6 +40,7 @@ use FireflyIII\Support\Http\Controllers\ChartGeneration;
 use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;

 /**
 * Class AccountController.
@@ -300,13 +301,13 @@ class AccountController extends Controller
        $start          = clone session('start', today(config('app.timezone'))->startOfMonth());
        $end            = clone session('end', today(config('app.timezone'))->endOfMonth());
        $defaultSet     = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray();
-        app('log')->debug('Default set is ', $defaultSet);
+        Log::debug('Default set is ', $defaultSet);
        $frontpage      = app('preferences')->get('frontpageAccounts', $defaultSet);
        $frontpageArray = !is_array($frontpage->data) ? [] : $frontpage->data;
-        app('log')->debug('Frontpage preference set is ', $frontpageArray);
+        Log::debug('Frontpage preference set is ', $frontpageArray);
        if (0 === count($frontpageArray)) {
            app('preferences')->set('frontpageAccounts', $defaultSet);
-            app('log')->debug('frontpage set is empty!');
+            Log::debug('frontpage set is empty!');
        }
        $accounts       = $repository->getAccountsById($frontpageArray);

@@ -414,7 +415,7 @@ class AccountController extends Controller
     */
    private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
    {
-        app('log')->debug(sprintf('Now in periodByCurrency("%s", "%s", %s, "%s")', $start->format('Y-m-d'), $end->format('Y-m-d'), $account->id, $currency->code));
+        Log::debug(sprintf('Now in periodByCurrency("%s", "%s", %s, "%s")', $start->format('Y-m-d'), $end->format('Y-m-d'), $account->id, $currency->code));
        $locale            = app('steam')->getLocale();
        $step              = $this->calculateStep($start, $end);
        $result            = [
@@ -424,13 +425,13 @@ class AccountController extends Controller
        ];
        $entries           = [];
        $current           = clone $start;
-        app('log')->debug(sprintf('Step is %s', $step));
+        Log::debug(sprintf('Step is %s', $step));

        // fix for issue https://github.com/firefly-iii/firefly-iii/issues/8041
        // have to make sure this chart is always based on the balance at the END of the period.
        // This period depends on the size of the chart
        $current           = app('navigation')->endOfX($current, $step, null);
-        app('log')->debug(sprintf('$current date is %s', $current->format('Y-m-d')));
+        Log::debug(sprintf('$current date is %s', $current->format('Y-m-d')));
        if ('1D' === $step) {
            // per day the entire period, balance for every day.
            $format   = (string)trans('config.month_and_day_js', [], $locale);
@@ -447,7 +448,7 @@ class AccountController extends Controller
        }
        if ('1W' === $step || '1M' === $step || '1Y' === $step) {
            while ($end >= $current) {
-                app('log')->debug(sprintf('Current is: %s', $current->format('Y-m-d')));
+                Log::debug(sprintf('Current is: %s', $current->format('Y-m-d')));
                $balance         = (float)app('steam')->balance($account, $current, $currency);
                $label           = app('navigation')->periodShow($current, $step);
                $entries[$label] = $balance;
--- a/app/Http/Controllers/Chart/ReportController.php
+++ b/app/Http/Controllers/Chart/ReportController.php
@@ -24,18 +24,19 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Chart;

 use Carbon\Carbon;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Helpers\Report\NetWorthInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Http\Controllers\BasicDataSupport;
 use FireflyIII\Support\Http\Controllers\ChartGeneration;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;

 /**
 * Class ReportController.
@@ -88,7 +89,7 @@ class ReportController extends Controller
                $includeNetWorth = $accountRepository->getMetaValue($account, 'include_net_worth');
                $result          = null === $includeNetWorth ? true : '1' === $includeNetWorth;
                if (false === $result) {
-                    app('log')->debug(sprintf('Will not include "%s" in net worth charts.', $account->name));
+                    Log::debug(sprintf('Will not include "%s" in net worth charts.', $account->name));
                }

                return $result;
@@ -136,6 +137,7 @@ class ReportController extends Controller
     */
    public function operations(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
    {
+        $end->endOfDay();
        // chart properties for cache:
        $cache          = new CacheProperties();
        $cache->addProperty('chart.report.operations');
@@ -146,7 +148,8 @@ class ReportController extends Controller
            // return response()->json($cache->get());
        }

-        app('log')->debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());
+        Log::debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());
+        Log::debug(sprintf('Period: %s to %s', $start->toW3cString(), $end->toW3cString()));
        $format         = app('navigation')->preferredCarbonFormat($start, $end);
        $titleFormat    = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
        $preferredRange = app('navigation')->preferredRangeFormat($start, $end);
@@ -158,7 +161,14 @@ class ReportController extends Controller
        $collector      = app(GroupCollectorInterface::class);
        $collector->setRange($start, $end)->withAccountInformation();
        $collector->setXorAccounts($accounts);
-        $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::RECONCILIATION, TransactionType::TRANSFER]);
+        $collector->setTypes(
+            [
+                TransactionTypeEnum::WITHDRAWAL,
+                TransactionTypeEnum::DEPOSIT,
+                TransactionTypeEnum::RECONCILIATION,
+                TransactionTypeEnum::TRANSFER,
+            ]
+        );
        $journals       = $collector->getExtractedJournals();

        // loop. group by currency and by period.
@@ -184,15 +194,25 @@ class ReportController extends Controller

            // deposit = incoming
            // transfer or reconcile or opening balance, and these accounts are the destination.
-            if (TransactionType::DEPOSIT === $journal['transaction_type_type'] || ((TransactionType::TRANSFER === $journal['transaction_type_type'] || TransactionType::RECONCILIATION === $journal['transaction_type_type'] || TransactionType::OPENING_BALANCE === $journal['transaction_type_type']) && in_array($journal['destination_account_id'], $ids, true))) {
+            if (
+                TransactionTypeEnum::DEPOSIT->value === $journal['transaction_type_type']
+                || ((
+                    TransactionTypeEnum::TRANSFER->value === $journal['transaction_type_type']
+                    || TransactionTypeEnum::RECONCILIATION->value === $journal['transaction_type_type']
+                    || TransactionTypeEnum::OPENING_BALANCE->value === $journal['transaction_type_type']
+                )
+                    && in_array($journal['destination_account_id'], $ids, true))) {
                $key = 'earned';
            }
            $data[$currencyId][$period][$key] = bcadd($data[$currencyId][$period][$key], $amount);
        }

        // loop this data, make chart bars for each currency:
+        Log::debug('Looping data');
+
        /** @var array $currency */
        foreach ($data as $currency) {
+            Log::debug(sprintf('Now processing currency "%s"', $currency['currency_name']));
            $income       = [
                'label'           => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]),
                'type'            => 'bar',
@@ -214,12 +234,15 @@ class ReportController extends Controller
            // loop all possible periods between $start and $end
            $currentStart = clone $start;
            $currentEnd   = clone $end;
+            Log::debug(sprintf('START current start and end: %s and %s', $currentStart->toW3cString(), $currentEnd->toW3cString()));

            // #8374. Sloppy fix for yearly charts. Not really interested in a better fix with v2 layout and all.
            if ('1Y' === $preferredRange) {
                $currentEnd = app('navigation')->endOfPeriod($currentEnd, $preferredRange);
            }
+            Log::debug('Start of sub-loop');
            while ($currentStart <= $currentEnd) {
+                Log::debug(sprintf('Current start: %s', $currentStart->toW3cString()));
                $key          = $currentStart->format($format);
                $title        = $currentStart->isoFormat($titleFormat);
                // #8663 make sure the period exists in the data previously collected.
@@ -227,12 +250,20 @@ class ReportController extends Controller
                    $income['entries'][$title]  = app('steam')->bcround($currency[$key]['earned'] ?? '0', $currency['currency_decimal_places']);
                    $expense['entries'][$title] = app('steam')->bcround($currency[$key]['spent'] ?? '0', $currency['currency_decimal_places']);
                }
+                // #9477 if the period is not in the data, add it with zero values.
+                if (!array_key_exists($key, $currency)) {
+                    $income['entries'][$title]  = '0';
+                    $expense['entries'][$title] = '0';
+
+                }
                $currentStart = app('navigation')->addPeriod($currentStart, $preferredRange, 0);
            }
+            Log::debug('End of sub-loop');

            $chartData[]  = $income;
            $chartData[]  = $expense;
        }
+        Log::debug('End of loop');

        $data           = $this->generator->multiSet($chartData);
        $cache->store($data);
--- a/app/Services/Internal/Update/JournalUpdateService.php
+++ b/app/Services/Internal/Update/JournalUpdateService.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Services\Internal\Update;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Events\TriggeredAuditLog;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Factory\TagFactory;
@@ -43,6 +44,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Services\Internal\Support\JournalServiceTrait;
+use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\Validation\AccountValidator;
 use Illuminate\Support\Facades\Log;
@@ -481,13 +483,16 @@ class JournalUpdateService
            $value                                  = $this->data[$fieldName];

            if ('date' === $fieldName) {
-                if ($value instanceof Carbon) {
-                    // update timezone.
-                    $value->setTimezone(config('app.timezone'));
-                }
                if (!$value instanceof Carbon) {
                    $value = new Carbon($value);
                }
+
+                $value->setTimezone(config('app.timezone'));
+                // 2024-11-22, overrule timezone with UTC and store it as UTC.
+                if (FireflyConfig::get('utc', false)) {
+                    $value->setTimezone('UTC');
+                }
+
                // do some parsing.
                app('log')->debug(sprintf('Create date value from string "%s".', $value));
                $this->transactionJournal->date_tz = $value->format('e');
@@ -716,13 +721,15 @@ class JournalUpdateService
            // if the transaction is a TRANSFER, and the foreign amount and currency are set (like they seem to be)
            // the correct fields to update in the destination transaction are NOT the foreign amount and currency
            // but rather the normal amount and currency. This is new behavior.
-
-            if (TransactionType::TRANSFER === $this->transactionJournal->transactionType->type) {
+            $isTransfer                  = TransactionTypeEnum::TRANSFER->value === $this->transactionJournal->transactionType->type;
+            if ($isTransfer) {
                Log::debug('Switch amounts, store in amount and not foreign_amount');
                $dest->transaction_currency_id = $foreignCurrency->id;
                $dest->amount                  = app('steam')->positive($foreignAmount);
+                $dest->foreign_amount          = app('steam')->positive($source->amount);
+                $dest->foreign_currency_id     = $source->transaction_currency_id;
            }
-            if (TransactionType::TRANSFER !== $this->transactionJournal->transactionType->type) {
+            if (!$isTransfer) {
                $dest->foreign_currency_id = $foreignCurrency->id;
                $dest->foreign_amount      = app('steam')->positive($foreignAmount);
            }
--- a/app/Transformers/V2/UserGroupTransformer.php
+++ b/app/Transformers/V2/UserGroupTransformer.php
@@ -65,7 +65,7 @@ class UserGroupTransformer extends AbstractTransformer
                    /** @var GroupMembership $groupMembership */
                    foreach ($groupMemberships as $groupMembership) {
                        $this->memberships[$userGroupId][] = [
-                            'user_id'    => (string)$groupMembership->user_id,
+                            'user_id'    => (string) $groupMembership->user_id,
                            'user_email' => $groupMembership->user->email,
                            'role'       => $groupMembership->userRole->title,
                            'you'        => $groupMembership->user_id === $user->id,
@@ -73,6 +73,7 @@ class UserGroupTransformer extends AbstractTransformer
                    }
                }
            }
+            $this->mergeMemberships();
        }

        return $objects;
@@ -90,8 +91,28 @@ class UserGroupTransformer extends AbstractTransformer
            'in_use'          => $this->inUse[$userGroup->id] ?? false,
            'title'           => $userGroup->title,
            'can_see_members' => $this->membershipsVisible[$userGroup->id] ?? false,
-            'members'         => $this->memberships[$userGroup->id] ?? [],
+            'members'         => array_values($this->memberships[$userGroup->id] ?? []),
        ];
        // if the user has a specific role in this group, then collect the memberships.
    }
+
+    private function mergeMemberships(): void
+    {
+        $new               = [];
+        foreach ($this->memberships as $groupId => $members) {
+            $new[$groupId] ??= [];
+
+            foreach ($members as $member) {
+                $mail                            = $member['user_email'];
+                $new[$groupId][$mail] ??= [
+                    'user_id'    => $member['user_id'],
+                    'user_email' => $member['user_email'],
+                    'you'        => $member['you'],
+                    'roles'      => [],
+                ];
+                $new[$groupId][$mail]['roles'][] = $member['role'];
+            }
+        }
+        $this->memberships = $new;
+    }
 }
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.1.23 - 2024-11-23
+
+### Added
+
+- Expand (future) timezone support.
+- [Issue 9451](https://github.com/firefly-iii/firefly-iii/issues/9451) (Trigger "Has at least this many attachments" is misnamed?) reported by @Kvan7
+- [Issue 9458](https://github.com/firefly-iii/firefly-iii/issues/9458) (The add transaction failed) reported by @wqwwffsytxwp
+- [Issue 9466](https://github.com/firefly-iii/firefly-iii/issues/9466) (First instance of recurring transaction not firing automatically or manually) reported by @makobot-sh
+- [PR 9468](https://github.com/firefly-iii/firefly-iii/pull/9468) (Transaction Model: explicitly cast decimal to string) reported by @yparitcher
+- [Issue 9477](https://github.com/firefly-iii/firefly-iii/issues/9477) (Default Financial report: Income vs Expense has missing months when multiple currencies are used) reported by @thomase1234
+- [PR 9488](https://github.com/firefly-iii/firefly-iii/pull/9488) (fix: set dest foreign_amount and foreign_currency_id for foreign transfers) reported by @antoniomrfranco
+- [PR 9483](https://github.com/firefly-iii/firefly-iii/pull/9483) (fix: include foreign_amount in transaction sum calculation) reported by @antoniomrfranco
+- 
+
+- Broken links in readme.
+
 ## 6.1.22 - 2024-11-07

 ### Added
--- a/composer.lock
+++ b/composer.lock
@@ -2547,16 +2547,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.32.0",
+            "version": "v11.33.2",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "bc2aad63f83ee5089be7b21cf29d645ccf31e927"
+                "reference": "6b9832751cf8eed18b3c73df5071f78f0682aa5d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/bc2aad63f83ee5089be7b21cf29d645ccf31e927",
-                "reference": "bc2aad63f83ee5089be7b21cf29d645ccf31e927",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/6b9832751cf8eed18b3c73df5071f78f0682aa5d",
+                "reference": "6b9832751cf8eed18b3c73df5071f78f0682aa5d",
                "shasum": ""
            },
            "require": {
@@ -2576,7 +2576,7 @@
                "guzzlehttp/guzzle": "^7.8",
                "guzzlehttp/uri-template": "^1.0",
                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
-                "laravel/serializable-closure": "^1.3",
+                "laravel/serializable-closure": "^1.3|^2.0",
                "league/commonmark": "^2.2.1",
                "league/flysystem": "^3.8.0",
                "monolog/monolog": "^3.0",
@@ -2659,9 +2659,9 @@
                "league/flysystem-path-prefixing": "^3.3",
                "league/flysystem-read-only": "^3.3",
                "league/flysystem-sftp-v3": "^3.0",
-                "mockery/mockery": "^1.6",
+                "mockery/mockery": "^1.6.10",
                "nyholm/psr7": "^1.2",
-                "orchestra/testbench-core": "^9.5",
+                "orchestra/testbench-core": "^9.6",
                "pda/pheanstalk": "^5.0",
                "phpstan/phpstan": "^1.11.5",
                "phpunit/phpunit": "^10.5|^11.0",
@@ -2752,7 +2752,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-11-15T17:04:33+00:00"
+            "time": "2024-11-19T22:47:13+00:00"
        },
        {
            "name": "laravel/passport",
@@ -2891,16 +2891,16 @@
        },
        {
            "name": "laravel/sanctum",
-            "version": "v4.0.3",
+            "version": "v4.0.4",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sanctum.git",
-                "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab"
+                "reference": "819782c75aaf2b08da1765503893bd2b8023d3b3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/54aea9d13743ae8a6cdd3c28dbef128a17adecab",
-                "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/819782c75aaf2b08da1765503893bd2b8023d3b3",
+                "reference": "819782c75aaf2b08da1765503893bd2b8023d3b3",
                "shasum": ""
            },
            "require": {
@@ -2951,36 +2951,36 @@
                "issues": "https://github.com/laravel/sanctum/issues",
                "source": "https://github.com/laravel/sanctum"
            },
-            "time": "2024-09-27T14:55:41+00:00"
+            "time": "2024-11-15T14:47:23+00:00"
        },
        {
            "name": "laravel/serializable-closure",
-            "version": "v1.3.6",
+            "version": "v2.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96"
+                "reference": "0d8d3d8086984996df86596a86dea60398093a81"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96",
-                "reference": "f865a58ea3a0107c336b7045104c75243fa59d96",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/0d8d3d8086984996df86596a86dea60398093a81",
+                "reference": "0d8d3d8086984996df86596a86dea60398093a81",
                "shasum": ""
            },
            "require": {
-                "php": "^7.3|^8.0"
+                "php": "^8.1"
            },
            "require-dev": {
-                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
-                "nesbot/carbon": "^2.61|^3.0",
-                "pestphp/pest": "^1.21.3",
-                "phpstan/phpstan": "^1.8.2",
-                "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
+                "illuminate/support": "^10.0|^11.0",
+                "nesbot/carbon": "^2.67|^3.0",
+                "pestphp/pest": "^2.36",
+                "phpstan/phpstan": "^2.0",
+                "symfony/var-dumper": "^6.2.0|^7.0.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-master": "2.x-dev"
                }
            },
            "autoload": {
@@ -3012,7 +3012,7 @@
                "issues": "https://github.com/laravel/serializable-closure/issues",
                "source": "https://github.com/laravel/serializable-closure"
            },
-            "time": "2024-11-11T17:06:04+00:00"
+            "time": "2024-11-19T01:38:44+00:00"
        },
        {
            "name": "laravel/slack-notification-channel",
@@ -4720,31 +4720,31 @@
        },
        {
            "name": "nunomaduro/termwind",
-            "version": "v2.2.0",
+            "version": "v2.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3"
+                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/42c84e4e8090766bbd6445d06cd6e57650626ea3",
-                "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/52915afe6a1044e8b9cee1bcff836fb63acf9cda",
+                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda",
                "shasum": ""
            },
            "require": {
                "ext-mbstring": "*",
                "php": "^8.2",
-                "symfony/console": "^7.1.5"
+                "symfony/console": "^7.1.8"
            },
            "require-dev": {
-                "illuminate/console": "^11.28.0",
-                "laravel/pint": "^1.18.1",
+                "illuminate/console": "^11.33.2",
+                "laravel/pint": "^1.18.2",
                "mockery/mockery": "^1.6.12",
                "pestphp/pest": "^2.36.0",
-                "phpstan/phpstan": "^1.12.6",
+                "phpstan/phpstan": "^1.12.11",
                "phpstan/phpstan-strict-rules": "^1.6.1",
-                "symfony/var-dumper": "^7.1.5",
+                "symfony/var-dumper": "^7.1.8",
                "thecodingmachine/phpstan-strict-rules": "^1.0.0"
            },
            "type": "library",
@@ -4787,7 +4787,7 @@
            ],
            "support": {
                "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v2.2.0"
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.3.0"
            },
            "funding": [
                {
@@ -4803,7 +4803,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-10-15T16:15:16+00:00"
+            "time": "2024-11-21T10:39:51+00:00"
        },
        {
            "name": "nyholm/psr7",
@@ -5756,16 +5756,16 @@
        },
        {
            "name": "predis/predis",
-            "version": "v2.2.2",
+            "version": "v2.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/predis/predis.git",
-                "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1"
+                "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1",
-                "reference": "b1d3255ed9ad4d7254f9f9bba386c99f4bb983d1",
+                "url": "https://api.github.com/repos/predis/predis/zipball/bac46bfdb78cd6e9c7926c697012aae740cb9ec9",
+                "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9",
                "shasum": ""
            },
            "require": {
@@ -5774,7 +5774,7 @@
            "require-dev": {
                "friendsofphp/php-cs-fixer": "^3.3",
                "phpstan/phpstan": "^1.9",
-                "phpunit/phpunit": "^8.0 || ~9.4.4"
+                "phpunit/phpunit": "^8.0 || ^9.4"
            },
            "suggest": {
                "ext-relay": "Faster connection with in-memory caching (>=0.6.2)"
@@ -5805,7 +5805,7 @@
            ],
            "support": {
                "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v2.2.2"
+                "source": "https://github.com/predis/predis/tree/v2.3.0"
            },
            "funding": [
                {
@@ -5813,7 +5813,7 @@
                    "type": "github"
                }
            ],
-            "time": "2023-09-13T16:42:03+00:00"
+            "time": "2024-11-21T20:00:02+00:00"
        },
        {
            "name": "psr/cache",
@@ -6575,16 +6575,16 @@
        },
        {
            "name": "spatie/backtrace",
-            "version": "1.6.2",
+            "version": "1.6.3",
            "source": {
                "type": "git",
                "url": "https://github.com/spatie/backtrace.git",
-                "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9"
+                "reference": "7c18db2bc667ac84e5d7c18e33f16c38ff2d8838"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/backtrace/zipball/1a9a145b044677ae3424693f7b06479fc8c137a9",
-                "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9",
+                "url": "https://api.github.com/repos/spatie/backtrace/zipball/7c18db2bc667ac84e5d7c18e33f16c38ff2d8838",
+                "reference": "7c18db2bc667ac84e5d7c18e33f16c38ff2d8838",
                "shasum": ""
            },
            "require": {
@@ -6622,7 +6622,7 @@
                "spatie"
            ],
            "support": {
-                "source": "https://github.com/spatie/backtrace/tree/1.6.2"
+                "source": "https://github.com/spatie/backtrace/tree/1.6.3"
            },
            "funding": [
                {
@@ -6634,7 +6634,7 @@
                    "type": "other"
                }
            ],
-            "time": "2024-07-22T08:21:24+00:00"
+            "time": "2024-11-18T14:58:58+00:00"
        },
        {
            "name": "spatie/error-solutions",
@@ -10309,16 +10309,16 @@
        },
        {
            "name": "voku/portable-ascii",
-            "version": "2.0.1",
+            "version": "2.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743"
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
                "shasum": ""
            },
            "require": {
@@ -10343,7 +10343,7 @@
            "authors": [
                {
                    "name": "Lars Moelleken",
-                    "homepage": "http://www.moelleken.org/"
+                    "homepage": "https://www.moelleken.org/"
                }
            ],
            "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
@@ -10355,7 +10355,7 @@
            ],
            "support": {
                "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/2.0.1"
+                "source": "https://github.com/voku/portable-ascii/tree/2.0.3"
            },
            "funding": [
                {
@@ -10379,7 +10379,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-08T17:03:00+00:00"
+            "time": "2024-11-21T01:49:47+00:00"
        },
        {
            "name": "webmozart/assert",
@@ -10930,16 +10930,16 @@
        },
        {
            "name": "ergebnis/phpstan-rules",
-            "version": "2.3.0",
+            "version": "2.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ergebnis/phpstan-rules.git",
-                "reference": "74ea27c11d5f0b7effc80a42368f8aa57a7b35b1"
+                "reference": "78289a18d71adc0970e39f9d15f67f0ca7354be4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/74ea27c11d5f0b7effc80a42368f8aa57a7b35b1",
-                "reference": "74ea27c11d5f0b7effc80a42368f8aa57a7b35b1",
+                "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/78289a18d71adc0970e39f9d15f67f0ca7354be4",
+                "reference": "78289a18d71adc0970e39f9d15f67f0ca7354be4",
                "shasum": ""
            },
            "require": {
@@ -10951,17 +10951,14 @@
            "require-dev": {
                "doctrine/orm": "^3.3.0",
                "ergebnis/composer-normalize": "^2.44.0",
-                "ergebnis/license": "^2.5.0",
+                "ergebnis/license": "^2.6.0",
                "ergebnis/php-cs-fixer-config": "^6.37.0",
                "ergebnis/phpunit-slow-test-detector": "^2.16.1",
                "nette/di": "^3.2.3",
                "phpstan/phpstan-deprecation-rules": "^1.2.1",
                "phpstan/phpstan-strict-rules": "^1.6.1",
                "phpunit/phpunit": "^10.5.26",
-                "psalm/plugin-phpunit": "~0.19.0",
-                "psr/container": "^2.0.2",
-                "rector/rector": "^1.2.10",
-                "vimeo/psalm": "^5.26.1"
+                "psr/container": "^2.0.2"
            },
            "type": "phpstan-extension",
            "extra": {
@@ -10998,20 +10995,20 @@
                "security": "https://github.com/ergebnis/phpstan-rules/blob/main/.github/SECURITY.md",
                "source": "https://github.com/ergebnis/phpstan-rules"
            },
-            "time": "2024-11-16T20:38:05+00:00"
+            "time": "2024-11-22T19:14:44+00:00"
        },
        {
            "name": "fakerphp/faker",
-            "version": "v1.24.0",
+            "version": "v1.24.1",
            "source": {
                "type": "git",
                "url": "https://github.com/FakerPHP/Faker.git",
-                "reference": "a136842a532bac9ecd8a1c723852b09915d7db50"
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/a136842a532bac9ecd8a1c723852b09915d7db50",
-                "reference": "a136842a532bac9ecd8a1c723852b09915d7db50",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
                "shasum": ""
            },
            "require": {
@@ -11059,9 +11056,9 @@
            ],
            "support": {
                "issues": "https://github.com/FakerPHP/Faker/issues",
-                "source": "https://github.com/FakerPHP/Faker/tree/v1.24.0"
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.24.1"
            },
-            "time": "2024-11-07T15:11:20+00:00"
+            "time": "2024-11-21T13:46:39+00:00"
        },
        {
            "name": "hamcrest/hamcrest-php",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -110,7 +110,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2024-11-18',
+    'version'                      => '6.1.23',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/package-lock.json
+++ b/package-lock.json
@@ -2130,9 +2130,9 @@
            }
        },
        "node_modules/@fortawesome/fontawesome-free": {
-            "version": "6.6.0",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz",
-            "integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==",
+            "version": "6.7.1",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.1.tgz",
+            "integrity": "sha512-ALIk/MOh5gYe1TG/ieS5mVUsk7VUIJTJKPMK9rFFqOgfp0Q3d5QiBXbcOMwUvs37fyZVCz46YjOE6IFeOAXCHA==",
            "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
            "engines": {
                "node": ">=6"
@@ -2216,9 +2216,9 @@
            }
        },
        "node_modules/@kurkle/color": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz",
-            "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==",
+            "version": "0.3.4",
+            "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.4.tgz",
+            "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==",
            "license": "MIT"
        },
        "node_modules/@leichtgewicht/ip-codec": {
@@ -2587,9 +2587,9 @@
            }
        },
        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.2.tgz",
-            "integrity": "sha512-Tj+j7Pyzd15wAdSJswvs5CJzJNV+qqSUcr/aCD+jpQSBtXvGnV0pnrjoc8zFTe9fcKCatkpFpOO7yAzpO998HA==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.4.tgz",
+            "integrity": "sha512-2Y3JT6f5MrQkICUyRVCw4oa0sutfAsgaSsb0Lmmy1Wi2y7X5vT9Euqw4gOsCyy0YfKURBg35nhUKZS4mDcfULw==",
            "cpu": [
                "arm"
            ],
@@ -2601,9 +2601,9 @@
            ]
        },
        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.2.tgz",
-            "integrity": "sha512-xsPeJgh2ThBpUqlLgRfiVYBEf/P1nWlWvReG+aBWfNv3XEBpa6ZCmxSVnxJgLgkNz4IbxpLy64h2gCmAAQLneQ==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.4.tgz",
+            "integrity": "sha512-wzKRQXISyi9UdCVRqEd0H4cMpzvHYt1f/C3CoIjES6cG++RHKhrBj2+29nPF0IB5kpy9MS71vs07fvrNGAl/iA==",
            "cpu": [
                "arm64"
            ],
@@ -2615,9 +2615,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.2.tgz",
-            "integrity": "sha512-KnXU4m9MywuZFedL35Z3PuwiTSn/yqRIhrEA9j+7OSkji39NzVkgxuxTYg5F8ryGysq4iFADaU5osSizMXhU2A==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.4.tgz",
+            "integrity": "sha512-PlNiRQapift4LNS8DPUHuDX/IdXiLjf8mc5vdEmUR0fF/pyy2qWwzdLjB+iZquGr8LuN4LnUoSEvKRwjSVYz3Q==",
            "cpu": [
                "arm64"
            ],
@@ -2629,9 +2629,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.2.tgz",
-            "integrity": "sha512-Hj77A3yTvUeCIx/Vi+4d4IbYhyTwtHj07lVzUgpUq9YpJSEiGJj4vXMKwzJ3w5zp5v3PFvpJNgc/J31smZey6g==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.4.tgz",
+            "integrity": "sha512-o9bH2dbdgBDJaXWJCDTNDYa171ACUdzpxSZt+u/AAeQ20Nk5x+IhA+zsGmrQtpkLiumRJEYef68gcpn2ooXhSQ==",
            "cpu": [
                "x64"
            ],
@@ -2643,9 +2643,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.2.tgz",
-            "integrity": "sha512-RjgKf5C3xbn8gxvCm5VgKZ4nn0pRAIe90J0/fdHUsgztd3+Zesb2lm2+r6uX4prV2eUByuxJNdt647/1KPRq5g==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.4.tgz",
+            "integrity": "sha512-NBI2/i2hT9Q+HySSHTBh52da7isru4aAAo6qC3I7QFVsuhxi2gM8t/EI9EVcILiHLj1vfi+VGGPaLOUENn7pmw==",
            "cpu": [
                "arm64"
            ],
@@ -2657,9 +2657,9 @@
            ]
        },
        "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.2.tgz",
-            "integrity": "sha512-duq21FoXwQtuws+V9H6UZ+eCBc7fxSpMK1GQINKn3fAyd9DFYKPJNcUhdIKOrMFjLEJgQskoMoiuizMt+dl20g==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.4.tgz",
+            "integrity": "sha512-wYcC5ycW2zvqtDYrE7deary2P2UFmSh85PUpAx+dwTCO9uw3sgzD6Gv9n5X4vLaQKsrfTSZZ7Z7uynQozPVvWA==",
            "cpu": [
                "x64"
            ],
@@ -2671,9 +2671,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.2.tgz",
-            "integrity": "sha512-6npqOKEPRZkLrMcvyC/32OzJ2srdPzCylJjiTJT2c0bwwSGm7nz2F9mNQ1WrAqCBZROcQn91Fno+khFhVijmFA==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.4.tgz",
+            "integrity": "sha512-9OwUnK/xKw6DyRlgx8UizeqRFOfi9mf5TYCw1uolDaJSbUmBxP85DE6T4ouCMoN6pXw8ZoTeZCSEfSaYo+/s1w==",
            "cpu": [
                "arm"
            ],
@@ -2685,9 +2685,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.2.tgz",
-            "integrity": "sha512-V9Xg6eXtgBtHq2jnuQwM/jr2mwe2EycnopO8cbOvpzFuySCGtKlPCI3Hj9xup/pJK5Q0388qfZZy2DqV2J8ftw==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.4.tgz",
+            "integrity": "sha512-Vgdo4fpuphS9V24WOV+KwkCVJ72u7idTgQaBoLRD0UxBAWTF9GWurJO9YD9yh00BzbkhpeXtm6na+MvJU7Z73A==",
            "cpu": [
                "arm"
            ],
@@ -2699,9 +2699,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.2.tgz",
-            "integrity": "sha512-uCFX9gtZJoQl2xDTpRdseYuNqyKkuMDtH6zSrBTA28yTfKyjN9hQ2B04N5ynR8ILCoSDOrG/Eg+J2TtJ1e/CSA==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.4.tgz",
+            "integrity": "sha512-pleyNgyd1kkBkw2kOqlBx+0atfIIkkExOTiifoODo6qKDSpnc6WzUY5RhHdmTdIJXBdSnh6JknnYTtmQyobrVg==",
            "cpu": [
                "arm64"
            ],
@@ -2713,9 +2713,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.2.tgz",
-            "integrity": "sha512-/PU9P+7Rkz8JFYDHIi+xzHabOu9qEWR07L5nWLIUsvserrxegZExKCi2jhMZRd0ATdboKylu/K5yAXbp7fYFvA==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.4.tgz",
+            "integrity": "sha512-caluiUXvUuVyCHr5DxL8ohaaFFzPGmgmMvwmqAITMpV/Q+tPoaHZ/PWa3t8B2WyoRcIIuu1hkaW5KkeTDNSnMA==",
            "cpu": [
                "arm64"
            ],
@@ -2727,9 +2727,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.2.tgz",
-            "integrity": "sha512-eCHmol/dT5odMYi/N0R0HC8V8QE40rEpkyje/ZAXJYNNoSfrObOvG/Mn+s1F/FJyB7co7UQZZf6FuWnN6a7f4g==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.4.tgz",
+            "integrity": "sha512-FScrpHrO60hARyHh7s1zHE97u0KlT/RECzCKAdmI+LEoC1eDh/RDji9JgFqyO+wPDb86Oa/sXkily1+oi4FzJQ==",
            "cpu": [
                "ppc64"
            ],
@@ -2741,9 +2741,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.2.tgz",
-            "integrity": "sha512-DEP3Njr9/ADDln3kNi76PXonLMSSMiCir0VHXxmGSHxCxDfQ70oWjHcJGfiBugzaqmYdTC7Y+8Int6qbnxPBIQ==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.4.tgz",
+            "integrity": "sha512-qyyprhyGb7+RBfMPeww9FlHwKkCXdKHeGgSqmIXw9VSUtvyFZ6WZRtnxgbuz76FK7LyoN8t/eINRbPUcvXB5fw==",
            "cpu": [
                "riscv64"
            ],
@@ -2755,9 +2755,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.2.tgz",
-            "integrity": "sha512-NHGo5i6IE/PtEPh5m0yw5OmPMpesFnzMIS/lzvN5vknnC1sXM5Z/id5VgcNPgpD+wHmIcuYYgW+Q53v+9s96lQ==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.4.tgz",
+            "integrity": "sha512-PFz+y2kb6tbh7m3A7nA9++eInGcDVZUACulf/KzDtovvdTizHpZaJty7Gp0lFwSQcrnebHOqxF1MaKZd7psVRg==",
            "cpu": [
                "s390x"
            ],
@@ -2769,9 +2769,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.2.tgz",
-            "integrity": "sha512-PaW2DY5Tan+IFvNJGHDmUrORadbe/Ceh8tQxi8cmdQVCCYsLoQo2cuaSj+AU+YRX8M4ivS2vJ9UGaxfuNN7gmg==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.4.tgz",
+            "integrity": "sha512-Ni8mMtfo+o/G7DVtweXXV/Ol2TFf63KYjTtoZ5f078AUgJTmaIJnj4JFU7TK/9SVWTaSJGxPi5zMDgK4w+Ez7Q==",
            "cpu": [
                "x64"
            ],
@@ -2783,9 +2783,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.2.tgz",
-            "integrity": "sha512-dOlWEMg2gI91Qx5I/HYqOD6iqlJspxLcS4Zlg3vjk1srE67z5T2Uz91yg/qA8sY0XcwQrFzWWiZhMNERylLrpQ==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.4.tgz",
+            "integrity": "sha512-5AeeAF1PB9TUzD+3cROzFTnAJAcVUGLuR8ng0E0WXGkYhp6RD6L+6szYVX+64Rs0r72019KHZS1ka1q+zU/wUw==",
            "cpu": [
                "x64"
            ],
@@ -2797,9 +2797,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.2.tgz",
-            "integrity": "sha512-euMIv/4x5Y2/ImlbGl88mwKNXDsvzbWUlT7DFky76z2keajCtcbAsN9LUdmk31hAoVmJJYSThgdA0EsPeTr1+w==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.4.tgz",
+            "integrity": "sha512-yOpVsA4K5qVwu2CaS3hHxluWIK5HQTjNV4tWjQXluMiiiu4pJj4BN98CvxohNCpcjMeTXk/ZMJBRbgRg8HBB6A==",
            "cpu": [
                "arm64"
            ],
@@ -2811,9 +2811,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.2.tgz",
-            "integrity": "sha512-RsnE6LQkUHlkC10RKngtHNLxb7scFykEbEwOFDjr3CeCMG+Rr+cKqlkKc2/wJ1u4u990urRHCbjz31x84PBrSQ==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.4.tgz",
+            "integrity": "sha512-KtwEJOaHAVJlxV92rNYiG9JQwQAdhBlrjNRp7P9L8Cb4Rer3in+0A+IPhJC9y68WAi9H0sX4AiG2NTsVlmqJeQ==",
            "cpu": [
                "ia32"
            ],
@@ -2825,9 +2825,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.2.tgz",
-            "integrity": "sha512-foJM5vv+z2KQmn7emYdDLyTbkoO5bkHZE1oth2tWbQNGW7mX32d46Hz6T0MqXdWS2vBZhaEtHqdy9WYwGfiliA==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.4.tgz",
+            "integrity": "sha512-3j4jx1TppORdTAoBJRd+/wJRGCPC0ETWkXOecJ6PPZLj6SptXkrXcNqdj0oclbKML6FkQltdz7bBA3rUSirZug==",
            "cpu": [
                "x64"
            ],
@@ -3115,9 +3115,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "22.9.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
-            "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
+            "version": "22.9.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.3.tgz",
+            "integrity": "sha512-F3u1fs/fce3FFk+DAxbxc78DF8x0cY09RRL8GnXLmkJ1jvx3TtPdWoTT5/NiYfI5ASqXBmfqJi9dZ3gxMx4lzw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4096,9 +4096,9 @@
            }
        },
        "node_modules/bonjour-service": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
-            "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+            "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4400,9 +4400,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001680",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
-            "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==",
+            "version": "1.0.30001683",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001683.tgz",
+            "integrity": "sha512-iqmNnThZ0n70mNwvxpEC2nBJ037ZHZUoBI5Gorh1Mw6IlEAZujEoU1tXA628iZfzm7R9FvFzxbfdgml82a3k8Q==",
            "dev": true,
            "funding": [
                {
@@ -4957,9 +4957,9 @@
            }
        },
        "node_modules/cross-spawn": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
-            "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -5580,9 +5580,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.62",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.62.tgz",
-            "integrity": "sha512-t8c+zLmJHa9dJy96yBZRXGQYoiCEnHYgFwn1asvSPZSUdVxnB62A4RASd7k41ytG3ErFBA0TpHlKg9D9SQBmLg==",
+            "version": "1.5.64",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.64.tgz",
+            "integrity": "sha512-IXEuxU+5ClW2IGEYFC2T7szbyVgehupCWQe5GNh+H065CD6U6IFN0s4KeAMFGNmQolRU4IV7zGBWSYMmZ8uuqQ==",
            "dev": true,
            "license": "ISC"
        },
@@ -6859,9 +6859,9 @@
            }
        },
        "node_modules/i18next": {
-            "version": "23.16.5",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.16.5.tgz",
-            "integrity": "sha512-KTlhE3EP9x6pPTAW7dy0WKIhoCpfOGhRQlO+jttQLgzVaoOjWwBWramu7Pp0i+8wDNduuzXfe3kkVbzrKyrbTA==",
+            "version": "23.16.8",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.16.8.tgz",
+            "integrity": "sha512-06r/TitrM88Mg5FdUXAKL96dJMzgqLE5dv3ryBAra4KCwD9mJ4ndOTS95ZuymIGoE+2hzfdaMak2X11/es7ZWg==",
            "funding": [
                {
                    "type": "individual",
@@ -6891,9 +6891,9 @@
            }
        },
        "node_modules/i18next-http-backend": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.6.2.tgz",
-            "integrity": "sha512-Hp/kd8/VuoxIHmxsknJXjkTYYHzivAyAF15pzliKzk2TiXC25rZCEerb1pUFoxz4IVrG3fCvQSY51/Lu4ECV4A==",
+            "version": "2.7.1",
+            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.7.1.tgz",
+            "integrity": "sha512-vPksHIckysGgykCD8JwCr2YsJEml9Cyw+Yu2wtb4fQ7xIn9RH/hkUDh5UkwnIzb0kSL4SJ30Ab/sCInhQxbCgg==",
            "license": "MIT",
            "dependencies": {
                "cross-fetch": "4.0.0"
@@ -7029,9 +7029,9 @@
            }
        },
        "node_modules/immutable": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.2.tgz",
-            "integrity": "sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==",
+            "version": "5.0.3",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+            "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
            "dev": true,
            "license": "MIT"
        },
@@ -7727,9 +7727,9 @@
            }
        },
        "node_modules/magic-string": {
-            "version": "0.30.12",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
-            "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
+            "version": "0.30.13",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.13.tgz",
+            "integrity": "sha512-8rYBO+MsWkgjDSOvLomYnzhdwEG51olQ4zL5KXnNJWV5MNmrb4rTZdrtkhxjnD/QyZUqR/Z/XDsUs/4ej2nx0g==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -8597,9 +8597,9 @@
            }
        },
        "node_modules/patch-package/node_modules/yaml": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
-            "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
+            "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
            "dev": true,
            "license": "ISC",
            "bin": {
@@ -9656,16 +9656,16 @@
            }
        },
        "node_modules/regexpu-core": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
-            "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+            "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
                "regenerate": "^1.4.2",
                "regenerate-unicode-properties": "^10.2.0",
                "regjsgen": "^0.8.0",
-                "regjsparser": "^0.11.0",
+                "regjsparser": "^0.12.0",
                "unicode-match-property-ecmascript": "^2.0.0",
                "unicode-match-property-value-ecmascript": "^2.1.0"
            },
@@ -9681,9 +9681,9 @@
            "license": "MIT"
        },
        "node_modules/regjsparser": {
-            "version": "0.11.2",
-            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.2.tgz",
-            "integrity": "sha512-3OGZZ4HoLJkkAZx/48mTXJNlmqTGOzc0o9OWQPuWpkOlXXPbyN6OafCcoXUnBqE2D3f/T5L+pWc1kdEmnfnRsA==",
+            "version": "0.12.0",
+            "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+            "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
            "dev": true,
            "license": "BSD-2-Clause",
            "dependencies": {
@@ -9838,9 +9838,9 @@
            }
        },
        "node_modules/rollup": {
-            "version": "4.27.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.2.tgz",
-            "integrity": "sha512-KreA+PzWmk2yaFmZVwe6GB2uBD86nXl86OsDkt1bJS9p3vqWuEQ6HnJJ+j/mZi/q0920P99/MVRlB4L3crpF5w==",
+            "version": "4.27.4",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.4.tgz",
+            "integrity": "sha512-RLKxqHEMjh/RGLsDxAEsaLO3mWgyoU6x9w6n1ikAzet4B3gI2/3yP6PWY2p9QzRTh6MfEIXB3MwsOY0Iv3vNrw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -9854,24 +9854,24 @@
                "npm": ">=8.0.0"
            },
            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.27.2",
-                "@rollup/rollup-android-arm64": "4.27.2",
-                "@rollup/rollup-darwin-arm64": "4.27.2",
-                "@rollup/rollup-darwin-x64": "4.27.2",
-                "@rollup/rollup-freebsd-arm64": "4.27.2",
-                "@rollup/rollup-freebsd-x64": "4.27.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.27.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.27.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.27.2",
-                "@rollup/rollup-linux-arm64-musl": "4.27.2",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.27.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.27.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.27.2",
-                "@rollup/rollup-linux-x64-gnu": "4.27.2",
-                "@rollup/rollup-linux-x64-musl": "4.27.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.27.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.27.2",
-                "@rollup/rollup-win32-x64-msvc": "4.27.2",
+                "@rollup/rollup-android-arm-eabi": "4.27.4",
+                "@rollup/rollup-android-arm64": "4.27.4",
+                "@rollup/rollup-darwin-arm64": "4.27.4",
+                "@rollup/rollup-darwin-x64": "4.27.4",
+                "@rollup/rollup-freebsd-arm64": "4.27.4",
+                "@rollup/rollup-freebsd-x64": "4.27.4",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.27.4",
+                "@rollup/rollup-linux-arm-musleabihf": "4.27.4",
+                "@rollup/rollup-linux-arm64-gnu": "4.27.4",
+                "@rollup/rollup-linux-arm64-musl": "4.27.4",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.27.4",
+                "@rollup/rollup-linux-riscv64-gnu": "4.27.4",
+                "@rollup/rollup-linux-s390x-gnu": "4.27.4",
+                "@rollup/rollup-linux-x64-gnu": "4.27.4",
+                "@rollup/rollup-linux-x64-musl": "4.27.4",
+                "@rollup/rollup-win32-arm64-msvc": "4.27.4",
+                "@rollup/rollup-win32-ia32-msvc": "4.27.4",
+                "@rollup/rollup-win32-x64-msvc": "4.27.4",
                "fsevents": "~2.3.2"
            }
        },
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -262,6 +262,7 @@ return [
    'gte.file'                        => 'The :attribute must be greater than or equal to :value kilobytes.',
    'gte.string'                      => 'The :attribute must be greater than or equal to :value characters.',
    'gte.array'                       => 'The :attribute must have :value items or more.',
+    'missing_with'                    => 'The :attribute cannot be combined with another field.',

    'amount_required_for_auto_budget' => 'The amount is required.',
    'auto_budget_amount_positive'     => 'The amount must be more than zero.',
--- a/routes/api.php
+++ b/routes/api.php
@@ -53,6 +53,24 @@ Route::group(
    }
 );

+// USER GROUP ROUTES
+Route::group(
+    [
+        'namespace' => 'FireflyIII\Api\V2\Controllers\UserGroup',
+        'prefix'    => 'v2/user-groups',
+        'as'        => 'api.v2.user-groups.',
+    ],
+    static function (): void {
+        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
+        Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
+        Route::get('{userGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
+        //        Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
+        //        Route::post('{userGroup}/use', ['uses' => 'UpdateController@useUserGroup', 'as' => 'use']);
+        //        Route::put('{userGroup}/update-membership', ['uses' => 'UpdateController@updateMembership', 'as' => 'updateMembership']);
+        //        Route::delete('{userGroup}', ['uses' => 'DestroyController@destroy', 'as' => 'destroy']);
+    }
+);
+
 // CHART ROUTES
 Route::group(
    [
@@ -221,23 +239,7 @@ Route::group(
    }
 );

-// V2 API route for user groups (administrations).
-Route::group(
-    [
-        'namespace' => 'FireflyIII\Api\V2\Controllers\UserGroup',
-        'prefix'    => 'v2/user-groups',
-        'as'        => 'api.v2.user-groups.',
-    ],
-    static function (): void {
-        //        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
-        //        Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
-        //        Route::get('{userGroup}', ['uses' => 'ShowController@show', 'as' => 'show']);
-        //        Route::put('{userGroup}', ['uses' => 'UpdateController@update', 'as' => 'update']);
-        //        Route::post('{userGroup}/use', ['uses' => 'UpdateController@useUserGroup', 'as' => 'use']);
-        //        Route::put('{userGroup}/update-membership', ['uses' => 'UpdateController@updateMembership', 'as' => 'updateMembership']);
-        //        Route::delete('{userGroup}', ['uses' => 'DestroyController@destroy', 'as' => 'destroy']);
-    }
-);
+

 // V2 JSON API ROUTES
 // JsonApiRoute::server('v2')->prefix('v2')
Author	SHA1	Message	Date
github-actions	cd10d04907	Auto commit for release 'v6.1.23' on 2024-11-23	2024-11-23 19:19:46 +01:00
James Cole	f9b76fcb8b	Update changelog for new release.	2024-11-23 19:14:15 +01:00
James Cole	093fa067e6	Merge branches 'develop' and 'develop' of github.com:firefly-iii/firefly-iii into develop	2024-11-23 16:15:00 +01:00
James Cole	fa655f065b	Part of new API, cleanup code.	2024-11-23 16:14:47 +01:00
James Cole	c8f2244912	Merge pull request #9483 from antoniomrfranco/fix/report-sum-foreign-amount fix: include foreign_amount in transaction sum calculation	2024-11-23 09:45:53 +01:00
James Cole	f3a20e14a6	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2024-11-23 09:06:36 +01:00
James Cole	33ad47b115	Add import	2024-11-23 09:06:29 +01:00
James Cole	775424d3b7	Merge pull request #9488 from antoniomrfranco/fix/transfer-dest-foreign-info fix: set dest foreign_amount and foreign_currency_id for foreign transfers	2024-11-23 09:06:07 +01:00
Antônio Franco	c9c86bbd1d	fix: set dest foreign_amount and foreign_currency_id for foreign transfers	2024-11-22 13:52:33 -03:00
Antônio Franco	f76a6ad85c	fix: include foreign_amount in transaction sum calculation	2024-11-22 09:52:35 -03:00
James Cole	2138b14d89	Add to update as well.	2024-11-22 06:04:32 +01:00
James Cole	1bf61f57f5	Add UTC support.	2024-11-22 06:03:29 +01:00
James Cole	07b55bd71f	Fix https://github.com/firefly-iii/firefly-iii/issues/9477	2024-11-19 06:31:49 +01:00