Auto commit for release 'develop' on 2025-01-27

Bumps the npm_and_yarn group with 1 update in the / directory: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite).


Updates `vite` from 6.0.7 to 6.0.9
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.0.9/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -41,6 +41,7 @@ use Illuminate\Http\JsonResponse;
 class AccountController extends Controller
 {
     use AccountFilter;
+    protected array $accepts = ['application/json'];
 
     /** @var array<int, string> */
     private array                      $balanceTypes;
@@ -84,12 +85,12 @@ class AccountController extends Controller
         /** @var Account $account */
         foreach ($result as $account) {
             $nameWithBalance = $account->name;
-            $currency        = $this->repository->getAccountCurrency($account) ?? $this->defaultCurrency;
+            $currency        = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency;
             $useCurrency     = $currency;
             if (in_array($account->accountType->type, $this->balanceTypes, true)) {
                 $balance         = Steam::finalAccountBalance($account, $date);
-                $key             = $this->convertToNative && $currency->id !== $this->defaultCurrency->id ? 'native_balance' : 'balance';
+                $key             = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? 'native_balance' : 'balance';
-                $useCurrency     = $this->convertToNative && $currency->id !== $this->defaultCurrency->id ? $this->defaultCurrency : $currency;
+                $useCurrency     = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? $this->nativeCurrency : $currency;
                 $amount          = $balance[$key] ?? '0';
                 $nameWithBalance = sprintf(
                     '%s (%s)',
@@ -123,6 +124,6 @@ class AccountController extends Controller
             }
         );
 
-        return response()->json($return);
+        return response()->api($return);
     }
 }

app/Api/V1/Controllers/Autocomplete/BillController.php

@@ -74,6 +74,6 @@ class BillController extends Controller
             }
         );
 
-        return response()->json($filtered->toArray());
+        return response()->api($filtered->toArray());
     }
 }

app/Api/V1/Controllers/Autocomplete/BudgetController.php

@@ -73,6 +73,6 @@ class BudgetController extends Controller
             }
         );
 
-        return response()->json($filtered);
+        return response()->api($filtered->toArray());
     }
 }

app/Api/V1/Controllers/Autocomplete/CategoryController.php

@@ -73,6 +73,6 @@ class CategoryController extends Controller
             }
         );
 
-        return response()->json($filtered);
+        return response()->api($filtered->toArray());
     }
 }

app/Api/V1/Controllers/Autocomplete/CurrencyController.php

@@ -77,7 +77,7 @@ class CurrencyController extends Controller
             ];
         }
 
-        return response()->json($result);
+        return response()->api($result);
     }
 
     /**
@@ -103,6 +103,6 @@ class CurrencyController extends Controller
             ];
         }
 
-        return response()->json($result);
+        return response()->api($result);
     }
 }

app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php

@@ -75,6 +75,6 @@ class ObjectGroupController extends Controller
             ];
         }
 
-        return response()->json($return);
+        return response()->api($return);
     }
 }

app/Api/V1/Controllers/Autocomplete/PiggyBankController.php

@@ -87,7 +87,7 @@ class PiggyBankController extends Controller
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 
     /**
@@ -124,6 +124,6 @@ class PiggyBankController extends Controller
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 }

app/Api/V1/Controllers/Autocomplete/RecurrenceController.php

@@ -73,6 +73,6 @@ class RecurrenceController extends Controller
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 }

app/Api/V1/Controllers/Autocomplete/RuleController.php

@@ -72,6 +72,6 @@ class RuleController extends Controller
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 }

app/Api/V1/Controllers/Autocomplete/RuleGroupController.php

@@ -72,6 +72,6 @@ class RuleGroupController extends Controller
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 }

app/Api/V1/Controllers/Autocomplete/TagController.php

@@ -75,6 +75,6 @@ class TagController extends Controller
             ];
         }
 
-        return response()->json($array);
+        return response()->api($array);
     }
 }

app/Api/V1/Controllers/Autocomplete/TransactionController.php

@@ -84,7 +84,7 @@ class TransactionController extends Controller
             ];
         }
 
-        return response()->json($array);
+        return response()->api($array);
     }
 
     /**
@@ -122,6 +122,6 @@ class TransactionController extends Controller
             ];
         }
 
-        return response()->json($array);
+        return response()->api($array);
     }
 }

app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php

@@ -72,6 +72,6 @@ class TransactionTypeController extends Controller
             ];
         }
 
-        return response()->json($array);
+        return response()->api($array);
     }
 }

app/Api/V1/Controllers/Chart/AccountController.php

@@ -97,8 +97,8 @@ class AccountController extends Controller
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            $currency     = $this->repository->getAccountCurrency($account) ?? $this->defaultCurrency;
+            $currency     = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency;
-            $field        = $this->convertToNative && $currency->id !== $this->defaultCurrency->id ? 'native_balance' : 'balance';
+            $field        = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? 'native_balance' : 'balance';
             $currentSet   = [
                 'label'                   => $account->name,
                 'currency_id'             => (string) $currency->id,

app/Api/V1/Controllers/Controller.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
+use FireflyIII\Exceptions\BadHttpHeaderException;
 use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
@@ -59,13 +60,15 @@ abstract class Controller extends BaseController
     use DispatchesJobs;
     use ValidatesRequests;
 
-    protected const string CONTENT_TYPE    = 'application/vnd.api+json';
+    protected const string CONTENT_TYPE      = 'application/vnd.api+json';
+    protected const string JSON_CONTENT_TYPE = 'application/json';
 
     /** @var array<int, string> */
     protected array        $allowedSort;
     protected ParameterBag $parameters;
-    protected bool        $convertToNative = false;
+    protected bool        $convertToNative   = false;
-    protected TransactionCurrency $defaultCurrency;
+    protected array $accepts                 = ['application/json'];
+    protected TransactionCurrency $nativeCurrency;
 
     /**
      * Controller constructor.
@@ -80,11 +83,17 @@ abstract class Controller extends BaseController
                 if (auth()->check()) {
                     $language              = Steam::getLanguage();
                     $this->convertToNative = Amount::convertToNative();
-                    $this->defaultCurrency = Amount::getNativeCurrency();
+                    $this->nativeCurrency  = Amount::getNativeCurrency();
                     app()->setLocale($language);
-
                 }
 
+
+                // filter down what this endpoint accepts.
+                if (!$request->accepts($this->accepts)) {
+                    throw new BadHttpHeaderException(sprintf('Sorry, Accept header "%s" is not something this endpoint can provide.', $request->header('Accept')));
+                }
+
+
                 return $next($request);
             }
         );
@@ -148,7 +157,15 @@ abstract class Controller extends BaseController
                 $value = null;
             }
             if (null !== $value) {
-                $bag->set($integer, (int) $value);
+                $value = (int) $value;
+                if ($value < 1) {
+                    $value = 1;
+                }
+                if ($value > 2 ** 16) {
+                    $value = 2 ** 16;
+                }
+
+                $bag->set($integer, $value);
             }
             if (null === $value
                 && 'limit' === $integer // @phpstan-ignore-line

app/Api/V1/Controllers/Models/Budget/ListController.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\Budget;
 
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Budget;
@@ -208,6 +209,8 @@ class ListController extends Controller
         $collector    = app(GroupCollectorInterface::class);
         $collector
             ->setUser($admin)
+            // withdrawals only
+            ->setTypes([TransactionTypeEnum::WITHDRAWAL->value])
             // filter on budget.
             ->withoutBudget()
             // all info needed for the API:

app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php

@@ -2,7 +2,7 @@
 
 /*
  * DestroyController.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * Copyright (c) 2025 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,10 +22,13 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Controllers\Model\ExchangeRate;
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 
-use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V2\Request\Model\ExchangeRate\DestroyRequest;
+use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\DestroyRequest;
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Exceptions\ValidationException;
+use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
@@ -36,6 +39,8 @@ class DestroyController extends Controller
 {
     use ValidatesUserGroupTrait;
 
+    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
+
     public const string RESOURCE_KEY = 'exchange-rates';
 
     private ExchangeRateRepositoryInterface $repository;
@@ -56,6 +61,9 @@ class DestroyController extends Controller
     public function destroy(DestroyRequest $request, TransactionCurrency $from, TransactionCurrency $to): JsonResponse
     {
         $date = $request->getDate();
+        if (null === $date) {
+            throw new ValidationException('Date is required');
+        }
         $rate = $this->repository->getSpecificRateOnDate($from, $to, $date);
         if (null === $rate) {
             throw new NotFoundHttpException();
@@ -64,4 +72,11 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
+
+    public function destroySingle(CurrencyExchangeRate $exchangeRate): JsonResponse
+    {
+        $this->repository->deleteRate($exchangeRate);
+
+        return response()->json([], 204);
+    }
 }

app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php

@@ -1,8 +1,8 @@
 <?php
 
 /*
- * ShowController.php
+ * IndexController.php
- * Copyright (c) 2023 james@firefly-iii.org
+ * Copyright (c) 2025 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -17,12 +17,12 @@
  * 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/>.
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Controllers\Model\ExchangeRate;
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
@@ -38,7 +38,7 @@ class IndexController extends Controller
 {
     use ValidatesUserGroupTrait;
 
-    public const string RESOURCE_KEY = 'exchange-rates';
+    public const string RESOURCE_KEY = 'currency_exchange_rates';
 
     private ExchangeRateRepositoryInterface $repository;
 
@@ -62,9 +62,6 @@ class IndexController extends Controller
         $count       = $piggies->count();
         $piggies     = $piggies->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator   = new LengthAwarePaginator($piggies, $count, $pageSize, $this->parameters->get('page'));
-
-        var_dump('here we are');
-
         $transformer = new ExchangeRateTransformer();
         $transformer->setParameters($this->parameters); // give params to transformer
 

app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php

@@ -2,7 +2,7 @@
 
 /*
  * ShowController.php
- * Copyright (c) 2023 james@firefly-iii.org
+ * Copyright (c) 2025 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -17,14 +17,15 @@
  * 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/>.
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Controllers\Model\ExchangeRate;
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 
 use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
@@ -73,4 +74,15 @@ class ShowController extends Controller
             ->header('Content-Type', self::CONTENT_TYPE)
         ;
     }
+
+    public function showSingle(CurrencyExchangeRate $exchangeRate): JsonResponse
+    {
+        $transformer = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
 }

app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php

@@ -1,8 +1,8 @@
 <?php
 
 /*
- * DestroyController.php
+ * StoreController.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * Copyright (c) 2025 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,10 +22,10 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Controllers\Model\ExchangeRate;
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 
+use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreRequest;
 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Api\V2\Request\Model\ExchangeRate\StoreRequest;
 use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\ExchangeRateTransformer;

app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php

@@ -1,8 +1,8 @@
 <?php
 
 /*
- * DestroyController.php
+ * UpdateController.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * Copyright (c) 2025 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,10 +22,10 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Controllers\Model\ExchangeRate;
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
 
+use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\UpdateRequest;
 use FireflyIII\Api\V2\Controllers\Controller;
-use FireflyIII\Api\V2\Request\Model\ExchangeRate\UpdateRequest;
 use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;

app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php

@@ -107,7 +107,7 @@ class ShowController extends Controller
         /** @var User $user */
         $user        = auth()->user();
         $manager     = $this->getManager();
-        $this->parameters->set('defaultCurrency', $this->defaultCurrency);
+        $this->parameters->set('nativeCurrency', $this->nativeCurrency);
 
         // update fields with user info.
         $currency->refreshForUser($user);
@@ -123,7 +123,7 @@ class ShowController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/getDefaultCurrency
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/getNativeCurrency
      *
      * Show a currency.
      *
@@ -134,7 +134,7 @@ class ShowController extends Controller
         /** @var User $user */
         $user        = auth()->user();
         $manager     = $this->getManager();
-        $currency    = $this->defaultCurrency;
+        $currency    = $this->nativeCurrency;
 
         // update fields with user info.
         $currency->refreshForUser($user);

app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php

@@ -100,7 +100,7 @@ class UpdateController extends Controller
 
     /**
      * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/defaultCurrency
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/currencies/nativeCurrency
      *
      * Make the currency a default currency.
      *

app/Api/V1/Controllers/System/AboutController.php

@@ -58,7 +58,7 @@ class AboutController extends Controller
                            'driver'      => $currentDriver,
                        ];
 
-        return response()->api(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
+        return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
     }
 
     /**

app/Api/V1/Controllers/System/ConfigurationController.php

@@ -86,7 +86,7 @@ class ConfigurationController extends Controller
             ];
         }
 
-        return response()->json($return);
+        return response()->api($return);
     }
 
     /**
@@ -142,7 +142,7 @@ class ConfigurationController extends Controller
             ];
         }
 
-        return response()->json(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
+        return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
     }
 
     /**
@@ -173,6 +173,6 @@ class ConfigurationController extends Controller
             'editable' => true,
         ];
 
-        return response()->json(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
+        return response()->api(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
     }
 }

app/Api/V1/Controllers/System/CronController.php

@@ -52,8 +52,8 @@ class CronController extends Controller
         if (true === config('cer.download_enabled')) {
             $return['exchange_rates'] = $this->exchangeRatesCronJob($config['force'], $config['date']);
         }
-        $return['bill_warnings']          = $this->billWarningCronJob($config['force'], $config['date']);
+        $return['bill_notifications']     = $this->billWarningCronJob($config['force'], $config['date']);
 
-        return response()->json($return);
+        return response()->api($return);
     }
 }

app/Api/V1/Controllers/User/PreferencesController.php

@@ -32,7 +32,6 @@ use FireflyIII\Models\Preference;
 use FireflyIII\Transformers\PreferenceTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
@@ -86,7 +85,7 @@ class PreferencesController extends Controller
         $manager     = $this->getManager();
 
         if ('currencyPreference' === $preference->name) {
-            throw new FireflyException('Please use api/v1/currencies/default instead.');
+            throw new FireflyException('Please use api/v1/currencies/native instead.');
         }
 
         /** @var PreferenceTransformer $transformer */
@@ -98,34 +97,6 @@ class PreferencesController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-    /**
-     * TODO This endpoint is not documented.
-     *
-     * Return a single preference by name.
-     *
-     * @param Collection<int, Preference> $collection
-     */
-    public function showList(Collection $collection): JsonResponse
-    {
-        $manager     = $this->getManager();
-        $count       = $collection->count();
-        $pageSize    = $this->parameters->get('limit');
-        $preferences = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-
-        // make paginator:
-        $paginator   = new LengthAwarePaginator($preferences, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.preferences.show-list').$this->buildParams());
-
-        /** @var PreferenceTransformer $transformer */
-        $transformer = app(PreferenceTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource    = new FractalCollection($preferences, $transformer, self::RESOURCE_KEY);
-        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-    }
-
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/preferences/storePreference
@@ -161,7 +132,7 @@ class PreferencesController extends Controller
     public function update(PreferenceUpdateRequest $request, Preference $preference): JsonResponse
     {
         if ('currencyPreference' === $preference->name) {
-            throw new FireflyException('Please use api/v1/currencies/default instead.');
+            throw new FireflyException('Please use api/v1/currencies/native instead.');
         }
 
         $manager     = $this->getManager();

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

@@ -58,6 +58,7 @@ class AutocompleteRequest extends FormRequest
     public function rules(): array
     {
         return [
+            'date' => 'date|after:1900-01-01|before:2099-12-31',
         ];
     }
 }

app/Api/V1/Requests/Data/DateRequest.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Data;
 
-use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Exceptions\ValidationException;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -49,7 +49,7 @@ class DateRequest extends FormRequest
         $start->startOfDay();
         $end->endOfDay();
         if ($start->diffInYears($end, true) > 5) {
-            throw new FireflyException('Date range out of range.');
+            throw new ValidationException('Date range out of range.');
         }
 
         return [

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Account;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Location;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\UniqueAccountNumber;
 use FireflyIII\Rules\UniqueIban;
@@ -33,6 +34,8 @@ use FireflyIII\Support\Request\AppendsLocationData;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Validator;
 
 /**
  * Class UpdateRequest
@@ -112,4 +115,36 @@ class UpdateRequest extends FormRequest
 
         return Location::requestRules($rules);
     }
+
+    /**
+     * Configure the validator instance with special rules for after the basic validation rules.
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator): void {
+                // validate start before end only if both are there.
+                $data       = $validator->getData();
+
+                /** @var Account $account */
+                $account    = $this->route()->parameter('account');
+
+                /** @var AccountRepositoryInterface $repository */
+                $repository = app(AccountRepositoryInterface::class);
+                $currency   = $repository->getAccountCurrency($account);
+
+                // how many piggies are attached?
+                $piggyBanks = $account->piggyBanks()->count();
+                if ($piggyBanks > 0 && array_key_exists('currency_code', $data) && $data['currency_code'] !== $currency->code) {
+                    $validator->errors()->add('currency_code', (string) trans('validation.piggy_no_change_currency'));
+                }
+                if ($piggyBanks > 0 && array_key_exists('currency_id', $data) && (int) $data['currency_id'] !== $currency->id) {
+                    $validator->errors()->add('currency_id', (string) trans('validation.piggy_no_change_currency'));
+                }
+            }
+        );
+        if ($validator->fails()) {
+            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+        }
+    }
 }

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -66,8 +66,8 @@ class Request extends FormRequest
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',
             'amount'        => ['nullable', new IsValidPositiveAmount()],
-            'start'         => 'date',
+            'start'         => 'date|after:1900-01-01|before:2099-12-31',
-            'end'           => 'date',
+            'end'           => 'date|after:1900-01-01|before:2099-12-31',
         ];
     }
 

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -78,9 +78,9 @@ class StoreRequest extends FormRequest
             'amount_max'     => ['required', new IsValidPositiveAmount()],
             'currency_id'    => 'numeric|exists:transaction_currencies,id',
             'currency_code'  => 'min:3|max:51|exists:transaction_currencies,code',
-            'date'           => 'date|required',
+            'date'           => 'date|required|after:1900-01-01|before:2099-12-31',
-            'end_date'       => 'nullable|date|after:date',
+            'end_date'       => 'nullable|date|after:date|after:1900-01-01|before:2099-12-31',
-            'extension_date' => 'nullable|date|after:date',
+            'extension_date' => 'nullable|date|after:date|after:1900-01-01|before:2099-12-31',
             'repeat_freq'    => 'in:weekly,monthly,quarterly,half-year,yearly|required',
             'skip'           => 'min:0|max:31|numeric',
             'active'         => [new IsBoolean()],
