Auto commit for release 'develop' on 2024-08-12

Remove comments
Auto commit for release 'develop' on 2024-08-05
2026-01-09 15:34:12 +00:00 · 2024-08-12 05:07:37 +02:00 · 2024-08-07 06:04:37 +02:00 · 2024-08-05 20:37:29 +02:00 · 2024-08-05 19:48:46 +02:00 · 2024-08-05 19:45:04 +02:00
18 changed files with 503 additions and 166 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -406,16 +406,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.61.1",
+            "version": "v3.62.0",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "94a87189f55814e6cabca2d9a33b06de384a2ab8"
+                "reference": "627692f794d35c43483f34b01d94740df2a73507"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/94a87189f55814e6cabca2d9a33b06de384a2ab8",
-                "reference": "94a87189f55814e6cabca2d9a33b06de384a2ab8",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/627692f794d35c43483f34b01d94740df2a73507",
+                "reference": "627692f794d35c43483f34b01d94740df2a73507",
                "shasum": ""
            },
            "require": {
@@ -497,7 +497,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.61.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.62.0"
            },
            "funding": [
                {
@@ -505,7 +505,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-07-31T14:33:15+00:00"
+            "time": "2024-08-07T17:03:09+00:00"
        },
        {
            "name": "psr/container",
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -37,6 +37,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException as LaravelValidationException;
 use Laravel\Passport\Exceptions\OAuthServerException as LaravelOAuthException;
 use LaravelJsonApi\Core\Exceptions\JsonApiException;
+use LaravelJsonApi\Exceptions\ExceptionParser;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpFoundation\Response;
@@ -67,6 +68,16 @@ class Handler extends ExceptionHandler
            JsonApiException::class,
        ];

+    /**
+     * Register the exception handling callbacks for the application.
+     */
+    public function register(): void
+    {
+        $this->renderable(
+            ExceptionParser::make()->renderable()
+        );
+    }
+
    /**
     * Render an exception into an HTTP response. It's complex but lucky for us, we never use it because
     * Firefly III never crashes.
@@ -81,15 +92,23 @@ class Handler extends ExceptionHandler
    public function render($request, \Throwable $e): Response
    {
        $expectsJson = $request->expectsJson();
-        // if the user requests anything /api/, assume the user wants to see JSON.
-        if (str_starts_with($request->getRequestUri(), '/api/')) {
-            app('log')->debug('API endpoint, always assume user wants JSON.');
-            $expectsJson = true;
-        }

        app('log')->debug('Now in Handler::render()');
+
+        if ($e instanceof JsonApiException) {
+            // ignore it: controller will handle it.
+
+            app('log')->debug(sprintf(
+                'Return to parent to handle JsonApiException(%d)',
+                $e->getCode()
+            ));
+
+            return parent::render($request, $e);
+        }
+
        if ($e instanceof LaravelValidationException && $expectsJson) {
            // ignore it: controller will handle it.
+
            app('log')->debug(sprintf('Return to parent to handle LaravelValidationException(%d)', $e->status));

            return parent::render($request, $e);
--- a/app/Helpers/Collector/GroupCollector.php
+++ b/app/Helpers/Collector/GroupCollector.php
@@ -805,7 +805,7 @@ class GroupCollector implements GroupCollectorInterface
                    return 'zzz';
                }

-                exit('here we are');
+                exit('here we are 2');
            });
        }

--- a/app/JsonApi/V2/Accounts/AccountRepository.php
+++ b/app/JsonApi/V2/Accounts/AccountRepository.php
@@ -99,6 +99,10 @@ class AccountRepository extends AbstractRepository implements QueriesAll, Create
        return Capabilities\CrudAccount::make();
    }

+    /**
+     * TODO piggy banks
+     * TODO transactions
+     */
    protected function relations(): CrudRelations
    {
        Log::debug(__METHOD__);
--- a/app/JsonApi/V2/Accounts/AccountRequest.php
+++ b/app/JsonApi/V2/Accounts/AccountRequest.php
@@ -4,7 +4,11 @@ declare(strict_types=1);

 namespace FireflyIII\JsonApi\V2\Accounts;

-use FireflyIII\Rules\BelongsUser;
+use FireflyIII\Rules\Account\IsUniqueAccount;
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidPositiveAmount;
+use FireflyIII\Rules\UniqueAccountNumber;
+use FireflyIII\Rules\UniqueIban;
 use Illuminate\Support\Facades\Log;
 use LaravelJsonApi\Laravel\Http\Requests\ResourceRequest;

@@ -16,18 +20,36 @@ class AccountRequest extends ResourceRequest
    public function rules(): array
    {
        Log::debug(__METHOD__);
-
-        exit('am i used');
+        $accountRoles   = implode(',', config('firefly.accountRoles'));
+        $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
+        $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
+        $type           = $this->convertString('type');
+        // var_dump($types);exit;

        return [
-            'type' => [
-                new BelongsUser(),
-            ],
-            'name' => [
-                'nullable',
-                'string',
-                'max:255',
-            ],
+            'name'                         => ['required', 'max:1024', 'min:1'], // , new IsUniqueAccount()
+            'account_type'                 => ['required', 'max:1024', 'min:1', sprintf('in:%s', $types)],
+            //            'iban'                 => ['iban', 'nullable', new UniqueIban(null, $type)],
+            //            'bic'                  => 'bic|nullable',
+            //            'account_number'       => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber(null, $type)],
+            //            'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
+            //            'opening_balance_date' => 'date|required_with:opening_balance|nullable',
+            //            'virtual_balance'      => 'numeric|nullable',
+            //            'order'                => 'numeric|nullable',
+            //            'currency_id'          => 'numeric|exists:transaction_currencies,id',
+            //            'currency_code'        => 'min:3|max:3|exists:transaction_currencies,code',
+            //            'active'               => [new IsBoolean()],
+            //            'include_net_worth'    => [new IsBoolean()],
+            //            'account_role'         => sprintf('nullable|in:%s|required_if:type,asset', $accountRoles),
+            //            'credit_card_type'     => sprintf('nullable|in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
+            //            'monthly_payment_date' => 'nullable|date|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
+            //            'liability_type'       => 'nullable|required_if:type,liability|required_if:type,liabilities|in:loan,debt,mortgage',
+            //            'liability_amount'     => ['required_with:liability_start_date', new IsValidPositiveAmount()],
+            //            'liability_start_date' => 'required_with:liability_amount|date',
+            //            'liability_direction'  => 'nullable|required_if:type,liability|required_if:type,liabilities|in:credit,debit',
+            //            'interest'             => 'min:0|max:100|numeric',
+            //            'interest_period'      => sprintf('nullable|in:%s', implode(',', config('firefly.interest_periods'))),
+            //            'notes'                => 'min:0|max:32768',
        ];
    }
 }
--- a/app/JsonApi/V2/Accounts/AccountResource.php
+++ b/app/JsonApi/V2/Accounts/AccountResource.php
@@ -6,7 +6,6 @@ namespace FireflyIII\JsonApi\V2\Accounts;

 use FireflyIII\Models\Account;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Log;
 use LaravelJsonApi\Core\Resources\JsonApiResource;

 /**
@@ -38,7 +37,7 @@ class AccountResource extends JsonApiResource
            'active'                  => $this->resource->active,
            'order'                   => $this->resource->order,
            'iban'                    => $this->resource->iban,
-            'type'                    => $this->resource->account_type_string,
+            'account_type'            => $this->resource->account_type_string,
            'account_role'            => $this->resource->account_role,
            'account_number'          => '' === $this->resource->account_number ? null : $this->resource->account_number,

--- a/app/JsonApi/V2/Accounts/AccountSchema.php
+++ b/app/JsonApi/V2/Accounts/AccountSchema.php
@@ -40,7 +40,7 @@ class AccountSchema extends Schema
            Attribute::make('active')->sortable(),
            Attribute::make('order')->sortable(),
            Attribute::make('iban')->sortable(),
-            Attribute::make('type'),
+            Attribute::make('account_type'),
            Attribute::make('account_role'),
            Attribute::make('account_number')->sortable(),

@@ -60,7 +60,9 @@ class AccountSchema extends Schema
            Attribute::make('liability_direction'),
            Attribute::make('interest'),
            Attribute::make('interest_period'),
-            Attribute::make('current_debt')->sortable(),
+            // Attribute::make('current_debt')->sortable(),
+
+            // TODO credit card fields.

            // dynamic data
            Attribute::make('last_activity')->sortable(),
--- a/app/JsonApi/V2/Accounts/Capabilities/CrudAccount.php
+++ b/app/JsonApi/V2/Accounts/Capabilities/CrudAccount.php
@@ -53,6 +53,8 @@ class CrudAccount extends CrudResource

    public function create(array $validatedData): Account
    {
-        exit('here we are');
+        var_dump($validatedData);
+
+        exit;
    }
 }
--- a/app/Policies/AccountPolicy.php
+++ b/app/Policies/AccountPolicy.php
@@ -37,6 +37,11 @@ class AccountPolicy
        return auth()->check() && $user->id === $account->user_id;
    }

+    public function create(): bool
+    {
+        return auth()->check();
+    }
+
    /**
     * Everybody can do this, but selection should limit to user.
     *
--- a/app/Rules/Account/IsUniqueAccount.php
+++ b/app/Rules/Account/IsUniqueAccount.php
@@ -0,0 +1,201 @@
+<?php
+/*
+ * IsUniqueAccount.php
+ * Copyright (c) 2024 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/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Rules\Account;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\User;
+use Illuminate\Contracts\Validation\DataAwareRule;
+use Illuminate\Contracts\Validation\ValidationRule;
+
+/**
+ * @method fail(string $string)
+ */
+class IsUniqueAccount implements ValidationRule, DataAwareRule
+{
+    protected \Closure $fail;
+    protected array   $data = [];
+
+    #[\Override]
+    public function validate(string $attribute, mixed $value, \Closure $fail): void
+    {
+        return;
+        $this->fail  = $fail;
+        // because a user does not have to be logged in (tests and what-not).
+        if (!auth()->check()) {
+            app('log')->debug('validateUniqueAccountForUser::anon');
+            $fail('validation.nog_logged_in')->translate();
+
+            return;
+        }
+        if (array_key_exists('type', $this->data)) {
+            app('log')->debug('validateUniqueAccountForUser::typeString');
+
+            $this->validateByAccountTypeString($value, $parameters, (string) $this->data['type']);
+        }
+        if (array_key_exists('account_type_id', $this->data)) {
+            app('log')->debug('validateUniqueAccountForUser::typeId');
+
+            $this->validateByAccountTypeId($value, $parameters);
+        }
+        $parameterId = $parameters[0] ?? null;
+        if (null !== $parameterId) {
+            app('log')->debug('validateUniqueAccountForUser::paramId');
+
+            $this->validateByParameterId((int) $parameterId, $value);
+        }
+        if (array_key_exists('id', $this->data)) {
+            app('log')->debug('validateUniqueAccountForUser::accountId');
+
+            $this->validateByAccountId($value);
+        }
+
+        // without type, just try to validate the name.
+        app('log')->debug('validateUniqueAccountForUser::accountName');
+
+        $this->validateByAccountName($value);
+    }
+
+    /**
+     * TODO duplicate from old validation class.
+     */
+    private function validateByAccountTypeString(string $value, array $parameters, string $type): bool
+    {
+        /** @var null|array $search */
+        $search         = config('firefly.accountTypeByIdentifier.%s', $type);
+
+        if (null === $search) {
+            return false;
+        }
+
+        $accountTypes   = AccountType::whereIn('type', $search)->get();
+        $ignore         = (int) ($parameters[0] ?? 0.0);
+        $accountTypeIds = $accountTypes->pluck('id')->toArray();
+
+        /** @var null|Account $result */
+        $result         = auth()->user()->accounts()->whereIn('account_type_id', $accountTypeIds)->where('id', '!=', $ignore)
+            ->where('name', $value)
+            ->first()
+        ;
+
+        return null === $result;
+    }
+
+    /**
+     * TODO duplicate from old validation class.
+     */
+    private function validateAccountAnonymously(): void
+    {
+        if (!array_key_exists('user_id', $this->data)) {
+            $this->fail('No user ID provided.');
+        }
+
+        /** @var User $user */
+        $user   = User::find($this->data['user_id']);
+        $type   = AccountType::find($this->data['account_type_id'])->first();
+        $value  = $this->data['name'];
+
+        /** @var null|Account $result */
+        $result = $user->accounts()->where('account_type_id', $type->id)->where('name', $value)->first();
+
+        return null === $result;
+    }
+
+    /**
+     * TODO Duplicate from old validation class.
+     *
+     * @param mixed $value
+     * @param mixed $parameters
+     */
+    private function validateByAccountTypeId($value, $parameters): bool
+    {
+        $type   = AccountType::find($this->data['account_type_id'])->first();
+        $ignore = (int) ($parameters[0] ?? 0.0);
+
+        /** @var null|Account $result */
+        $result = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)
+            ->where('name', $value)
+            ->first()
+        ;
+
+        return null === $result;
+    }
+
+    /**
+     * TODO Duplicate from old validation class.
+     *
+     * @param mixed $value
+     */
+    private function validateByParameterId(int $accountId, $value): bool
+    {
+        /** @var Account $existingAccount */
+        $existingAccount = Account::find($accountId);
+
+        $type            = $existingAccount->accountType;
+        $ignore          = $existingAccount->id;
+
+        $entry           = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)
+            ->where('name', $value)
+            ->first()
+        ;
+
+        return null === $entry;
+    }
+
+    /**
+     * TODO Duplicate from old validation class.
+     *
+     * @param mixed $value
+     */
+    private function validateByAccountId($value): bool
+    {
+        /** @var Account $existingAccount */
+        $existingAccount = Account::find($this->data['id']);
+
+        $type            = $existingAccount->accountType;
+        $ignore          = $existingAccount->id;
+
+        $entry           = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)
+            ->where('name', $value)
+            ->first()
+        ;
+
+        return null === $entry;
+    }
+
+    /**
+     * TODO is duplicate
+     * TODO does not take group into account. Must be made group aware.
+     */
+    private function validateByAccountName(string $value): bool
+    {
+        return 0 === auth()->user()->accounts()->where('name', $value)->count();
+    }
+
+    #[\Override]
+    public function setData(array $data): void
+    {
+        $this->data = $data;
+    }
+}
--- a/app/Support/Models/AccountBalanceCalculator.php
+++ b/app/Support/Models/AccountBalanceCalculator.php
@@ -306,7 +306,7 @@ class AccountBalanceCalculator

    private function getStartAmounts(Account $account, TransactionJournal $journal): array
    {
-        exit('here we are');
+        exit('here we are 1');

        return [];
    }
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -44,8 +44,7 @@ class Steam
     */
    public function balanceIgnoreVirtual(Account $account, Carbon $date): string
    {
-        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
-
+        // Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
        /** @var AccountRepositoryInterface $repository */
        $repository     = app(AccountRepositoryInterface::class);
        $repository->setUser($account->user);
@@ -96,7 +95,7 @@ class Steam
     */
    public function balanceInRange(Account $account, Carbon $start, Carbon $end, ?TransactionCurrency $currency = null): array
    {
-        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
+        //        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
        $cache                = new CacheProperties();
        $cache->addProperty($account->id);
        $cache->addProperty('balance-in-range');
@@ -221,7 +220,7 @@ class Steam
     */
    public function balance(Account $account, Carbon $date, ?TransactionCurrency $currency = null): string
    {
-        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
+        //        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
        // abuse chart properties:
        $cache          = new CacheProperties();
        $cache->addProperty($account->id);
@@ -270,7 +269,7 @@ class Steam
     */
    public function balanceInRangeConverted(Account $account, Carbon $start, Carbon $end, TransactionCurrency $native): array
    {
-        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
+        //        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
        $cache                = new CacheProperties();
        $cache->addProperty($account->id);
        $cache->addProperty('balance-in-range-converted');
@@ -396,7 +395,7 @@ class Steam
     */
    public function balanceConverted(Account $account, Carbon $date, TransactionCurrency $native): string
    {
-        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
+        //        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
        Log::debug(sprintf('Now in balanceConverted (%s) for account #%d, converting to %s', $date->format('Y-m-d'), $account->id, $native->code));
        $cache      = new CacheProperties();
        $cache->addProperty($account->id);
@@ -542,7 +541,7 @@ class Steam
     */
    public function balancesByAccounts(Collection $accounts, Carbon $date): array
    {
-        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
+        //        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
        $ids    = $accounts->pluck('id')->toArray();
        // cache this property.
        $cache  = new CacheProperties();
@@ -573,7 +572,7 @@ class Steam
     */
    public function balancesByAccountsConverted(Collection $accounts, Carbon $date): array
    {
-        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
+        //        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
        $ids    = $accounts->pluck('id')->toArray();
        // cache this property.
        $cache  = new CacheProperties();
@@ -607,7 +606,7 @@ class Steam
     */
    public function balancesPerCurrencyByAccounts(Collection $accounts, Carbon $date): array
    {
-        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
+        //        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
        $ids    = $accounts->pluck('id')->toArray();
        // cache this property.
        $cache  = new CacheProperties();
@@ -633,7 +632,7 @@ class Steam

    public function balancePerCurrency(Account $account, Carbon $date): array
    {
-        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
+        //        Log::warning(sprintf('Deprecated method %s, do not use.', __METHOD__));
        // abuse chart properties:
        $cache    = new CacheProperties();
        $cache->addProperty($account->id);
--- a/composer.lock
+++ b/composer.lock
@@ -191,23 +191,23 @@
        },
        {
            "name": "dasprid/enum",
-            "version": "1.0.5",
+            "version": "1.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/DASPRiD/Enum.git",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016"
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
                "shasum": ""
            },
            "require": {
                "php": ">=7.1 <9.0"
            },
            "require-dev": {
-                "phpunit/phpunit": "^7 | ^8 | ^9",
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
                "squizlabs/php_codesniffer": "*"
            },
            "type": "library",
@@ -235,9 +235,9 @@
            ],
            "support": {
                "issues": "https://github.com/DASPRiD/Enum/issues",
-                "source": "https://github.com/DASPRiD/Enum/tree/1.0.5"
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.6"
            },
-            "time": "2023-08-25T16:18:39+00:00"
+            "time": "2024-08-09T14:30:48+00:00"
        },
        {
            "name": "defuse/php-encryption",
@@ -2410,16 +2410,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.19.0",
+            "version": "v11.20.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "5e103d499e9ee5bcfc184412d034c4e516b87085"
+                "reference": "3cd7593dd9b67002fc416b46616f4d4d1da3e571"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/5e103d499e9ee5bcfc184412d034c4e516b87085",
-                "reference": "5e103d499e9ee5bcfc184412d034c4e516b87085",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/3cd7593dd9b67002fc416b46616f4d4d1da3e571",
+                "reference": "3cd7593dd9b67002fc416b46616f4d4d1da3e571",
                "shasum": ""
            },
            "require": {
@@ -2612,20 +2612,20 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-07-30T15:22:41+00:00"
+            "time": "2024-08-06T14:39:21+00:00"
        },
        {
            "name": "laravel/passport",
-            "version": "v12.2.1",
+            "version": "v12.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/passport.git",
-                "reference": "795bbb406c8f10167df6062032de803bd7d686f2"
+                "reference": "ca63a86697a4fa091c7dcabe88ebba91d97c785d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/795bbb406c8f10167df6062032de803bd7d686f2",
-                "reference": "795bbb406c8f10167df6062032de803bd7d686f2",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/ca63a86697a4fa091c7dcabe88ebba91d97c785d",
+                "reference": "ca63a86697a4fa091c7dcabe88ebba91d97c785d",
                "shasum": ""
            },
            "require": {
@@ -2688,7 +2688,7 @@
                "issues": "https://github.com/laravel/passport/issues",
                "source": "https://github.com/laravel/passport"
            },
-            "time": "2024-07-10T19:25:36+00:00"
+            "time": "2024-08-05T13:44:51+00:00"
        },
        {
            "name": "laravel/prompts",
@@ -2814,26 +2814,27 @@
        },
        {
            "name": "laravel/serializable-closure",
-            "version": "v1.3.3",
+            "version": "v1.3.4",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
+                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
-                "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
+                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
                "shasum": ""
            },
            "require": {
                "php": "^7.3|^8.0"
            },
            "require-dev": {
-                "nesbot/carbon": "^2.61",
+                "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"
+                "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
            },
            "type": "library",
            "extra": {
@@ -2870,7 +2871,7 @@
                "issues": "https://github.com/laravel/serializable-closure/issues",
                "source": "https://github.com/laravel/serializable-closure"
            },
-            "time": "2023-11-08T14:08:06+00:00"
+            "time": "2024-08-02T07:48:17+00:00"
        },
        {
            "name": "laravel/slack-notification-channel",
@@ -4258,20 +4259,20 @@
        },
        {
            "name": "nette/utils",
-            "version": "v4.0.4",
+            "version": "v4.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/nette/utils.git",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
-                "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
+                "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.0 <8.4"
+                "php": "8.0 - 8.4"
            },
            "conflict": {
                "nette/finder": "<3",
@@ -4338,9 +4339,9 @@
            ],
            "support": {
                "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.4"
+                "source": "https://github.com/nette/utils/tree/v4.0.5"
            },
-            "time": "2024-01-17T16:50:36+00:00"
+            "time": "2024-08-07T15:39:19+00:00"
        },
        {
            "name": "nunomaduro/collision",
@@ -4799,16 +4800,16 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "3.0.39",
+            "version": "3.0.41",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485"
+                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/211ebc399c6e73c225a018435fe5ae209d1d1485",
-                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
+                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
                "shasum": ""
            },
            "require": {
@@ -4889,7 +4890,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.39"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.41"
            },
            "funding": [
                {
@@ -4905,7 +4906,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-06-24T06:27:33+00:00"
+            "time": "2024-08-12T00:13:54+00:00"
        },
        {
            "name": "pragmarx/google2fa",
@@ -8401,6 +8402,82 @@
            ],
            "time": "2024-05-31T15:07:36+00:00"
        },
+        {
+            "name": "symfony/polyfill-php81",
+            "version": "v1.30.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af",
+                "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-06-19T12:30:46+00:00"
+        },
        {
            "name": "symfony/polyfill-php83",
            "version": "v1.30.0",
@@ -9411,16 +9488,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.10.3",
+            "version": "v3.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "67f29781ffafa520b0bbfbd8384674b42db04572"
+                "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572",
-                "reference": "67f29781ffafa520b0bbfbd8384674b42db04572",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/e80fb8ebba85c7341a97a9ebf825d7fd4b77708d",
+                "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d",
                "shasum": ""
            },
            "require": {
@@ -9428,7 +9505,8 @@
                "symfony/deprecation-contracts": "^2.5|^3",
                "symfony/polyfill-ctype": "^1.8",
                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php80": "^1.22"
+                "symfony/polyfill-php80": "^1.22",
+                "symfony/polyfill-php81": "^1.29"
            },
            "require-dev": {
                "psr/container": "^1.0|^2.0",
@@ -9474,7 +9552,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.10.3"
+                "source": "https://github.com/twigphp/Twig/tree/v3.11.0"
            },
            "funding": [
                {
@@ -9486,7 +9564,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-16T10:04:27+00:00"
+            "time": "2024-08-08T16:15:16+00:00"
        },
        {
            "name": "vlucas/phpdotenv",
@@ -11225,16 +11303,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.11.9",
+            "version": "1.11.10",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "e370bcddadaede0c1716338b262346f40d296f82"
+                "reference": "640410b32995914bde3eed26fa89552f9c2c082f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e370bcddadaede0c1716338b262346f40d296f82",
-                "reference": "e370bcddadaede0c1716338b262346f40d296f82",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/640410b32995914bde3eed26fa89552f9c2c082f",
+                "reference": "640410b32995914bde3eed26fa89552f9c2c082f",
                "shasum": ""
            },
            "require": {
@@ -11279,7 +11357,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-08-01T16:25:18+00:00"
+            "time": "2024-08-08T09:02:50+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -117,7 +117,7 @@ return [
        'expression_engine' => true,
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2024-08-05',
+    'version'                      => 'develop/2024-08-12',
    'api_version'                  => '2.1.0',
    'db_version'                   => 24,

--- a/package-lock.json
+++ b/package-lock.json
@@ -11,36 +11,36 @@
            ]
        },
        "node_modules/@ag-grid-community/client-side-row-model": {
-            "version": "32.0.2",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/client-side-row-model/-/client-side-row-model-32.0.2.tgz",
-            "integrity": "sha512-NuwnXsogowbtceLRF8YpAgqj/KU/nPb+FFgwajPwAoxAVzc0qQITMSV/PQN5T5YR9HSaaQQFyyjsHiPAcEoTlw==",
+            "version": "32.1.0",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/client-side-row-model/-/client-side-row-model-32.1.0.tgz",
+            "integrity": "sha512-R/IA3chA/w9fy6/EeZhi42PTwVnb6bNjGMah1GWGvuNDTvfbPO4X9r4nhOMj6YH483bO+C7pPb4EoLECx0dfRQ==",
            "dependencies": {
-                "@ag-grid-community/core": "32.0.2",
+                "@ag-grid-community/core": "32.1.0",
                "tslib": "^2.3.0"
            }
        },
        "node_modules/@ag-grid-community/core": {
-            "version": "32.0.2",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/core/-/core-32.0.2.tgz",
-            "integrity": "sha512-Pm4KpWuoHtn/eXgzunX0R10TZt6ze3KIz89Q/pzl2ZE+GdEjn6vPmgG+lMb/z90FgFwnMuIOQiz1qk0x5/xaHA==",
+            "version": "32.1.0",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/core/-/core-32.1.0.tgz",
+            "integrity": "sha512-fHpgSZa/aBjg2DdOzooDxILFZqxmxP8vsjRfeZVtqby19mTKwNAclE7Z6rWzOA0GYjgN9s8JwLFcNA5pvfswMg==",
            "dependencies": {
-                "ag-charts-types": "10.0.2",
+                "ag-charts-types": "10.1.0",
                "tslib": "^2.3.0"
            }
        },
        "node_modules/@ag-grid-community/infinite-row-model": {
-            "version": "32.0.2",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/infinite-row-model/-/infinite-row-model-32.0.2.tgz",
-            "integrity": "sha512-OCYF/t49Y8Ru5wRUBjuJqIqqm9tEEPPIfDLrNiURBtwlQiaqLXJ2qGnZQe+RWQ0iQh2eBaQrtbr1xley4Z+DWw==",
+            "version": "32.1.0",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/infinite-row-model/-/infinite-row-model-32.1.0.tgz",
+            "integrity": "sha512-+otBbrRgP+10CzYIyKj3BfL7GBs3f4xtQy7l6Wm9e74M4zfIW805x92xV+x65pkrX5L0VZRlKOPWhsoI1h2seQ==",
            "dependencies": {
-                "@ag-grid-community/core": "32.0.2",
+                "@ag-grid-community/core": "32.1.0",
                "tslib": "^2.3.0"
            }
        },
        "node_modules/@ag-grid-community/styles": {
-            "version": "32.0.2",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/styles/-/styles-32.0.2.tgz",
-            "integrity": "sha512-AIbk1Oq1TOEfQopdretMs7Umv5Swm74JTTWH38sc1BX5NOFEC49m3wDi+5E/8xejtH0tmCAhKtpMsbMa16FGIQ=="
+            "version": "32.1.0",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/styles/-/styles-32.1.0.tgz",
+            "integrity": "sha512-OjakLetS/zr0g5mJWpnjldk/RjGnl7Rv3I/5cGuvtgdmSgS+4FNZMr8ZmyR8Bl34s0RM63OSIphpVaFGlnJM4w=="
        },
        "node_modules/@ampproject/remapping": {
            "version": "2.3.0",
@@ -2760,9 +2760,9 @@
            "dev": true
        },
        "node_modules/@types/http-proxy": {
-            "version": "1.17.14",
-            "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
-            "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
+            "version": "1.17.15",
+            "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
+            "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
            "dev": true,
            "dependencies": {
                "@types/node": "*"
@@ -2833,9 +2833,9 @@
            "dev": true
        },
        "node_modules/@types/node": {
-            "version": "22.1.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.1.0.tgz",
-            "integrity": "sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw==",
+            "version": "22.2.0",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.2.0.tgz",
+            "integrity": "sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==",
            "dev": true,
            "dependencies": {
                "undici-types": "~6.13.0"
@@ -2929,39 +2929,39 @@
            }
        },
        "node_modules/@vue/compiler-core": {
-            "version": "3.4.35",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.35.tgz",
-            "integrity": "sha512-gKp0zGoLnMYtw4uS/SJRRO7rsVggLjvot3mcctlMXunYNsX+aRJDqqw/lV5/gHK91nvaAAlWFgdVl020AW1Prg==",
+            "version": "3.4.37",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.37.tgz",
+            "integrity": "sha512-ZDDT/KiLKuCRXyzWecNzC5vTcubGz4LECAtfGPENpo0nrmqJHwuWtRLxk/Sb9RAKtR9iFflFycbkjkY+W/PZUQ==",
            "dev": true,
            "dependencies": {
                "@babel/parser": "^7.24.7",
-                "@vue/shared": "3.4.35",
-                "entities": "^4.5.0",
+                "@vue/shared": "3.4.37",
+                "entities": "^5.0.0",
                "estree-walker": "^2.0.2",
                "source-map-js": "^1.2.0"
            }
        },
        "node_modules/@vue/compiler-dom": {
-            "version": "3.4.35",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.35.tgz",
-            "integrity": "sha512-pWIZRL76/oE/VMhdv/ovZfmuooEni6JPG1BFe7oLk5DZRo/ImydXijoZl/4kh2406boRQ7lxTYzbZEEXEhj9NQ==",
+            "version": "3.4.37",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.37.tgz",
+            "integrity": "sha512-rIiSmL3YrntvgYV84rekAtU/xfogMUJIclUMeIKEtVBFngOL3IeZHhsH3UaFEgB5iFGpj6IW+8YuM/2Up+vVag==",
            "dev": true,
            "dependencies": {
-                "@vue/compiler-core": "3.4.35",
-                "@vue/shared": "3.4.35"
+                "@vue/compiler-core": "3.4.37",
+                "@vue/shared": "3.4.37"
            }
        },
        "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.35",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.35.tgz",
-            "integrity": "sha512-xacnRS/h/FCsjsMfxBkzjoNxyxEyKyZfBch/P4vkLRvYJwe5ChXmZZrj8Dsed/752H2Q3JE8kYu9Uyha9J6PgA==",
+            "version": "3.4.37",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.37.tgz",
+            "integrity": "sha512-vCfetdas40Wk9aK/WWf8XcVESffsbNkBQwS5t13Y/PcfqKfIwJX2gF+82th6dOpnpbptNMlMjAny80li7TaCIg==",
            "dev": true,
            "dependencies": {
                "@babel/parser": "^7.24.7",
-                "@vue/compiler-core": "3.4.35",
-                "@vue/compiler-dom": "3.4.35",
-                "@vue/compiler-ssr": "3.4.35",
-                "@vue/shared": "3.4.35",
+                "@vue/compiler-core": "3.4.37",
+                "@vue/compiler-dom": "3.4.37",
+                "@vue/compiler-ssr": "3.4.37",
+                "@vue/shared": "3.4.37",
                "estree-walker": "^2.0.2",
                "magic-string": "^0.30.10",
                "postcss": "^8.4.40",
@@ -2969,13 +2969,13 @@
            }
        },
        "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.35",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.35.tgz",
-            "integrity": "sha512-7iynB+0KB1AAJKk/biENTV5cRGHRdbdaD7Mx3nWcm1W8bVD6QmnH3B4AHhQQ1qZHhqFwzEzMwiytXm3PX1e60A==",
+            "version": "3.4.37",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.37.tgz",
+            "integrity": "sha512-TyAgYBWrHlFrt4qpdACh8e9Ms6C/AZQ6A6xLJaWrCL8GCX5DxMzxyeFAEMfU/VFr4tylHm+a2NpfJpcd7+20XA==",
            "dev": true,
            "dependencies": {
-                "@vue/compiler-dom": "3.4.35",
-                "@vue/shared": "3.4.35"
+                "@vue/compiler-dom": "3.4.37",
+                "@vue/shared": "3.4.37"
            }
        },
        "node_modules/@vue/component-compiler-utils": {
@@ -3050,9 +3050,9 @@
            "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
        },
        "node_modules/@vue/shared": {
-            "version": "3.4.35",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.35.tgz",
-            "integrity": "sha512-hvuhBYYDe+b1G8KHxsQ0diDqDMA8D9laxWZhNAjE83VZb5UDaXl9Xnz7cGdDSyiHM90qqI/CyGMcpBpiDy6VVQ==",
+            "version": "3.4.37",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.37.tgz",
+            "integrity": "sha512-nIh8P2fc3DflG8+5Uw8PT/1i17ccFn0xxN/5oE9RfV5SVnd7G0XEFRwakrnNFE/jlS95fpGXDVG5zDETS26nmg==",
            "dev": true
        },
        "node_modules/@webassemblyjs/ast": {
@@ -3295,9 +3295,9 @@
            "integrity": "sha512-sRpozBFpM65uJbr4zJ38RAfhgfIrJlM2aWaLlfBSkz0cuALl/cJSn1hSc437IPw+rS7r+j82Y6H5HCYJSNUBIg=="
        },
        "node_modules/ag-charts-types": {
-            "version": "10.0.2",
-            "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-10.0.2.tgz",
-            "integrity": "sha512-Nxo5slHOXlaeg0gRIsVnovAosQzzlYfWJtdDy0Aq/VvpJru/PJ+5i2c9aCyEhgRxhBjImsoegwkgRj7gNOWV6Q=="
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/ag-charts-types/-/ag-charts-types-10.1.0.tgz",
+            "integrity": "sha512-pk9ft8hbgTXJ/thI/SEUR1BoauNplYExpcHh7tMOqVikoDsta1O15TB1ZL4XWnl4TPIzROBmONKsz7d8a2HBuQ=="
        },
        "node_modules/ajv": {
            "version": "6.12.6",
@@ -4011,9 +4011,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001647",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001647.tgz",
-            "integrity": "sha512-n83xdNiyeNcHpzWY+1aFbqCK7LuLfBricc4+alSQL2Xb6OR3XpnQAmlDG+pQcdTfiHRuLcQ96VOfrPSGiNJYSg==",
+            "version": "1.0.30001651",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz",
+            "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==",
            "dev": true,
            "funding": [
                {
@@ -5086,9 +5086,9 @@
            "dev": true
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.4",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
-            "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
+            "version": "1.5.6",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.6.tgz",
+            "integrity": "sha512-jwXWsM5RPf6j9dPYzaorcBSUg6AiqocPEyMpkchkvntaH9HGfOOMZwxMJjDY/XEs3T5dM7uyH1VhRMkqUU9qVw==",
            "dev": true
        },
        "node_modules/elliptic": {
@@ -5150,9 +5150,9 @@
            }
        },
        "node_modules/entities": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-5.0.0.tgz",
+            "integrity": "sha512-BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA==",
            "dev": true,
            "engines": {
                "node": ">=0.12"
@@ -6966,9 +6966,9 @@
            }
        },
        "node_modules/launch-editor": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz",
-            "integrity": "sha512-vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA==",
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.1.tgz",
+            "integrity": "sha512-elBx2l/tp9z99X5H/qev8uyDywVh0VXAwEbjk8kJhnc5grOFkGh7aW6q55me9xnYbss261XtnUrysZ+XvGbhQA==",
            "dev": true,
            "dependencies": {
                "picocolors": "^1.0.0",
@@ -7984,9 +7984,9 @@
            }
        },
        "node_modules/postcss": {
-            "version": "8.4.40",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
-            "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
+            "version": "8.4.41",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+            "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
            "dev": true,
            "funding": [
                {
@@ -9721,9 +9721,9 @@
            }
        },
        "node_modules/terser": {
-            "version": "5.31.3",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz",
-            "integrity": "sha512-pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==",
+            "version": "5.31.5",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.5.tgz",
+            "integrity": "sha512-YPmas0L0rE1UyLL/llTWA0SiDOqIcAQYLeUj7cJYzXHlRTAnMSg9pPe4VJ5PlKvTrPQsdVFuiRiwyeNlYgwh2Q==",
            "dev": true,
            "dependencies": {
                "@jridgewell/source-map": "^0.3.3",
@@ -10086,13 +10086,13 @@
            }
        },
        "node_modules/vite": {
-            "version": "5.3.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz",
-            "integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==",
+            "version": "5.4.0",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.0.tgz",
+            "integrity": "sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==",
            "dev": true,
            "dependencies": {
                "esbuild": "^0.21.3",
-                "postcss": "^8.4.39",
+                "postcss": "^8.4.40",
                "rollup": "^4.13.0"
            },
            "bin": {
@@ -10112,6 +10112,7 @@
                "less": "*",
                "lightningcss": "^1.21.0",
                "sass": "*",
+                "sass-embedded": "*",
                "stylus": "*",
                "sugarss": "*",
                "terser": "^5.4.0"
@@ -10129,6 +10130,9 @@
                "sass": {
                    "optional": true
                },
+                "sass-embedded": {
+                    "optional": true
+                },
                "stylus": {
                    "optional": true
                },
--- a/resources/assets/v1/src/locales/pt.json
+++ b/resources/assets/v1/src/locales/pt.json
@@ -5,8 +5,8 @@
        "flash_warning": "Aviso!",
        "flash_success": "Sucesso!",
        "close": "Fechar",
-        "select_dest_account": "Please select or type a valid destination account name",
-        "select_source_account": "Please select or type a valid source account name",
+        "select_dest_account": "Por favor, selecione ou digite um nome de conta destinat\u00e1ria v\u00e1lida",
+        "select_source_account": "Por favor, selecione ou digite um nome de conta v\u00e1lido",
        "split_transaction_title": "Descri\u00e7\u00e3o da transa\u00e7\u00e3o dividida",
        "errors_submission": "Algo correu mal com o envio dos dados. Por favor verifique e corrija os erros abaixo.",
        "split": "Dividir",
--- a/resources/lang/en_US/validation.php
+++ b/resources/lang/en_US/validation.php
@@ -28,6 +28,7 @@ return [
    'filter_must_be_in'               => 'Filter ":filter" must be one of: :values',
    'filter_not_string'               => 'Filter ":filter" is expected to be a string of text',
    'bad_api_filter'                  => 'This API endpoint does not support ":filter" as a filter.',
+    'nog_logged_in'                   => 'You are not logged in.',
    'bad_type_source'                 => 'Firefly III can\'t determine the transaction type based on this source account.',
    'bad_type_destination'            => 'Firefly III can\'t determine the transaction type based on this destination account.',
    'missing_where'                   => 'Array is missing "where"-clause',
--- a/routes/api.php
+++ b/routes/api.php
@@ -243,10 +243,11 @@ Route::group(
 JsonApiRoute::server('v2')->prefix('v2')
    ->resources(function (ResourceRegistrar $server): void {
        // ACCOUNTS
-        $server->resource('accounts', AccountController::class)->relationships(function (Relationships $relations): void {
-            $relations->hasOne('user')->readOnly();
-        });
-        //                $server->resource('accounts', AccountController::class)->readOnly();
+        $server->resource('accounts', AccountController::class)
+            ->relationships(function (Relationships $relations): void {
+                $relations->hasOne('user')->readOnly();
+            })
+        ;

        // USERS
        $server->resource('users', JsonApiController::class)->readOnly()->relationships(function (Relationships $relations): void {
Author	SHA1	Message	Date
github-actions	debfd9160c	Auto commit for release 'develop' on 2024-08-12	2024-08-12 05:07:37 +02:00
James Cole	f2482e4ace	Remove comments	2024-08-07 06:04:37 +02:00
github-actions	d98d757f8b	Auto commit for release 'develop' on 2024-08-05	2024-08-05 20:37:29 +02:00
James Cole	0c9a41a929	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop # Conflicts: # app/JsonApi/V2/Accounts/AccountRepository.php # app/JsonApi/V2/Accounts/AccountRequest.php # app/JsonApi/V2/Accounts/Capabilities/CrudAccount.php # app/Support/Steam.php	2024-08-05 19:48:46 +02:00
James Cole	e26f78bf50	Better error handling and remove some warnings.	2024-08-05 19:45:04 +02:00