@@ -95,16 +95,40 @@ class StoreRequest extends FormRequest
     {
         $validator->after(
             static function (Validator $validator): void {
-                $data = $validator->getData();
+                $data   = $validator->getData();
-                $min  = (string) ($data['amount_min'] ?? '0');
+                $min    = $data['amount_min'] ?? '0';
-                $max  = (string) ($data['amount_max'] ?? '0');
+                $max    = $data['amount_max'] ?? '0';
 
-                if (1 === bccomp($min, $max)) {
+                if (is_array($min) || is_array($max)) {
+                    $validator->errors()->add('amount_min', (string) trans('validation.generic_invalid'));
+                    $validator->errors()->add('amount_max', (string) trans('validation.generic_invalid'));
+                    $min = '0';
+                    $max = '0';
+                }
+                $result = false;
+
+                try {
+                    $result = bccomp($min, $max);
+                } catch (\ValueError $e) {
+                    Log::error($e->getMessage());
+                    $validator->errors()->add('amount_min', (string) trans('validation.generic_invalid'));
+                    $validator->errors()->add('amount_max', (string) trans('validation.generic_invalid'));
+                }
+
+                if (1 === $result) {
                     $validator->errors()->add('amount_min', (string) trans('validation.amount_min_over_max'));
                 }
             }
         );
-        if ($validator->fails()) {
+        $failed = false;
+
+        try {
+            $failed = $validator->fails();
+        } catch (\TypeError $e) {
+            Log::error($e->getMessage());
+            $failed = false;
+        }
+        if ($failed) {
             Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
         }
     }

app/Api/V1/Requests/Models/Bill/UpdateRequest.php

@@ -81,9 +81,9 @@ class UpdateRequest extends FormRequest
             'amount_max'     => ['nullable', new IsValidPositiveAmount()],
             'currency_id'    => 'numeric|exists:transaction_currencies,id',
             'currency_code'  => 'min:3|max:51|exists:transaction_currencies,code',
-            'date'           => 'date',
+            'date'           => 'date|after:1900-01-01|before:2099-12-31',
-            'end_date'       => 'date|after:date',
+            'end_date'       => 'date|after:date|after:1900-01-01|before:2099-12-31',
-            'extension_date' => 'date|after:date',
+            'extension_date' => 'date|after:date|after:1900-01-01|before:2099-12-31',
             'repeat_freq'    => 'in:weekly,monthly,quarterly,half-year,yearly',
             'skip'           => 'min:0|max:31|numeric',
             'active'         => [new IsBoolean()],

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -67,8 +67,8 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'         => 'date',
+            'start'         => 'date|after:1900-01-01|before:2099-12-31',
-            'end'           => 'date',
+            'end'           => 'date|after:1900-01-01|before:2099-12-31',
             'amount'        => ['nullable', new IsValidPositiveAmount()],
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',

app/Api/V1/Requests/Models/CurrencyExchangeRate/DestroyRequest.php

@@ -2,7 +2,7 @@
 
 /*
  * DestroyRequest.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * Copyright (c) 2025 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Request\Model\ExchangeRate;
+namespace FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate;
 
 use Carbon\Carbon;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -34,7 +34,7 @@ class DestroyRequest extends FormRequest
     use ChecksLogin;
     use ConvertsDataTypes;
 
-    public function getDate(): Carbon
+    public function getDate(): ?Carbon
     {
         return $this->getCarbonDate('date');
     }

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreRequest.php

@@ -1,8 +1,8 @@
 <?php
 
 /*
- * DestroyRequest.php
+ * StoreRequest.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * Copyright (c) 2025 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Request\Model\ExchangeRate;
+namespace FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate;
 
 use Carbon\Carbon;
 use FireflyIII\Models\TransactionCurrency;

app/Api/V1/Requests/Models/CurrencyExchangeRate/UpdateRequest.php

@@ -1,8 +1,8 @@
 <?php
 
 /*
- * DestroyRequest.php
+ * UpdateRequest.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * Copyright (c) 2025 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -22,7 +22,7 @@
 
 declare(strict_types=1);
 
-namespace FireflyIII\Api\V2\Request\Model\ExchangeRate;
+namespace FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate;
 
 use Carbon\Carbon;
 use FireflyIII\Support\Request\ChecksLogin;

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -154,7 +154,7 @@ class UpdateRequest extends FormRequest
         return [
             'title'                                => sprintf('min:1|max:255|uniqueObjectForUser:recurrences,title,%d', $recurrence->id),
             'description'                          => 'min:1|max:32768',
-            'first_date'                           => 'date',
+            'first_date'                           => 'date|after:1900-01-01|before:2099-12-31',
             'apply_rules'                          => [new IsBoolean()],
             'active'                               => [new IsBoolean()],
             'repeat_until'                         => 'nullable|date',

app/Api/V1/Requests/Models/Rule/TestRequest.php

@@ -71,8 +71,8 @@ class TestRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'      => 'date',
+            'start'      => 'date|after:1900-01-01|before:2099-12-31',
-            'end'        => 'date|after_or_equal:start',
+            'end'        => 'date|after_or_equal:start|after:1900-01-01|before:2099-12-31',
             'accounts'   => '',
             'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts',
         ];

app/Api/V1/Requests/Models/Rule/TriggerRequest.php

@@ -65,8 +65,8 @@ class TriggerRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'      => 'date',
+            'start'      => 'date|after:1900-01-01|before:2099-12-31',
-            'end'        => 'date|after_or_equal:start',
+            'end'        => 'date|after_or_equal:start|after:1900-01-01|before:2099-12-31',
             'accounts'   => '',
             'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
         ];

app/Api/V1/Requests/Models/RuleGroup/TestRequest.php

@@ -65,8 +65,8 @@ class TestRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'      => 'date',
+            'start'      => 'date|after:1900-01-01|before:2099-12-31',
-            'end'        => 'date|after_or_equal:start',
+            'end'        => 'date|after_or_equal:start|after:1900-01-01|before:2099-12-31',
             'accounts'   => '',
             'accounts.*' => 'exists:accounts,id|belongsToUser:accounts',
         ];

app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php

@@ -69,8 +69,8 @@ class TriggerRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start' => 'date',
+            'start' => 'date|after:1900-01-01|before:2099-12-31',
-            'end'   => 'date|after_or_equal:start',
+            'end'   => 'date|after_or_equal:start|after:1900-01-01|before:2099-12-31',
         ];
     }
 }

app/Api/V1/Requests/Models/Tag/StoreRequest.php

@@ -62,7 +62,7 @@ class StoreRequest extends FormRequest
         $rules = [
             'tag'         => 'required|min:1|uniqueObjectForUser:tags,tag|max:1024',
             'description' => 'min:1|nullable|max:32768',
-            'date'        => 'date|nullable',
+            'date'        => 'date|nullable|after:1900-01-01|before:2099-12-31',
         ];
 
         return Location::requestRules($rules);

app/Api/V1/Requests/Models/Tag/UpdateRequest.php

@@ -63,11 +63,10 @@ class UpdateRequest extends FormRequest
     {
         /** @var Tag $tag */
         $tag   = $this->route()->parameter('tagOrId');
-        // TODO check if uniqueObjectForUser is obsolete
         $rules = [
             'tag'         => 'min:1|max:1024|uniqueObjectForUser:tags,tag,'.$tag->id,
             'description' => 'min:1|nullable|max:32768',
-            'date'        => 'date|nullable',
+            'date'        => 'date|nullable|after:1900-01-01|before:2099-12-31',
         ];
 
         return Location::requestRules($rules);

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Transaction;
 
+use FireflyIII\Models\Location;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsDateOrTime;
@@ -82,82 +83,87 @@ class StoreRequest extends FormRequest
         foreach ($this->get('transactions') as $transaction) {
             $object   = new NullArrayObject($transaction);
             $return[] = [
-                'type'                  => $this->clearString($object['type']),
+                'type'                    => $this->clearString($object['type']),
-                'date'                  => $this->dateFromValue($object['date']),
+                'date'                    => $this->dateFromValue($object['date']),
-                'order'                 => $this->integerFromValue((string) $object['order']),
+                'order'                   => $this->integerFromValue((string) $object['order']),
 
-                'currency_id'           => $this->integerFromValue((string) $object['currency_id']),
+                'currency_id'             => $this->integerFromValue((string) $object['currency_id']),
-                'currency_code'         => $this->clearString((string) $object['currency_code']),
+                'currency_code'           => $this->clearString((string) $object['currency_code']),
+
+                // location
+                'latitude'                => $this->floatFromValue((string) $object['latitude']),
+                'longitude'               => $this->floatFromValue((string) $object['longitude']),
+                'zoom_level'              => $this->integerFromValue((string) $object['zoom_level']),
 
                 // foreign currency info:
-                'foreign_currency_id'   => $this->integerFromValue((string) $object['foreign_currency_id']),
+                'foreign_currency_id'     => $this->integerFromValue((string) $object['foreign_currency_id']),
-                'foreign_currency_code' => $this->clearString((string) $object['foreign_currency_code']),
+                'foreign_currency_code'   => $this->clearString((string) $object['foreign_currency_code']),
 
                 // amount and foreign amount. Cannot be 0.
-                'amount'                => $this->clearString((string) $object['amount']),
+                'amount'                  => $this->clearString((string) $object['amount']),
-                'foreign_amount'        => $this->clearString((string) $object['foreign_amount']),
+                'foreign_amount'          => $this->clearString((string) $object['foreign_amount']),
 
                 // description.
-                'description'           => $this->clearString($object['description']),
+                'description'             => $this->clearString($object['description']),
 
                 // source of transaction. If everything is null, assume cash account.
-                'source_id'             => $this->integerFromValue((string) $object['source_id']),
+                'source_id'               => $this->integerFromValue((string) $object['source_id']),
-                'source_name'           => $this->clearString((string) $object['source_name']),
+                'source_name'             => $this->clearString((string) $object['source_name']),
-                'source_iban'           => $this->clearIban((string) $object['source_iban']),
+                'source_iban'             => $this->clearIban((string) $object['source_iban']),
-                'source_number'         => $this->clearString((string) $object['source_number']),
+                'source_number'           => $this->clearString((string) $object['source_number']),
-                'source_bic'            => $this->clearString((string) $object['source_bic']),
+                'source_bic'              => $this->clearString((string) $object['source_bic']),
 
                 // destination of transaction. If everything is null, assume cash account.
-                'destination_id'        => $this->integerFromValue((string) $object['destination_id']),
+                'destination_id'          => $this->integerFromValue((string) $object['destination_id']),
-                'destination_name'      => $this->clearString((string) $object['destination_name']),
+                'destination_name'        => $this->clearString((string) $object['destination_name']),
-                'destination_iban'      => $this->clearIban((string) $object['destination_iban']),
+                'destination_iban'        => $this->clearIban((string) $object['destination_iban']),
-                'destination_number'    => $this->clearString((string) $object['destination_number']),
+                'destination_number'      => $this->clearString((string) $object['destination_number']),
-                'destination_bic'       => $this->clearString((string) $object['destination_bic']),
+                'destination_bic'         => $this->clearString((string) $object['destination_bic']),
 
                 // budget info
-                'budget_id'             => $this->integerFromValue((string) $object['budget_id']),
+                'budget_id'               => $this->integerFromValue((string) $object['budget_id']),
-                'budget_name'           => $this->clearString((string) $object['budget_name']),
+                'budget_name'             => $this->clearString((string) $object['budget_name']),
 
                 // category info
-                'category_id'           => $this->integerFromValue((string) $object['category_id']),
+                'category_id'             => $this->integerFromValue((string) $object['category_id']),
-                'category_name'         => $this->clearString((string) $object['category_name']),
+                'category_name'           => $this->clearString((string) $object['category_name']),
 
                 // journal bill reference. Optional. Will only work for withdrawals
-                'bill_id'               => $this->integerFromValue((string) $object['bill_id']),
+                'bill_id'                 => $this->integerFromValue((string) $object['bill_id']),
-                'bill_name'             => $this->clearString((string) $object['bill_name']),
+                'bill_name'               => $this->clearString((string) $object['bill_name']),
 
                 // piggy bank reference. Optional. Will only work for transfers
-                'piggy_bank_id'         => $this->integerFromValue((string) $object['piggy_bank_id']),
+                'piggy_bank_id'           => $this->integerFromValue((string) $object['piggy_bank_id']),
-                'piggy_bank_name'       => $this->clearString((string) $object['piggy_bank_name']),
+                'piggy_bank_name'         => $this->clearString((string) $object['piggy_bank_name']),
 
                 // some other interesting properties
-                'reconciled'            => $this->convertBoolean((string) $object['reconciled']),
+                'reconciled'              => $this->convertBoolean((string) $object['reconciled']),
-                'notes'                 => $this->clearStringKeepNewlines((string) $object['notes']),
+                'notes'                   => $this->clearStringKeepNewlines((string) $object['notes']),
-                'tags'                  => $this->arrayFromValue($object['tags']),
+                'tags'                    => $this->arrayFromValue($object['tags']),
 
                 // all custom fields:
-                'internal_reference'    => $this->clearString((string) $object['internal_reference']),
+                'internal_reference'      => $this->clearString((string) $object['internal_reference']),
-                'external_id'           => $this->clearString((string) $object['external_id']),
+                'external_id'             => $this->clearString((string) $object['external_id']),
-                'original_source'       => sprintf('ff3-v%s', config('firefly.version')),
+                'original_source'         => sprintf('ff3-v%s', config('firefly.version')),
-                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
+                'recurrence_id'           => $this->integerFromValue($object['recurrence_id']),
-                'bunq_payment_id'       => $this->clearString((string) $object['bunq_payment_id']),
+                'bunq_payment_id'         => $this->clearString((string) $object['bunq_payment_id']),
-                'external_url'          => $this->clearString((string) $object['external_url']),
+                'external_url'            => $this->clearString((string) $object['external_url']),
 
-                'sepa_cc'               => $this->clearString((string) $object['sepa_cc']),
+                'sepa_cc'                 => $this->clearString((string) $object['sepa_cc']),
-                'sepa_ct_op'            => $this->clearString((string) $object['sepa_ct_op']),
+                'sepa_ct_op'              => $this->clearString((string) $object['sepa_ct_op']),
-                'sepa_ct_id'            => $this->clearString((string) $object['sepa_ct_id']),
+                'sepa_ct_id'              => $this->clearString((string) $object['sepa_ct_id']),
-                'sepa_db'               => $this->clearString((string) $object['sepa_db']),
+                'sepa_db'                 => $this->clearString((string) $object['sepa_db']),
-                'sepa_country'          => $this->clearString((string) $object['sepa_country']),
+                'sepa_country'            => $this->clearString((string) $object['sepa_country']),
-                'sepa_ep'               => $this->clearString((string) $object['sepa_ep']),
+                'sepa_ep'                 => $this->clearString((string) $object['sepa_ep']),
-                'sepa_ci'               => $this->clearString((string) $object['sepa_ci']),
+                'sepa_ci'                 => $this->clearString((string) $object['sepa_ci']),
-                'sepa_batch_id'         => $this->clearString((string) $object['sepa_batch_id']),
+                'sepa_batch_id'           => $this->clearString((string) $object['sepa_batch_id']),
                 // custom date fields. Must be Carbon objects. Presence is optional.
-                'interest_date'         => $this->dateFromValue($object['interest_date']),
+                'interest_date'           => $this->dateFromValue($object['interest_date']),
-                'book_date'             => $this->dateFromValue($object['book_date']),
+                'book_date'               => $this->dateFromValue($object['book_date']),
-                'process_date'          => $this->dateFromValue($object['process_date']),
+                'process_date'            => $this->dateFromValue($object['process_date']),
-                'due_date'              => $this->dateFromValue($object['due_date']),
+                'due_date'                => $this->dateFromValue($object['due_date']),
-                'payment_date'          => $this->dateFromValue($object['payment_date']),
+                'payment_date'            => $this->dateFromValue($object['payment_date']),
-                'invoice_date'          => $this->dateFromValue($object['invoice_date']),
+                'invoice_date'            => $this->dateFromValue($object['invoice_date']),
             ];
         }
 
@@ -171,6 +177,7 @@ class StoreRequest extends FormRequest
     {
         app('log')->debug('Collect rules of TransactionStoreRequest');
         $validProtocols = config('firefly.valid_url_protocols');
+        $locationRules  = Location::requestRules([]);
 
         return [
             // basic fields for group:
@@ -178,6 +185,11 @@ class StoreRequest extends FormRequest
             'error_if_duplicate_hash'              => [new IsBoolean()],
             'apply_rules'                          => [new IsBoolean()],
 
+            // location rules
+            'transactions.*.latitude'              => $locationRules['latitude'],
+            'transactions.*.longitude'             => $locationRules['longitude'],
+            'transactions.*.zoom_level'            => $locationRules['zoom_level'],
+
             // transaction rules (in array for splits):
             'transactions.*.type'                  => 'required|in:withdrawal,deposit,transfer,opening-balance,reconciliation',
             'transactions.*.date'                  => ['required', new IsDateOrTime()],

app/Api/V1/Requests/System/CronRequest.php

@@ -57,6 +57,10 @@ class CronRequest extends FormRequest
         if ($this->has('date')) {
             $data['date'] = $this->getCarbonDate('date');
         }
+        // catch NULL.
+        if (null === $data['date']) {
+            $data['date'] = today(config('app.timezone'));
+        }
 
         return $data;
     }
@@ -68,7 +72,7 @@ class CronRequest extends FormRequest
     {
         return [
             'force' => 'in:true,false',
-            'date'  => 'date',
+            'date'  => 'nullable|date|after:1900-01-01|before:2099-12-31',
         ];
     }
 }

app/Api/V2/Request/Model/Transaction/InfiniteListRequest.php

@@ -109,8 +109,8 @@ class InfiniteListRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start'     => 'date',
+            'start'     => 'date|after:1900-01-01|before:2099-12-31',
-            'end'       => 'date|after:start',
+            'end'       => 'date|after:start|after:1900-01-01|before:2099-12-31',
             'start_row' => 'integer|min:0|max:4294967296',
             'end_row'   => 'integer|min:0|max:4294967296|gt:start_row',
         ];

app/Api/V2/Request/Model/Transaction/ListRequest.php

@@ -84,8 +84,8 @@ class ListRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'start' => 'date',
+            'start' => 'date|after:1900-01-01|before:2099-12-31',
-            'end'   => 'date|after:start',
+            'end'   => 'date|after:start|after:1900-01-01|before:2099-12-31',
         ];
     }
 }

app/Exceptions/Handler.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Exceptions;
 
+use Brick\Math\Exception\NumberFormatException;
 use FireflyIII\Jobs\MailError;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
@@ -124,7 +125,7 @@ class Handler extends ExceptionHandler
         if ($e instanceof BadRequestHttpException) {
             app('log')->debug('Return JSON BadRequestHttpException.');
 
-            return response()->json(['message' => $e->getMessage(), 'exception' => 'BadRequestHttpException'], 400);
+            return response()->json(['message' => $e->getMessage(), 'exception' => 'HttpException'], 400);
         }
 
         if ($e instanceof BadHttpHeaderException) {
@@ -133,6 +134,14 @@ class Handler extends ExceptionHandler
 
             return response()->json(['message' => $e->getMessage(), 'exception' => 'BadHttpHeaderException'], $e->statusCode);
         }
+        if (($e instanceof ValidationException || $e instanceof NumberFormatException) && $expectsJson) {
+            $errorCode = 422;
+
+            return response()->json(
+                ['message' => sprintf('Validation exception: %s', $e->getMessage()), 'errors' => ['field' => 'Field is invalid']],
+                $errorCode
+            );
+        }
 
         if ($expectsJson) {
             $errorCode = 500;
@@ -156,7 +165,7 @@ class Handler extends ExceptionHandler
             app('log')->debug(sprintf('Return JSON %s.', get_class($e)));
 
             return response()->json(
-                ['message' => sprintf('Internal Firefly III Exception: %s', $e->getMessage()), 'exception' => get_class($e)],
+                ['message' => sprintf('Internal Firefly III Exception: %s', $e->getMessage()), 'exception' => 'UndisclosedException'],
                 $errorCode
             );
         }

app/Factory/TransactionJournalFactory.php

@@ -576,7 +576,7 @@ class TransactionJournalFactory
 
     private function storeLocation(TransactionJournal $journal, NullArrayObject $data): void
     {
-        if (true === $data['store_location']) {
+        if (null !== $data['longitude'] && null !== $data['latitude'] && null !== $data['zoom_level']) {
             $location             = new Location();
             $location->longitude  = $data['longitude'];
             $location->latitude   = $data['latitude'];

app/Http/Controllers/Account/IndexController.php

@@ -106,6 +106,7 @@ class IndexController extends Controller
                 $account->interestPeriod    = (string) trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
                 $account->accountTypeString = (string) trans(sprintf('firefly.account_type_%s', $account->accountType->type));
                 $account->current_debt      = '0';
+                $account->currency          = $currency ?? $this->defaultCurrency;
                 $account->iban              = implode(' ', str_split((string) $account->iban, 4));
             }
         );

app/Http/Controllers/Controller.php

@@ -95,17 +95,22 @@ abstract class Controller extends BaseController
 
         // share is alpha, is beta
         $isAlpha = false;
+        $isBeta = false;
+        $isDevelop = false;
         if (str_contains(config('firefly.version'), 'alpha')) {
             $isAlpha = true;
         }
+        if (str_contains(config('firefly.version'), 'develop') || str_contains(config('firefly.version'), 'branch')) {
+            $isDevelop = true;
+        }
 
-        $isBeta = false;
         if (str_contains(config('firefly.version'), 'beta')) {
             $isBeta = true;
         }
 
         View::share('FF_IS_ALPHA', $isAlpha);
         View::share('FF_IS_BETA', $isBeta);
+        View::share('FF_IS_DEVELOP', $isDevelop);
 
         $this->middleware(
             function ($request, $next): mixed {

app/Http/Controllers/DebugController.php

@@ -31,6 +31,9 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Preferences;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\GetConfigurationData;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use FireflyIII\User;
@@ -61,7 +64,7 @@ class DebugController extends Controller
         $this->middleware(IsDemoUser::class)->except(['displayError']);
     }
 
-    public function routes(): never
+    public function routes(Request $request): never
     {
         if (!auth()->user()->hasRole('owner')) {
             throw new NotFoundHttpException();
@@ -69,6 +72,46 @@ class DebugController extends Controller
 
         /** @var iterable $routes */
         $routes = Route::getRoutes();
+
+        if ('true' === $request->get('api')) {
+            $collection = [];
+            $i          = 0;
+
+            echo 'PATHS="';
+
+            /** @var \Illuminate\Routing\Route $route */
+            foreach ($routes as $route) {
+                ++$i;
+                // skip API and other routes.
+                if (!str_starts_with($route->uri(), 'api/v1')
+                ) {
+                    continue;
+                }
+                // skip non GET routes
+                if (!in_array('GET', $route->methods(), true)) {
+                    continue;
+                }
+                // no name route:
+                if (null === $route->getName()) {
+                    var_dump($route);
+
+                    exit;
+                }
+
+                echo substr($route->uri(), 3);
+                if (0 === $i % 5) {
+                    echo '"<br>PATHS="${PATHS},';
+                }
+                if (0 !== $i % 5) {
+                    echo ',';
+                }
+            }
+
+            exit;
+        }
+
+
+
         $return = [];
 
         /** @var \Illuminate\Routing\Route $route */
@@ -153,7 +196,7 @@ class DebugController extends Controller
      */
     public function flush(Request $request)
     {
-        app('preferences')->mark();
+        Preferences::mark();
         $request->session()->forget(['start', 'end', '_previous', 'viewRange', 'range', 'is_custom_range', 'temp-mfa-secret', 'temp-mfa-codes']);
 
         Artisan::call('cache:clear');
@@ -223,8 +266,8 @@ class DebugController extends Controller
 
     private function getSystemInformation(): array
     {
-        $maxFileSize   = app('steam')->phpBytes((string) ini_get('upload_max_filesize'));
+        $maxFileSize   = Steam::phpBytes((string) ini_get('upload_max_filesize'));
-        $maxPostSize   = app('steam')->phpBytes((string) ini_get('post_max_size'));
+        $maxPostSize   = Steam::phpBytes((string) ini_get('post_max_size'));
         $drivers       = \DB::availableDrivers();
         $currentDriver = \DB::getDriverName();
 
@@ -314,7 +357,7 @@ class DebugController extends Controller
         ];
     }
 
-    private function getuserInfo(): array
+    private function getUserInfo(): array
     {
         $userFlags      = $this->getUserFlags();
 
@@ -324,7 +367,7 @@ class DebugController extends Controller
         // set languages, see what happens:
         $original       = setlocale(LC_ALL, '0');
         $localeAttempts = [];
-        $parts          = app('steam')->getLocaleArray(app('steam')->getLocale());
+        $parts          = Steam::getLocaleArray(Steam::getLocale());
         foreach ($parts as $code) {
             $code                  = trim($code);
             app('log')->debug(sprintf('Trying to set %s', $code));
@@ -334,14 +377,15 @@ class DebugController extends Controller
         setlocale(LC_ALL, (string) $original);
 
         return [
-            'user_id'         => auth()->user()->id,
+            'user_id'           => auth()->user()->id,
-            'user_count'      => User::count(),
+            'user_count'        => User::count(),
-            'user_flags'      => $userFlags,
+            'user_flags'        => $userFlags,
-            'user_agent'      => $userAgent,
+            'user_agent'        => $userAgent,
-            'locale_attempts' => $localeAttempts,
+            'convert_to_native' => Amount::convertToNative(),
-            'locale'          => app('steam')->getLocale(),
+            'locale_attempts'   => $localeAttempts,
-            'language'        => app('steam')->getLanguage(),
+            'locale'            => Steam::getLocale(),
-            'view_range'      => app('preferences')->get('viewRange', '1M')->data,
+            'language'          => Steam::getLanguage(),
+            'view_range'        => Preferences::get('viewRange', '1M')->data,
         ];
     }
 

app/Http/Controllers/PreferencesController.php

@@ -31,6 +31,7 @@ use FireflyIII\Http\Requests\PreferencesRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
@@ -93,35 +94,35 @@ class PreferencesController extends Controller
         /** @var array<int, int> $accountIds */
         $accountIds                     = $accounts->pluck('id')->toArray();
         $viewRange                      = app('navigation')->getViewRange(false);
-        $frontpageAccountsPref          = app('preferences')->get('frontpageAccounts', $accountIds);
+        $frontpageAccountsPref          = Preferences::get('frontpageAccounts', $accountIds);
         $frontpageAccounts              = $frontpageAccountsPref->data;
         if (!is_array($frontpageAccounts)) {
             $frontpageAccounts = $accountIds;
         }
         $language                       = app('steam')->getLanguage();
         $languages                      = config('firefly.languages');
-        $locale                         = app('preferences')->get('locale', config('firefly.default_locale', 'equal'))->data;
+        $locale                         = Preferences::get('locale', config('firefly.default_locale', 'equal'))->data;
-        $listPageSize                   = app('preferences')->get('listPageSize', 50)->data;
+        $listPageSize                   = Preferences::get('listPageSize', 50)->data;
-        $darkMode                       = app('preferences')->get('darkMode', 'browser')->data;
+        $darkMode                       = Preferences::get('darkMode', 'browser')->data;
-        $customFiscalYear               = app('preferences')->get('customFiscalYear', 0)->data;
+        $customFiscalYear               = Preferences::get('customFiscalYear', 0)->data;
-        $fiscalYearStartStr             = app('preferences')->get('fiscalYearStart', '01-01')->data;
+        $fiscalYearStartStr             = Preferences::get('fiscalYearStart', '01-01')->data;
         $convertToNative                = $this->convertToNative;
         if (is_array($fiscalYearStartStr)) {
             $fiscalYearStartStr = '01-01';
         }
         $fiscalYearStart                = sprintf('%s-%s', date('Y'), (string) $fiscalYearStartStr);
-        $tjOptionalFields               = app('preferences')->get('transaction_journal_optional_fields', [])->data;
+        $tjOptionalFields               = Preferences::get('transaction_journal_optional_fields', [])->data;
         $availableDarkModes             = config('firefly.available_dark_modes');
 
         // notifications settings
-        $slackUrl                       = app('preferences')->getEncrypted('slack_webhook_url', '')->data;
+        $slackUrl                       = Preferences::getEncrypted('slack_webhook_url', '')->data;
-        $pushoverAppToken               = (string) app('preferences')->getEncrypted('pushover_app_token', '')->data;
+        $pushoverAppToken               = (string) Preferences::getEncrypted('pushover_app_token', '')->data;
-        $pushoverUserToken              = (string) app('preferences')->getEncrypted('pushover_user_token', '')->data;
+        $pushoverUserToken              = (string) Preferences::getEncrypted('pushover_user_token', '')->data;
-        $ntfyServer                     = app('preferences')->getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
+        $ntfyServer                     = Preferences::getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
-        $ntfyTopic                      = (string) app('preferences')->getEncrypted('ntfy_topic', '')->data;
+        $ntfyTopic                      = (string) Preferences::getEncrypted('ntfy_topic', '')->data;
-        $ntfyAuth                       = app('preferences')->get('ntfy_auth', false)->data;
+        $ntfyAuth                       = Preferences::get('ntfy_auth', false)->data;
-        $ntfyUser                       = app('preferences')->getEncrypted('ntfy_user', '')->data;
+        $ntfyUser                       = Preferences::getEncrypted('ntfy_user', '')->data;
-        $ntfyPass                       = (string) app('preferences')->getEncrypted('ntfy_pass', '')->data;
+        $ntfyPass                       = (string) Preferences::getEncrypted('ntfy_pass', '')->data;
         $channels                       = config('notifications.channels');
         $forcedAvailability             = [];
 
@@ -131,7 +132,7 @@ class PreferencesController extends Controller
             if (true === $info['enabled']) {
                 $notifications[$key]
                     = [
-                        'enabled'      => true === app('preferences')->get(sprintf('notification_%s', $key), true)->data,
+                        'enabled'      => true === Preferences::get(sprintf('notification_%s', $key), true)->data,
                         'configurable' => $info['configurable'],
                     ];
             }
@@ -221,7 +222,7 @@ class PreferencesController extends Controller
             foreach ($request->get('frontpageAccounts') as $id) {
                 $frontpageAccounts[] = (int) $id;
             }
-            app('preferences')->set('frontpageAccounts', $frontpageAccounts);
+            Preferences::set('frontpageAccounts', $frontpageAccounts);
         }
 
         // extract notifications:
@@ -229,15 +230,15 @@ class PreferencesController extends Controller
         foreach (config('notifications.notifications.user') as $key => $info) {
             $key = sprintf('notification_%s', $key);
             if (array_key_exists($key, $all)) {
-                app('preferences')->set($key, true);
+                Preferences::set($key, true);
             }
             if (!array_key_exists($key, $all)) {
-                app('preferences')->set($key, false);
+                Preferences::set($key, false);
             }
         }
 
         // view range:
-        app('preferences')->set('viewRange', $request->get('viewRange'));
+        Preferences::set('viewRange', $request->get('viewRange'));
         // forget session values:
         session()->forget('start');
         session()->forget('end');
@@ -249,13 +250,13 @@ class PreferencesController extends Controller
             $variables = ['slack_webhook_url', 'pushover_app_token', 'pushover_user_token', 'ntfy_server', 'ntfy_topic', 'ntfy_user', 'ntfy_pass'];
             foreach ($variables as $variable) {
                 if ('' === $all[$variable]) {
-                    app('preferences')->delete($variable);
+                    Preferences::delete($variable);
                 }
                 if ('' !== $all[$variable]) {
-                    app('preferences')->setEncrypted($variable, $all[$variable]);
+                    Preferences::setEncrypted($variable, $all[$variable]);
                 }
             }
-            app('preferences')->set('ntfy_auth', $all['ntfy_auth'] ?? false);
+            Preferences::set('ntfy_auth', $all['ntfy_auth'] ?? false);
         }
 
         // convert native
@@ -265,30 +266,30 @@ class PreferencesController extends Controller
             Log::debug('User sets convertToNative to true.');
             event(new UserGroupChangedDefaultCurrency(auth()->user()->userGroup));
         }
-        app('preferences')->set('convert_to_native', $convertToNative);
+        Preferences::set('convert_to_native', $convertToNative);
 
         // custom fiscal year
         $customFiscalYear  = 1 === (int) $request->get('customFiscalYear');
         $string            = strtotime((string) $request->get('fiscalYearStart'));
         if (false !== $string) {
             $fiscalYearStart = date('m-d', $string);
-            app('preferences')->set('customFiscalYear', $customFiscalYear);
+            Preferences::set('customFiscalYear', $customFiscalYear);
-            app('preferences')->set('fiscalYearStart', $fiscalYearStart);
+            Preferences::set('fiscalYearStart', $fiscalYearStart);
         }
 
         // save page size:
-        app('preferences')->set('listPageSize', 50);
+        Preferences::set('listPageSize', 50);
         $listPageSize      = (int) $request->get('listPageSize');
         if ($listPageSize > 0 && $listPageSize < 1337) {
-            app('preferences')->set('listPageSize', $listPageSize);
+            Preferences::set('listPageSize', $listPageSize);
         }
 
         // language:
         /** @var Preference $currentLang */
-        $currentLang       = app('preferences')->get('language', 'en_US');
+        $currentLang       = Preferences::get('language', 'en_US');
         $lang              = $request->get('language');
         if (array_key_exists($lang, config('firefly.languages'))) {
-            app('preferences')->set('language', $lang);
+            Preferences::set('language', $lang);
         }
         if ($currentLang->data !== $lang) {
             // this string is untranslated on purpose.
@@ -299,7 +300,7 @@ class PreferencesController extends Controller
         if (!auth()->user()->hasRole('demo')) {
             $locale = (string) $request->get('locale');
             $locale = '' === $locale ? null : $locale;
-            app('preferences')->set('locale', $locale);
+            Preferences::set('locale', $locale);
         }
 
         // optional fields for transactions:
@@ -318,16 +319,16 @@ class PreferencesController extends Controller
             'location'           => array_key_exists('location', $setOptions),
             'links'              => array_key_exists('links', $setOptions),
         ];
-        app('preferences')->set('transaction_journal_optional_fields', $optionalTj);
+        Preferences::set('transaction_journal_optional_fields', $optionalTj);
 
         // dark mode
         $darkMode          = $request->get('darkMode') ?? 'browser';
         if (in_array($darkMode, config('firefly.available_dark_modes'), true)) {
-            app('preferences')->set('darkMode', $darkMode);
+            Preferences::set('darkMode', $darkMode);
         }
 
         session()->flash('success', (string) trans('firefly.saved_preferences'));
-        app('preferences')->mark();
+        Preferences::mark();
 
         return redirect(route('preferences.index'));
     }

app/Jobs/CreateRecurringTransactions.php

@@ -419,7 +419,9 @@ class CreateRecurringTransactions implements ShouldQueue
         /** @var RecurrenceTransaction $transaction */
         foreach ($transactions as $index => $transaction) {
             $single   = [
-                'type'                  => null === $transaction->transactionType->type ? strtolower($recurrence->transactionType->type) : strtolower($transaction->transactionType->type),
+                'type'                  => null === $transaction?->transactionType?->type ?
+                    strtolower($recurrence->transactionType->type) :
+                    strtolower($transaction->transactionType->type),
                 'date'                  => $date,
                 'user'                  => $recurrence->user_id,
                 'currency_id'           => $transaction->transaction_currency_id,

app/Rules/IsValidPositiveAmount.php

@@ -38,6 +38,15 @@ class IsValidPositiveAmount implements ValidationRule
      */
     public function validate(string $attribute, mixed $value, \Closure $fail): void
     {
+        if (is_array($value)) {
+            $fail('validation.numeric')->translate();
+            $message = sprintf('IsValidPositiveAmount: "%s" is not a number.', json_encode($value));
+            Log::debug($message);
+            Log::channel('audit')->info($message);
+
+            return;
+        }
+
         $value = (string) $value;
         // must not be empty:
         if ($this->emptyString($value)) {

app/Rules/UniqueAccountNumber.php

@@ -79,6 +79,12 @@ class UniqueAccountNumber implements ValidationRule
         if (null === $this->expectedType) {
             return;
         }
+        if (is_array($value)) {
+            $fail('validation.generic_invalid')->translate();
+
+            return;
+        }
+        $value     = (string) $value;
         $maxCounts = $this->getMaxOccurrences();
 
         foreach ($maxCounts as $type => $max) {

app/Rules/UniqueIban.php

@@ -94,6 +94,10 @@ class UniqueIban implements ValidationRule
         if (0 === count($this->expectedTypes)) {
             return true;
         }
+        if (is_array($value)) {
+            return false;
+        }
+        $value     = (string) $value;
         $maxCounts = $this->getMaxOccurrences();
 
         foreach ($maxCounts as $type => $max) {

app/Support/Cronjobs/BillWarningCronjob.php

@@ -48,14 +48,14 @@ class BillWarningCronjob extends AbstractCronjob
         $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true);
 
         if (0 === $lastTime) {
-            app('log')->info('The bill warning cron-job has never fired before.');
+            app('log')->info('The bill notification cron-job has never fired before.');
         }
         // less than half a day ago:
         if ($lastTime > 0 && $diff <= 43200) {
-            app('log')->info(sprintf('It has been %s since the bill warning cron-job has fired.', $diffForHumans));
+            app('log')->info(sprintf('It has been %s since the bill notification cron-job has fired.', $diffForHumans));
             if (false === $this->force) {
                 app('log')->info('The cron-job will not fire now.');
-                $this->message      = sprintf('It has been %s since the bill warning cron-job has fired. It will not fire now.', $diffForHumans);
+                $this->message      = sprintf('It has been %s since the bill notification cron-job has fired. It will not fire now.', $diffForHumans);
                 $this->jobFired     = false;
                 $this->jobErrored   = false;
                 $this->jobSucceeded = false;
@@ -63,11 +63,11 @@ class BillWarningCronjob extends AbstractCronjob
                 return;
             }
 
-            app('log')->info('Execution of the bill warning cron-job has been FORCED.');
+            app('log')->info('Execution of the bill notification cron-job has been FORCED.');
         }
 
         if ($lastTime > 0 && $diff > 43200) {
-            app('log')->info(sprintf('It has been %s since the bill warning cron-job has fired. It will fire now!', $diffForHumans));
+            app('log')->info(sprintf('It has been %s since the bill notification cron-job has fired. It will fire now!', $diffForHumans));
         }
 
         $this->fireWarnings();
@@ -77,7 +77,7 @@ class BillWarningCronjob extends AbstractCronjob
 
     private function fireWarnings(): void
     {
-        app('log')->info(sprintf('Will now fire bill warning job task for date "%s".', $this->date->format('Y-m-d H:i:s')));
+        app('log')->info(sprintf('Will now fire bill notification job task for date "%s".', $this->date->format('Y-m-d H:i:s')));
 
         /** @var WarnAboutBills $job */
         $job                = app(WarnAboutBills::class);
@@ -89,10 +89,10 @@ class BillWarningCronjob extends AbstractCronjob
         $this->jobFired     = true;
         $this->jobErrored   = false;
         $this->jobSucceeded = true;
-        $this->message      = 'Bill warning cron job fired successfully.';
+        $this->message      = 'Bill notification cron job fired successfully.';
 
         app('fireflyconfig')->set('last_bw_job', (int) $this->date->format('U'));
         app('log')->info(sprintf('Marked the last time this job has run as "%s" (%d)', $this->date->format('Y-m-d H:i:s'), (int) $this->date->format('U')));
-        app('log')->info('Done with bill warning cron job task.');
+        app('log')->info('Done with bill notification cron job task.');
     }
 }

app/Support/Http/Controllers/ChartGeneration.php

@@ -90,7 +90,7 @@ trait ChartGeneration
                 $balance                       = $range[$format] ?? $previous;
                 $previous                      = $balance;
                 $currentStart->addDay();
-                $currentSet['entries'][$label] = $balance[$field];
+                $currentSet['entries'][$label] = $balance[$field] ?? '0';
             }
             $chartData[]  = $currentSet;
         }

app/Support/Request/ConvertsDataTypes.php

@@ -30,6 +30,7 @@ use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Facades\Steam;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Trait ConvertsDataTypes
@@ -359,10 +360,13 @@ trait ConvertsDataTypes
     {
         $result = null;
 
+        Log::debug(sprintf('Date string is "%s"', (string) $this->get($field)));
+
         try {
             $result = '' !== (string) $this->get($field) ? new Carbon((string) $this->get($field), config('app.timezone')) : null;
         } catch (InvalidFormatException $e) {
             // @ignoreException
+            Log::debug(sprintf('Exception when parsing date "%s".', $this->get($field)));
         }
         if (null === $result) {
             app('log')->debug(sprintf('Exception when parsing date "%s".', $this->get($field)));
@@ -386,6 +390,18 @@ trait ConvertsDataTypes
         return (int) $string;
     }
 
+    protected function floatFromValue(?string $string): ?float
+    {
+        if (null === $string) {
+            return null;
+        }
+        if ('' === $string) {
+            return null;
+        }
+
+        return (float) $string;
+    }
+
     /**
      * Return integer value, or NULL when it's not set.
      */

app/Transformers/AccountTransformer.php

@@ -40,7 +40,7 @@ class AccountTransformer extends AbstractTransformer
 {
     protected AccountRepositoryInterface $repository;
     protected bool                       $convertToNative;
-    protected TransactionCurrency        $default;
+    protected TransactionCurrency        $native;
 
     /**
      * AccountTransformer constructor.
@@ -50,7 +50,7 @@ class AccountTransformer extends AbstractTransformer
         $this->parameters      = new ParameterBag();
         $this->repository      = app(AccountRepositoryInterface::class);
         $this->convertToNative = Amount::convertToNative();
-        $this->default         = Amount::getNativeCurrency();
+        $this->native          = Amount::getNativeCurrency();
     }
 
     /**
@@ -72,7 +72,7 @@ class AccountTransformer extends AbstractTransformer
         $convertToNative                                              = Amount::convertToNative();
 
         // get account role (will only work if the type is asset).
-        $default                                                      = Amount::getNativeCurrency();
+        $native                                                       = Amount::getNativeCurrency();
         $accountRole                                                  = $this->getAccountRole($account, $accountType);
         $date                                                         = $this->getDate();
         $date->endOfDay();
@@ -82,10 +82,10 @@ class AccountTransformer extends AbstractTransformer
         [$openingBalance, $nativeOpeningBalance, $openingBalanceDate] = $this->getOpeningBalance($account, $accountType, $convertToNative);
         [$interest, $interestPeriod]                                  = $this->getInterest($account, $accountType);
 
-        $default                                                      = $this->default;
+        $native                                                       = $this->native;
         if (!$this->convertToNative) {
-            // reset default currency to NULL, not interesting.
+            // reset native currency to NULL, not interesting.
-            $default = null;
+            $native = null;
         }
 
         $openingBalance                                               = app('steam')->bcround($openingBalance, $decimalPlaces);
@@ -112,7 +112,7 @@ class AccountTransformer extends AbstractTransformer
         }
 
         $currentBalance                                               = app('steam')->bcround($finalBalance['balance'] ?? '0', $decimalPlaces);
-        $nativeCurrentBalance                                         = $convertToNative ? app('steam')->bcround($finalBalance['native_balance'] ?? '0', $default->decimal_places) : null;
+        $nativeCurrentBalance                                         = $convertToNative ? app('steam')->bcround($finalBalance['native_balance'] ?? '0', $native->decimal_places) : null;
 
         return [
             'id'                             => (string) $account->id,
@@ -127,10 +127,10 @@ class AccountTransformer extends AbstractTransformer
             'currency_code'                  => $currencyCode,
             'currency_symbol'                => $currencySymbol,
             'currency_decimal_places'        => $decimalPlaces,
-            'native_currency_id'             => null === $default ? null : (string) $default->id,
+            'native_currency_id'             => null === $native ? null : (string) $native->id,
-            'native_currency_code'           => $default?->code,
+            'native_currency_code'           => $native?->code,
-            'native_currency_symbol'         => $default?->symbol,
+            'native_currency_symbol'         => $native?->symbol,
-            'native_currency_decimal_places' => $default?->decimal_places,
+            'native_currency_decimal_places' => $native?->decimal_places,
             'current_balance'                => $currentBalance,
             'native_current_balance'         => $nativeCurrentBalance,
             'current_balance_date'           => $date->toAtomString(),
@@ -141,7 +141,7 @@ class AccountTransformer extends AbstractTransformer
             'iban'                           => '' === $account->iban ? null : $account->iban,
             'bic'                            => $this->repository->getMetaValue($account, 'BIC'),
             'virtual_balance'                => app('steam')->bcround($account->virtual_balance, $decimalPlaces),
-            'native_virtual_balance'         => $this->convertToNative ? app('steam')->bcround($account->native_virtual_balance, $default->decimal_places) : null,
+            'native_virtual_balance'         => $this->convertToNative ? app('steam')->bcround($account->native_virtual_balance, $native->decimal_places) : null,
             'opening_balance'                => $openingBalance,
             'native_opening_balance'         => $nativeOpeningBalance,
             'opening_balance_date'           => $openingBalanceDate,
@@ -190,9 +190,9 @@ class AccountTransformer extends AbstractTransformer
     {
         $currency       = $this->repository->getAccountCurrency($account);
 
-        // only grab default when result is null:
+        // only grab native when result is null:
         if (null === $currency) {
-            $currency = $this->default;
+            $currency = $this->native;
         }
         $currencyId     = (string) $currency->id;
         $currencyCode   = $currency->code;

app/Transformers/AttachmentTransformer.php

@@ -50,20 +50,21 @@ class AttachmentTransformer extends AbstractTransformer
         $this->repository->setUser($attachment->user);
 
         return [
-            'id'              => (string) $attachment->id,
+            'id'               => (string) $attachment->id,
-            'created_at'      => $attachment->created_at->toAtomString(),
+            'created_at'       => $attachment->created_at->toAtomString(),
-            'updated_at'      => $attachment->updated_at->toAtomString(),
+            'updated_at'       => $attachment->updated_at->toAtomString(),
-            'attachable_id'   => (string) $attachment->attachable_id,
+            'attachable_id'    => (string) $attachment->attachable_id,
-            'attachable_type' => str_replace('FireflyIII\Models\\', '', $attachment->attachable_type),
+            'attachable_type'  => str_replace('FireflyIII\Models\\', '', $attachment->attachable_type),
-            'md5'             => $attachment->md5,
+            'md5'              => $attachment->md5,
-            'filename'        => $attachment->filename,
+            'hash'             => $attachment->md5,
-            'download_url'    => route('api.v1.attachments.download', [$attachment->id]),
+            'filename'         => $attachment->filename,
-            'upload_url'      => route('api.v1.attachments.upload', [$attachment->id]),
+            'download_url'     => route('api.v1.attachments.download', [$attachment->id]),
-            'title'           => $attachment->title,
+            'upload_url'       => route('api.v1.attachments.upload', [$attachment->id]),
-            'notes'           => $this->repository->getNoteText($attachment),
+            'title'            => $attachment->title,
-            'mime'            => $attachment->mime,
+            'notes'            => $this->repository->getNoteText($attachment),
-            'size'            => (int) $attachment->size,
+            'mime'             => $attachment->mime,
-            'links'           => [
+            'size'             => (int) $attachment->size,
+            'links'            => [
                 [
                     'rel' => 'self',
                     'uri' => '/attachment/'.$attachment->id,

app/Transformers/BudgetTransformer.php

@@ -119,6 +119,7 @@ class BudgetTransformer extends AbstractTransformer
             'native_currency_decimal_places' => $default?->decimal_places,
 
             // amount and native amount if present.
+
             'auto_budget_amount'             => $abAmount,
             'native_auto_budget_amount'      => $abNative,
             'spent'                          => $spent, // always in native.

app/Transformers/UserGroupTransformer.php

@@ -113,14 +113,14 @@ class UserGroupTransformer extends AbstractTransformer
             'created_at'                     => $userGroup->created_at->toAtomString(),
             'updated_at'                     => $userGroup->updated_at->toAtomString(),
             'in_use'                         => $this->inUse[$userGroup->id] ?? false,
-            'title'                          => $userGroup->title,
             'can_see_members'                => $this->membershipsVisible[$userGroup->id] ?? false,
-            'members'                        => array_values($this->memberships[$userGroup->id] ?? []),
+            'title'                          => $userGroup->title,
             'native_currency_id'             => (string) $currency->id,
             'native_currency_name'           => $currency->name,
             'native_currency_code'           => $currency->code,
             'native_currency_symbol'         => $currency->symbol,
             'native_currency_decimal_places' => $currency->decimal_places,
+            'members'                        => array_values($this->memberships[$userGroup->id] ?? []),
         ];
         // if the user has a specific role in this group, then collect the memberships.
     }

app/Validation/FireflyValidator.php

@@ -38,6 +38,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Services\Password\Verifier;
 use FireflyIII\Support\ParseDateString;
 use FireflyIII\User;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Validator;
 use PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException;
 use PragmaRX\Google2FA\Exceptions\InvalidCharactersException;
@@ -66,7 +67,7 @@ class FireflyValidator extends Validator
         }
         $user             = auth()->user();
         if (null === $user) {
-            app('log')->error('No user during validate2faCode');
+            Log::error('No user during validate2faCode');
 
             return false;
         }
@@ -104,6 +105,9 @@ class FireflyValidator extends Validator
      */
     public function validateBic(mixed $attribute, mixed  $value): bool
     {
+        if (!is_string($value) || strlen($value) < 8) {
+            return false;
+        }
         $regex  = '/^[a-z]{6}[0-9a-z]{2}([0-9a-z]{3})?\z/i';
         $result = preg_match($regex, $value);
         if (false === $result || 0 === $result) {
@@ -120,7 +124,7 @@ class FireflyValidator extends Validator
         }
         $user   = auth()->user();
         if (null === $user) {
-            app('log')->error('No user during validate2faCode');
+            Log::error('No user during validate2faCode');
 
             return false;
         }
@@ -212,8 +216,8 @@ class FireflyValidator extends Validator
             $checksum = bcmod($iban, '97');
         } catch (\ValueError $e) { // @phpstan-ignore-line
             $message = sprintf('Could not validate IBAN check value "%s" (IBAN "%s")', $iban, $value);
-            app('log')->error($message);
+            Log::error($message);
-            app('log')->error($e->getTraceAsString());
+            Log::error($e->getTraceAsString());
 
             return false;
         }
@@ -427,7 +431,7 @@ class FireflyValidator extends Validator
             try {
                 $parser->parseDate($value);
             } catch (FireflyException $e) {
-                app('log')->error($e->getMessage());
+                Log::error($e->getMessage());
 
                 return false;
             }
@@ -467,41 +471,46 @@ class FireflyValidator extends Validator
      */
     public function validateUniqueAccountForUser($attribute, $value, $parameters): bool
     {
+        if (is_array($value)) {
+            Log::debug('$value is an array, always return false', $value);
+
+            return false;
+        }
         // because a user does not have to be logged in (tests and what-not).
         if (!auth()->check()) {
-            app('log')->debug('validateUniqueAccountForUser::anon');
+            Log::debug('validateUniqueAccountForUser::anon');
 
             return $this->validateAccountAnonymously();
         }
         if (array_key_exists('objectType', $this->data)) {
-            app('log')->debug('validateUniqueAccountForUser::typeString');
+            Log::debug('validateUniqueAccountForUser::typeString');
 
             return $this->validateByAccountTypeString($value, $parameters, $this->data['objectType']);
         }
-        if (array_key_exists('type', $this->data)) {
+        if (array_key_exists('type', $this->data) && !is_array($this->data['type'])) {
-            app('log')->debug('validateUniqueAccountForUser::typeString');
+            Log::debug('validateUniqueAccountForUser::typeString');
 
             return $this->validateByAccountTypeString($value, $parameters, (string) $this->data['type']);
         }
         if (array_key_exists('account_type_id', $this->data)) {
-            app('log')->debug('validateUniqueAccountForUser::typeId');
+            Log::debug('validateUniqueAccountForUser::typeId');
 
             return $this->validateByAccountTypeId($value, $parameters);
         }
         $parameterId = $parameters[0] ?? null;
         if (null !== $parameterId) {
-            app('log')->debug('validateUniqueAccountForUser::paramId');
+            Log::debug('validateUniqueAccountForUser::paramId');
 
             return $this->validateByParameterId((int) $parameterId, $value);
         }
         if (array_key_exists('id', $this->data)) {
-            app('log')->debug('validateUniqueAccountForUser::accountId');
+            Log::debug('validateUniqueAccountForUser::accountId');
 
             return $this->validateByAccountId($value);
         }
 
         // without type, just try to validate the name.
-        app('log')->debug('validateUniqueAccountForUser::accountName');
+        Log::debug('validateUniqueAccountForUser::accountName');
 
         return $this->validateByAccountName($value);
     }
@@ -642,11 +651,11 @@ class FireflyValidator extends Validator
         }
         $type      = $this->data['objectType'] ?? 'unknown';
         if ('expense' !== $type && 'revenue' !== $type) {
-            app('log')->warning(sprintf('Account number "%s" is not unique and account type "%s" cannot share its account number.', $value, $type));
+            Log::warning(sprintf('Account number "%s" is not unique and account type "%s" cannot share its account number.', $value, $type));
 
             return false;
         }
-        app('log')->debug(sprintf('Account number "%s" is not unique but account type "%s" may share its account number.', $value, $type));
+        Log::debug(sprintf('Account number "%s" is not unique but account type "%s" may share its account number.', $value, $type));
 
         // one other account with this account number.
         /** @var AccountMeta $entry */
@@ -654,11 +663,11 @@ class FireflyValidator extends Validator
             $otherAccount = $entry->account;
             $otherType    = (string) config(sprintf('firefly.shortNamesByFullName.%s', $otherAccount->accountType->type));
             if (('expense' === $otherType || 'revenue' === $otherType) && $otherType !== $type) {
-                app('log')->debug(sprintf('The other account with this account number is a "%s" so return true.', $otherType));
+                Log::debug(sprintf('The other account with this account number is a "%s" so return true.', $otherType));
 
                 return true;
             }
-            app('log')->debug(sprintf('The other account with this account number is a "%s" so return false.', $otherType));
+            Log::debug(sprintf('The other account with this account number is a "%s" so return false.', $otherType));
         }
 
         return false;

changelog.md

@@ -3,13 +3,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## 6.2.0 - 2025-01-19 (or later)
+## 6.2.0 - 2025-01-26 (or later)
+
+*This release comes with many changes, small and large. I expect you will run into issue, and I appreciate your feedback and your patience as I fix them. I've tested many things, but I'm 100% sure I've missed things. Please open [an issue here](https://github.com/firefly-iii/firefly-iii/issues/new?template=bug.yml) if you run into problems.
 
 ### Added
 
-- Multi-currency support. If you set `ENABLE_EXCHANGE_RATES=true` and optionally `ENABLE_EXTERNAL_RATES=true` Firefly III will try to calculate all foreign currencies back to your native currency. This is a work in progress, not all fields and all places will support this yet. Please check out the [documentation](https://docs.firefly-iii.org/explanation/financial-concepts/exchange-rates/).
+- Multi-currency support. If you set `ENABLE_EXCHANGE_RATES=true` and optionally `ENABLE_EXTERNAL_RATES=true` Firefly III will have the ability to calculate all foreign currencies back to your native currency. This is a work in progress, not all fields and all places will support this yet. Please check out the [documentation](https://docs.firefly-iii.org/explanation/financial-concepts/exchange-rates/).
-- Notifications support Nfty, Pushover, Slack and Discord.
+- There is notifications support for Nfty, Pushover, Slack and Discord.
-- Many new security related notifications.
+- There are many new security related notifications.
 - [Issue 5523](https://github.com/firefly-iii/firefly-iii/issues/5523) (Add comment on a budget for a given month) reported by @n-serrette
 - [Issue 5532](https://github.com/firefly-iii/firefly-iii/issues/5532) (Asset prices and exchange rates) reported by @svozniuk
 - [Issue 6314](https://github.com/firefly-iii/firefly-iii/issues/6314) (Currencies and exchange rates) reported by @JC5
@@ -26,12 +28,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Firefly III requires PHP 8.4.
-- [Issue 9501](https://github.com/firefly-iii/firefly-iii/issues/9501) (PHP8.4 support) reported by @JC5
 - Docker container no longer runs under root.
 - "Bills" are now called "subscriptions" to better reflect their purpose.
 - Rename "administration" to "settings" to prevent confusion with "financial administrations"
 - Rename 'default currency' to 'native currency'
 - Move native currency setting to financial administration edit screen to better reflect where it belongs
+- [Issue 9501](https://github.com/firefly-iii/firefly-iii/issues/9501) (PHP8.4 support) reported by @JC5
+- [Issue 9683](https://github.com/firefly-iii/firefly-iii/issues/9683) (500 viewing inactive liabilities) reported by @stuzer05
 
 ### Removed
 
@@ -45,7 +48,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### API
 
-- API changes related to new features are [documented](#).
+- API changes related to new features are [documented](https://api-docs.firefly-iii.org/).
+- New endpoint for multiple financial administrations ("user groups").
+- The change from "default currency" (user) to "native currency" (financial administration) is slowly being reflected in the API. Please report issues.
 
 ## 6.1.25 - 2024-12-19
 

composer.lock

@@ -940,16 +940,16 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.16.0",
+            "version": "2.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
+                "reference": "075bc0c26631110584175de6523ab3f1652eb28e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e",
-                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
+                "reference": "075bc0c26631110584175de6523ab3f1652eb28e",
                 "shasum": ""
             },
             "require": {
@@ -999,7 +999,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.16.0"
+                "source": "https://github.com/filp/whoops/tree/2.17.0"
             },
             "funding": [
                 {
@@ -1007,20 +1007,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-25T12:00:00+00:00"
+            "time": "2025-01-25T12:00:00+00:00"
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.10.2",
+            "version": "v6.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b"
+                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/8f718f4dfc9c5d5f0c994cdfd103921b43592712",
-                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
+                "reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712",
                 "shasum": ""
             },
             "require": {
@@ -1068,9 +1068,9 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.10.2"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.11.0"
             },
-            "time": "2024-11-24T11:22:49+00:00"
+            "time": "2025-01-23T05:11:06+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -1874,16 +1874,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.38.2",
+            "version": "v11.40.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "9d290aa90fcad44048bedca5219d2b872e98772a"
+                "reference": "599a28196d284fee158cc10086fd56ac625ad7a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/9d290aa90fcad44048bedca5219d2b872e98772a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/599a28196d284fee158cc10086fd56ac625ad7a3",
-                "reference": "9d290aa90fcad44048bedca5219d2b872e98772a",
+                "reference": "599a28196d284fee158cc10086fd56ac625ad7a3",
                 "shasum": ""
             },
             "require": {
@@ -1909,7 +1909,7 @@
                 "league/flysystem-local": "^3.25.1",
                 "league/uri": "^7.5.1",
                 "monolog/monolog": "^3.0",
-                "nesbot/carbon": "^2.72.2|^3.4",
+                "nesbot/carbon": "^2.72.6|^3.8.4",
                 "nunomaduro/termwind": "^2.0",
                 "php": "^8.2",
                 "psr/container": "^1.1.1|^2.0.1",
@@ -1984,6 +1984,7 @@
                 "fakerphp/faker": "^1.24",
                 "guzzlehttp/promises": "^2.0.3",
                 "guzzlehttp/psr7": "^2.4",
+                "laravel/pint": "^1.18",
                 "league/flysystem-aws-s3-v3": "^3.25.1",
                 "league/flysystem-ftp": "^3.25.1",
                 "league/flysystem-path-prefixing": "^3.25.1",
@@ -2084,7 +2085,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-01-15T00:06:46+00:00"
+            "time": "2025-01-24T16:17:42+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2348,16 +2349,16 @@
         },
         {
             "name": "laravel/slack-notification-channel",
-            "version": "v3.4.2",
+            "version": "v3.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/slack-notification-channel.git",
-                "reference": "282d52d70195283eb1b92e59d7bdc2d525361f4b"
+                "reference": "336859d1108f3cb9fc598ccca7083cc07081aa09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/282d52d70195283eb1b92e59d7bdc2d525361f4b",
+                "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/336859d1108f3cb9fc598ccca7083cc07081aa09",
-                "reference": "282d52d70195283eb1b92e59d7bdc2d525361f4b",
+                "reference": "336859d1108f3cb9fc598ccca7083cc07081aa09",
                 "shasum": ""
             },
             "require": {
@@ -2407,9 +2408,9 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/slack-notification-channel/issues",
-                "source": "https://github.com/laravel/slack-notification-channel/tree/v3.4.2"
+                "source": "https://github.com/laravel/slack-notification-channel/tree/v3.4.3"
             },
-            "time": "2024-11-29T14:59:32+00:00"
+            "time": "2025-01-20T16:59:17+00:00"
         },
         {
             "name": "laravel/ui",
@@ -3956,37 +3957,37 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v8.5.0",
+            "version": "v8.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "f5c101b929c958e849a633283adff296ed5f38f5"
+                "reference": "86f003c132143d5a2ab214e19933946409e0cae7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f5c101b929c958e849a633283adff296ed5f38f5",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/86f003c132143d5a2ab214e19933946409e0cae7",
-                "reference": "f5c101b929c958e849a633283adff296ed5f38f5",
+                "reference": "86f003c132143d5a2ab214e19933946409e0cae7",
                 "shasum": ""
             },
             "require": {
                 "filp/whoops": "^2.16.0",
-                "nunomaduro/termwind": "^2.1.0",
+                "nunomaduro/termwind": "^2.3.0",
                 "php": "^8.2.0",
-                "symfony/console": "^7.1.5"
+                "symfony/console": "^7.2.1"
             },
             "conflict": {
-                "laravel/framework": "<11.0.0 || >=12.0.0",
+                "laravel/framework": "<11.39.1 || >=13.0.0",
-                "phpunit/phpunit": "<10.5.1 || >=12.0.0"
+                "phpunit/phpunit": "<11.5.3 || >=12.0.0"
             },
             "require-dev": {
-                "larastan/larastan": "^2.9.8",
+                "larastan/larastan": "^2.9.12",
-                "laravel/framework": "^11.28.0",
+                "laravel/framework": "^11.39.1",
-                "laravel/pint": "^1.18.1",
+                "laravel/pint": "^1.20.0",
-                "laravel/sail": "^1.36.0",
+                "laravel/sail": "^1.40.0",
-                "laravel/sanctum": "^4.0.3",
+                "laravel/sanctum": "^4.0.7",
                 "laravel/tinker": "^2.10.0",
-                "orchestra/testbench-core": "^9.5.3",
+                "orchestra/testbench-core": "^9.9.2",
-                "pestphp/pest": "^2.36.0 || ^3.4.0",
+                "pestphp/pest": "^3.7.3",
                 "sebastian/environment": "^6.1.0 || ^7.2.0"
             },
             "type": "library",
@@ -4024,6 +4025,7 @@
                 "cli",
                 "command-line",
                 "console",
+                "dev",
                 "error",
                 "handling",
                 "laravel",
@@ -4049,7 +4051,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2024-10-15T16:06:32+00:00"
+            "time": "2025-01-23T13:41:43+00:00"
         },
         {
             "name": "nunomaduro/termwind",
@@ -6363,16 +6365,16 @@
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.18.0",
+            "version": "1.18.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "8332205b90d17164913244f4a8e13ab7e6761d29"
+                "reference": "ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/8332205b90d17164913244f4a8e13ab7e6761d29",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78",
-                "reference": "8332205b90d17164913244f4a8e13ab7e6761d29",
+                "reference": "ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78",
                 "shasum": ""
             },
             "require": {
@@ -6411,7 +6413,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.0"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.3"
             },
             "funding": [
                 {
@@ -6419,7 +6421,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-30T13:13:39+00:00"
+            "time": "2025-01-22T08:51:18+00:00"
         },
         {
             "name": "spatie/period",
@@ -11342,16 +11344,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.1",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7"
+                "reference": "7d08f569e582ade182a375c366cbd896eccadd3a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7d08f569e582ade182a375c366cbd896eccadd3a",
-                "reference": "cd6e973e04b4c2b94c86e8612b5a65f0da0e08e7",
+                "reference": "7d08f569e582ade182a375c366cbd896eccadd3a",
                 "shasum": ""
             },
             "require": {
@@ -11396,7 +11398,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-05T16:43:48+00:00"
+            "time": "2025-01-21T14:54:06+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -11447,16 +11449,16 @@
         },
         {
             "name": "phpstan/phpstan-strict-rules",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "02277ce4b0dd03d74f15282064f8f027d1dec9cc"
+                "reference": "8b88b5f818bfa301e0c99154ab622dace071c3ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/02277ce4b0dd03d74f15282064f8f027d1dec9cc",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/8b88b5f818bfa301e0c99154ab622dace071c3ba",
-                "reference": "02277ce4b0dd03d74f15282064f8f027d1dec9cc",
+                "reference": "8b88b5f818bfa301e0c99154ab622dace071c3ba",
                 "shasum": ""
             },
             "require": {
@@ -11489,9 +11491,9 @@
             "description": "Extra strict and opinionated rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.2"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.3"
             },
-            "time": "2025-01-19T13:03:11+00:00"
+            "time": "2025-01-21T10:52:14+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

config/firefly.php

@@ -81,7 +81,7 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-01-19',
+    'version'                      => 'develop/2025-01-27',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

package-lock.json

@@ -89,22 +89,22 @@
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.26.0",
+            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz",
-            "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
+            "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@ampproject/remapping": "^2.2.0",
-                "@babel/code-frame": "^7.26.0",
+                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.0",
+                "@babel/generator": "^7.26.5",
-                "@babel/helper-compilation-targets": "^7.25.9",
+                "@babel/helper-compilation-targets": "^7.26.5",
                 "@babel/helper-module-transforms": "^7.26.0",
-                "@babel/helpers": "^7.26.0",
+                "@babel/helpers": "^7.26.7",
-                "@babel/parser": "^7.26.0",
+                "@babel/parser": "^7.26.7",
                 "@babel/template": "^7.25.9",
-                "@babel/traverse": "^7.25.9",
+                "@babel/traverse": "^7.26.7",
-                "@babel/types": "^7.26.0",
+                "@babel/types": "^7.26.7",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -428,27 +428,27 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.26.0",
+            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz",
-            "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+            "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/template": "^7.25.9",
-                "@babel/types": "^7.26.0"
+                "@babel/types": "^7.26.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.26.5",
+            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
-            "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==",
+            "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.26.5"
+                "@babel/types": "^7.26.7"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -1436,13 +1436,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-typeof-symbol": {
-            "version": "7.25.9",
+            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz",
-            "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
+            "integrity": "sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
+                "@babel/helper-plugin-utils": "^7.26.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1519,15 +1519,15 @@
             }
         },
         "node_modules/@babel/preset-env": {
-            "version": "7.26.0",
+            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.7.tgz",
-            "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==",
+            "integrity": "sha512-Ycg2tnXwixaXOVb29rana8HNPgLVBof8qqtNQ9LE22IoyZboQbGSxI6ZySMdW3K5nAe6gu35IaJefUJflhUFTQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/compat-data": "^7.26.0",
+                "@babel/compat-data": "^7.26.5",
-                "@babel/helper-compilation-targets": "^7.25.9",
+                "@babel/helper-compilation-targets": "^7.26.5",
-                "@babel/helper-plugin-utils": "^7.25.9",
+                "@babel/helper-plugin-utils": "^7.26.5",
                 "@babel/helper-validator-option": "^7.25.9",
                 "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
                 "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
@@ -1541,7 +1541,7 @@
                 "@babel/plugin-transform-arrow-functions": "^7.25.9",
                 "@babel/plugin-transform-async-generator-functions": "^7.25.9",
                 "@babel/plugin-transform-async-to-generator": "^7.25.9",
-                "@babel/plugin-transform-block-scoped-functions": "^7.25.9",
+                "@babel/plugin-transform-block-scoped-functions": "^7.26.5",
                 "@babel/plugin-transform-block-scoping": "^7.25.9",
                 "@babel/plugin-transform-class-properties": "^7.25.9",
                 "@babel/plugin-transform-class-static-block": "^7.26.0",
@@ -1552,7 +1552,7 @@
                 "@babel/plugin-transform-duplicate-keys": "^7.25.9",
                 "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
                 "@babel/plugin-transform-dynamic-import": "^7.25.9",
-                "@babel/plugin-transform-exponentiation-operator": "^7.25.9",
+                "@babel/plugin-transform-exponentiation-operator": "^7.26.3",
                 "@babel/plugin-transform-export-namespace-from": "^7.25.9",
                 "@babel/plugin-transform-for-of": "^7.25.9",
                 "@babel/plugin-transform-function-name": "^7.25.9",
@@ -1561,12 +1561,12 @@
                 "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
                 "@babel/plugin-transform-member-expression-literals": "^7.25.9",
                 "@babel/plugin-transform-modules-amd": "^7.25.9",
-                "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+                "@babel/plugin-transform-modules-commonjs": "^7.26.3",
                 "@babel/plugin-transform-modules-systemjs": "^7.25.9",
                 "@babel/plugin-transform-modules-umd": "^7.25.9",
                 "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
                 "@babel/plugin-transform-new-target": "^7.25.9",
-                "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
+                "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6",
                 "@babel/plugin-transform-numeric-separator": "^7.25.9",
                 "@babel/plugin-transform-object-rest-spread": "^7.25.9",
                 "@babel/plugin-transform-object-super": "^7.25.9",
@@ -1583,7 +1583,7 @@
                 "@babel/plugin-transform-spread": "^7.25.9",
                 "@babel/plugin-transform-sticky-regex": "^7.25.9",
                 "@babel/plugin-transform-template-literals": "^7.25.9",
-                "@babel/plugin-transform-typeof-symbol": "^7.25.9",
+                "@babel/plugin-transform-typeof-symbol": "^7.26.7",
                 "@babel/plugin-transform-unicode-escapes": "^7.25.9",
                 "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
                 "@babel/plugin-transform-unicode-regex": "^7.25.9",
@@ -1628,9 +1628,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.26.0",
+            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz",
-            "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+            "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==",
             "license": "MIT",
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
@@ -1655,17 +1655,17 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.26.5",
+            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
-            "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==",
+            "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.26.2",
                 "@babel/generator": "^7.26.5",
-                "@babel/parser": "^7.26.5",
+                "@babel/parser": "^7.26.7",
                 "@babel/template": "^7.25.9",
-                "@babel/types": "^7.26.5",
+                "@babel/types": "^7.26.7",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -1674,9 +1674,9 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.26.5",
+            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
-            "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==",
+            "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2271,9 +2271,9 @@
             }
         },
         "node_modules/@parcel/watcher": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-            "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
+            "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -2292,25 +2292,25 @@
                 "url": "https://opencollective.com/parcel"
             },
             "optionalDependencies": {
-                "@parcel/watcher-android-arm64": "2.5.0",
+                "@parcel/watcher-android-arm64": "2.5.1",
-                "@parcel/watcher-darwin-arm64": "2.5.0",
+                "@parcel/watcher-darwin-arm64": "2.5.1",
-                "@parcel/watcher-darwin-x64": "2.5.0",
+                "@parcel/watcher-darwin-x64": "2.5.1",
-                "@parcel/watcher-freebsd-x64": "2.5.0",
+                "@parcel/watcher-freebsd-x64": "2.5.1",
-                "@parcel/watcher-linux-arm-glibc": "2.5.0",
+                "@parcel/watcher-linux-arm-glibc": "2.5.1",
-                "@parcel/watcher-linux-arm-musl": "2.5.0",
+                "@parcel/watcher-linux-arm-musl": "2.5.1",
-                "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+                "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-                "@parcel/watcher-linux-arm64-musl": "2.5.0",
+                "@parcel/watcher-linux-arm64-musl": "2.5.1",
-                "@parcel/watcher-linux-x64-glibc": "2.5.0",
+                "@parcel/watcher-linux-x64-glibc": "2.5.1",
-                "@parcel/watcher-linux-x64-musl": "2.5.0",
+                "@parcel/watcher-linux-x64-musl": "2.5.1",
-                "@parcel/watcher-win32-arm64": "2.5.0",
+                "@parcel/watcher-win32-arm64": "2.5.1",
-                "@parcel/watcher-win32-ia32": "2.5.0",
+                "@parcel/watcher-win32-ia32": "2.5.1",
-                "@parcel/watcher-win32-x64": "2.5.0"
+                "@parcel/watcher-win32-x64": "2.5.1"
             }
         },
         "node_modules/@parcel/watcher-android-arm64": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-            "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+            "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
             "cpu": [
                 "arm64"
             ],
@@ -2329,9 +2329,9 @@
             }
         },
         "node_modules/@parcel/watcher-darwin-arm64": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-            "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+            "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
             "cpu": [
                 "arm64"
             ],
@@ -2350,9 +2350,9 @@
             }
         },
         "node_modules/@parcel/watcher-darwin-x64": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-            "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+            "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
             "cpu": [
                 "x64"
             ],
@@ -2371,9 +2371,9 @@
             }
         },
         "node_modules/@parcel/watcher-freebsd-x64": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-            "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+            "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
             "cpu": [
                 "x64"
             ],
@@ -2392,9 +2392,9 @@
             }
         },
         "node_modules/@parcel/watcher-linux-arm-glibc": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-            "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+            "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
             "cpu": [
                 "arm"
             ],
@@ -2413,9 +2413,9 @@
             }
         },
         "node_modules/@parcel/watcher-linux-arm-musl": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-            "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+            "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
             "cpu": [
                 "arm"
             ],
@@ -2434,9 +2434,9 @@
             }
         },
         "node_modules/@parcel/watcher-linux-arm64-glibc": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-            "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+            "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
             "cpu": [
                 "arm64"
             ],
@@ -2455,9 +2455,9 @@
             }
         },
         "node_modules/@parcel/watcher-linux-arm64-musl": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-            "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+            "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
             "cpu": [
                 "arm64"
             ],
@@ -2476,9 +2476,9 @@
             }
         },
         "node_modules/@parcel/watcher-linux-x64-glibc": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-            "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+            "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
             "cpu": [
                 "x64"
             ],
@@ -2497,9 +2497,9 @@
             }
         },
         "node_modules/@parcel/watcher-linux-x64-musl": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-            "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+            "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
             "cpu": [
                 "x64"
             ],
@@ -2518,9 +2518,9 @@
             }
         },
         "node_modules/@parcel/watcher-win32-arm64": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-            "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+            "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
             "cpu": [
                 "arm64"
             ],
@@ -2539,9 +2539,9 @@
             }
         },
         "node_modules/@parcel/watcher-win32-ia32": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-            "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+            "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
             "cpu": [
                 "ia32"
             ],
@@ -2560,9 +2560,9 @@
             }
         },
         "node_modules/@parcel/watcher-win32-x64": {
-            "version": "2.5.0",
+            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-            "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+            "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
             "cpu": [
                 "x64"
             ],
@@ -2591,9 +2591,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.32.0.tgz",
-            "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==",
+            "integrity": "sha512-G2fUQQANtBPsNwiVFg4zKiPQyjVKZCUdQUol53R8E71J7AsheRMV/Yv/nB8giOcOVqP7//eB5xPqieBYZe9bGg==",
             "cpu": [
                 "arm"
             ],
@@ -2605,9 +2605,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.32.0.tgz",
-            "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==",
+            "integrity": "sha512-qhFwQ+ljoymC+j5lXRv8DlaJYY/+8vyvYmVx074zrLsu5ZGWYsJNLjPPVJJjhZQpyAKUGPydOq9hRLLNvh1s3A==",
             "cpu": [
                 "arm64"
             ],
@@ -2619,9 +2619,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.32.0.tgz",
-            "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
+            "integrity": "sha512-44n/X3lAlWsEY6vF8CzgCx+LQaoqWGN7TzUfbJDiTIOjJm4+L2Yq+r5a8ytQRGyPqgJDs3Rgyo8eVL7n9iW6AQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2633,9 +2633,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.32.0.tgz",
-            "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==",
+            "integrity": "sha512-F9ct0+ZX5Np6+ZDztxiGCIvlCaW87HBdHcozUfsHnj1WCUTBUubAoanhHUfnUHZABlElyRikI0mgcw/qdEm2VQ==",
             "cpu": [
                 "x64"
             ],
@@ -2647,9 +2647,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.32.0.tgz",
-            "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
+            "integrity": "sha512-JpsGxLBB2EFXBsTLHfkZDsXSpSmKD3VxXCgBQtlPcuAqB8TlqtLcbeMhxXQkCDv1avgwNjF8uEIbq5p+Cee0PA==",
             "cpu": [
                 "arm64"
             ],
@@ -2661,9 +2661,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.32.0.tgz",
-            "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
+            "integrity": "sha512-wegiyBT6rawdpvnD9lmbOpx5Sph+yVZKHbhnSP9MqUEDX08G4UzMU+D87jrazGE7lRSyTRs6NEYHtzfkJ3FjjQ==",
             "cpu": [
                 "x64"
             ],
@@ -2675,9 +2675,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.32.0.tgz",
-            "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==",
+            "integrity": "sha512-3pA7xecItbgOs1A5H58dDvOUEboG5UfpTq3WzAdF54acBbUM+olDJAPkgj1GRJ4ZqE12DZ9/hNS2QZk166v92A==",
             "cpu": [
                 "arm"
             ],
@@ -2689,9 +2689,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.32.0.tgz",
-            "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==",
+            "integrity": "sha512-Y7XUZEVISGyge51QbYyYAEHwpGgmRrAxQXO3siyYo2kmaj72USSG8LtlQQgAtlGfxYiOwu+2BdbPjzEpcOpRmQ==",
             "cpu": [
                 "arm"
             ],
@@ -2703,9 +2703,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.32.0.tgz",
-            "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==",
+            "integrity": "sha512-r7/OTF5MqeBrZo5omPXcTnjvv1GsrdH8a8RerARvDFiDwFpDVDnJyByYM/nX+mvks8XXsgPUxkwe/ltaX2VH7w==",
             "cpu": [
                 "arm64"
             ],
@@ -2717,9 +2717,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.32.0.tgz",
-            "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==",
+            "integrity": "sha512-HJbifC9vex9NqnlodV2BHVFNuzKL5OnsV2dvTw6e1dpZKkNjPG6WUq+nhEYV6Hv2Bv++BXkwcyoGlXnPrjAKXw==",
             "cpu": [
                 "arm64"
             ],
@@ -2731,9 +2731,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.32.0.tgz",
-            "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==",
+            "integrity": "sha512-VAEzZTD63YglFlWwRj3taofmkV1V3xhebDXffon7msNz4b14xKsz7utO6F8F4cqt8K/ktTl9rm88yryvDpsfOw==",
             "cpu": [
                 "loong64"
             ],
@@ -2745,9 +2745,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.32.0.tgz",
-            "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==",
+            "integrity": "sha512-Sts5DST1jXAc9YH/iik1C9QRsLcCoOScf3dfbY5i4kH9RJpKxiTBXqm7qU5O6zTXBTEZry69bGszr3SMgYmMcQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -2759,9 +2759,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.32.0.tgz",
-            "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==",
+            "integrity": "sha512-qhlXeV9AqxIyY9/R1h1hBD6eMvQCO34ZmdYvry/K+/MBs6d1nRFLm6BOiITLVI+nFAAB9kUB6sdJRKyVHXnqZw==",
             "cpu": [
                 "riscv64"
             ],
@@ -2773,9 +2773,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.32.0.tgz",
-            "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==",
+            "integrity": "sha512-8ZGN7ExnV0qjXa155Rsfi6H8M4iBBwNLBM9lcVS+4NcSzOFaNqmt7djlox8pN1lWrRPMRRQ8NeDlozIGx3Omsw==",
             "cpu": [
                 "s390x"
             ],
@@ -2787,9 +2787,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.32.0.tgz",
-            "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==",
+            "integrity": "sha512-VDzNHtLLI5s7xd/VubyS10mq6TxvZBp+4NRWoW+Hi3tgV05RtVm4qK99+dClwTN1McA6PHwob6DEJ6PlXbY83A==",
             "cpu": [
                 "x64"
             ],
@@ -2801,9 +2801,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.32.0.tgz",
-            "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==",
+            "integrity": "sha512-qcb9qYDlkxz9DxJo7SDhWxTWV1gFuwznjbTiov289pASxlfGbaOD54mgbs9+z94VwrXtKTu+2RqwlSTbiOqxGg==",
             "cpu": [
                 "x64"
             ],
@@ -2815,9 +2815,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.32.0.tgz",
-            "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==",
+            "integrity": "sha512-pFDdotFDMXW2AXVbfdUEfidPAk/OtwE/Hd4eYMTNVVaCQ6Yl8et0meDaKNL63L44Haxv4UExpv9ydSf3aSayDg==",
             "cpu": [
                 "arm64"
             ],
@@ -2829,9 +2829,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.32.0.tgz",
-            "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==",
+            "integrity": "sha512-/TG7WfrCAjeRNDvI4+0AAMoHxea/USWhAzf9PVDFHbcqrQ7hMMKp4jZIy4VEjk72AAfN5k4TiSMRXRKf/0akSw==",
             "cpu": [
                 "ia32"
             ],
@@ -2843,9 +2843,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.32.0.tgz",
-            "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==",
+            "integrity": "sha512-5hqO5S3PTEO2E5VjCePxv40gIgyS2KvO7E7/vvC/NbIW4SIRamkMr1hqj+5Y67fbBWv/bQLB6KelBQmXlyCjWA==",
             "cpu": [
                 "x64"
             ],
@@ -3133,9 +3133,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.10.7",
+            "version": "22.10.10",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.10.tgz",
-            "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
+            "integrity": "sha512-X47y/mPNzxviAGY5TcYPtYL8JsY3kAq2n8fMmKoRCxq/c4v4pyGNCzM2R6+M5/umG4ZfHuT+sgqDYqWc9rJ6ww==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3231,9 +3231,9 @@
             "license": "MIT"
         },
         "node_modules/@types/ws": {
-            "version": "8.5.13",
+            "version": "8.5.14",
-            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
+            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz",
-            "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
+            "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5663,9 +5663,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.83",
+            "version": "1.5.88",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.83.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.88.tgz",
-            "integrity": "sha512-LcUDPqSt+V0QmI47XLzZrz5OqILSMGsPFkDYus22rIbgorSvBYEFqq854ltTmUdHkY92FSdAAvsh4jWEULMdfQ==",
+            "integrity": "sha512-K3C2qf1o+bGzbilTDCTBhTQcMS9KW60yTAaTeeXsfvQuTDDwlokLam/AdqlqcSy9u4UainDgsHV23ksXAOgamw==",
             "dev": true,
             "license": "ISC"
         },
@@ -6105,9 +6105,9 @@
             "license": "MIT"
         },
         "node_modules/fast-uri": {
-            "version": "3.0.5",
+            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.5.tgz",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-            "integrity": "sha512-5JnBCWpFlMo0a3ciDy/JckMzzv1U9coZrIhedq+HXxxUfDTAiS0LA8OKVao4G9BxmCVck/jtA5r3KAtRWEyD8Q==",
+            "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
             "dev": true,
             "funding": [
                 {
@@ -6974,9 +6974,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "24.2.1",
+            "version": "24.2.2",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.1.tgz",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.2.tgz",
-            "integrity": "sha512-Q2wC1TjWcSikn1VAJg13UGIjc+okpFxQTxjVAymOnSA3RpttBQNMPf2ovcgoFVsV4QNxTfNZMAxorXZXsk4fBA==",
+            "integrity": "sha512-NE6i86lBCKRYZa5TaUDkU5S4HFgLIEJRLr3Whf2psgaxBleQ2LC1YW1Vc+SCgkAW7VEzndT6al6+CzegSUHcTQ==",
             "funding": [
                 {
                     "type": "individual",
@@ -7014,9 +7014,9 @@
             }
         },
         "node_modules/i18next-http-backend": {
-            "version": "3.0.1",
+            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.2.tgz",
-            "integrity": "sha512-XT2lYSkbAtDE55c6m7CtKxxrsfuRQO3rUfHzj8ZyRtY9CkIX3aRGwXGTkUhpGWce+J8n7sfu3J0f2wTzo7Lw0A==",
+            "integrity": "sha512-PdlvPnvIp4E1sYi46Ik4tBYh/v/NbYfFFgTjkwFl0is8A18s7/bx9aXqsrOax9WUbeNS6mD2oix7Z0yGGf6m5g==",
             "license": "MIT",
             "dependencies": {
                 "cross-fetch": "4.0.0"
@@ -7711,9 +7711,9 @@
             }
         },
         "node_modules/laravel-vite-plugin": {
-            "version": "1.1.1",
+            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.1.1.tgz",
+            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.2.0.tgz",
-            "integrity": "sha512-HMZXpoSs1OR+7Lw1+g4Iy/s3HF3Ldl8KxxYT2Ot8pEB4XB/QRuZeWgDYJdu552UN03YRSRNK84CLC9NzYRtncA==",
+            "integrity": "sha512-R0pJ+IcTVeqEMoKz/B2Ij57QVq3sFTABiFmb06gAwFdivbOgsUtuhX6N2MGLEArajrS3U5JbberzwOe7uXHMHQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -9987,9 +9987,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.31.0",
+            "version": "4.32.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.32.0.tgz",
-            "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
+            "integrity": "sha512-JmrhfQR31Q4AuNBjjAX4s+a/Pu/Q8Q9iwjWBsjRH1q52SPFE2NqRMK6fUZKKnvKO6id+h7JIRf0oYsph53eATg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10003,25 +10003,25 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.31.0",
+                "@rollup/rollup-android-arm-eabi": "4.32.0",
-                "@rollup/rollup-android-arm64": "4.31.0",
+                "@rollup/rollup-android-arm64": "4.32.0",
-                "@rollup/rollup-darwin-arm64": "4.31.0",
+                "@rollup/rollup-darwin-arm64": "4.32.0",
-                "@rollup/rollup-darwin-x64": "4.31.0",
+                "@rollup/rollup-darwin-x64": "4.32.0",
-                "@rollup/rollup-freebsd-arm64": "4.31.0",
+                "@rollup/rollup-freebsd-arm64": "4.32.0",
-                "@rollup/rollup-freebsd-x64": "4.31.0",
+                "@rollup/rollup-freebsd-x64": "4.32.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.31.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.32.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.31.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.32.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.31.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.32.0",
-                "@rollup/rollup-linux-arm64-musl": "4.31.0",
+                "@rollup/rollup-linux-arm64-musl": "4.32.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.31.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.32.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.32.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.31.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.32.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.31.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.32.0",
-                "@rollup/rollup-linux-x64-gnu": "4.31.0",
+                "@rollup/rollup-linux-x64-gnu": "4.32.0",
-                "@rollup/rollup-linux-x64-musl": "4.31.0",
+                "@rollup/rollup-linux-x64-musl": "4.32.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.31.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.32.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.31.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.32.0",
-                "@rollup/rollup-win32-x64-msvc": "4.31.0",
+                "@rollup/rollup-win32-x64-msvc": "4.32.0",
                 "fsevents": "~2.3.2"
             }
         },
@@ -11297,9 +11297,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.0.7",
+            "version": "6.0.11",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.7.tgz",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.11.tgz",
-            "integrity": "sha512-RDt8r/7qx9940f8FcOIAH9PTViRrghKaK2K1jY3RaAURrEUbm9Du1mJ72G+jlhtG3WwodnfzY8ORQZbBavZEAQ==",
+            "integrity": "sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

resources/assets/v1/src/components/exchange-rates/Index.vue

@@ -68,7 +68,7 @@ export default {
             this.downloadCurrencies(1);
         },
         downloadCurrencies: function (page) {
-            axios.get("./api/v2/currencies?enabled=1&page=" + page).then((response) => {
+            axios.get("./api/v1/currencies?enabled=1&page=" + page).then((response) => {
                 for (let i in response.data.data) {
                     if (response.data.data.hasOwnProperty(i)) {
                         let current = response.data.data[i];

resources/assets/v1/src/components/exchange-rates/Rates.vue

@@ -183,7 +183,7 @@ export default {
             if(e) e.preventDefault();
             this.posting = true;
 
-            axios.post("./api/v2/exchange-rates", {
+            axios.post("./api/v1/exchange-rates", {
                 from: this.from_code,
                 to: this.to_code,
                 rate: this.newRate,
@@ -214,7 +214,7 @@ export default {
                 // console.log('Rate is ' + this.rates[index].rate);
                 // console.log('ID is ' + this.rates[index].rate_id);
                 this.updating = true;
-                axios.put("./api/v2/exchange-rates/" + this.rates[index].rate_id, {rate: this.rates[index].rate})
+                axios.put("./api/v1/exchange-rates/" + this.rates[index].rate_id, {rate: this.rates[index].rate})
                     .then(() => {
                         this.updating = false;
                     });
@@ -224,7 +224,7 @@ export default {
                 // console.log('Inverse is ' + this.rates[index].inverse);
                 // console.log('Inverse ID is ' + this.rates[index].inverse_id);
                 this.updating = true;
-                axios.put("./api/v2/exchange-rates/" + this.rates[index].inverse_id, {rate: this.rates[index].inverse})
+                axios.put("./api/v1/exchange-rates/" + this.rates[index].inverse_id, {rate: this.rates[index].inverse})
                     .then(() => {
                         this.updating = false;
                     });
@@ -239,9 +239,9 @@ export default {
             // console.log(parts);
 
             // delete A to B
-            axios.delete("./api/v2/exchange-rates/rates/" + parts.from + '/' + parts.to + '?date=' + format(parts.date, 'yyyy-MM-dd'));
+            axios.delete("./api/v1/exchange-rates/rates/" + parts.from + '/' + parts.to + '?date=' + format(parts.date, 'yyyy-MM-dd'));
             // delete B to A.
-            axios.delete("./api/v2/exchange-rates/rates/" + parts.to + '/' + parts.from + '?date=' + format(parts.date, 'yyyy-MM-dd'));
+            axios.delete("./api/v1/exchange-rates/rates/" + parts.to + '/' + parts.from + '?date=' + format(parts.date, 'yyyy-MM-dd'));
 
             this.rates.splice(index, 1);
         },
@@ -263,14 +263,14 @@ export default {
         },
         downloadCurrencies: function () {
             this.loading = true;
-            axios.get("./api/v2/currencies/" + this.from_code).then((response) => {
+            axios.get("./api/v1/currencies/" + this.from_code).then((response) => {
                 this.from = {
                     id: response.data.data.id,
                     code: response.data.data.attributes.code,
                     name: response.data.data.attributes.name,
                 }
             });
-            axios.get("./api/v2/currencies/" + this.to_code).then((response) => {
+            axios.get("./api/v1/currencies/" + this.to_code).then((response) => {
                 // console.log(response.data.data);
                 this.to = {
                     id: response.data.data.id,
@@ -283,7 +283,7 @@ export default {
             this.tempRates = {};
             this.rates = [];
             this.loading = true;
-            axios.get("./api/v2/exchange-rates/rates/" + this.from_code + '/' + this.to_code + '?page=' + page).then((response) => {
+            axios.get("./api/v1/exchange-rates/rates/" + this.from_code + '/' + this.to_code + '?page=' + page).then((response) => {
                 for (let i in response.data.data) {
                     if (response.data.data.hasOwnProperty(i)) {
                         let current = response.data.data[i];

resources/assets/v1/src/locales/hu.json

@@ -151,7 +151,7 @@
         "url": "URL",
         "active": "Akt\u00edv",
         "interest_date": "Kamatfizet\u00e9si id\u0151pont",
-        "administration_currency": "Native currency",
+        "administration_currency": "Hazai p\u00e9nznem",
         "title": "C\u00edm",
         "date": "D\u00e1tum",
         "book_date": "K\u00f6nyvel\u00e9s d\u00e1tuma",
@@ -161,22 +161,22 @@
         "payment_date": "Fizet\u00e9s d\u00e1tuma",
         "invoice_date": "Sz\u00e1mla d\u00e1tuma",
         "internal_reference": "Bels\u0151 hivatkoz\u00e1s",
-        "webhook_response": "Response",
+        "webhook_response": "V\u00e1lasz",
-        "webhook_trigger": "Trigger",
+        "webhook_trigger": "Esem\u00e9nyind\u00edt\u00f3",
-        "webhook_delivery": "Delivery",
+        "webhook_delivery": "Sz\u00e1ll\u00edt\u00e1s",
         "from_currency_to_currency": "{from} → {to}",
         "to_currency_from_currency": "{to} → {from}",
-        "rate": "Rate"
+        "rate": "Ar\u00e1ny"
     },
     "list": {
         "title": "C\u00edm",
         "active": "Akt\u00edv?",
-        "native_currency": "Native currency",
+        "native_currency": "Hazai p\u00e9nznem",
-        "trigger": "Trigger",
+        "trigger": "Esem\u00e9nyind\u00edt\u00f3",
-        "response": "Response",
+        "response": "V\u00e1lasz",
-        "delivery": "Delivery",
+        "delivery": "Sz\u00e1ll\u00edt\u00e1s",
         "url": "URL",
-        "secret": "Secret"
+        "secret": "Titkos k\u00f3d"
     },
     "config": {
         "html_language": "hu",

resources/assets/v1/src/locales/sl.json

@@ -1,10 +1,10 @@
 {
     "firefly": {
         "administrations_page_title": "Finan\u010dne administracije",
-        "administrations_index_menu": "Financial administrations",
+        "administrations_index_menu": "Finan\u010dne administracije",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
+        "temp_administrations_introduction": "Firefly III bo kmalu dobil mo\u017enost upravljanja ve\u010d finan\u010dnih administracij. Trenutno imate samo eno. Nastavite lahko naziv te administracije in njeno doma\u010do valuto. To nadome\u0161\u010da prej\u0161njo nastavitev, kjer bi nastavili svojo \"privzeto valuto\". Ta nastavitev je zdaj vezana na finan\u010dno administracijo in se lahko razlikuje glede na administracijo.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
+        "administration_currency_form_help": "\u010ce spremenite doma\u010do valuto, lahko traja dolgo \u010dasa, da se stran nalo\u017ei, ker bo transakcijo morda treba pretvoriti v va\u0161o (novo) doma\u010do valuto.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_page_edit_sub_title_js": "Uredi finan\u010dno administracijo \"{title}\"",
         "table": "Tabela",
         "welcome_back": "Kaj vse se dogaja?",
         "flash_error": "Napaka!",
@@ -151,7 +151,7 @@
         "url": "URL",
         "active": "Aktivno",
         "interest_date": "Datum obresti",
-        "administration_currency": "Native currency",
+        "administration_currency": "Doma\u010da valuta",
         "title": "Naslov",
         "date": "Datum",
         "book_date": "Datum knji\u017eenja",
@@ -171,7 +171,7 @@
     "list": {
         "title": "Naslov",
         "active": "Aktiviran?",
-        "native_currency": "Native currency",
+        "native_currency": "Doma\u010da valuta",
         "trigger": "Spro\u017eilec",
         "response": "Odziv",
         "delivery": "Dostava",

resources/assets/v2/vite.config.js

@@ -82,6 +82,7 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
 
 
         server: {
+            origin: 'http://127.0.0.1:8000',
             watch: {
                 usePolling: true,
             },

resources/lang/en_US/validation.php

@@ -25,166 +25,168 @@
 declare(strict_types=1);
 
 return [
-    'invalid_account_type'            => 'A piggy bank can only be linked to asset accounts and liabilities',
+    'invalid_account_type'             => 'A piggy bank can only be linked to asset accounts and liabilities',
-    'invalid_account_currency'        => 'This account does not use the currency you have selected',
+    'invalid_account_currency'         => 'This account does not use the currency you have selected',
-    'current_amount_too_much'         => 'The combined amount in "current_amount" cannot exceed the "target_amount".',
+    'current_amount_too_much'          => 'The combined amount in "current_amount" cannot exceed the "target_amount".',
-    'filter_must_be_in'               => 'Filter ":filter" must be one of: :values',
+    'filter_must_be_in'                => 'Filter ":filter" must be one of: :values',
-    'filter_not_string'               => 'Filter ":filter" is expected to be a string of text',
+    '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.',
+    'bad_api_filter'                   => 'This API endpoint does not support ":filter" as a filter.',
-    'nog_logged_in'                   => 'You are not logged in.',
+    '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_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.',
+    'bad_type_destination'             => 'Firefly III can\'t determine the transaction type based on this destination account.',
-    'missing_where'                   => 'Array is missing "where"-clause',
+    'missing_where'                    => 'Array is missing "where"-clause',
-    'missing_update'                  => 'Array is missing "update"-clause',
+    'missing_update'                   => 'Array is missing "update"-clause',
-    'invalid_where_key'               => 'JSON contains an invalid key for the "where"-clause',
+    'invalid_where_key'                => 'JSON contains an invalid key for the "where"-clause',
-    'invalid_update_key'              => 'JSON contains an invalid key for the "update"-clause',
+    'invalid_update_key'               => 'JSON contains an invalid key for the "update"-clause',
-    'invalid_query_data'              => 'There is invalid data in the %s:%s field of your query.',
+    'invalid_query_data'               => 'There is invalid data in the %s:%s field of your query.',
-    'invalid_query_account_type'      => 'Your query contains accounts of different types, which is not allowed.',
+    'invalid_query_account_type'       => 'Your query contains accounts of different types, which is not allowed.',
-    'invalid_query_currency'          => 'Your query contains accounts that have different currency settings, which is not allowed.',
+    'invalid_query_currency'           => 'Your query contains accounts that have different currency settings, which is not allowed.',
-    'iban'                            => 'This is not a valid IBAN.',
+    'iban'                             => 'This is not a valid IBAN.',
-    'zero_or_more'                    => 'The value cannot be negative.',
+    'zero_or_more'                     => 'The value cannot be negative.',
-    'more_than_zero'                  => 'The value must be more than zero.',
+    'more_than_zero'                   => 'The value must be more than zero.',
-    'more_than_zero_correct'          => 'The value must be zero or more.',
+    'more_than_zero_correct'           => 'The value must be zero or more.',
-    'no_asset_account'                => 'This is not an asset account.',
+    'no_asset_account'                 => 'This is not an asset account.',
-    'date_or_time'                    => 'The value must be a valid date or time value (ISO 8601).',
+    'date_or_time'                     => 'The value must be a valid date or time value (ISO 8601).',
-    'source_equals_destination'       => 'The source account equals the destination account.',
+    'source_equals_destination'        => 'The source account equals the destination account.',
-    'unique_account_number_for_user'  => 'It looks like this account number is already in use.',
+    'unique_account_number_for_user'   => 'It looks like this account number is already in use.',
-    'unique_user_group_for_user'      => 'It looks like this administration title is already in use.',
+    'unique_user_group_for_user'       => 'It looks like this administration title is already in use.',
-    'unique_iban_for_user'            => 'It looks like this IBAN is already in use.',
+    'unique_iban_for_user'             => 'It looks like this IBAN is already in use.',
-    'reconciled_forbidden_field'      => 'This transaction is already reconciled, you cannot change the ":field"',
+    'reconciled_forbidden_field'       => 'This transaction is already reconciled, you cannot change the ":field"',
-    'deleted_user'                    => 'Due to security constraints, you cannot register using this email address.',
+    'deleted_user'                     => 'Due to security constraints, you cannot register using this email address.',
-    'rule_trigger_value'              => 'This value is invalid for the selected trigger.',
+    'rule_trigger_value'               => 'This value is invalid for the selected trigger.',
-    'rule_action_expression'          => 'Invalid expression. :error',
+    'rule_action_expression'           => 'Invalid expression. :error',
-    'rule_action_value'               => 'This value is invalid for the selected action.',
+    'rule_action_value'                => 'This value is invalid for the selected action.',
-    'file_already_attached'           => 'Uploaded file ":name" is already attached to this object.',
+    'file_already_attached'            => 'Uploaded file ":name" is already attached to this object.',
-    'file_attached'                   => 'Successfully uploaded file ":name".',
+    'file_attached'                    => 'Successfully uploaded file ":name".',
-    'file_zero'                       => 'The file is zero bytes in size.',
+    'file_zero'                        => 'The file is zero bytes in size.',
-    'must_exist'                      => 'The ID in field :attribute does not exist in the database.',
+    'must_exist'                       => 'The ID in field :attribute does not exist in the database.',
-    'all_accounts_equal'              => 'All accounts in this field must be equal.',
+    'all_accounts_equal'               => 'All accounts in this field must be equal.',
-    'group_title_mandatory'           => 'A group title is mandatory when there is more than one transaction.',
+    'group_title_mandatory'            => 'A group title is mandatory when there is more than one transaction.',
-    'transaction_types_equal'         => 'All splits must be of the same type.',
+    'transaction_types_equal'          => 'All splits must be of the same type.',
-    'invalid_transaction_type'        => 'Invalid transaction type.',
+    'invalid_transaction_type'         => 'Invalid transaction type.',
-    'invalid_selection'               => 'Your selection is invalid.',
+    'invalid_selection'                => 'Your selection is invalid.',
-    'belongs_user'                    => 'This value is linked to an object that does not seem to exist.',
+    'belongs_user'                     => 'This value is linked to an object that does not seem to exist.',
-    'belongs_user_or_user_group'      => 'This value is linked to an object that does not seem to exist in your current financial administration.',
+    'belongs_user_or_user_group'       => 'This value is linked to an object that does not seem to exist in your current financial administration.',
-    'no_access_group'                 => 'The user has no access to this administration.',
+    'no_access_group'                  => 'The user has no access to this administration.',
-    'no_accepted_roles_defined'       => 'No access roles have been defined for this endpoint, access denied.',
+    'no_accepted_roles_defined'        => 'No access roles have been defined for this endpoint, access denied.',
-    'at_least_one_transaction'        => 'Need at least one transaction.',
+    'at_least_one_transaction'         => 'Need at least one transaction.',
-    'recurring_transaction_id'        => 'Need at least one transaction.',
+    'recurring_transaction_id'         => 'Need at least one transaction.',
-    'need_id_to_match'                => 'You need to submit this entry with an ID for the API to be able to match it.',
+    'need_id_to_match'                 => 'You need to submit this entry with an ID for the API to be able to match it.',
-    'too_many_unmatched'              => 'Too many submitted transactions cannot be matched to their respective database entries. Make sure existing entries have a valid ID.',
+    'too_many_unmatched'               => 'Too many submitted transactions cannot be matched to their respective database entries. Make sure existing entries have a valid ID.',
-    'id_does_not_match'               => 'Submitted ID #:id does not match expected ID. Make sure it matches or omit the field.',
+    'id_does_not_match'                => 'Submitted ID #:id does not match expected ID. Make sure it matches or omit the field.',
-    'at_least_one_repetition'         => 'Need at least one repetition.',
+    'at_least_one_repetition'          => 'Need at least one repetition.',
-    'require_repeat_until'            => 'Require either a number of repetitions, or an end date (repeat_until). Not both.',
+    'require_repeat_until'             => 'Require either a number of repetitions, or an end date (repeat_until). Not both.',
-    'require_currency_info'           => 'The content of this field is invalid without currency information.',
+    'require_currency_info'            => 'The content of this field is invalid without currency information.',
-    'not_transfer_account'            => 'This account is not an account that can be used for transfers.',
+    'not_transfer_account'             => 'This account is not an account that can be used for transfers.',
-    'require_currency_amount'         => 'The content of this field is invalid without foreign amount information.',
+    'require_currency_amount'          => 'The content of this field is invalid without foreign amount information.',
-    'require_foreign_currency'        => 'This field requires a number',
+    'require_foreign_currency'         => 'This field requires a number',
-    'require_foreign_dest'            => 'This field value must match the currency of the destination account.',
+    'require_foreign_dest'             => 'This field value must match the currency of the destination account.',
-    'require_foreign_src'             => 'This field value must match the currency of the source account.',
+    'require_foreign_src'              => 'This field value must match the currency of the source account.',
-    'equal_description'               => 'Transaction description should not equal global description.',
+    'equal_description'                => 'Transaction description should not equal global description.',
-    'file_invalid_mime'               => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
+    'file_invalid_mime'                => 'File ":name" is of type ":mime" which is not accepted as a new upload.',
-    'file_too_large'                  => 'File ":name" is too large.',
+    'file_too_large'                   => 'File ":name" is too large.',
-    'belongs_to_user'                 => 'The value of :attribute is unknown.',
+    'belongs_to_user'                  => 'The value of :attribute is unknown.',
-    'accepted'                        => 'The :attribute must be accepted.',
+    'accepted'                         => 'The :attribute must be accepted.',
-    'bic'                             => 'This is not a valid BIC.',
+    'bic'                              => 'This is not a valid BIC.',
-    'at_least_one_trigger'            => 'Rule must have at least one trigger.',
+    'at_least_one_trigger'             => 'Rule must have at least one trigger.',
-    'at_least_one_active_trigger'     => 'Rule must have at least one active trigger.',
+    'at_least_one_active_trigger'      => 'Rule must have at least one active trigger.',
-    'at_least_one_action'             => 'Rule must have at least one action.',
+    'at_least_one_action'              => 'Rule must have at least one action.',
-    'at_least_one_active_action'      => 'Rule must have at least one active action.',
+    'at_least_one_active_action'       => 'Rule must have at least one active action.',
-    'base64'                          => 'This is not valid base64 encoded data.',
+    'base64'                           => 'This is not valid base64 encoded data.',
-    'model_id_invalid'                => 'The given ID seems invalid for this model.',
+    'model_id_invalid'                 => 'The given ID seems invalid for this model.',
-    'less'                            => ':attribute must be less than 10,000,000',
+    'less'                             => ':attribute must be less than 10,000,000',
-    'active_url'                      => 'The :attribute is not a valid URL.',
+    'active_url'                       => 'The :attribute is not a valid URL.',
-    'after'                           => 'The :attribute must be a date after :date.',
+    'after'                            => 'The :attribute must be a date after :date.',
-    'date_after'                      => 'The start date must be before the end date.',
+    'date_after'                       => 'The start date must be before the end date.',
-    'alpha'                           => 'The :attribute may only contain letters.',
+    'alpha'                            => 'The :attribute may only contain letters.',
-    'alpha_dash'                      => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_dash'                       => 'The :attribute may only contain letters, numbers, and dashes.',
-    'alpha_num'                       => 'The :attribute may only contain letters and numbers.',
+    'alpha_num'                        => 'The :attribute may only contain letters and numbers.',
-    'array'                           => 'The :attribute must be an array.',
+    'array'                            => 'The :attribute must be an array.',
-    'unique_for_user'                 => 'There already is an entry with this :attribute.',
+    'unique_for_user'                  => 'There already is an entry with this :attribute.',
-    'before'                          => 'The :attribute must be a date before :date.',
+    'before'                           => 'The :attribute must be a date before :date.',
-    'unique_object_for_user'          => 'This name is already in use.',
+    'unique_object_for_user'           => 'This name is already in use.',
-    'unique_account_for_user'         => 'This account name is already in use.',
+    'unique_account_for_user'          => 'This account name is already in use.',
 
 
 
-    'between.numeric'                 => 'The :attribute must be between :min and :max.',
+    'between.numeric'                  => 'The :attribute must be between :min and :max.',
-    'between.file'                    => 'The :attribute must be between :min and :max kilobytes.',
+    'between.file'                     => 'The :attribute must be between :min and :max kilobytes.',
-    'between.string'                  => 'The :attribute must be between :min and :max characters.',
+    'between.string'                   => 'The :attribute must be between :min and :max characters.',
-    'between.array'                   => 'The :attribute must have between :min and :max items.',
+    'between.array'                    => 'The :attribute must have between :min and :max items.',
-    'boolean'                         => 'The :attribute field must be true or false.',
+    'boolean'                          => 'The :attribute field must be true or false.',
-    'confirmed'                       => 'The :attribute confirmation does not match.',
+    'confirmed'                        => 'The :attribute confirmation does not match.',
-    'date'                            => 'The :attribute is not a valid date.',
+    'date'                             => 'The :attribute is not a valid date.',
-    'date_format'                     => 'The :attribute does not match the format :format.',
+    'date_format'                      => 'The :attribute does not match the format :format.',
-    'different'                       => 'The :attribute and :other must be different.',
+    'different'                        => 'The :attribute and :other must be different.',
-    'digits'                          => 'The :attribute must be :digits digits.',
+    'digits'                           => 'The :attribute must be :digits digits.',
-    'digits_between'                  => 'The :attribute must be between :min and :max digits.',
+    'digits_between'                   => 'The :attribute must be between :min and :max digits.',
-    'email'                           => 'The :attribute must be a valid email address.',
+    'email'                            => 'The :attribute must be a valid email address.',
-    'filled'                          => 'The :attribute field is required.',
+    'filled'                           => 'The :attribute field is required.',
-    'exists'                          => 'The selected :attribute is invalid.',
+    'exists'                           => 'The selected :attribute is invalid.',
-    'image'                           => 'The :attribute must be an image.',
+    'image'                            => 'The :attribute must be an image.',
-    'in'                              => 'The selected :attribute is invalid.',
+    'in'                               => 'The selected :attribute is invalid.',
-    'integer'                         => 'The :attribute must be an integer.',
+    'integer'                          => 'The :attribute must be an integer.',
-    'ip'                              => 'The :attribute must be a valid IP address.',
+    'ip'                               => 'The :attribute must be a valid IP address.',
-    'json'                            => 'The :attribute must be a valid JSON string.',
+    'json'                             => 'The :attribute must be a valid JSON string.',
-    'max.numeric'                     => 'The :attribute may not be greater than :max.',
+    'max.numeric'                      => 'The :attribute may not be greater than :max.',
-    'max.file'                        => 'The :attribute may not be greater than :max kilobytes.',
+    'max.file'                         => 'The :attribute may not be greater than :max kilobytes.',
-    'max.string'                      => 'The :attribute may not be greater than :max characters.',
+    'max.string'                       => 'The :attribute may not be greater than :max characters.',
-    'max.array'                       => 'The :attribute may not have more than :max items.',
+    'max.array'                        => 'The :attribute may not have more than :max items.',
-    'mimes'                           => 'The :attribute must be a file of type: :values.',
+    'mimes'                            => 'The :attribute must be a file of type: :values.',
-    'min.numeric'                     => 'The :attribute must be at least :min.',
+    'min.numeric'                      => 'The :attribute must be at least :min.',
-    'lte.numeric'                     => 'The :attribute must be less than or equal :value.',
+    'lte.numeric'                      => 'The :attribute must be less than or equal :value.',
-    'min.file'                        => 'The :attribute must be at least :min kilobytes.',
+    'min.file'                         => 'The :attribute must be at least :min kilobytes.',
-    'min.string'                      => 'The :attribute must be at least :min characters.',
+    'min.string'                       => 'The :attribute must be at least :min characters.',
-    'min.array'                       => 'The :attribute must have at least :min items.',
+    'min.array'                        => 'The :attribute must have at least :min items.',
-    'not_in'                          => 'The selected :attribute is invalid.',
+    'not_in'                           => 'The selected :attribute is invalid.',
-    'numeric'                         => 'The :attribute must be a number.',
+    'numeric'                          => 'The :attribute must be a number.',
-    'scientific_notation'             => 'The :attribute cannot use the scientific notation.',
+    'scientific_notation'              => 'The :attribute cannot use the scientific notation.',
-    'numeric_native'                  => 'The native amount must be a number.',
+    'numeric_native'                   => 'The native amount must be a number.',
-    'numeric_destination'             => 'The destination amount must be a number.',
+    'numeric_destination'              => 'The destination amount must be a number.',
-    'numeric_source'                  => 'The source amount must be a number.',
+    'numeric_source'                   => 'The source amount must be a number.',
-    'regex'                           => 'The :attribute format is invalid.',
+    'generic_invalid'                  => 'This value is invalid.',
-    'required'                        => 'The :attribute field is required.',
+    'regex'                            => 'The :attribute format is invalid.',
-    'required_if'                     => 'The :attribute field is required when :other is :value.',
+    'required'                         => 'The :attribute field is required.',
-    'required_unless'                 => 'The :attribute field is required unless :other is in :values.',
+    'required_if'                      => 'The :attribute field is required when :other is :value.',
-    'required_with'                   => 'The :attribute field is required when :values is present.',
+    'required_unless'                  => 'The :attribute field is required unless :other is in :values.',
-    'required_with_all'               => 'The :attribute field is required when :values is present.',
+    'required_with'                    => 'The :attribute field is required when :values is present.',
-    'required_without'                => 'The :attribute field is required when :values is not present.',
+    'required_with_all'                => 'The :attribute field is required when :values is present.',
-    'required_without_all'            => 'The :attribute field is required when none of :values are present.',
+    'required_without'                 => 'The :attribute field is required when :values is not present.',
-    'same'                            => 'The :attribute and :other must match.',
+    'required_without_all'             => 'The :attribute field is required when none of :values are present.',
-    'size.numeric'                    => 'The :attribute must be :size.',
+    'same'                             => 'The :attribute and :other must match.',
-    'amount_min_over_max'             => 'The minimum amount cannot be larger than the maximum amount.',
+    'size.numeric'                     => 'The :attribute must be :size.',
-    'size.file'                       => 'The :attribute must be :size kilobytes.',
+    'amount_min_over_max'              => 'The minimum amount cannot be larger than the maximum amount.',
-    'size.string'                     => 'The :attribute must be :size characters.',
+    'size.file'                        => 'The :attribute must be :size kilobytes.',
-    'size.array'                      => 'The :attribute must contain :size items.',
+    'size.string'                      => 'The :attribute must be :size characters.',
-    'unique'                          => 'The :attribute has already been taken.',
+    'size.array'                       => 'The :attribute must contain :size items.',
-    'string'                          => 'The :attribute must be a string.',
+    'unique'                           => 'The :attribute has already been taken.',
-    'url'                             => 'The :attribute format is invalid.',
+    'string'                           => 'The :attribute must be a string.',
-    'timezone'                        => 'The :attribute must be a valid zone.',
+    'url'                              => 'The :attribute format is invalid.',
-    '2fa_code'                        => 'The :attribute field is invalid.',
+    'timezone'                         => 'The :attribute must be a valid zone.',
-    'dimensions'                      => 'The :attribute has invalid image dimensions.',
+    '2fa_code'                         => 'The :attribute field is invalid.',
-    'distinct'                        => 'The :attribute field has a duplicate value.',
+    'dimensions'                       => 'The :attribute has invalid image dimensions.',
-    'file'                            => 'The :attribute must be a file.',
+    'distinct'                         => 'The :attribute field has a duplicate value.',
-    'in_array'                        => 'The :attribute field does not exist in :other.',
+    'file'                             => 'The :attribute must be a file.',
-    'present'                         => 'The :attribute field must be present.',
+    'in_array'                         => 'The :attribute field does not exist in :other.',
-    'amount_zero'                     => 'The total amount cannot be zero.',
+    'present'                          => 'The :attribute field must be present.',
-    'current_target_amount'           => 'The current amount must be less than the target amount.',
+    'amount_zero'                      => 'The total amount cannot be zero.',
-    'unique_piggy_bank_for_user'      => 'The name of the piggy bank must be unique.',
+    'current_target_amount'            => 'The current amount must be less than the target amount.',
-    'unique_object_group'             => 'The group name must be unique',
+    'unique_piggy_bank_for_user'       => 'The name of the piggy bank must be unique.',
-    'starts_with'                     => 'The value must start with :values.',
+    'unique_object_group'              => 'The group name must be unique',
-    'unique_webhook'                  => 'You already have a webhook with this combination of URL, trigger, response and delivery.',
+    'starts_with'                      => 'The value must start with :values.',
-    'unique_existing_webhook'         => 'You already have another webhook with this combination of URL, trigger, response and delivery.',
+    'unique_webhook'                   => 'You already have a webhook with this combination of URL, trigger, response and delivery.',
-    'same_account_type'               => 'Both accounts must be of the same account type',
+    'unique_existing_webhook'          => 'You already have another webhook with this combination of URL, trigger, response and delivery.',
-    'same_account_currency'           => 'Both accounts must have the same currency setting',
+    'same_account_type'                => 'Both accounts must be of the same account type',
+    'same_account_currency'            => 'Both accounts must have the same currency setting',
+    'piggy_no_change_currency'         => 'Because there are piggy banks linked to this account, you cannot change the currency of the account.',
 
 
 
-    'secure_password'                 => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
+    'secure_password'                  => 'This is not a secure password. Please try again. For more information, visit https://bit.ly/FF3-password',
-    'valid_recurrence_rep_type'       => 'Invalid repetition type for recurring transactions.',
+    'valid_recurrence_rep_type'        => 'Invalid repetition type for recurring transactions.',
-    'valid_recurrence_rep_moment'     => 'Invalid repetition moment for this type of repetition.',
+    'valid_recurrence_rep_moment'      => 'Invalid repetition moment for this type of repetition.',
-    'invalid_account_info'            => 'Invalid account information.',
+    'invalid_account_info'             => 'Invalid account information.',
-    'attributes'                      => [
+    'attributes'                       => [
         'email'                   => 'email address',
         'description'             => 'description',
         'amount'                  => 'amount',
@@ -223,59 +225,59 @@ return [
     ],
 
     // validation of accounts:
-    'withdrawal_source_need_data'     => 'Need to get a valid source account ID and/or valid source account name to continue.',
+    'withdrawal_source_need_data'      => 'Need to get a valid source account ID and/or valid source account name to continue.',
-    'withdrawal_source_bad_data'      => '[a] Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'withdrawal_source_bad_data'       => '[a] Could not find a valid source account when searching for ID ":id" or name ":name".',
-    'withdrawal_dest_need_data'       => '[a] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'withdrawal_dest_need_data'        => '[a] Need to get a valid destination account ID and/or valid destination account name to continue.',
-    'withdrawal_dest_bad_data'        => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
+    'withdrawal_dest_bad_data'         => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
 
-    'withdrawal_dest_iban_exists'     => 'This destination account IBAN is already in use by an asset account or a liability and cannot be used as a withdrawal destination.',
+    'withdrawal_dest_iban_exists'      => 'This destination account IBAN is already in use by an asset account or a liability and cannot be used as a withdrawal destination.',
-    'deposit_src_iban_exists'         => 'This source account IBAN is already in use by an asset account or a liability and cannot be used as a deposit source.',
+    'deposit_src_iban_exists'          => 'This source account IBAN is already in use by an asset account or a liability and cannot be used as a deposit source.',
 
-    'reconciliation_source_bad_data'  => 'Could not find a valid reconciliation account when searching for ID ":id" or name ":name".',
+    'reconciliation_source_bad_data'   => 'Could not find a valid reconciliation account when searching for ID ":id" or name ":name".',
 
-    'generic_source_bad_data'         => '[e] Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'generic_source_bad_data'          => '[e] Could not find a valid source account when searching for ID ":id" or name ":name".',
 
-    'deposit_source_need_data'        => 'Need to get a valid source account ID and/or valid source account name to continue.',
+    'deposit_source_need_data'         => 'Need to get a valid source account ID and/or valid source account name to continue.',
-    'deposit_source_bad_data'         => '[b] Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'deposit_source_bad_data'          => '[b] Could not find a valid source account when searching for ID ":id" or name ":name".',
-    'deposit_dest_need_data'          => '[b] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'deposit_dest_need_data'           => '[b] Need to get a valid destination account ID and/or valid destination account name to continue.',
-    'deposit_dest_bad_data'           => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
+    'deposit_dest_bad_data'            => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
-    'deposit_dest_wrong_type'         => 'The submitted destination account is not of the right type.',
+    'deposit_dest_wrong_type'          => 'The submitted destination account is not of the right type.',
 
 
 
-    'transfer_source_need_data'       => 'Need to get a valid source account ID and/or valid source account name to continue.',
+    'transfer_source_need_data'        => 'Need to get a valid source account ID and/or valid source account name to continue.',
-    'transfer_source_bad_data'        => '[c] Could not find a valid source account when searching for ID ":id" or name ":name".',
+    'transfer_source_bad_data'         => '[c] Could not find a valid source account when searching for ID ":id" or name ":name".',
-    'transfer_dest_need_data'         => '[c] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'transfer_dest_need_data'          => '[c] Need to get a valid destination account ID and/or valid destination account name to continue.',
-    'transfer_dest_bad_data'          => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
+    'transfer_dest_bad_data'           => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
-    'need_id_in_edit'                 => 'Each split must have transaction_journal_id (either valid ID or 0).',
+    'need_id_in_edit'                  => 'Each split must have transaction_journal_id (either valid ID or 0).',
 
-    'ob_source_need_data'             => 'Need to get a valid source account ID and/or valid source account name to continue.',
+    'ob_source_need_data'              => 'Need to get a valid source account ID and/or valid source account name to continue.',
-    'lc_source_need_data'             => 'Need to get a valid source account ID to continue.',
+    'lc_source_need_data'              => 'Need to get a valid source account ID to continue.',
-    'ob_dest_need_data'               => '[d] Need to get a valid destination account ID and/or valid destination account name to continue.',
+    'ob_dest_need_data'                => '[d] Need to get a valid destination account ID and/or valid destination account name to continue.',
-    'ob_dest_bad_data'                => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
+    'ob_dest_bad_data'                 => 'Could not find a valid destination account when searching for ID ":id" or name ":name".',
-    'reconciliation_either_account'   => 'To submit a reconciliation, you must submit either a source or a destination account. Not both, not neither.',
+    'reconciliation_either_account'    => 'To submit a reconciliation, you must submit either a source or a destination account. Not both, not neither.',
 
-    'generic_invalid_source'          => 'You can\'t use this account as the source account.',
+    'generic_invalid_source'           => 'You can\'t use this account as the source account.',
-    'generic_invalid_destination'     => 'You can\'t use this account as the destination account.',
+    'generic_invalid_destination'      => 'You can\'t use this account as the destination account.',
 
-    'generic_no_source'               => 'You must submit source account information or submit a transaction journal ID.',
+    'generic_no_source'                => 'You must submit source account information or submit a transaction journal ID.',
-    'generic_no_destination'          => 'You must submit destination account information or submit a transaction journal ID.',
+    'generic_no_destination'           => 'You must submit destination account information or submit a transaction journal ID.',
 
-    'gte.numeric'                     => 'The :attribute must be greater than or equal to :value.',
+    'gte.numeric'                      => 'The :attribute must be greater than or equal to :value.',
-    'gt.numeric'                      => 'The :attribute must be greater than :value.',
+    'gt.numeric'                       => 'The :attribute must be greater than :value.',
-    'gte.file'                        => 'The :attribute must be greater than or equal to :value kilobytes.',
+    '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.string'                       => 'The :attribute must be greater than or equal to :value characters.',
-    'gte.array'                       => 'The :attribute must have :value items or more.',
+    'gte.array'                        => 'The :attribute must have :value items or more.',
-    'missing_with'                    => 'The :attribute cannot be combined with another field.',
+    'missing_with'                     => 'The :attribute cannot be combined with another field.',
 
-    'amount_required_for_auto_budget' => 'The amount is required.',
+    'amount_required_for_auto_budget'  => 'The amount is required.',
-    'auto_budget_amount_positive'     => 'The amount must be more than zero.',
+    'auto_budget_amount_positive'      => 'The amount must be more than zero.',
 
-    'auto_budget_period_mandatory'    => 'The auto budget period is a mandatory field.',
+    'auto_budget_period_mandatory'     => 'The auto budget period is a mandatory field.',
 
     // no access to administration:
-    'no_auth_user_group'              => 'You have to be logged in to access this administration.',
+    'no_auth_user_group'               => 'You have to be logged in to access this administration.',
-    'no_access_user_group'            => 'You do not have the correct access rights for this administration.',
+    'no_access_user_group'             => 'You do not have the correct access rights for this administration.',
-    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
+    'administration_owner_rename'      => 'You can\'t rename your standard administration.',
-    'existing_mfa_code'               => 'Please enter a valid code',
+    'existing_mfa_code'                => 'Please enter a valid code',
 ];

resources/views/debug.twig

@@ -13,7 +13,7 @@
 </p>
 <textarea rows="30" cols="100" name="debug_info" id="debug_info"
           style="font-family:Menlo, Monaco, Consolas, monospace;font-size:8pt;">
-Debug information generated at {{ now }} for Firefly III version **v{{ FF_VERSION }}**.
+Debug information generated at {{ now }} for Firefly III version **{% if not FF_IS_DEVELOP %}v{% endif %}{{ FF_VERSION }}**.
 
 {{ table|escape('html') }}
 </textarea>

resources/views/partials/debug-table.twig

@@ -12,7 +12,7 @@
     {# Firefly III version #}
     <tr>
         <td>Firefly III</td>
-        <td>{% if FF_VERSION starts with 'develop' %}{{ FF_VERSION }}{% else %}{{ FF_VERSION }}{% endif %} / v{{ config('firefly.api_version') }} / {{ system.db_version }} (exp. {{ config('firefly.db_version') }})
+        <td>{% if FF_IS_DEVELOP %}<!-- .Z9JBCmw64Zkx1pQw -->{% endif %}{% if not FF_IS_DEVELOP %}v{% endif %}{{ FF_VERSION }} / <span>#</span>{{ system.db_version }} (expects <span>#</span>{{ config('firefly.db_version') }})
         </td>
     </tr>
     {# PHP version + settings #}
@@ -83,8 +83,8 @@
         <td>{{ config('logging.level') }}, {{ config('logging.default') }} / {{ app.audit_log_channel }}</td>
     </tr>
     <tr>
-        <td>Cache driver</td>
+        <td>Cache driver, session driver</td>
-        <td>{{ config('cache.default') }}</td>
+        <td>{{ config('cache.default') }}, {{ config('session.driver') }}</td>
     </tr>
     <tr>
         <td>Default language and locale</td>
@@ -92,7 +92,7 @@
     </tr>
     <tr>
         <td>Trusted proxies</td>
-        <td>{{ config('firefly.trusted_proxies')|escape }}</td>
+        <td><code>{{ config('firefly.trusted_proxies')|escape }}</code></td>
     </tr>
     <tr>
         <td>Login provider & user guard</td>
@@ -114,6 +114,10 @@
         <td>Mailer</td>
         <td>{{ config('mail.default') }}</td>
     </tr>
+    <tr>
+        <td>Exchange rates</td>
+        <td>{% if config('cer.enabled') %}Enabled{% else %}Disabled{% endif %}, downloads {% if config('cer.download_enabled') %}enabled{% else %}disabled{% endif %}</td>
+    </tr>
     </tbody>
 </table>
 
@@ -136,6 +140,10 @@
         <td>User flags</td>
         <td>{{ user.user_flags | raw }}</td>
     </tr>
+    <tr>
+        <td>Convert to native currency?</td>
+        <td>{% if user.convert_to_native %}Enabled{% else %}Disabled{% endif %}</td>
+    </tr>
     <tr>
         <td>Session start</td>
         <td>{{ session('start') }}</td>

routes/api-noauth.php

@@ -23,11 +23,14 @@
 declare(strict_types=1);
 
 // Cron job API routes:
+use FireflyIII\Http\Middleware\AcceptHeaders;
+
 Route::group(
     [
-        'namespace' => 'FireflyIII\Api\V1\Controllers\System',
+        'namespace'  => 'FireflyIII\Api\V1\Controllers\System',
-        'prefix'    => '',
+        'prefix'     => '',
-        'as'        => 'api.v1.cron.',
+        'as'         => 'api.v1.cron.',
+        'middleware' => [AcceptHeaders::class],
     ],
     static function (): void {
         Route::get('{cliToken}', ['uses' => 'CronController@cron', 'as' => 'index']);

routes/api.php

@@ -22,12 +22,6 @@
 
 declare(strict_types=1);
 
-use FireflyIII\Api\V2\Controllers\JsonApi\AccountController;
-use LaravelJsonApi\Laravel\Facades\JsonApiRoute;
-use LaravelJsonApi\Laravel\Http\Controllers\JsonApiController;
-use LaravelJsonApi\Laravel\Routing\Relationships;
-use LaravelJsonApi\Laravel\Routing\ResourceRegistrar;
-
 /*
  *
  * ____    ____  ___      .______        ______    __    __  .___________. _______     _______.
@@ -105,27 +99,6 @@ Route::group(
     }
 );
 
-// exchange rates
-Route::group(
-    [
-        'namespace' => 'FireflyIII\Api\V2\Controllers\Model\ExchangeRate',
-        'prefix'    => 'v2/exchange-rates',
-        'as'        => 'api.v2.exchange-rates.',
-    ],
-    static function (): void {
-        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
-        Route::get('rates/{fromCurrencyCode}/{toCurrencyCode}', ['uses' => 'ShowController@show', 'as' => 'show']);
-        Route::delete('rates/{fromCurrencyCode}/{toCurrencyCode}', ['uses' => 'DestroyController@destroy', 'as' => 'destroy']);
-        Route::put('{userGroupExchangeRate}', ['uses' => 'UpdateController@update', 'as' => 'update']);
-        Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
-        //
-        //        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 API route for Summary boxes
 // BASIC
@@ -336,6 +309,24 @@ Route::group(
     }
 );
 
+// exchange rates
+Route::group(
+    [
+        'namespace' => 'FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate',
+        'prefix'    => 'v1/exchange-rates',
+        'as'        => 'api.v1.exchange-rates.',
+    ],
+    static function (): void {
+        Route::get('', ['uses' => 'IndexController@index', 'as' => 'index']);
+        Route::get('rates/{fromCurrencyCode}/{toCurrencyCode}', ['uses' => 'ShowController@show', 'as' => 'show']);
+        Route::get('{userGroupExchangeRate}', ['uses' => 'ShowController@showSingle', 'as' => 'show.single']);
+        Route::delete('rates/{fromCurrencyCode}/{toCurrencyCode}', ['uses' => 'DestroyController@destroy', 'as' => 'destroy']);
+        Route::delete('{userGroupExchangeRate}', ['uses' => 'DestroyController@destroySingle', 'as' => 'destroy.single']);
+        Route::put('{userGroupExchangeRate}', ['uses' => 'UpdateController@update', 'as' => 'update']);
+        Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
+    }
+);
+
 // CHART ROUTES.
 // Chart accounts
 Route::group(
@@ -804,6 +795,7 @@ Route::group(
         Route::get('', ['uses' => 'ShowController@index', 'as' => 'index']);
         Route::post('', ['uses' => 'StoreController@store', 'as' => 'store']);
         Route::get('default', ['uses' => 'ShowController@showDefault', 'as' => 'show.default']);
+        Route::get('native', ['uses' => 'ShowController@showDefault', 'as' => 'show.native']);
         Route::get('{currency_code}', ['uses' => 'ShowController@show', 'as' => 'show']);
         Route::put('{currency_code}', ['uses' => 'UpdateController@update', 'as' => 'update']);
         Route::delete('{currency_code}', ['uses' => 'DestroyController@destroy', 'as' => 'delete']);