Auto commit for release 'develop' on 2025-02-08

# Conflicts:
#	app/Support/Steam.php

.github/label-actions.yml

@@ -9,9 +9,9 @@ fixed:
 
       This is an automatic reply. `Share and enjoy`
 
-      This issue has been marked as fixed. The bug, feature or enhancement will become a part of Firefly III or the data importer in due course. Thanks for reporting!
+      This issue has been marked as fixed. Thanks for reporting! A new version will be released in due time. Unfortunately, [I cannot give an estimate](https://docs.firefly-iii.org/references/faq/firefly-iii/general/#when-will-you-release-version-the-next-version), but [the roadmap](https://roadmap.firefly-iii.org/) is available for your reading pleasure.
 
-      A new version will be released in due time. Unfortunately, [I cannot give an estimate](https://docs.firefly-iii.org/references/faq/firefly-iii/general/#when-will-you-release-version-the-next-version), but [the roadmap](https://roadmap.firefly-iii.org/) is available for your reading pleasure.
+      There is no need to close the issue. It will be closed automatically.
 
       Thank you for your contributions.
 feature:
@@ -23,7 +23,7 @@ feature:
 
       This is an automatic reply. `Share and enjoy`
 
-      This issue has been marked as a feature request. The requested (new) feature will become a part of Firefly III or the data importer in due course.
+      This issue has been marked as a feature request.
 
       If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
 
@@ -54,7 +54,7 @@ enhancement:
 
       This is an automatic reply. `Share and enjoy`
 
-      This issue has been marked as an enhancement. The requested enhancement to an existing feature will become a part of Firefly III or the data importer in due course.
+      This issue has been marked as an enhancement.
 
       If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
 

.github/workflows/closed-issues.yml

@@ -8,7 +8,7 @@ jobs:
   command_and_close:
     runs-on: ubuntu-latest
     steps:
-      - uses: aws-actions/closed-issue-message@v1
+      - uses: aws-actions/closed-issue-message@v2
         with:
           message: |
             Hi there! This is an automatic reply. `Share and enjoy`

THANKS.md

@@ -3,6 +3,9 @@
 Over time, many people have contributed to Firefly III. Their efforts are not always visible, but always remembered and appreciated.
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
 
+## 2025
+- SoftBrix
+
 ## 2024
 - Sobuno
 - TasneemTantawy

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

@@ -83,6 +83,9 @@ class AccountController extends Controller
         $return = [];
         $result = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));
 
+        // set date to end-of-day for account balance.
+        $date->endOfDay();
+
         /** @var Account $account */
         foreach ($result as $account) {
             $nameWithBalance = $account->name;

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

@@ -32,6 +32,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -80,6 +81,10 @@ class AccountController extends Controller
         /** @var Carbon $end */
         $end        = $dates['end'];
 
+        // set dates to end of day + start of day:
+        $start->startOfDay();
+        $end->endOfDay();
+
         // user's preferences
         $defaultSet = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray();
 
@@ -113,7 +118,7 @@ class AccountController extends Controller
             ];
             // TODO this code is also present in the V2 chart account controller so this method is due to be deprecated.
             $currentStart = clone $start;
-            $range        = app('steam')->finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
+            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
             $previous     = array_values($range)[0][$field];
             while ($currentStart <= $end) {
                 $format                        = $currentStart->format('Y-m-d');

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

@@ -57,11 +57,11 @@ class IndexController extends Controller
 
     public function index(): JsonResponse
     {
-        $piggies     = $this->repository->getAll();
+        $entries     = $this->repository->getAll();
         $pageSize    = $this->parameters->get('limit');
-        $count       = $piggies->count();
-        $piggies     = $piggies->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-        $paginator   = new LengthAwarePaginator($piggies, $count, $pageSize, $this->parameters->get('page'));
+        $count       = $entries->count();
+        $entries     = $entries->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator   = new LengthAwarePaginator($entries, $count, $pageSize, $this->parameters->get('page'));
         $transformer = new ExchangeRateTransformer();
         $transformer->setParameters($this->parameters); // give params to transformer
 

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

@@ -31,6 +31,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Chart\ChartData;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
@@ -118,7 +119,7 @@ class AccountController extends Controller
             'native_entries'                 => [],
         ];
         $currentStart   = clone $params['start'];
-        $range          = app('steam')->finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToNative);
+        $range          = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToNative);
 
         $previous       = array_values($range)[0]['balance'];
         $previousNative = array_values($range)[0]['native_balance'];

app/Console/Commands/Export/ExportsData.php

@@ -57,7 +57,7 @@ class ExportsData extends Command
     {--export-tags : Create a file with all your tags and some meta data.}
     {--export-recurring : Create a file with all your recurring transactions and some meta data.}
     {--export-rules : Create a file with all your rules and some meta data.}
-    {--export-bills : Create a file with all your bills and some meta data.}
+    {--export-subscriptions : Create a file with all your subscriptions and some meta data.}
     {--export-piggies : Create a file with all your piggy banks and some meta data.}
     {--force : Force overwriting of previous exports if found.}';
     private AccountRepositoryInterface $accountRepository;
@@ -106,7 +106,7 @@ class ExportsData extends Command
         $exporter->setExportTags($options['export']['tags']);
         $exporter->setExportRecurring($options['export']['recurring']);
         $exporter->setExportRules($options['export']['rules']);
-        $exporter->setExportBills($options['export']['bills']);
+        $exporter->setExportBills($options['export']['subscriptions']);
         $exporter->setExportPiggies($options['export']['piggies']);
         $data       = $exporter->export();
         if (0 === count($data)) {
@@ -157,7 +157,7 @@ class ExportsData extends Command
                 'tags'         => $this->option('export-tags'),
                 'recurring'    => $this->option('export-recurring'),
                 'rules'        => $this->option('export-rules'),
-                'bills'        => $this->option('export-bills'),
+                'bills'        => $this->option('export-subscriptions'),
                 'piggies'      => $this->option('export-piggies'),
             ],
             'start'     => $start,

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -54,6 +54,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $dayBefore   = clone $this->start;
         $dayBefore->subDay();
 
+        // move to end of day
+        $dayBefore->endOfDay();
+
         /** @var Account $account */
         foreach ($this->accounts as $account) {
             // balance the day before:

app/Handlers/Events/StoredGroupEventHandler.php

@@ -38,10 +38,17 @@ use Illuminate\Support\Collection;
  */
 class StoredGroupEventHandler
 {
+    public function runAllHandlers(StoredTransactionGroup $event): void
+    {
+        $this->processRules($event);
+        $this->recalculateCredit($event);
+        $this->triggerWebhooks($event);
+    }
+
     /**
      * This method grabs all the users rules and processes them.
      */
-    public function processRules(StoredTransactionGroup $storedGroupEvent): void
+    private function processRules(StoredTransactionGroup $storedGroupEvent): void
     {
         if (false === $storedGroupEvent->applyRules) {
             app('log')->info(sprintf('Will not run rules on group #%d', $storedGroupEvent->transactionGroup->id));
@@ -76,7 +83,7 @@ class StoredGroupEventHandler
         $newRuleEngine->fire();
     }
 
-    public function recalculateCredit(StoredTransactionGroup $event): void
+    private function recalculateCredit(StoredTransactionGroup $event): void
     {
         $group  = $event->transactionGroup;
 
@@ -89,7 +96,7 @@ class StoredGroupEventHandler
     /**
      * This method processes all webhooks that respond to the "stored transaction group" trigger (100)
      */
-    public function triggerWebhooks(StoredTransactionGroup $storedGroupEvent): void
+    private function triggerWebhooks(StoredTransactionGroup $storedGroupEvent): void
     {
         app('log')->debug(__METHOD__);
         $group  = $storedGroupEvent->transactionGroup;

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -41,10 +41,19 @@ use Illuminate\Support\Collection;
  */
 class UpdatedGroupEventHandler
 {
+    public function runAllHandlers(UpdatedTransactionGroup $event): void
+    {
+        $this->unifyAccounts($event);
+        $this->processRules($event);
+        $this->recalculateCredit($event);
+        $this->triggerWebhooks($event);
+
+    }
+
     /**
      * This method will check all the rules when a journal is updated.
      */
-    public function processRules(UpdatedTransactionGroup $updatedGroupEvent): void
+    private function processRules(UpdatedTransactionGroup $updatedGroupEvent): void
     {
         if (false === $updatedGroupEvent->applyRules) {
             app('log')->info(sprintf('Will not run rules on group #%d', $updatedGroupEvent->transactionGroup->id));
@@ -76,7 +85,7 @@ class UpdatedGroupEventHandler
         $newRuleEngine->fire();
     }
 
-    public function recalculateCredit(UpdatedTransactionGroup $event): void
+    private function recalculateCredit(UpdatedTransactionGroup $event): void
     {
         $group  = $event->transactionGroup;
 
@@ -86,7 +95,7 @@ class UpdatedGroupEventHandler
         $object->recalculate();
     }
 
-    public function triggerWebhooks(UpdatedTransactionGroup $updatedGroupEvent): void
+    private function triggerWebhooks(UpdatedTransactionGroup $updatedGroupEvent): void
     {
         app('log')->debug(__METHOD__);
         $group  = $updatedGroupEvent->transactionGroup;

app/Handlers/Observer/AccountObserver.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Account;
 use FireflyIII\Models\PiggyBank;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
@@ -52,6 +53,7 @@ class AccountObserver
         $currency     = $repository->getAccountCurrency($account);
         if (null !== $currency && $currency->id !== $userCurrency->id && '' !== (string) $account->virtual_balance && 0 !== bccomp($account->virtual_balance, '0')) {
             $converter                       = new ExchangeRateConverter();
+            $converter->setUserGroup($account->user->userGroup);
             $converter->setIgnoreSettings(true);
             $account->native_virtual_balance = $converter->convert($currency, $userCurrency, today(), $account->virtual_balance);
 
@@ -72,12 +74,15 @@ class AccountObserver
         //        app('log')->debug('Observe "deleting" of an account.');
         $account->accountMeta()->delete();
 
+        $repository = app(AttachmentRepositoryInterface::class);
+        $repository->setUser($account->user);
+
         /** @var PiggyBank $piggy */
         foreach ($account->piggyBanks()->get() as $piggy) {
             $piggy->accounts()->detach($account);
         }
         foreach ($account->attachments()->get() as $attachment) {
-            $attachment->delete();
+            $repository->destroy($attachment);
         }
         foreach ($account->transactions()->get() as $transaction) {
             $transaction->delete();

app/Handlers/Observer/AutoBudgetObserver.php

@@ -52,6 +52,7 @@ class AutoBudgetObserver
         $autoBudget->native_amount = null;
         if ($autoBudget->transactionCurrency->id !== $userCurrency->id) {
             $converter                 = new ExchangeRateConverter();
+            $converter->setUserGroup($autoBudget->budget->user->userGroup);
             $converter->setIgnoreSettings(true);
             $autoBudget->native_amount = $converter->convert($autoBudget->transactionCurrency, $userCurrency, today(), $autoBudget->amount);
         }

app/Handlers/Observer/BillObserver.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Bill;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Facades\Log;
@@ -41,9 +42,12 @@ class BillObserver
 
     public function deleting(Bill $bill): void
     {
+        $repository = app(AttachmentRepositoryInterface::class);
+        $repository->setUser($bill->user);
+
         //        app('log')->debug('Observe "deleting" of a bill.');
         foreach ($bill->attachments()->get() as $attachment) {
-            $attachment->delete();
+            $repository->destroy($attachment);
         }
         $bill->notes()->delete();
     }
@@ -64,6 +68,7 @@ class BillObserver
         $bill->native_amount_max = null;
         if ($bill->transactionCurrency->id !== $userCurrency->id) {
             $converter               = new ExchangeRateConverter();
+            $converter->setUserGroup($bill->user->userGroup);
             $converter->setIgnoreSettings(true);
             $bill->native_amount_min = $converter->convert($bill->transactionCurrency, $userCurrency, today(), $bill->amount_min);
             $bill->native_amount_max = $converter->convert($bill->transactionCurrency, $userCurrency, today(), $bill->amount_max);

app/Handlers/Observer/BudgetLimitObserver.php

@@ -54,6 +54,7 @@ class BudgetLimitObserver
         $budgetLimit->native_amount = null;
         if ($budgetLimit->transactionCurrency->id !== $userCurrency->id) {
             $converter                  = new ExchangeRateConverter();
+            $converter->setUserGroup($budgetLimit->budget->user->userGroup);
             $converter->setIgnoreSettings(true);
             $budgetLimit->native_amount = $converter->convert($budgetLimit->transactionCurrency, $userCurrency, today(), $budgetLimit->amount);
         }

app/Handlers/Observer/BudgetObserver.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 
 /**
  * Class BudgetObserver
@@ -34,8 +35,12 @@ class BudgetObserver
     public function deleting(Budget $budget): void
     {
         app('log')->debug('Observe "deleting" of a budget.');
+
+        $repository   = app(AttachmentRepositoryInterface::class);
+        $repository->setUser($budget->user);
+
         foreach ($budget->attachments()->get() as $attachment) {
-            $attachment->delete();
+            $repository->destroy($attachment);
         }
         $budgetLimits = $budget->budgetlimits()->get();
 

app/Handlers/Observer/CategoryObserver.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Category;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 
 /**
  * Class CategoryObserver
@@ -33,8 +34,12 @@ class CategoryObserver
     public function deleting(Category $category): void
     {
         app('log')->debug('Observe "deleting" of a category.');
+
+        $repository = app(AttachmentRepositoryInterface::class);
+        $repository->setUser($category->user);
+
         foreach ($category->attachments()->get() as $attachment) {
-            $attachment->delete();
+            $repository->destroy($attachment);
         }
         $category->notes()->delete();
     }

app/Handlers/Observer/PiggyBankEventObserver.php

@@ -52,6 +52,7 @@ class PiggyBankEventObserver
         $event->native_amount = null;
         if ($event->piggyBank->transactionCurrency->id !== $userCurrency->id) {
             $converter            = new ExchangeRateConverter();
+            $converter->setUserGroup($event->piggyBank->accounts()->first()->user->userGroup);
             $converter->setIgnoreSettings(true);
             $event->native_amount = $converter->convert($event->piggyBank->transactionCurrency, $userCurrency, today(), $event->amount);
         }

app/Handlers/Observer/PiggyBankObserver.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\PiggyBank;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Facades\Log;
 
@@ -46,8 +47,11 @@ class PiggyBankObserver
     {
         app('log')->debug('Observe "deleting" of a piggy bank.');
 
+        $repository = app(AttachmentRepositoryInterface::class);
+        $repository->setUser($piggyBank->accounts()->first()->user);
+
         foreach ($piggyBank->attachments()->get() as $attachment) {
-            $attachment->delete();
+            $repository->destroy($attachment);
         }
 
         $piggyBank->piggyBankEvents()->delete();

app/Handlers/Observer/RecurrenceObserver.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Recurrence;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 
 /**
  * Class RecurrenceObserver
@@ -33,8 +34,12 @@ class RecurrenceObserver
     public function deleting(Recurrence $recurrence): void
     {
         app('log')->debug('Observe "deleting" of a recurrence.');
+
+        $repository = app(AttachmentRepositoryInterface::class);
+        $repository->setUser($recurrence->user);
+
         foreach ($recurrence->attachments()->get() as $attachment) {
-            $attachment->delete();
+            $repository->destroy($attachment);
         }
 
         $recurrence->recurrenceRepetitions()->delete();

app/Handlers/Observer/TagObserver.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Tag;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 
 /**
  * Class TagObserver
@@ -34,8 +35,11 @@ class TagObserver
     {
         app('log')->debug('Observe "deleting" of a tag.');
 
+        $repository = app(AttachmentRepositoryInterface::class);
+        $repository->setUser($tag->user);
+
         foreach ($tag->attachments()->get() as $attachment) {
-            $attachment->delete();
+            $repository->destroy($attachment);
         }
 
         $tag->locations()->delete();

app/Handlers/Observer/TransactionJournalObserver.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 
 /**
  * Class TransactionJournalObserver
@@ -34,6 +35,10 @@ class TransactionJournalObserver
     {
         app('log')->debug('Observe "deleting" of a transaction journal.');
 
+        $repository = app(AttachmentRepositoryInterface::class);
+        $repository->setUser($transactionJournal->user);
+
+
         // to make sure the listener doesn't get back to use and loop
         TransactionJournal::withoutEvents(static function () use ($transactionJournal): void {
             foreach ($transactionJournal->transactions()->get() as $transaction) {
@@ -41,7 +46,7 @@ class TransactionJournalObserver
             }
         });
         foreach ($transactionJournal->attachments()->get() as $attachment) {
-            $attachment->delete();
+            $repository->destroy($attachment);
         }
         $transactionJournal->locations()->delete();
         $transactionJournal->sourceJournalLinks()->delete();

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -167,6 +167,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'external_id');
         $this->query->where('journal_meta.data', '!=', sprintf('%s', json_encode($externalId)));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -405,6 +406,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'internal_reference');
         $this->query->whereLike('journal_meta.data', sprintf('%%%s%%', $internalReference));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -417,6 +419,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'internal_reference');
         $this->query->whereNotLike('journal_meta.data', sprintf('%%%s%%', $internalReference));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -429,6 +432,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'internal_reference');
         $this->query->whereNotLike('journal_meta.data', sprintf('%%%s"', $internalReference));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -441,6 +445,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'internal_reference');
         $this->query->whereLike('journal_meta.data', sprintf('"%s%%', $internalReference));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -453,6 +458,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'internal_reference');
         $this->query->whereLike('journal_meta.data', sprintf('%%%s"', $internalReference));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -465,6 +471,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'internal_reference');
         $this->query->whereLike('journal_meta.data', sprintf('"%s%%', $internalReference));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -697,6 +704,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'external_id');
         $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($externalId)));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -706,6 +714,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'external_url');
         $this->query->where('journal_meta.data', '=', json_encode($url));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -718,6 +727,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'internal_reference');
         $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($internalReference)));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -727,6 +737,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'recurrence_id');
         $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($recurringId)));
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -862,6 +873,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'external_id');
         $this->query->whereNotNull('journal_meta.data');
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -871,6 +883,7 @@ trait MetaCollection
         $this->joinMetaDataTables();
         $this->query->where('journal_meta.name', '=', 'external_url');
         $this->query->whereNotNull('journal_meta.data');
+        $this->query->whereNull('journal_meta.deleted_at');
 
         return $this;
     }
@@ -915,10 +928,13 @@ trait MetaCollection
             $q1->where(static function (Builder $q2): void {
                 $q2->where('journal_meta.name', '=', 'external_id');
                 $q2->whereNull('journal_meta.data');
+                $q2->whereNull('journal_meta.deleted_at');
             })->orWhere(static function (Builder $q3): void {
                 $q3->where('journal_meta.name', '!=', 'external_id');
+                $q3->whereNull('journal_meta.deleted_at');
             })->orWhere(static function (Builder $q4): void {
                 $q4->whereNull('journal_meta.name');
+                $q4->whereNull('journal_meta.deleted_at');
             });
         });
 
@@ -933,10 +949,13 @@ trait MetaCollection
             $q1->where(static function (Builder $q2): void {
                 $q2->where('journal_meta.name', '=', 'external_url');
                 $q2->whereNull('journal_meta.data');
+                $q2->whereNull('journal_meta.deleted_at');
             })->orWhere(static function (Builder $q3): void {
                 $q3->where('journal_meta.name', '!=', 'external_url');
+                $q3->whereNull('journal_meta.deleted_at');
             })->orWhere(static function (Builder $q4): void {
                 $q4->whereNull('journal_meta.name');
+                $q4->whereNull('journal_meta.deleted_at');
             });
         });
 

app/Helpers/Collector/GroupCollector.php

@@ -100,7 +100,7 @@ class GroupCollector implements GroupCollectorInterface
             'category_id',
             'budget_id',
         ];
-        $this->stringFields         = ['amount', 'foreign_amount'];
+        $this->stringFields         = ['amount', 'foreign_amount', 'native_amount', 'native_foreign_amount'];
         $this->total                = 0;
         $this->fields               = [
             // group
@@ -714,6 +714,9 @@ class GroupCollector implements GroupCollectorInterface
                 if (null === $transaction['amount']) {
                     throw new FireflyException(sprintf('Amount is NULL for a transaction in group #%d, please investigate.', $groudId));
                 }
+                $nativeAmount                                           = (string) ('' === $transaction['native_amount'] ? '0' : $transaction['native_amount']);
+                $nativeForeignAmount                                    = (string) ('' === $transaction['native_foreign_amount'] ? '0' : $transaction['native_foreign_amount']);
+                $foreignAmount                                          = (string) ('' === $transaction['foreign_amount'] ? '0' : $transaction['foreign_amount']);
 
                 // set default:
                 if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) {
@@ -724,9 +727,8 @@ class GroupCollector implements GroupCollectorInterface
                     $groups[$groudId]['sums'][$currencyId]['amount']                  = '0';
                     $groups[$groudId]['sums'][$currencyId]['native_amount']           = '0';
                 }
-                $transaction['native_amount']                           = null === $transaction['native_amount'] ? '0' : $transaction['native_amount'];
                 $groups[$groudId]['sums'][$currencyId]['amount']        = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $transaction['amount']);
-                $groups[$groudId]['sums'][$currencyId]['native_amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['native_amount'], $transaction['native_amount']);
+                $groups[$groudId]['sums'][$currencyId]['native_amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['native_amount'], $nativeAmount);
 
                 if (null !== $transaction['foreign_amount'] && null !== $transaction['foreign_currency_id']) {
                     $currencyId                                             = (int) $transaction['foreign_currency_id'];
@@ -738,11 +740,10 @@ class GroupCollector implements GroupCollectorInterface
                         $groups[$groudId]['sums'][$currencyId]['currency_symbol']         = $transaction['foreign_currency_symbol'];
                         $groups[$groudId]['sums'][$currencyId]['currency_decimal_places'] = $transaction['foreign_currency_decimal_places'];
                         $groups[$groudId]['sums'][$currencyId]['amount']                  = '0';
-                        $groups[$groudId]['sums'][$currencyId]['save_amount']             = '0';
+                        $groups[$groudId]['sums'][$currencyId]['native_amount']           = '0';
                     }
-                    $transaction['native_foreign_amount']                   = null === $transaction['native_foreign_amount'] ? '0' : $transaction['native_foreign_amount'];
-                    $groups[$groudId]['sums'][$currencyId]['amount']        = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $transaction['foreign_amount']);
-                    $groups[$groudId]['sums'][$currencyId]['native_amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $transaction['native_foreign_amount']);
+                    $groups[$groudId]['sums'][$currencyId]['amount']        = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $foreignAmount);
+                    $groups[$groudId]['sums'][$currencyId]['native_amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $nativeForeignAmount);
                 }
             }
         }

app/Http/Controllers/Account/ReconcileController.php

@@ -108,11 +108,14 @@ class ReconcileController extends Controller
         if ($end->lt($start)) {
             [$start, $end] = [$end, $start];
         }
+        // move dates to end of day and start of day:
+        $start->startOfDay();
+        $end->endOfDay();
 
         $startDate       = clone $start;
-        $startDate->subDay();
-        $startBalance    = Steam::finalAccountBalance($account, $startDate)['balance'];
-        $endBalance      = Steam::finalAccountBalance($account, $end)['balance'];
+        $startDate->subDay()->endOfDay();
+        $startBalance    = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places);
+        $endBalance      = Steam::bcround(Steam::finalAccountBalance($account, $end)['balance'], $currency->decimal_places);
         $subTitleIcon    = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type));
         $subTitle        = (string) trans('firefly.reconcile_account', ['account' => $account->name]);
 

app/Http/Controllers/Account/ShowController.php

@@ -93,6 +93,11 @@ class ShowController extends Controller
         if ($end->lt($start)) {
             [$start, $end] = [$end, $start];
         }
+
+        // make sure dates are end of day and start of day:
+        $start->startOfDay();
+        $end->endOfDay();
+
         $location         = $this->repository->getLocation($account);
         $attachments      = $this->repository->getAttachments($account);
         $today            = today(config('app.timezone'));
@@ -181,6 +186,8 @@ class ShowController extends Controller
         $subTitle        = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]);
         $periods         = new Collection();
 
+        $end->endOfDay();
+
         /** @var GroupCollectorInterface $collector */
         $collector       = app(GroupCollectorInterface::class);
         $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page)->withAccountInformation()->withCategoryInformation();

app/Http/Controllers/Chart/AccountController.php

@@ -109,8 +109,8 @@ class AccountController extends Controller
         $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
-        $startBalances = app('steam')->finalAccountsBalance($accounts, $start);
-        $endBalances   = app('steam')->finalAccountsBalance($accounts, $end);
+        $startBalances = Steam::finalAccountsBalance($accounts, $start);
+        $endBalances   = Steam::finalAccountsBalance($accounts, $end);
 
         // loop the accounts, then check for balance and currency info.
         foreach ($accounts as $account) {
@@ -139,6 +139,7 @@ class AccountController extends Controller
                 }
                 // Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
                 $searchCode   = $this->convertToNative ? $this->defaultCurrency->code : $key;
+                $searchCode   = 'balance' === $searchCode || 'native_balance' === $searchCode ? $this->defaultCurrency->code : $searchCode;
                 // Log::debug(sprintf('Search code is %s', $searchCode));
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.
@@ -344,6 +345,9 @@ class AccountController extends Controller
         }
         $accounts       = $repository->getAccountsById($frontpageArray);
 
+        // move to end of day for $end.
+        $end->endOfDay();
+
         return response()->json($this->accountBalanceChart($accounts, $start, $end));
     }
 
@@ -416,7 +420,9 @@ class AccountController extends Controller
      */
     public function period(Account $account, Carbon $start, Carbon $end): JsonResponse
     {
-        Log::debug(sprintf('Now in period("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d')));
+        $start->startOfDay();
+        $end->endOfDay();
+        Log::debug(sprintf('Now in period("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
         $chartData       = [];
         $cache           = new CacheProperties();
         $cache->addProperty('chart.account.period');
@@ -431,7 +437,7 @@ class AccountController extends Controller
         // collect and filter balances for the entire period.
         $step            = $this->calculateStep($start, $end);
         Log::debug(sprintf('Step is %s', $step));
-        $locale          = app('steam')->getLocale();
+        $locale          = Steam::getLocale();
         $return          = [];
 
         // fix for issue https://github.com/firefly-iii/firefly-iii/issues/8041
@@ -442,11 +448,8 @@ class AccountController extends Controller
         $format          = (string) trans('config.month_and_day_js', [], $locale);
         $accountCurrency = $this->accountRepository->getAccountCurrency($account);
 
-        Log::debug('One');
         $range           = Steam::finalAccountBalanceInRange($account, $start, $end, $this->convertToNative);
-        Log::debug('Two');
         $range           = Steam::filterAccountBalances($range, $account, $this->convertToNative, $accountCurrency);
-        Log::debug('Three');
 
         // temp, get end balance.
         Log::debug('temp get end balance');
@@ -462,25 +465,32 @@ class AccountController extends Controller
         Log::debug('Balances exist at:');
         foreach ($range as $key => $value) {
             $newRange[] = ['date' => $key, 'info' => $value];
-            Log::debug(sprintf(' - %s', $key));
+            Log::debug(sprintf('%d - %s (%s)', count($newRange) - 1, $key, json_encode($value)));
         }
-        $carbon          = Carbon::createFromFormat('Y-m-d', $newRange[0]['date']);
+        $carbon          = Carbon::createFromFormat('Y-m-d', $newRange[0]['date'])->endOfDay();
+        Log::debug(sprintf('Start of loop, $carbon is %s', $carbon->format('Y-m-d H:i:s')));
         while ($end->gte($current)) {
             $momentBalance = $previous;
-            $theDate       = $current->format('Y-m-d');
-            while ($carbon->lte($current) && array_key_exists($expectedIndex, $newRange)) {
-                $momentBalance = $newRange[$expectedIndex]['info'];
-                Log::debug(sprintf('Expected index is %d!, date is %s, current is %s', $expectedIndex, $carbon->format('Y-m-d'), $current->format('Y-m-d')));
-                $carbon        = Carbon::createFromFormat('Y-m-d', $newRange[$expectedIndex]['date']);
-                ++$expectedIndex;
-            }
+            // $theDate       = $current->format('Y-m-d');
+            Log::debug(sprintf('Now at %s, with momentBalance %s', $current->format('Y-m-d H:i:s'), json_encode($momentBalance)));
 
+            // loop over the array with balances, find one that is earlier or on the same day.
+            while ($carbon->lte($current) && array_key_exists($expectedIndex, $newRange)) {
+                Log::debug(sprintf('[a] Expected index is %d, $carbon is %s, current is %s', $expectedIndex, $carbon->format('Y-m-d H:i:s'), $current->format('Y-m-d H:i:s')));
+
+                // grab the balance from that particular $expectedIndex
+                $momentBalance = $newRange[$expectedIndex]['info'];
+                ++$expectedIndex;
+
+                // make new carbon based on the next found date. this should stop the loop.
+                if (array_key_exists($expectedIndex, $newRange)) {
+                    $carbon = Carbon::createFromFormat('Y-m-d', $newRange[$expectedIndex]['date'])->endOfDay();
+                }
+            }
+            Log::debug(sprintf('momentBalance is now %s', json_encode($momentBalance)));
             $return        = $this->updateChartKeys($return, $momentBalance);
             $previous      = $momentBalance;
 
-            Log::debug(sprintf('Now at %s', $theDate), $momentBalance);
-
-
             // process each balance thing.
             foreach ($momentBalance as $key => $amount) {
                 $label                           = $current->isoFormat($format);
@@ -489,8 +499,6 @@ class AccountController extends Controller
             $current       = app('navigation')->addPeriod($current, $step, 0);
             // here too, to fix #8041, the data is corrected to the end of the period.
             $current       = app('navigation')->endOfX($current, $step, null);
-            Log::debug(sprintf('Next moment is %s', $current->format('Y-m-d')));
-
         }
         Log::debug('End of chart loop.');
         // second loop (yes) to create nice array with info! Yay!
@@ -567,8 +575,8 @@ class AccountController extends Controller
         $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
-        $startBalances = app('steam')->finalAccountsBalance($accounts, $start);
-        $endBalances   = app('steam')->finalAccountsBalance($accounts, $end);
+        $startBalances = Steam::finalAccountsBalance($accounts, $start);
+        $endBalances   = Steam::finalAccountsBalance($accounts, $end);
 
 
         // loop the accounts, then check for balance and currency info.
@@ -598,6 +606,7 @@ class AccountController extends Controller
                 }
                 // Log::debug(sprintf('Will process expense array "%s" with amount %s', $key, $endBalance));
                 $searchCode   = $this->convertToNative ? $this->defaultCurrency->code : $key;
+                $searchCode   = 'balance' === $searchCode || 'native_balance' === $searchCode ? $this->defaultCurrency->code : $searchCode;
                 // Log::debug(sprintf('Search code is %s', $searchCode));
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.

app/Http/Controllers/Json/ReconcileController.php

@@ -189,13 +189,14 @@ class ReconcileController extends Controller
         if ($end->lt($start)) {
             [$end, $start] = [$start, $end];
         }
+        $start->endOfDay();
+        $end->endOfDay();
         $startDate      = clone $start;
         $startDate->subDay();
-        $end->endOfDay();
 
         $currency       = $this->accountRepos->getAccountCurrency($account) ?? $this->defaultCurrency;
-        $startBalance   = Steam::finalAccountBalance($account, $startDate)['balance'];
-        $endBalance     = Steam::finalAccountBalance($account, $end)['balance'];
+        $startBalance   = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places);
+        $endBalance     = Steam::bcround(Steam::finalAccountBalance($account, $end)['balance'], $currency->decimal_places);
 
         // get the transactions
         $selectionStart = clone $start;

app/Http/Controllers/ReportController.php

@@ -83,6 +83,8 @@ class ReportController extends Controller
             return view('error')->with('message', (string) trans('firefly.end_after_start_date'));
         }
         $this->repository->cleanupBudgets();
+        $start->endOfDay(); // end of day so the final balance is at the end of that day.
+        $end->endOfDay();
 
         app('view')->share(
             'subTitle',
@@ -114,6 +116,8 @@ class ReportController extends Controller
             return view('error')->with('message', (string) trans('firefly.end_after_start_date'));
         }
         $this->repository->cleanupBudgets();
+        $start->endOfDay(); // end of day so the final balance is at the end of that day.
+        $end->endOfDay();
 
         app('view')->share(
             'subTitle',
@@ -146,6 +150,8 @@ class ReportController extends Controller
             return view('error')->with('message', (string) trans('firefly.end_after_start_date'));
         }
         $this->repository->cleanupBudgets();
+        $start->endOfDay(); // end of day so the final balance is at the end of that day.
+        $end->endOfDay();
 
         app('view')->share(
             'subTitle',
@@ -179,6 +185,8 @@ class ReportController extends Controller
         }
 
         $this->repository->cleanupBudgets();
+        $start->endOfDay(); // end of day so the final balance is at the end of that day.
+        $end->endOfDay();
 
         app('view')->share(
             'subTitle',
@@ -211,6 +219,8 @@ class ReportController extends Controller
         }
 
         $this->repository->cleanupBudgets();
+        $start->endOfDay(); // end of day so the final balance is at the end of that day.
+        $end->endOfDay();
 
         app('view')->share(
             'subTitle',
@@ -367,6 +377,8 @@ class ReportController extends Controller
             return view('error')->with('message', (string) trans('firefly.end_after_start_date'));
         }
         $this->repository->cleanupBudgets();
+        $start->endOfDay(); // end of day so the final balance is at the end of that day.
+        $end->endOfDay();
 
         app('view')->share(
             'subTitle',

app/Notifications/ReturnsSettings.php

@@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\User;
+use Illuminate\Support\Facades\Log;
 
 class ReturnsSettings
 {
@@ -42,6 +43,7 @@ class ReturnsSettings
 
     private static function getNtfySettings(string $type, ?User $user): array
     {
+        Log::debug(sprintf('Getting Ntfy settings for %s and user #%d', $type, $user?->id));
         $settings = [
             'ntfy_server' => 'https://ntfy.sh',
             'ntfy_topic'  => '',
@@ -56,6 +58,7 @@ class ReturnsSettings
             $settings['ntfy_auth']   = Preferences::getForUser($user, 'ntfy_auth', false)->data;
             $settings['ntfy_user']   = Preferences::getEncryptedForUser($user, 'ntfy_user', '')->data;
             $settings['ntfy_pass']   = Preferences::getEncryptedForUser($user, 'ntfy_pass', '')->data;
+            Log::debug(sprintf('Auth is %s, user = "%s"', var_export($settings['ntfy_auth'], true), $settings['ntfy_user']));
         }
         if ('owner' === $type) {
             $settings['ntfy_server'] = FireflyConfig::getEncrypted('ntfy_server', 'https://ntfy.sh')->data;
@@ -63,6 +66,7 @@ class ReturnsSettings
             $settings['ntfy_auth']   = FireflyConfig::get('ntfy_auth', false)->data;
             $settings['ntfy_user']   = FireflyConfig::getEncrypted('ntfy_user', '')->data;
             $settings['ntfy_pass']   = FireflyConfig::getEncrypted('ntfy_pass', '')->data;
+            Log::debug(sprintf('Auth is %s, user = "%s"', var_export($settings['ntfy_auth'], true), $settings['ntfy_user']));
         }
 
         // overrule config.
@@ -74,7 +78,9 @@ class ReturnsSettings
             config(['ntfy-notification-channel.authentication.enabled' => true]);
             config(['ntfy-notification-channel.authentication.username' => $settings['ntfy_user']]);
             config(['ntfy-notification-channel.authentication.password' => $settings['ntfy_pass']]);
+            Log::debug('Authentication enabled for Ntfy.');
         }
+        Log::debug('Return ntfy settings.');
 
         return $settings;
     }

app/Providers/EventServiceProvider.php

@@ -169,16 +169,11 @@ class EventServiceProvider extends ServiceProvider
 
             // is a Transaction Journal related event.
             StoredTransactionGroup::class          => [
-                'FireflyIII\Handlers\Events\StoredGroupEventHandler@processRules',
-                'FireflyIII\Handlers\Events\StoredGroupEventHandler@recalculateCredit',
-                'FireflyIII\Handlers\Events\StoredGroupEventHandler@triggerWebhooks',
+                'FireflyIII\Handlers\Events\StoredGroupEventHandler@runAllHandlers',
             ],
             // is a Transaction Journal related event.
             UpdatedTransactionGroup::class         => [
-                'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@unifyAccounts',
-                'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@processRules',
-                'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@recalculateCredit',
-                'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@triggerWebhooks',
+                'FireflyIII\Handlers\Events\UpdatedGroupEventHandler@runAllHandlers',
             ],
             DestroyedTransactionGroup::class       => [
                 'FireflyIII\Handlers\Events\DestroyedGroupEventHandler@triggerWebhooks',

app/Repositories/Currency/CurrencyRepository.php

@@ -57,7 +57,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
      */
     public function getCompleteSet(): Collection
     {
-        return TransactionCurrency::orderBy('code', 'ASC')->get();
+        return TransactionCurrency::where('enabled', true)->orderBy('code', 'ASC')->get();
     }
 
     /**

app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php

@@ -108,6 +108,6 @@ class ExchangeRateRepository implements ExchangeRateRepositoryInterface
     #[\Override]
     public function getAll(): Collection
     {
-        return $this->userGroup->currencyExchangeRates()->get();
+        return $this->userGroup->currencyExchangeRates()->orderBy('date', 'ASC')->get();
     }
 }

app/Support/Http/Controllers/ChartGeneration.php

@@ -33,6 +33,7 @@ use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Trait ChartGeneration
@@ -69,8 +70,11 @@ trait ChartGeneration
         $default         = app('amount')->getNativeCurrency();
         $chartData       = [];
 
+        Log::debug(sprintf('Start of accountBalanceChart(list, %s, %s)', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
+
         /** @var Account $account */
         foreach ($accounts as $account) {
+            Log::debug(sprintf('Now at account #%d ("%s)', $account->id, $account->name));
             $currency     = $accountRepos->getAccountCurrency($account) ?? $default;
             $useNative    = $convertToNative && $default->id !== $currency->id;
             $field        = $useNative ? 'native_balance' : 'balance';
@@ -82,7 +86,7 @@ trait ChartGeneration
             ];
 
             $currentStart = clone $start;
-            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
+            $range        = Steam::finalAccountBalanceInRange($account, clone $start, clone $end, $this->convertToNative);
             $previous     = array_values($range)[0];
             while ($currentStart <= $end) {
                 $format                        = $currentStart->format('Y-m-d');

app/Support/Search/QueryParser/Node.php

@@ -55,4 +55,43 @@ abstract class Node
         return $this->prohibited;
 
     }
+
+    public function equals(self $compare): bool
+    {
+        if ($compare->isProhibited(false) !== $this->isProhibited(false)) {
+            Log::debug('Return false because prohibited status is different');
+
+            return false;
+        }
+        if ($compare instanceof NodeGroup) {
+            if (count($compare->getNodes()) !== count($this->getNodes())) {
+                Log::debug(sprintf('Return false because node count is different. Original is %d, compare is %d', count($this->getNodes()), count($compare->getNodes())));
+
+                //                var_dump($this);
+                //                var_dump($compare);
+                //                exit;
+                return false;
+            }
+
+            /**
+             * @var int  $index
+             * @var Node $node
+             */
+            foreach ($this->getNodes() as $index => $node) {
+                if (false === $node->equals($compare->getNodes()[$index])) {
+                    Log::debug('Return false because nodes are different!');
+                    var_dump($this);
+                    var_dump($compare);
+
+                    exit;
+
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return true;
+    }
 }

app/Support/Search/QueryParser/QueryParser.php

@@ -71,6 +71,7 @@ class QueryParser implements QueryParserInterface
 
         while ($this->position < strlen($this->query)) {
             $char = $this->query[$this->position];
+            // Log::debug(sprintf('Char #%d: %s', $this->position, $char));
 
             // If we're in a quoted string, we treat all characters except another quote as ordinary characters
             if ($inQuotes) {
@@ -150,15 +151,19 @@ class QueryParser implements QueryParserInterface
 
 
                 case ':':
-                    if ('' !== $tokenUnderConstruction) {
+                    $skipNext = false;
+                    if ('' === $tokenUnderConstruction) { // @phpstan-ignore-line
+                        // In any other location, it's just a normal character
+                        $tokenUnderConstruction .= $char;
+                        $skipNext = true;
+                    }
+                    if ('' !== $tokenUnderConstruction && !$skipNext) {
+                        Log::debug(sprintf('Turns out that "%s" is a field name. Reset the token.', $tokenUnderConstruction));
                         // If we meet a colon with a left-hand side string, we know we're in a field and are about to set up the value
                         $fieldName              = $tokenUnderConstruction;
                         $tokenUnderConstruction = '';
                     }
-                    if ('' === $tokenUnderConstruction) { // @phpstan-ignore-line
-                        // In any other location, it's just a normal character
-                        $tokenUnderConstruction .= $char;
-                    }
+
 
                     break;
 

app/Support/Steam.php

@@ -28,10 +28,11 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use FireflyIII\Support\Facades\Amount;
 
 /**
  * Class Steam.
@@ -58,8 +59,8 @@ class Steam
     public function finalAccountBalanceInRange(Account $account, Carbon $start, Carbon $end, bool $convertToNative): array
     {
         // expand period.
-        $start->subDay()->startOfDay();
-        $end->addDay()->endOfDay();
+        $start->subDay()->endOfDay(); // go to END of day to get the balance at the END of the day.
+        $end->addDay()->startOfDay(); // go to START of day to get the balance at the END of the previous day (see ahead).
         Log::debug(sprintf('finalAccountBalanceInRange(#%d, %s, %s)', $account->id, $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
 
         // set up cache
@@ -75,100 +76,82 @@ class Steam
         $balances             = [];
         $formatted            = $start->format('Y-m-d');
         $startBalance         = $this->finalAccountBalance($account, $start);
-        $defaultCurrency      = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
+        $nativeCurrency       = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         $accountCurrency      = $this->getAccountCurrency($account);
         $hasCurrency          = null !== $accountCurrency;
-        $currency             = $accountCurrency ?? $defaultCurrency;
+        $currency             = $accountCurrency ?? $nativeCurrency;
         Log::debug(sprintf('Currency is %s', $currency->code));
+
+        // set start balances:
+        $startBalance[$currency->code] ??= '0';
+        if ($hasCurrency) {
+            $startBalance[$accountCurrency->code] ??= '0';
+        }
         if (!$hasCurrency) {
-            Log::debug(sprintf('Also set start balance in %s', $defaultCurrency->code));
-            $startBalance[$defaultCurrency->code] ??= '0';
+            Log::debug(sprintf('Also set start balance in %s', $nativeCurrency->code));
+            $startBalance[$nativeCurrency->code] ??= '0';
         }
         $currencies           = [
-            $currency->id        => $currency,
-            $defaultCurrency->id => $defaultCurrency,
+            $currency->id       => $currency,
+            $nativeCurrency->id => $nativeCurrency,
         ];
 
-
-        $startBalance[$currency->code] ??= '0';
         $balances[$formatted] = $startBalance;
         Log::debug('Final start balance: ', $startBalance);
 
-
-        // sums up the balance changes per day, for foreign, native and normal amounts.
+        // sums up the balance changes per day.
         $set                  = $account->transactions()
             ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->where('transaction_journals.date', '>=', $start->format('Y-m-d H:i:s'))
-            ->where('transaction_journals.date', '<=', $end->format('Y-m-d  H:i:s'))
+            ->where('transaction_journals.date', '>', $start->format('Y-m-d H:i:s'))
+            ->where('transaction_journals.date', '<', $end->format('Y-m-d  H:i:s'))
             ->groupBy('transaction_journals.date')
             ->groupBy('transactions.transaction_currency_id')
-            ->groupBy('transactions.foreign_currency_id')
             ->orderBy('transaction_journals.date', 'ASC')
             ->whereNull('transaction_journals.deleted_at')
             ->get(
                 [ // @phpstan-ignore-line
                     'transaction_journals.date',
                     'transactions.transaction_currency_id',
-                    DB::raw('SUM(transactions.amount) AS modified'),
-                    'transactions.foreign_currency_id',
-                    DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
-                    DB::raw('SUM(transactions.native_amount) AS modified_native'),
+                    DB::raw('SUM(transactions.amount) AS sum_of_day'),
                 ]
             )
         ;
 
         $currentBalance       = $startBalance;
+        $converter            = new ExchangeRateConverter();
+
 
         /** @var Transaction $entry */
         foreach ($set as $entry) {
-            // normal, native and foreign amount
-            $carbon                             = new Carbon($entry->date, $entry->date_tz);
-            $modified                           = (string) (null === $entry->modified ? '0' : $entry->modified);
-            $foreignModified                    = (string) (null === $entry->modified_foreign ? '0' : $entry->modified_foreign);
-            $nativeModified                     = (string) (null === $entry->modified_native ? '0' : $entry->modified_native);
+            // get date object
+            $carbon                               = new Carbon($entry->date, $entry->date_tz);
+            $carbonKey                            = $carbon->format('Y-m-d');
+            // make sure sum is a string:
+            $sumOfDay                             = (string) (null === $entry->sum_of_day ? '0' : $entry->sum_of_day);
 
-            // find currency of this entry.
+            // find currency of this entry, does not have to exist.
             $currencies[$entry->transaction_currency_id] ??= TransactionCurrency::find($entry->transaction_currency_id);
 
+            // make sure this $entry has its own $entryCurrency
             /** @var TransactionCurrency $entryCurrency */
-            $entryCurrency                      = $currencies[$entry->transaction_currency_id];
+            $entryCurrency                        = $currencies[$entry->transaction_currency_id];
 
-            Log::debug(sprintf('Processing transaction(s) on date %s', $carbon->format('Y-m-d H:i:s')));
+            Log::debug(sprintf('Processing transaction(s) on moment %s', $carbon->format('Y-m-d H:i:s')));
+            $currentBalance[$entryCurrency->code]        ??= '0';
+            $currentBalance[$entryCurrency->code] = bcadd($sumOfDay, $currentBalance[$entryCurrency->code]);
 
-            // if convert to native, if NOT convert to native.
-            if ($convertToNative) {
-                Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $this->bcround($modified, 2), $this->bcround($foreignModified, 2), $this->bcround($nativeModified, 2)));
-                // if the currency is the default currency add to native balance + currency balance
-                if ($entry->transaction_currency_id === $defaultCurrency->id) {
-                    Log::debug('Add amount to native.');
-                    $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $modified);
-                }
-
-                // add to native balance.
-                if ($entry->foreign_currency_id !== $defaultCurrency->id) {
-                    // this check is not necessary, because if the foreign currency is the same as the default currency, the native amount is zero.
-                    // so adding this would mean nothing.
-                    $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $nativeModified);
-                }
-                if ($entry->foreign_currency_id === $defaultCurrency->id) {
-                    $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $foreignModified);
-                }
-                // add to balance if is the same.
-                if ($entry->transaction_currency_id === $accountCurrency?->id) {
-                    $currentBalance['balance'] = bcadd($currentBalance['balance'], $modified);
-                }
-                // add currency balance
-                $currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified);
-            }
+            // if not convert to native, add the amount to "balance", do nothing else.
             if (!$convertToNative) {
-                Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $modified, $foreignModified, $nativeModified));
-                // add to balance, as expected.
-                $currentBalance['balance']            = bcadd($currentBalance['balance'] ?? '0', $modified);
-                // add to GBP, as expected.
-                $currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified);
+                $currentBalance['balance'] = bcadd($currentBalance['balance'], $sumOfDay);
             }
-            $balances[$carbon->format('Y-m-d')] = $currentBalance;
-            Log::debug('Updated entry', $currentBalance);
+            // if convert to native add the converted amount to "native_balance".
+            if ($convertToNative) {
+                $nativeSumOfDay                   = $converter->convert($entryCurrency, $nativeCurrency, $carbon, $sumOfDay);
+                $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $nativeSumOfDay);
+            }
+            // just set it.
+            $balances[$carbonKey]                 = $currentBalance;
+            Log::debug(sprintf('Updated entry [%s]', $carbonKey), $currentBalance);
         }
         $cache->store($balances);
         Log::debug('End of method');
@@ -275,116 +258,77 @@ class Steam
 
     /**
      * Returns the balance of an account at exact moment given. Array with at least one value.
+     * Always returns:
+     * "balance": balance in the account's currency OR user's native currency if the account has no currency
+     * "EUR": balance in EUR (or whatever currencies the account has balance in)
      *
-     * "balance" the balance in whatever currency the account has, so the sum of all transaction that happen to have
-     * THAT currency.
-     * "native_balance" the balance according to the "native_amount" + "native_foreign_amount" fields.
-     * "ABC" the balance in this particular currency code (may repeat for each found currency).
-     *
-     * Het maakt niet uit of de native currency wel of niet gelijk is aan de account currency.
-     * Optelsom zou hetzelfde moeten zijn. Als het EUR is en de rekening ook is native_amount 0.
-     * Zo niet is amount 0 en native_amount het bedrag.
-     *
-     * Eerst een som van alle transacties in de native currency. Alle EUR bij elkaar opgeteld.
-     * Om te weten wat er nog meer op de rekening gebeurt, pak alles waar currency niet EUR is, en de foreign ook niet,
-     * en tel native_amount erbij op.
-     * Daarna pak je alle transacties waar currency niet EUR is, en de foreign wel, en tel foreign_amount erbij op.
-     *
-     * Wil je niks weten van native currencies, pak je:
-     *
-     * Eerst een som van alle transacties gegroepeerd op currency. Einde.
+     * If the user has $convertToNative:
+     * "balance": balance in the account's currency OR user's native currency if the account has no currency
+     * --> "native_balance": balance in the user's native balance, with all amounts converted to native.
+     * "EUR": balance in EUR (or whatever currencies the account has balance in)
      */
     public function finalAccountBalance(Account $account, Carbon $date): array
     {
-        $cache           = new CacheProperties();
+
+        $cache             = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty($date);
         if ($cache->has()) {
-            return $cache->get();
+            //            Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
+            //            return $cache->get();
         }
+        Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
 
-        Log::debug(sprintf('Now in finalAccountBalance(#%d, "%s", "%s")', $account->id, $account->name, $date->format('Y-m-d H:i:s')));
-
-        $native          = Amount::getNativeCurrencyByUserGroup($account->user->userGroup);
-        $convertToNative = Amount::convertToNative($account->user);
-        $accountCurrency = $this->getAccountCurrency($account);
-        $hasCurrency     = null !== $accountCurrency;
-        $currency        = $hasCurrency ? $accountCurrency : $native;
-        $return          = [];
-
-        // first, the "balance", as described earlier.
-        if ($convertToNative) {
-            // normal balance
-            $return['balance']        = (string) $account->transactions()
-                ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
-                ->where('transactions.transaction_currency_id', $native->id)
-                ->sum('transactions.amount')
-            ;
-            // plus virtual balance, if the account has a virtual_balance in the native currency
-            if ($native->id === $accountCurrency?->id) {
-                $return['balance'] = bcadd('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance, $return['balance']);
-            }
-            // Log::debug(sprintf('balance is (%s only) %s (with virtual balance)', $native->code, $this->bcround($return['balance'], 2)));
-
-            // native balance
-            $return['native_balance'] = (string) $account->transactions()
-                ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
-                ->whereNot('transactions.transaction_currency_id', $native->id)
-                ->sum('transactions.native_amount')
-            ;
-            // plus native virtual balance.
-            $return['native_balance'] = bcadd('' === (string) $account->native_virtual_balance ? '0' : $account->native_virtual_balance, $return['native_balance']);
-            // Log::debug(sprintf('native_balance is (all transactions to %s) %s (with virtual balance)', $native->code, $this->bcround($return['native_balance'])));
-
-            // plus foreign transactions in THIS currency.
-            $sum                      = (string) $account->transactions()
-                ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
-                ->whereNot('transactions.transaction_currency_id', $native->id)
-                ->where('transactions.foreign_currency_id', $native->id)
-                ->sum('transactions.foreign_amount')
-            ;
-            $return['native_balance'] = bcadd($return['native_balance'], $sum);
-
-            // Log::debug(sprintf('Foreign amount transactions add (%s only) %s, total native_balance is now %s', $native->code, $this->bcround($sum), $this->bcround($return['native_balance'])));
-        }
-
-        // balance(s) in other (all) currencies.
-        $array           = $account->transactions()
+        $native            = Amount::getNativeCurrencyByUserGroup($account->user->userGroup);
+        $convertToNative   = Amount::convertToNative($account->user);
+        $accountCurrency   = $this->getAccountCurrency($account);
+        $hasCurrency       = null !== $accountCurrency;
+        $currency          = $hasCurrency ? $accountCurrency : $native;
+        $return            = [
+            'native_balance' => '0',
+            'balance'        => '0', // this key is overwritten right away, but I must remember it is always created.
+        ];
+        // balance(s) in all currencies.
+        $array             = $account->transactions()
             ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
             ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
             ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
             ->get(['transaction_currencies.code', 'transactions.amount'])->toArray()
         ;
-        $others          = $this->groupAndSumTransactions($array, 'code', 'amount');
+        $others            = $this->groupAndSumTransactions($array, 'code', 'amount');
         // Log::debug('All balances are (joined)', $others);
-        // if the account has no own currency preference, drop balance in favor of native balance
-        if ($hasCurrency && !$convertToNative) {
-            $return['balance']        = $others[$currency->code] ?? '0';
-            $return['native_balance'] = $others[$currency->code] ?? '0';
-            // Log::debug(sprintf('Set balance + native_balance to %s', $return['balance']));
+        // if there is no request to convert, take this as "balance" and "native_balance".
+        $return['balance'] = $others[$currency->code] ?? '0';
+        if (!$convertToNative) {
+            unset($return['native_balance']);
+            // Log::debug(sprintf('Set balance to %s, unset native_balance', $return['balance']));
+        }
+        // if there is a request to convert, convert to "native_balance" and use "balance" for whichever amount is in the native currency.
+        if ($convertToNative) {
+            $return['native_balance'] = $this->convertAllBalances($others, $native, $date); // todo sum all and convert.
+            // Log::debug(sprintf('Set native_balance to %s', $return['native_balance']));
         }
 
-        // if the currency is the same as the native currency, set the native_balance to the balance for consistency.
-        //        if($currency->id === $native->id) {
-        //            $return['native_balance'] = $return['balance'];
-        //        }
+        // either way, the balance is always combined with the virtual balance:
+        $virtualBalance    = (string) ('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance);
 
-        if (!$hasCurrency && array_key_exists('balance', $return)) {
-            //            Log::debug('Account has no currency preference, dropping balance in favor of native balance.');
-            $sum                      = bcadd($return['balance'], $return['native_balance']);
-            //            Log::debug(sprintf('%s + %s = %s', $return['balance'], $return['native_balance'], $sum));
-            $return['native_balance'] = $sum;
-            unset($return['balance']);
+        if ($convertToNative) {
+            // the native balance is combined with a converted virtual_balance:
+            $converter                = new ExchangeRateConverter();
+            $nativeVirtualBalance     = $converter->convert($currency, $native, $date, $virtualBalance);
+            $return['native_balance'] = bcadd($nativeVirtualBalance, $return['native_balance']);
+            // Log::debug(sprintf('Native virtual balance makes the native total %s', $return['native_balance']));
         }
-        $final           = array_merge($return, $others);
-        // Log::debug('Return is', $final);
+        if (!$convertToNative) {
+            // if not, also increase the balance + native balance for consistency.
+            $return['balance'] = bcadd($return['balance'], $virtualBalance);
+            // Log::debug(sprintf('Virtual balance makes the (native) total %s', $return['balance']));
+        }
+        $final             = array_merge($return, $others);
+        Log::debug('Final balance is', $final);
         $cache->store($final);
 
-        return array_merge($return, $others);
-        // Log::debug('Return is', $final);
+        return $final;
     }
 
     public function filterAccountBalances(array $total, Account $account, bool $convertToNative, ?TransactionCurrency $currency = null): array
@@ -410,17 +354,18 @@ class Steam
         $defaultCurrency = app('amount')->getNativeCurrency();
         if ($convertToNative) {
             if ($defaultCurrency->id === $currency?->id) {
-                Log::debug(sprintf('Unset "native_balance" and "%s" for account #%d', $defaultCurrency->code, $account->id));
+                Log::debug(sprintf('Unset "native_balance" and [%s] for account #%d', $defaultCurrency->code, $account->id));
                 unset($set['native_balance'], $set[$defaultCurrency->code]);
             }
+            // todo rethink this logic.
             if (null !== $currency && $defaultCurrency->id !== $currency->id) {
                 Log::debug(sprintf('Unset balance for account #%d', $account->id));
                 unset($set['balance']);
             }
 
             if (null === $currency) {
-                Log::debug(sprintf('TEMP DO NOT Drop defaultCurrency balance for account #%d', $account->id));
-                // unset($set[$this->defaultCurrency->code]);
+                Log::debug(sprintf('Unset balance for account #%d', $account->id));
+                unset($set['balance']);
             }
         }
 
@@ -428,16 +373,15 @@ class Steam
             if (null === $currency) {
                 Log::debug(sprintf('Unset native_balance and make defaultCurrency balance the balance for account #%d', $account->id));
                 $set['balance'] = $set[$defaultCurrency->code] ?? '0';
-                unset($set['native_balance'], $set[$defaultCurrency->code]);
+                unset($set[$defaultCurrency->code]);
             }
 
             if (null !== $currency) {
-                Log::debug(sprintf('Unset native_balance + defaultCurrency + currencyCode balance for account #%d', $account->id));
-                unset($set['native_balance'], $set[$defaultCurrency->code], $set[$currency->code]);
+                Log::debug(sprintf('Unset [%s] + [%s] balance for account #%d', $defaultCurrency->code, $currency->code, $account->id));
+                unset($set[$defaultCurrency->code], $set[$currency->code]);
             }
         }
 
-
         // put specific value first in array.
         if (array_key_exists('native_balance', $set)) {
             $set = ['native_balance' => $set['native_balance']] + $set;
@@ -687,4 +631,21 @@ class Steam
 
         return $amount;
     }
+
+    private function convertAllBalances(array $others, TransactionCurrency $native, Carbon $date): string
+    {
+        $total     = '0';
+        $converter = new ExchangeRateConverter();
+        foreach ($others as $key => $amount) {
+            $currency = TransactionCurrency::where('code', $key)->first();
+            if (null === $currency) {
+                continue;
+            }
+            $current  = $converter->convert($currency, $native, $date, $amount);
+            Log::debug(sprintf('Convert %s %s to %s %s', $currency->code, $amount, $native->code, $current));
+            $total    = bcadd($current, $total);
+        }
+
+        return $total;
+    }
 }

app/Support/Twig/AmountFormat.php

@@ -26,6 +26,8 @@ namespace FireflyIII\Support\Twig;
 use FireflyIII\Models\Account as AccountModel;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
+use Illuminate\Support\Facades\Log;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;
@@ -114,6 +116,11 @@ class AmountFormat extends AbstractExtension
 
                 /** @var TransactionCurrency $currency */
                 $currency = TransactionCurrency::whereCode($code)->first();
+                if (null === $currency) {
+                    Log::error(sprintf('Could not find currency with code "%s". Fallback to native currency.', $code));
+                    $currency = Amount::getNativeCurrency();
+                    Log::error(sprintf('Fallback currency is "%s".', $currency->code));
+                }
 
                 return app('amount')->formatAnything($currency, $amount, $coloured);
             },

app/Support/Twig/General.php

@@ -72,6 +72,7 @@ class General extends AbstractExtension
                 $default         = Amount::getNativeCurrency();
                 $convertToNative = Amount::convertToNative();
                 $useNative       = $convertToNative && $default->id !== $currency->id;
+                $currency        = null === $currency ? $default : $currency;
                 $strings         = [];
                 foreach ($info as $key => $balance) {
                     if ('balance' === $key) {

app/Transformers/PiggyBankTransformer.php

@@ -132,7 +132,7 @@ class PiggyBankTransformer extends AbstractTransformer
         $return = [];
         foreach ($piggyBank->accounts()->get() as $account) {
             $return[] = [
-                'id'                    => $account->id,
+                'id'                    => (string) $account->id,
                 'name'                  => $account->name,
                 'current_amount'        => (string) $account->pivot->current_amount,
                 'native_current_amount' => (string) $account->pivot->native_current_amount,

changelog.md

@@ -3,6 +3,77 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.2.5 - 2025-02-08
+
+### Fixed
+
+- [Issue 9736](https://github.com/firefly-iii/firefly-iii/issues/9736) (Wrong `finalAccountBalance` result) reported by @gthbusrr
+- [Issue 9747](https://github.com/firefly-iii/firefly-iii/issues/9747) (Data entry issues with exchange rates) reported by @Azmodeszer
+- [Issue 9769](https://github.com/firefly-iii/firefly-iii/issues/9769) ("Your accounts" graph shows changes at wrong dates - not fixed by v6.2.4) reported by @SteffoSpieler
+- [Discussion 9780](https://github.com/orgs/firefly-iii/discussions/9780) (Rules or webhook precedence?) started by @joeshmoe57
+- [Issue 9781](https://github.com/firefly-iii/firefly-iii/issues/9781) (Search key `has_any_external_url:false` returns all transactions) reported by @joeshmoe57
+- [Issue 9783](https://github.com/firefly-iii/firefly-iii/issues/9783) (Subscriptions: Make "Not expected this period" and "expected x days from now" different colors) reported by @SteffoSpieler
+- [Issue 9786](https://github.com/firefly-iii/firefly-iii/issues/9786) (The error 500 information page has non-clickable links to github and the debug page) reported by @tjmv
+- [Issue 9787](https://github.com/firefly-iii/firefly-iii/issues/9787) (Twig general template error formatting TransactionCurrency on main page) reported by @tjmv
+- [Issue 9789](https://github.com/firefly-iii/firefly-iii/issues/9789) (Can't open expense and revenue accounts view) reported by @puffer-duck
+
+## 6.2.4 - 2025-02-05
+
+> ⚠️ _Most pressing issues are fixed. Please open [an issue here](https://github.com/firefly-iii/firefly-iii/issues/new?template=bug.yml) if you run into problems._
+
+
+### Fixed
+
+- [Issue 9327](https://github.com/firefly-iii/firefly-iii/issues/9327) (Add Link to Search-Page to the help file) reported by @nottheend
+- [Issue 9713](https://github.com/firefly-iii/firefly-iii/issues/9713) (Many decimal points in amounts) reported by @memo-567
+- [Issue 9736](https://github.com/firefly-iii/firefly-iii/issues/9736) (Wrong `finalAccountBalance` result) reported by @gthbusrr
+- [Discussion 9737](https://github.com/orgs/firefly-iii/discussions/9737) (API returns 0 as current balance) started by @eps90
+- [Issue 9745](https://github.com/firefly-iii/firefly-iii/issues/9745) (Type mismatch in period overview) reported by @electrofloat
+- [Issue 9747](https://github.com/firefly-iii/firefly-iii/issues/9747) (Data entry issues with exchange rates) reported by @Azmodeszer
+- [Issue 9751](https://github.com/firefly-iii/firefly-iii/issues/9751) (Net worth changes since 6.2 update) reported by @ahmaddxb
+- [Issue 9754](https://github.com/firefly-iii/firefly-iii/issues/9754) (Deleting account - Attachments remain) reported by @memo-567
+- [Issue 9762](https://github.com/firefly-iii/firefly-iii/issues/9762) (Piggy bank show: start/target date not displayed) reported by @Simeam
+- Various other balance related fixes.
+- Hotfix for account charts.
+
+## 6.2.3 - 2025-02-05
+
+> ⚠️ _Most pressing issues are fixed. Please open [an issue here](https://github.com/firefly-iii/firefly-iii/issues/new?template=bug.yml) if you run into problems._
+
+### Fixed
+
+- [Issue 9327](https://github.com/firefly-iii/firefly-iii/issues/9327) (Add Link to Search-Page to the help file) reported by @nottheend
+- [Issue 9713](https://github.com/firefly-iii/firefly-iii/issues/9713) (Many decimal points in amounts) reported by @memo-567
+- [Issue 9736](https://github.com/firefly-iii/firefly-iii/issues/9736) (Wrong `finalAccountBalance` result) reported by @gthbusrr
+- [Discussion 9737](https://github.com/orgs/firefly-iii/discussions/9737) (API returns 0 as current balance) started by @eps90
+- [Issue 9745](https://github.com/firefly-iii/firefly-iii/issues/9745) (Type mismatch in period overview) reported by @electrofloat
+- [Issue 9747](https://github.com/firefly-iii/firefly-iii/issues/9747) (Data entry issues with exchange rates) reported by @Azmodeszer
+- [Issue 9751](https://github.com/firefly-iii/firefly-iii/issues/9751) (Net worth changes since 6.2 update) reported by @ahmaddxb
+- [Issue 9754](https://github.com/firefly-iii/firefly-iii/issues/9754) (Deleting account - Attachments remain) reported by @memo-567
+- [Issue 9762](https://github.com/firefly-iii/firefly-iii/issues/9762) (Piggy bank show: start/target date not displayed) reported by @Simeam
+- Various other balance related fixes.
+
+## 6.2.2 - 2025-02-02
+
+> ⚠️ _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._
+
+### Fixed
+
+- [Issue 9713](https://github.com/firefly-iii/firefly-iii/issues/9713) (Many decimal points in amounts) reported by @memo-567
+- [Discussion 9727](https://github.com/orgs/firefly-iii/discussions/9727) (Odd behavior from graphs) started by @jbrandwi
+- [Issue 9729](https://github.com/firefly-iii/firefly-iii/issues/9729) (Type mismatch in transaction collector) reported by @electrofloat
+- [Issue 9730](https://github.com/firefly-iii/firefly-iii/issues/9730) (API: `PiggyBankAccountRead.id` should return string, returns int) reported by @dreautall
+- [Issue 9731](https://github.com/firefly-iii/firefly-iii/issues/9731) ($userGroup must not be accessed before initialization) reported by @Azmodeszer
+- [Issue 9732](https://github.com/firefly-iii/firefly-iii/issues/9732) (Editing dates of a piggy bank does not save) reported by @Simeam
+- [Issue 9736](https://github.com/firefly-iii/firefly-iii/issues/9736) (Wrong `finalAccountBalance` result) reported by @gthbusrr
+- [Issue 9738](https://github.com/firefly-iii/firefly-iii/issues/9738) (Missing pagination controls on exchange rate page) reported by @dicksonleong
+- [Discussion 9744](https://github.com/orgs/firefly-iii/discussions/9744) (Downloading exchange rates results in 404 error) started by @electrofloat
+
+### Added
+
+- [PR 9743](https://github.com/firefly-iii/firefly-iii/pull/9743) (Feature nordic currencies) reported by @mansehr
+
+
 ## 6.2.1 - 2025-02-01
 
 > ⚠️ _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._

composer.lock

@@ -1571,16 +1571,16 @@
         },
         {
             "name": "guzzlehttp/uri-template",
-            "version": "v1.0.3",
+            "version": "v1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/uri-template.git",
-                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c"
+                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c",
-                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/30e286560c137526eccd4ce21b2de477ab0676d2",
+                "reference": "30e286560c137526eccd4ce21b2de477ab0676d2",
                 "shasum": ""
             },
             "require": {
@@ -1637,7 +1637,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/uri-template/issues",
-                "source": "https://github.com/guzzle/uri-template/tree/v1.0.3"
+                "source": "https://github.com/guzzle/uri-template/tree/v1.0.4"
             },
             "funding": [
                 {
@@ -1653,7 +1653,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-03T19:50:20+00:00"
+            "time": "2025-02-03T10:55:03+00:00"
         },
         {
             "name": "jc5/google2fa-laravel",
@@ -6196,16 +6196,16 @@
         },
         {
             "name": "spatie/laravel-html",
-            "version": "3.11.1",
+            "version": "3.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-html.git",
-                "reference": "167e5b8243103072155b562e5cc396c90a3c1055"
+                "reference": "248508f3ed50e6538707fc54a4b3b23fb53e8045"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/167e5b8243103072155b562e5cc396c90a3c1055",
-                "reference": "167e5b8243103072155b562e5cc396c90a3c1055",
+                "url": "https://api.github.com/repos/spatie/laravel-html/zipball/248508f3ed50e6538707fc54a4b3b23fb53e8045",
+                "reference": "248508f3ed50e6538707fc54a4b3b23fb53e8045",
                 "shasum": ""
             },
             "require": {
@@ -6262,7 +6262,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/laravel-html/tree/3.11.1"
+                "source": "https://github.com/spatie/laravel-html/tree/3.11.2"
             },
             "funding": [
                 {
@@ -6270,7 +6270,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2024-10-18T14:37:21+00:00"
+            "time": "2025-02-05T08:27:24+00:00"
         },
         {
             "name": "spatie/laravel-ignition",
@@ -6365,27 +6365,27 @@
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.18.3",
+            "version": "1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78"
+                "reference": "1c9c30ac6a6576b8d15c6c37b6cf23d748df2faa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78",
-                "reference": "ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/1c9c30ac6a6576b8d15c6c37b6cf23d748df2faa",
+                "reference": "1c9c30ac6a6576b8d15c6c37b6cf23d748df2faa",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "^9.28|^10.0|^11.0",
+                "illuminate/contracts": "^9.28|^10.0|^11.0|^12.0",
                 "php": "^8.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.5",
-                "orchestra/testbench": "^7.7|^8.0|^9.0",
-                "pestphp/pest": "^1.22|^2",
-                "phpunit/phpunit": "^9.5.24|^10.5",
+                "orchestra/testbench": "^7.7|^8.0|^9.0|^10.0",
+                "pestphp/pest": "^1.23|^2.1|^3.1",
+                "phpunit/phpunit": "^9.5.24|^10.5|^11.5",
                 "spatie/pest-plugin-test-time": "^1.1|^2.2"
             },
             "type": "library",
@@ -6413,7 +6413,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.3"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.19.0"
             },
             "funding": [
                 {
@@ -6421,7 +6421,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-22T08:51:18+00:00"
+            "time": "2025-02-06T14:58:20+00:00"
         },
         {
             "name": "spatie/period",
@@ -10398,16 +10398,16 @@
         },
         {
             "name": "composer/class-map-generator",
-            "version": "1.5.0",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915"
+                "reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915",
-                "reference": "4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915",
+                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/ffe442c5974c44a9343e37a0abcb1cc37319f5b9",
+                "reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9",
                 "shasum": ""
             },
             "require": {
@@ -10451,7 +10451,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.5.0"
+                "source": "https://github.com/composer/class-map-generator/tree/1.6.0"
             },
             "funding": [
                 {
@@ -10467,7 +10467,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-25T16:11:06+00:00"
+            "time": "2025-02-05T10:05:34+00:00"
         },
         {
             "name": "composer/pcre",
@@ -10664,16 +10664,16 @@
         },
         {
             "name": "larastan/larastan",
-            "version": "v3.0.2",
+            "version": "v3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/larastan/larastan.git",
-                "reference": "b2e24e1605cff1d1097ccb6fb8af3bbd1dfe1c6f"
+                "reference": "b394eba5805727423071fac9b53ea50dd7e920f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/larastan/larastan/zipball/b2e24e1605cff1d1097ccb6fb8af3bbd1dfe1c6f",
-                "reference": "b2e24e1605cff1d1097ccb6fb8af3bbd1dfe1c6f",
+                "url": "https://api.github.com/repos/larastan/larastan/zipball/b394eba5805727423071fac9b53ea50dd7e920f4",
+                "reference": "b394eba5805727423071fac9b53ea50dd7e920f4",
                 "shasum": ""
             },
             "require": {
@@ -10687,7 +10687,7 @@
                 "illuminate/support": "^11.15.0",
                 "php": "^8.2",
                 "phpmyadmin/sql-parser": "^5.9.0",
-                "phpstan/phpstan": "^2.0.2"
+                "phpstan/phpstan": "^2.1.3"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0",
@@ -10745,7 +10745,7 @@
             ],
             "support": {
                 "issues": "https://github.com/larastan/larastan/issues",
-                "source": "https://github.com/larastan/larastan/tree/v3.0.2"
+                "source": "https://github.com/larastan/larastan/tree/v3.0.4"
             },
             "funding": [
                 {
@@ -10753,7 +10753,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-26T23:15:21+00:00"
+            "time": "2025-02-06T21:03:36+00:00"
         },
         {
             "name": "laravel-json-api/testing",
@@ -11344,16 +11344,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.2",
+            "version": "2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "7d08f569e582ade182a375c366cbd896eccadd3a"
+                "reference": "64ae44e48214f3deebdaeebf2694297a10a2bea9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7d08f569e582ade182a375c366cbd896eccadd3a",
-                "reference": "7d08f569e582ade182a375c366cbd896eccadd3a",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/64ae44e48214f3deebdaeebf2694297a10a2bea9",
+                "reference": "64ae44e48214f3deebdaeebf2694297a10a2bea9",
                 "shasum": ""
             },
             "require": {
@@ -11398,7 +11398,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-21T14:54:06+00:00"
+            "time": "2025-02-07T15:05:24+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -11820,16 +11820,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.6",
+            "version": "11.5.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3c3ae14c90f244cdda95028c3e469028e8d1c02c"
+                "reference": "e1cb706f019e2547039ca2c839898cd5f557ee5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3c3ae14c90f244cdda95028c3e469028e8d1c02c",
-                "reference": "3c3ae14c90f244cdda95028c3e469028e8d1c02c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e1cb706f019e2547039ca2c839898cd5f557ee5d",
+                "reference": "e1cb706f019e2547039ca2c839898cd5f557ee5d",
                 "shasum": ""
             },
             "require": {
@@ -11901,7 +11901,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.6"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.7"
             },
             "funding": [
                 {
@@ -11917,7 +11917,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-31T07:03:30+00:00"
+            "time": "2025-02-06T16:10:05+00:00"
         },
         {
             "name": "sebastian/cli-parser",

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'                      => '6.2.1',
+    'version'                      => 'develop/2025-02-08',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

config/search.php

@@ -24,234 +24,239 @@ declare(strict_types=1);
 
 return [
     'operators'        => [
-        'user_action'                             => ['alias' => false, 'needs_context' => true],
-        'account_id'                              => ['alias' => false, 'needs_context' => true],
-        'reconciled'                              => ['alias' => false, 'needs_context' => false],
-        'source_account_id'                       => ['alias' => false, 'needs_context' => true],
-        'destination_account_id'                  => ['alias' => false, 'needs_context' => true],
-        'transaction_type'                        => ['alias' => false, 'needs_context' => true],
-        'type'                                    => ['alias' => true, 'alias_for' => 'transaction_type', 'needs_context' => true],
-        'tag_is'                                  => ['alias' => false, 'needs_context' => true],
-        'tag_is_not'                              => ['alias' => false, 'needs_context' => true],
-        'tag'                                     => ['alias' => true, 'alias_for' => 'tag_is', 'needs_context' => true],
-        'tag_contains'                            => ['alias' => false, 'needs_context' => true],
-        'tag_ends'                                => ['alias' => false, 'needs_context' => true],
-        'tag_starts'                              => ['alias' => false, 'needs_context' => true],
-        'description_is'                          => ['alias' => false, 'needs_context' => true],
-        'description'                             => ['alias' => true, 'alias_for' => 'description_is', 'needs_context' => true],
-        'description_contains'                    => ['alias' => false, 'needs_context' => true],
-        'description_ends'                        => ['alias' => false, 'needs_context' => true],
-        'description_starts'                      => ['alias' => false, 'needs_context' => true],
-        'notes_is'                                => ['alias' => false, 'needs_context' => true],
-        'notes_are'                               => ['alias' => true, 'alias_for' => 'notes_is', 'needs_context' => true],
-        'notes_contains'                          => ['alias' => false, 'needs_context' => true],
-        'notes_contain'                           => ['alias' => true, 'alias_for' => 'notes_contains', 'needs_context' => true],
-        'notes'                                   => ['alias' => true, 'alias_for' => 'notes_contains', 'needs_context' => true],
-        'notes_ends'                              => ['alias' => false, 'needs_context' => true],
-        'notes_end'                               => ['alias' => true, 'alias_for' => 'notes_ends', 'needs_context' => true],
-        'notes_starts'                            => ['alias' => false, 'needs_context' => true],
-        'notes_start'                             => ['alias' => true, 'alias_for' => 'notes_starts', 'needs_context' => true],
-        'source_account_is'                       => ['alias' => false, 'needs_context' => true],
-        'from_account_is'                         => ['alias' => true, 'alias_for' => 'source_account_is', 'needs_context' => true],
-        'source_account_contains'                 => ['alias' => false, 'needs_context' => true],
-        'source'                                  => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true],
-        'from'                                    => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true],
-        'from_account_contains'                   => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true],
-        'source_account_ends'                     => ['alias' => false, 'needs_context' => true],
-        'from_account_ends'                       => ['alias' => true, 'alias_for' => 'source_account_ends', 'needs_context' => true],
-        'source_account_starts'                   => ['alias' => false, 'needs_context' => true],
-        'from_account_starts'                     => ['alias' => true, 'alias_for' => 'source_account_starts', 'needs_context' => true],
-        'source_account_nr_is'                    => ['alias' => false, 'needs_context' => true],
-        'from_account_nr_is'                      => ['alias' => true, 'alias_for' => 'source_account_nr_is', 'needs_context' => true],
-        'source_account_nr_contains'              => ['alias' => false, 'needs_context' => true],
-        'from_account_nr_contains'                => ['alias' => true, 'alias_for' => 'source_account_nr_contains', 'needs_context' => true],
-        'source_account_nr_ends'                  => ['alias' => false, 'needs_context' => true],
-        'from_account_nr_ends'                    => ['alias' => true, 'alias_for' => 'source_account_nr_ends', 'needs_context' => true],
-        'source_account_nr_starts'                => ['alias' => false, 'needs_context' => true],
-        'from_account_nr_starts'                  => ['alias' => true, 'alias_for' => 'source_account_nr_starts', 'needs_context' => true],
-        'destination_account_is'                  => ['alias' => false, 'needs_context' => true],
-        'to_account_is'                           => ['alias' => true, 'alias_for' => 'destination_account_is', 'needs_context' => true],
-        'destination_account_contains'            => ['alias' => false, 'needs_context' => true],
-        'destination'                             => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true],
-        'to'                                      => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true],
-        'to_account_contains'                     => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true],
-        'destination_account_ends'                => ['alias' => false, 'needs_context' => true],
-        'to_account_ends'                         => ['alias' => true, 'alias_for' => 'destination_account_ends', 'needs_context' => true],
-        'destination_account_starts'              => ['alias' => false, 'needs_context' => true],
-        'to_account_starts'                       => ['alias' => true, 'alias_for' => 'destination_account_starts', 'needs_context' => true],
-        'destination_account_nr_is'               => ['alias' => false, 'needs_context' => true],
-        'to_account_nr_is'                        => ['alias' => true, 'alias_for' => 'destination_account_nr_is', 'needs_context' => true],
-        'destination_account_nr_contains'         => ['alias' => false, 'needs_context' => true],
-        'to_account_nr_contains'                  => ['alias' => true, 'alias_for' => 'destination_account_nr_contains', 'needs_context' => true],
-        'destination_account_nr_ends'             => ['alias' => false, 'needs_context' => true],
-        'to_account_nr_ends'                      => ['alias' => true, 'alias_for' => 'destination_account_nr_ends', 'needs_context' => true],
-        'destination_account_nr_starts'           => ['alias' => false, 'needs_context' => true],
-        'to_account_nr_starts'                    => ['alias' => true, 'alias_for' => 'destination_account_nr_starts', 'needs_context' => true],
-        'account_is'                              => ['alias' => false, 'needs_context' => true],
-        'account_contains'                        => ['alias' => false, 'needs_context' => true],
-        'account_ends'                            => ['alias' => false, 'needs_context' => true],
-        'account_starts'                          => ['alias' => false, 'needs_context' => true],
-        'account_nr_is'                           => ['alias' => false, 'needs_context' => true],
-        'account_nr_contains'                     => ['alias' => false, 'needs_context' => true],
-        'account_nr_ends'                         => ['alias' => false, 'needs_context' => true],
-        'account_nr_starts'                       => ['alias' => false, 'needs_context' => true],
-        'category_is'                             => ['alias' => false, 'needs_context' => true],
-        'category_contains'                       => ['alias' => false, 'needs_context' => true],
-        'category'                                => ['alias' => true, 'alias_for' => 'category_contains', 'needs_context' => true],
-        'category_ends'                           => ['alias' => false, 'needs_context' => true],
-        'category_starts'                         => ['alias' => false, 'needs_context' => true],
-        'budget_is'                               => ['alias' => false, 'needs_context' => true],
-        'budget_contains'                         => ['alias' => false, 'needs_context' => true],
-        'budget'                                  => ['alias' => true, 'alias_for' => 'budget_contains', 'needs_context' => true],
-        'budget_ends'                             => ['alias' => false, 'needs_context' => true],
-        'budget_starts'                           => ['alias' => false, 'needs_context' => true],
-        'bill_is'                                 => ['alias' => false, 'needs_context' => true],
-        'bill_contains'                           => ['alias' => false, 'needs_context' => true],
-        'bill'                                    => ['alias' => true, 'alias_for' => 'bill_contains', 'needs_context' => true],
-        'bill_ends'                               => ['alias' => false, 'needs_context' => true],
-        'bill_starts'                             => ['alias' => false, 'needs_context' => true],
-        'external_id_is'                          => ['alias' => false, 'needs_context' => true],
-        'external_id_contains'                    => ['alias' => false, 'needs_context' => true],
-        'external_id'                             => ['alias' => true, 'alias_for' => 'external_id_contains', 'needs_context' => true],
-        'external_id_ends'                        => ['alias' => false, 'needs_context' => true],
-        'external_id_starts'                      => ['alias' => false, 'needs_context' => true],
-        'internal_reference_is'                   => ['alias' => false, 'needs_context' => true],
-        'internal_reference_contains'             => ['alias' => false, 'needs_context' => true],
-        'internal_reference'                      => ['alias' => true, 'alias_for' => 'internal_reference_contains', 'needs_context' => true],
-        'internal_reference_ends'                 => ['alias' => false, 'needs_context' => true],
-        'internal_reference_starts'               => ['alias' => false, 'needs_context' => true],
-        'external_url_is'                         => ['alias' => false, 'needs_context' => true],
-        'external_url_contains'                   => ['alias' => false, 'needs_context' => true],
-        'external_url'                            => ['alias' => true, 'alias_for' => 'external_url_contains', 'needs_context' => true],
-        'external_url_ends'                       => ['alias' => false, 'needs_context' => true],
-        'external_url_starts'                     => ['alias' => false, 'needs_context' => true],
-        'has_attachments'                         => ['alias' => false, 'needs_context' => false],
-        'has_any_category'                        => ['alias' => false, 'needs_context' => false],
-        'has_any_budget'                          => ['alias' => false, 'needs_context' => false],
-        'has_any_bill'                            => ['alias' => false, 'needs_context' => false],
-        'has_any_tag'                             => ['alias' => false, 'needs_context' => false],
-        'any_notes'                               => ['alias' => false, 'needs_context' => false],
-        'has_any_notes'                           => ['alias' => true, 'alias_for' => 'any_notes', 'needs_context' => false],
-        'has_notes'                               => ['alias' => true, 'alias_for' => 'any_notes', 'needs_context' => false],
-        'any_external_url'                        => ['alias' => false, 'needs_context' => false],
-        'has_any_external_url'                    => ['alias' => true, 'alias_for' => 'any_external_url', 'needs_context' => false],
-        'has_no_attachments'                      => ['alias' => false, 'needs_context' => false],
-        'has_no_category'                         => ['alias' => false, 'needs_context' => false],
-        'has_no_budget'                           => ['alias' => false, 'needs_context' => false],
-        'has_no_bill'                             => ['alias' => false, 'needs_context' => false],
-        'has_no_tag'                              => ['alias' => false, 'needs_context' => false],
-        'no_notes'                                => ['alias' => false, 'needs_context' => false],
-        'no_external_url'                         => ['alias' => false, 'needs_context' => false],
-        'source_is_cash'                          => ['alias' => false, 'needs_context' => false],
-        'destination_is_cash'                     => ['alias' => false, 'needs_context' => false],
-        'account_is_cash'                         => ['alias' => false, 'needs_context' => false],
-        'currency_is'                             => ['alias' => false, 'needs_context' => true],
-        'foreign_currency_is'                     => ['alias' => false, 'needs_context' => true],
-        'id'                                      => ['alias' => false, 'trigger_class' => '', 'needs_context' => true],
-        'journal_id'                              => ['alias' => false, 'trigger_class' => '', 'needs_context' => true],
-        'recurrence_id'                           => ['alias' => false, 'trigger_class' => '', 'needs_context' => true],
-        'date_on'                                 => ['alias' => false, 'needs_context' => true],
-        'date'                                    => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true],
-        'date_is'                                 => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true],
-        'on'                                      => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true],
-        'date_before'                             => ['alias' => false, 'needs_context' => true],
-        'before'                                  => ['alias' => true, 'alias_for' => 'date_before', 'needs_context' => true],
-        'date_after'                              => ['alias' => false, 'needs_context' => true],
-        'after'                                   => ['alias' => true, 'alias_for' => 'date_after', 'needs_context' => true],
-        'interest_date_on'                        => ['alias' => false, 'needs_context' => true],
-        'interest_date'                           => ['alias' => true, 'alias_for' => 'interest_date_on', 'needs_context' => true],
-        'interest_date_is'                        => ['alias' => true, 'alias_for' => 'interest_date_on', 'needs_context' => true],
-        'interest_date_before'                    => ['alias' => false, 'needs_context' => true],
-        'interest_date_after'                     => ['alias' => false, 'needs_context' => true],
-        'book_date_on'                            => ['alias' => false, 'needs_context' => true],
-        'book_date'                               => ['alias' => true, 'alias_for' => 'book_date_on', 'needs_context' => true],
-        'book_date_is'                            => ['alias' => true, 'alias_for' => 'book_date_on', 'needs_context' => true],
-        'book_date_before'                        => ['alias' => false, 'needs_context' => true],
-        'book_date_after'                         => ['alias' => false, 'needs_context' => true],
-        'process_date_on'                         => ['alias' => false, 'needs_context' => true],
-        'process_date'                            => ['alias' => true, 'alias_for' => 'process_date_on', 'needs_context' => true],
-        'process_date_is'                         => ['alias' => true, 'alias_for' => 'process_date_on', 'needs_context' => true],
-        'process_date_before'                     => ['alias' => false, 'needs_context' => true],
-        'process_date_after'                      => ['alias' => false, 'needs_context' => true],
-        'due_date_on'                             => ['alias' => false, 'needs_context' => true],
-        'due_date'                                => ['alias' => true, 'alias_for' => 'due_date_on', 'needs_context' => true],
-        'due_date_is'                             => ['alias' => true, 'alias_for' => 'due_date_on', 'needs_context' => true],
-        'due_date_before'                         => ['alias' => false, 'needs_context' => true],
-        'due_date_after'                          => ['alias' => false, 'needs_context' => true],
-        'payment_date_on'                         => ['alias' => false, 'needs_context' => true],
-        'payment_date'                            => ['alias' => true, 'alias_for' => 'payment_date_on', 'needs_context' => true],
-        'payment_date_is'                         => ['alias' => true, 'alias_for' => 'payment_date_on', 'needs_context' => true],
-        'payment_date_before'                     => ['alias' => false, 'needs_context' => true],
-        'payment_date_after'                      => ['alias' => false, 'needs_context' => true],
-        'invoice_date_on'                         => ['alias' => false, 'needs_context' => true],
-        'invoice_date'                            => ['alias' => true, 'alias_for' => 'invoice_date_on', 'needs_context' => true],
-        'invoice_date_is'                         => ['alias' => true, 'alias_for' => 'invoice_date_on', 'needs_context' => true],
-        'invoice_date_before'                     => ['alias' => false, 'needs_context' => true],
-        'invoice_date_after'                      => ['alias' => false, 'needs_context' => true],
-        'created_at_on'                           => ['alias' => false, 'needs_context' => true],
-        'created_at'                              => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true],
-        'created_at_is'                           => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true],
-        'created_at_before'                       => ['alias' => false, 'needs_context' => true],
-        'created_at_after'                        => ['alias' => false, 'needs_context' => true],
-        'updated_at_on'                           => ['alias' => false, 'needs_context' => true],
-        'updated_at'                              => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true],
-        'updated_at_is'                           => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true],
-        'updated_at_before'                       => ['alias' => false, 'needs_context' => true],
-        'updated_at_after'                        => ['alias' => false, 'needs_context' => true],
-        'created_on_on'                           => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true],
-        'created_on'                              => ['alias' => true, 'alias_for' => 'created_at', 'needs_context' => true],
-        'created_on_before'                       => ['alias' => true, 'alias_for' => 'created_at_before', 'needs_context' => true],
-        'created_on_after'                        => ['alias' => true, 'alias_for' => 'created_at_after', 'needs_context' => true],
-        'updated_on_on'                           => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true],
-        'updated_on'                              => ['alias' => true, 'alias_for' => 'updated_at', 'needs_context' => true],
-        'updated_on_before'                       => ['alias' => true, 'alias_for' => 'updated_at_before', 'needs_context' => true],
-        'updated_on_after'                        => ['alias' => true, 'alias_for' => 'updated_at_after', 'needs_context' => true],
-        'amount_is'                               => ['alias' => false, 'needs_context' => true],
-        'amount'                                  => ['alias' => true, 'alias_for' => 'amount_is', 'needs_context' => true],
-        'amount_exactly'                          => ['alias' => true, 'alias_for' => 'amount_is', 'needs_context' => true],
-        'amount_less'                             => ['alias' => false, 'needs_context' => true],
-        'amount_max'                              => ['alias' => true, 'alias_for' => 'amount_less', 'needs_context' => true],
-        'less'                                    => ['alias' => true, 'alias_for' => 'amount_less', 'needs_context' => true],
-        'amount_more'                             => ['alias' => false, 'needs_context' => true],
-        'amount_min'                              => ['alias' => true, 'alias_for' => 'amount_more', 'needs_context' => true],
-        'more'                                    => ['alias' => true, 'alias_for' => 'amount_more', 'needs_context' => true],
-        'foreign_amount_is'                       => ['alias' => false, 'needs_context' => true],
-        'foreign_amount'                          => ['alias' => true, 'alias_for' => 'foreign_amount_is', 'needs_context' => true],
-        'foreign_amount_less'                     => ['alias' => false, 'needs_context' => true],
-        'foreign_amount_max'                      => ['alias' => true, 'alias_for' => 'foreign_amount_less', 'needs_context' => true],
-        'foreign_amount_more'                     => ['alias' => false, 'needs_context' => true],
-        'foreign_amount_min'                      => ['alias' => true, 'alias_for' => 'foreign_amount_more', 'needs_context' => true],
-        'attachment_name_is'                      => ['alias' => false, 'needs_context' => true],
-        'attachment'                              => ['alias' => true, 'alias_for' => 'attachment_name_is', 'needs_context' => true],
-        'attachment_is'                           => ['alias' => true, 'alias_for' => 'attachment_name_is', 'needs_context' => true],
-        'attachment_name'                         => ['alias' => true, 'alias_for' => 'attachment_name_is', 'needs_context' => true],
-        'attachment_name_contains'                => ['alias' => false, 'needs_context' => true],
-        'attachment_name_starts'                  => ['alias' => false, 'needs_context' => true],
-        'attachment_name_ends'                    => ['alias' => false, 'needs_context' => true],
-        'attachment_notes'                        => ['alias' => true, 'alias_for' => 'attachment_notes_are', 'needs_context' => true],
-        'attachment_notes_are'                    => ['alias' => false, 'needs_context' => true],
-        'attachment_notes_contains'               => ['alias' => false, 'needs_context' => true],
-        'attachment_notes_contain'                => ['alias' => true, 'alias_for' => 'attachment_notes_contains', 'needs_context' => true],
-        'attachment_notes_starts'                 => ['alias' => false, 'needs_context' => true],
-        'attachment_notes_start'                  => ['alias' => true, 'alias_for' => 'attachment_notes_starts', 'needs_context' => true],
-        'attachment_notes_ends'                   => ['alias' => false, 'needs_context' => true],
-        'attachment_notes_end'                    => ['alias' => true, 'alias_for' => 'attachment_notes_ends', 'needs_context' => true],
-        'exists'                                  => ['alias' => false, 'needs_context' => false],
-        'sepa_ct_is'                              => ['alias' => false, 'needs_context' => true],
-        'no_external_id'                          => ['alias' => false, 'needs_context' => false],
-        'any_external_id'                         => ['alias' => false, 'needs_context' => false],
+        'user_action'                                     => ['alias' => false, 'needs_context' => true],
+        'account_id'                                      => ['alias' => false, 'needs_context' => true],
+        'reconciled'                                      => ['alias' => false, 'needs_context' => false],
+        'source_account_id'                               => ['alias' => false, 'needs_context' => true],
+        'destination_account_id'                          => ['alias' => false, 'needs_context' => true],
+        'transaction_type'                                => ['alias' => false, 'needs_context' => true],
+        'type'                                            => ['alias' => true, 'alias_for' => 'transaction_type', 'needs_context' => true],
+        'tag_is'                                          => ['alias' => false, 'needs_context' => true],
+        'tag_is_not'                                      => ['alias' => false, 'needs_context' => true],
+        'tag'                                             => ['alias' => true, 'alias_for' => 'tag_is', 'needs_context' => true],
+        'tag_contains'                                    => ['alias' => false, 'needs_context' => true],
+        'tag_ends'                                        => ['alias' => false, 'needs_context' => true],
+        'tag_starts'                                      => ['alias' => false, 'needs_context' => true],
+        'description_is'                                  => ['alias' => false, 'needs_context' => true],
+        'description'                                     => ['alias' => true, 'alias_for' => 'description_is', 'needs_context' => true],
+        'description_contains'                            => ['alias' => false, 'needs_context' => true],
+        'description_ends'                                => ['alias' => false, 'needs_context' => true],
+        'description_starts'                              => ['alias' => false, 'needs_context' => true],
+        'notes_is'                                        => ['alias' => false, 'needs_context' => true],
+        'notes_are'                                       => ['alias' => true, 'alias_for' => 'notes_is', 'needs_context' => true],
+        'notes_contains'                                  => ['alias' => false, 'needs_context' => true],
+        'notes_contain'                                   => ['alias' => true, 'alias_for' => 'notes_contains', 'needs_context' => true],
+        'notes'                                           => ['alias' => true, 'alias_for' => 'notes_contains', 'needs_context' => true],
+        'notes_ends'                                      => ['alias' => false, 'needs_context' => true],
+        'notes_end'                                       => ['alias' => true, 'alias_for' => 'notes_ends', 'needs_context' => true],
+        'notes_starts'                                    => ['alias' => false, 'needs_context' => true],
+        'notes_start'                                     => ['alias' => true, 'alias_for' => 'notes_starts', 'needs_context' => true],
+        'source_account_is'                               => ['alias' => false, 'needs_context' => true],
+        'from_account_is'                                 => ['alias' => true, 'alias_for' => 'source_account_is', 'needs_context' => true],
+        'source_account_contains'                         => ['alias' => false, 'needs_context' => true],
+        'source'                                          => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true],
+        'from'                                            => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true],
+        'from_account_contains'                           => ['alias' => true, 'alias_for' => 'source_account_contains', 'needs_context' => true],
+        'source_account_ends'                             => ['alias' => false, 'needs_context' => true],
+        'from_account_ends'                               => ['alias' => true, 'alias_for' => 'source_account_ends', 'needs_context' => true],
+        'source_account_starts'                           => ['alias' => false, 'needs_context' => true],
+        'from_account_starts'                             => ['alias' => true, 'alias_for' => 'source_account_starts', 'needs_context' => true],
+        'source_account_nr_is'                            => ['alias' => false, 'needs_context' => true],
+        'from_account_nr_is'                              => ['alias' => true, 'alias_for' => 'source_account_nr_is', 'needs_context' => true],
+        'source_account_nr_contains'                      => ['alias' => false, 'needs_context' => true],
+        'from_account_nr_contains'                        => ['alias' => true, 'alias_for' => 'source_account_nr_contains', 'needs_context' => true],
+        'source_account_nr_ends'                          => ['alias' => false, 'needs_context' => true],
+        'from_account_nr_ends'                            => ['alias' => true, 'alias_for' => 'source_account_nr_ends', 'needs_context' => true],
+        'source_account_nr_starts'                        => ['alias' => false, 'needs_context' => true],
+        'from_account_nr_starts'                          => ['alias' => true, 'alias_for' => 'source_account_nr_starts', 'needs_context' => true],
+        'destination_account_is'                          => ['alias' => false, 'needs_context' => true],
+        'to_account_is'                                   => ['alias' => true, 'alias_for' => 'destination_account_is', 'needs_context' => true],
+        'destination_account_contains'                    => ['alias' => false, 'needs_context' => true],
+        'destination'                                     => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true],
+        'to'                                              => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true],
+        'to_account_contains'                             => ['alias' => true, 'alias_for' => 'destination_account_contains', 'needs_context' => true],
+        'destination_account_ends'                        => ['alias' => false, 'needs_context' => true],
+        'to_account_ends'                                 => ['alias' => true, 'alias_for' => 'destination_account_ends', 'needs_context' => true],
+        'destination_account_starts'                      => ['alias' => false, 'needs_context' => true],
+        'to_account_starts'                               => ['alias' => true, 'alias_for' => 'destination_account_starts', 'needs_context' => true],
+        'destination_account_nr_is'                       => ['alias' => false, 'needs_context' => true],
+        'to_account_nr_is'                                => ['alias' => true, 'alias_for' => 'destination_account_nr_is', 'needs_context' => true],
+        'destination_account_nr_contains'                 => ['alias' => false, 'needs_context' => true],
+        'to_account_nr_contains'                          => ['alias' => true, 'alias_for' => 'destination_account_nr_contains', 'needs_context' => true],
+        'destination_account_nr_ends'                     => ['alias' => false, 'needs_context' => true],
+        'to_account_nr_ends'                              => ['alias' => true, 'alias_for' => 'destination_account_nr_ends', 'needs_context' => true],
+        'destination_account_nr_starts'                   => ['alias' => false, 'needs_context' => true],
+        'to_account_nr_starts'                            => ['alias' => true, 'alias_for' => 'destination_account_nr_starts', 'needs_context' => true],
+        'account_is'                                      => ['alias' => false, 'needs_context' => true],
+        'account_contains'                                => ['alias' => false, 'needs_context' => true],
+        'account_ends'                                    => ['alias' => false, 'needs_context' => true],
+        'account_starts'                                  => ['alias' => false, 'needs_context' => true],
+        'account_nr_is'                                   => ['alias' => false, 'needs_context' => true],
+        'account_nr_contains'                             => ['alias' => false, 'needs_context' => true],
+        'account_nr_ends'                                 => ['alias' => false, 'needs_context' => true],
+        'account_nr_starts'                               => ['alias' => false, 'needs_context' => true],
+        'category_is'                                     => ['alias' => false, 'needs_context' => true],
+        'category_contains'                               => ['alias' => false, 'needs_context' => true],
+        'category'                                        => ['alias' => true, 'alias_for' => 'category_contains', 'needs_context' => true],
+        'category_ends'                                   => ['alias' => false, 'needs_context' => true],
+        'category_starts'                                 => ['alias' => false, 'needs_context' => true],
+        'budget_is'                                       => ['alias' => false, 'needs_context' => true],
+        'budget_contains'                                 => ['alias' => false, 'needs_context' => true],
+        'budget'                                          => ['alias' => true, 'alias_for' => 'budget_contains', 'needs_context' => true],
+        'budget_ends'                                     => ['alias' => false, 'needs_context' => true],
+        'budget_starts'                                   => ['alias' => false, 'needs_context' => true],
+        'bill_is'                                         => ['alias' => false, 'needs_context' => true],
+        'bill_contains'                                   => ['alias' => false, 'needs_context' => true],
+        'bill'                                            => ['alias' => true, 'alias_for' => 'bill_contains', 'needs_context' => true],
+        'bill_ends'                                       => ['alias' => false, 'needs_context' => true],
+        'bill_starts'                                     => ['alias' => false, 'needs_context' => true],
+        'subscription_is'                                 => ['alias' => true, 'alias_for' => 'bill_is', 'needs_context' => true],
+        'subscription_contains'                           => ['alias' => true, 'alias_for' => 'bill_contains', 'needs_context' => true],
+        'subscription'                                    => ['alias' => true, 'alias_for' => 'bill_contains', 'needs_context' => true],
+        'subscription_ends'                               => ['alias' => true, 'alias_for' => 'bill_ends', 'needs_context' => true],
+        'subscription_starts'                             => ['alias' => true, 'alias_for' => 'bill_starts', 'needs_context' => true],
+        'external_id_is'                                  => ['alias' => false, 'needs_context' => true],
+        'external_id_contains'                            => ['alias' => false, 'needs_context' => true],
+        'external_id'                                     => ['alias' => true, 'alias_for' => 'external_id_contains', 'needs_context' => true],
+        'external_id_ends'                                => ['alias' => false, 'needs_context' => true],
+        'external_id_starts'                              => ['alias' => false, 'needs_context' => true],
+        'internal_reference_is'                           => ['alias' => false, 'needs_context' => true],
+        'internal_reference_contains'                     => ['alias' => false, 'needs_context' => true],
+        'internal_reference'                              => ['alias' => true, 'alias_for' => 'internal_reference_contains', 'needs_context' => true],
+        'internal_reference_ends'                         => ['alias' => false, 'needs_context' => true],
+        'internal_reference_starts'                       => ['alias' => false, 'needs_context' => true],
+        'external_url_is'                                 => ['alias' => false, 'needs_context' => true],
+        'external_url_contains'                           => ['alias' => false, 'needs_context' => true],
+        'external_url'                                    => ['alias' => true, 'alias_for' => 'external_url_contains', 'needs_context' => true],
+        'external_url_ends'                               => ['alias' => false, 'needs_context' => true],
+        'external_url_starts'                             => ['alias' => false, 'needs_context' => true],
+        'has_attachments'                                 => ['alias' => false, 'needs_context' => false],
+        'has_any_category'                                => ['alias' => false, 'needs_context' => false],
+        'has_any_budget'                                  => ['alias' => false, 'needs_context' => false],
+        'has_any_bill'                                    => ['alias' => false, 'needs_context' => false],
+        'has_any_tag'                                     => ['alias' => false, 'needs_context' => false],
+        'any_notes'                                       => ['alias' => false, 'needs_context' => false],
+        'has_any_notes'                                   => ['alias' => true, 'alias_for' => 'any_notes', 'needs_context' => false],
+        'has_notes'                                       => ['alias' => true, 'alias_for' => 'any_notes', 'needs_context' => false],
+        'any_external_url'                                => ['alias' => false, 'needs_context' => false],
+        'has_any_external_url'                            => ['alias' => true, 'alias_for' => 'any_external_url', 'needs_context' => false],
+        'has_no_attachments'                              => ['alias' => false, 'needs_context' => false],
+        'has_no_category'                                 => ['alias' => false, 'needs_context' => false],
+        'has_no_budget'                                   => ['alias' => false, 'needs_context' => false],
+        'has_no_bill'                                     => ['alias' => false, 'needs_context' => false],
+        'has_no_tag'                                      => ['alias' => false, 'needs_context' => false],
+        'no_notes'                                        => ['alias' => false, 'needs_context' => false],
+        'no_external_url'                                 => ['alias' => false, 'needs_context' => false],
+        'source_is_cash'                                  => ['alias' => false, 'needs_context' => false],
+        'destination_is_cash'                             => ['alias' => false, 'needs_context' => false],
+        'account_is_cash'                                 => ['alias' => false, 'needs_context' => false],
+        'currency_is'                                     => ['alias' => false, 'needs_context' => true],
+        'foreign_currency_is'                             => ['alias' => false, 'needs_context' => true],
+        'id'                                              => ['alias' => false, 'trigger_class' => '', 'needs_context' => true],
+        'journal_id'                                      => ['alias' => false, 'trigger_class' => '', 'needs_context' => true],
+        'recurrence_id'                                   => ['alias' => false, 'trigger_class' => '', 'needs_context' => true],
+        'date_on'                                         => ['alias' => false, 'needs_context' => true],
+        'date'                                            => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true],
+        'date_is'                                         => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true],
+        'on'                                              => ['alias' => true, 'alias_for' => 'date_on', 'needs_context' => true],
+        'date_before'                                     => ['alias' => false, 'needs_context' => true],
+        'before'                                          => ['alias' => true, 'alias_for' => 'date_before', 'needs_context' => true],
+        'date_after'                                      => ['alias' => false, 'needs_context' => true],
+        'after'                                           => ['alias' => true, 'alias_for' => 'date_after', 'needs_context' => true],
+        'interest_date_on'                                => ['alias' => false, 'needs_context' => true],
+        'interest_date'                                   => ['alias' => true, 'alias_for' => 'interest_date_on', 'needs_context' => true],
+        'interest_date_is'                                => ['alias' => true, 'alias_for' => 'interest_date_on', 'needs_context' => true],
+        'interest_date_before'                            => ['alias' => false, 'needs_context' => true],
+        'interest_date_after'                             => ['alias' => false, 'needs_context' => true],
+        'book_date_on'                                    => ['alias' => false, 'needs_context' => true],
+        'book_date'                                       => ['alias' => true, 'alias_for' => 'book_date_on', 'needs_context' => true],
+        'book_date_is'                                    => ['alias' => true, 'alias_for' => 'book_date_on', 'needs_context' => true],
+        'book_date_before'                                => ['alias' => false, 'needs_context' => true],
+        'book_date_after'                                 => ['alias' => false, 'needs_context' => true],
+        'process_date_on'                                 => ['alias' => false, 'needs_context' => true],
+        'process_date'                                    => ['alias' => true, 'alias_for' => 'process_date_on', 'needs_context' => true],
+        'process_date_is'                                 => ['alias' => true, 'alias_for' => 'process_date_on', 'needs_context' => true],
+        'process_date_before'                             => ['alias' => false, 'needs_context' => true],
+        'process_date_after'                              => ['alias' => false, 'needs_context' => true],
+        'due_date_on'                                     => ['alias' => false, 'needs_context' => true],
+        'due_date'                                        => ['alias' => true, 'alias_for' => 'due_date_on', 'needs_context' => true],
+        'due_date_is'                                     => ['alias' => true, 'alias_for' => 'due_date_on', 'needs_context' => true],
+        'due_date_before'                                 => ['alias' => false, 'needs_context' => true],
+        'due_date_after'                                  => ['alias' => false, 'needs_context' => true],
+        'payment_date_on'                                 => ['alias' => false, 'needs_context' => true],
+        'payment_date'                                    => ['alias' => true, 'alias_for' => 'payment_date_on', 'needs_context' => true],
+        'payment_date_is'                                 => ['alias' => true, 'alias_for' => 'payment_date_on', 'needs_context' => true],
+        'payment_date_before'                             => ['alias' => false, 'needs_context' => true],
+        'payment_date_after'                              => ['alias' => false, 'needs_context' => true],
+        'invoice_date_on'                                 => ['alias' => false, 'needs_context' => true],
+        'invoice_date'                                    => ['alias' => true, 'alias_for' => 'invoice_date_on', 'needs_context' => true],
+        'invoice_date_is'                                 => ['alias' => true, 'alias_for' => 'invoice_date_on', 'needs_context' => true],
+        'invoice_date_before'                             => ['alias' => false, 'needs_context' => true],
+        'invoice_date_after'                              => ['alias' => false, 'needs_context' => true],
+        'created_at_on'                                   => ['alias' => false, 'needs_context' => true],
+        'created_at'                                      => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true],
+        'created_at_is'                                   => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true],
+        'created_at_before'                               => ['alias' => false, 'needs_context' => true],
+        'created_at_after'                                => ['alias' => false, 'needs_context' => true],
+        'updated_at_on'                                   => ['alias' => false, 'needs_context' => true],
+        'updated_at'                                      => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true],
+        'updated_at_is'                                   => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true],
+        'updated_at_before'                               => ['alias' => false, 'needs_context' => true],
+        'updated_at_after'                                => ['alias' => false, 'needs_context' => true],
+        'created_on_on'                                   => ['alias' => true, 'alias_for' => 'created_at_on', 'needs_context' => true],
+        'created_on'                                      => ['alias' => true, 'alias_for' => 'created_at', 'needs_context' => true],
+        'created_on_before'                               => ['alias' => true, 'alias_for' => 'created_at_before', 'needs_context' => true],
+        'created_on_after'                                => ['alias' => true, 'alias_for' => 'created_at_after', 'needs_context' => true],
+        'updated_on_on'                                   => ['alias' => true, 'alias_for' => 'updated_at_on', 'needs_context' => true],
+        'updated_on'                                      => ['alias' => true, 'alias_for' => 'updated_at', 'needs_context' => true],
+        'updated_on_before'                               => ['alias' => true, 'alias_for' => 'updated_at_before', 'needs_context' => true],
+        'updated_on_after'                                => ['alias' => true, 'alias_for' => 'updated_at_after', 'needs_context' => true],
+        'amount_is'                                       => ['alias' => false, 'needs_context' => true],
+        'amount'                                          => ['alias' => true, 'alias_for' => 'amount_is', 'needs_context' => true],
+        'amount_exactly'                                  => ['alias' => true, 'alias_for' => 'amount_is', 'needs_context' => true],
+        'amount_less'                                     => ['alias' => false, 'needs_context' => true],
+        'amount_max'                                      => ['alias' => true, 'alias_for' => 'amount_less', 'needs_context' => true],
+        'less'                                            => ['alias' => true, 'alias_for' => 'amount_less', 'needs_context' => true],
+        'amount_more'                                     => ['alias' => false, 'needs_context' => true],
+        'amount_min'                                      => ['alias' => true, 'alias_for' => 'amount_more', 'needs_context' => true],
+        'more'                                            => ['alias' => true, 'alias_for' => 'amount_more', 'needs_context' => true],
+        'foreign_amount_is'                               => ['alias' => false, 'needs_context' => true],
+        'foreign_amount'                                  => ['alias' => true, 'alias_for' => 'foreign_amount_is', 'needs_context' => true],
+        'foreign_amount_less'                             => ['alias' => false, 'needs_context' => true],
+        'foreign_amount_max'                              => ['alias' => true, 'alias_for' => 'foreign_amount_less', 'needs_context' => true],
+        'foreign_amount_more'                             => ['alias' => false, 'needs_context' => true],
+        'foreign_amount_min'                              => ['alias' => true, 'alias_for' => 'foreign_amount_more', 'needs_context' => true],
+        'attachment_name_is'                              => ['alias' => false, 'needs_context' => true],
+        'attachment'                                      => ['alias' => true, 'alias_for' => 'attachment_name_is', 'needs_context' => true],
+        'attachment_is'                                   => ['alias' => true, 'alias_for' => 'attachment_name_is', 'needs_context' => true],
+        'attachment_name'                                 => ['alias' => true, 'alias_for' => 'attachment_name_is', 'needs_context' => true],
+        'attachment_name_contains'                        => ['alias' => false, 'needs_context' => true],
+        'attachment_name_starts'                          => ['alias' => false, 'needs_context' => true],
+        'attachment_name_ends'                            => ['alias' => false, 'needs_context' => true],
+        'attachment_notes'                                => ['alias' => true, 'alias_for' => 'attachment_notes_are', 'needs_context' => true],
+        'attachment_notes_are'                            => ['alias' => false, 'needs_context' => true],
+        'attachment_notes_contains'                       => ['alias' => false, 'needs_context' => true],
+        'attachment_notes_contain'                        => ['alias' => true, 'alias_for' => 'attachment_notes_contains', 'needs_context' => true],
+        'attachment_notes_starts'                         => ['alias' => false, 'needs_context' => true],
+        'attachment_notes_start'                          => ['alias' => true, 'alias_for' => 'attachment_notes_starts', 'needs_context' => true],
+        'attachment_notes_ends'                           => ['alias' => false, 'needs_context' => true],
+        'attachment_notes_end'                            => ['alias' => true, 'alias_for' => 'attachment_notes_ends', 'needs_context' => true],
+        'exists'                                          => ['alias' => false, 'needs_context' => false],
+        'sepa_ct_is'                                      => ['alias' => false, 'needs_context' => true],
+        'no_external_id'                                  => ['alias' => false, 'needs_context' => false],
+        'any_external_id'                                 => ['alias' => false, 'needs_context' => false],
 
         // based on source or destination balance. Very heavy search.
-        'source_balance_gte'                      => ['alias' => false, 'needs_context' => true],
-        'source_balance_gt'                       => ['alias' => false, 'needs_context' => true],
-        'source_balance_lte'                      => ['alias' => false, 'needs_context' => true],
-        'source_balance_lt'                       => ['alias' => false, 'needs_context' => true],
-        'source_balance_is'                       => ['alias' => false, 'needs_context' => true],
-        'destination_balance_gte'                 => ['alias' => false, 'needs_context' => true],
-        'destination_balance_gt'                  => ['alias' => false, 'needs_context' => true],
-        'destination_balance_lte'                 => ['alias' => false, 'needs_context' => true],
-        'destination_balance_lt'                  => ['alias' => false, 'needs_context' => true],
-        'destination_balance_is'                  => ['alias' => false, 'needs_context' => true],
+        'source_balance_gte'                              => ['alias' => false, 'needs_context' => true],
+        'source_balance_gt'                               => ['alias' => false, 'needs_context' => true],
+        'source_balance_lte'                              => ['alias' => false, 'needs_context' => true],
+        'source_balance_lt'                               => ['alias' => false, 'needs_context' => true],
+        'source_balance_is'                               => ['alias' => false, 'needs_context' => true],
+        'destination_balance_gte'                         => ['alias' => false, 'needs_context' => true],
+        'destination_balance_gt'                          => ['alias' => false, 'needs_context' => true],
+        'destination_balance_lte'                         => ['alias' => false, 'needs_context' => true],
+        'destination_balance_lt'                          => ['alias' => false, 'needs_context' => true],
+        'destination_balance_is'                          => ['alias' => false, 'needs_context' => true],
     ],
     /**
      * Which query parser to use - 'new' or 'legacy'

config/translations.php

@@ -155,6 +155,8 @@ return [
                 'is_reconciled',
                 'split',
                 'single_split',
+                'not_enough_currencies',
+                'not_enough_currencies_enabled',
                 'transaction_stored_link',
                 'webhook_stored_link',
                 'webhook_updated_link',

database/migrations/2024_11_30_075826_multi_piggy.php

@@ -50,42 +50,70 @@ return new class () extends Migration {
         });
         Schema::table('piggy_banks', static function (Blueprint $table): void {
             // 3. add currency
-            $table->integer('transaction_currency_id', false, true)->after('account_id')->nullable();
-            $table->foreign('transaction_currency_id', 'unique_currency')->references('id')->on('transaction_currencies')->onDelete('cascade');
+            if (!Schema::hasColumn('piggy_banks', 'transaction_currency_id')) {
+                $table->integer('transaction_currency_id', false, true)->after('account_id')->nullable();
+            }
+            if (!self::hasForeign('piggy_banks', 'unique_currency')) {
+                $table->foreign('transaction_currency_id', 'unique_currency')->references('id')->on('transaction_currencies')->onDelete('cascade');
+            }
         });
         Schema::table('piggy_banks', static function (Blueprint $table): void {
             // 4. rename columns
-            $table->renameColumn('targetamount', 'target_amount');
-            $table->renameColumn('startdate', 'start_date');
-            $table->renameColumn('targetdate', 'target_date');
-            $table->renameColumn('startdate_tz', 'start_date_tz');
-            $table->renameColumn('targetdate_tz', 'target_date_tz');
+            if (Schema::hasColumn('piggy_banks', 'targetamount') && !Schema::hasColumn('piggy_banks', 'target_amount')) {
+                $table->renameColumn('targetamount', 'target_amount');
+            }
+            if (Schema::hasColumn('piggy_banks', 'startdate') && !Schema::hasColumn('piggy_banks', 'start_date')) {
+                $table->renameColumn('startdate', 'start_date');
+            }
+            if (Schema::hasColumn('piggy_banks', 'targetdate') && !Schema::hasColumn('piggy_banks', 'target_date')) {
+                $table->renameColumn('targetdate', 'target_date');
+            }
+            if (Schema::hasColumn('piggy_banks', 'targetdate') && !Schema::hasColumn('startdate_tz', 'start_date_tz')) {
+                $table->renameColumn('startdate_tz', 'start_date_tz');
+            }
+            if (Schema::hasColumn('piggy_banks', 'targetdate_tz') && !Schema::hasColumn('target_date_tz', 'start_date_tz')) {
+                $table->renameColumn('targetdate_tz', 'target_date_tz');
+            }
         });
         Schema::table('piggy_banks', static function (Blueprint $table): void {
             // 5. add new index
-            $table->foreign('account_id')->references('id')->on('accounts')->onDelete('set null');
+            if (!self::hasForeign('piggy_banks', 'piggy_banks_account_id_foreign')) {
+                $table->foreign('account_id')->references('id')->on('accounts')->onDelete('set null');
+            }
         });
 
         // rename some fields in piggy bank reps.
         Schema::table('piggy_bank_repetitions', static function (Blueprint $table): void {
             // 6. rename columns
-            $table->renameColumn('currentamount', 'current_amount');
-            $table->renameColumn('startdate', 'start_date');
-            $table->renameColumn('targetdate', 'target_date');
-            $table->renameColumn('startdate_tz', 'start_date_tz');
-            $table->renameColumn('targetdate_tz', 'target_date_tz');
+            if (Schema::hasColumn('piggy_bank_repetitions', 'currentamount') && !Schema::hasColumn('piggy_bank_repetitions', 'current_amount')) {
+                $table->renameColumn('currentamount', 'current_amount');
+            }
+            if (Schema::hasColumn('piggy_bank_repetitions', 'startdate') && !Schema::hasColumn('piggy_bank_repetitions', 'start_date')) {
+                $table->renameColumn('startdate', 'start_date');
+            }
+            if (Schema::hasColumn('piggy_bank_repetitions', 'targetdate') && !Schema::hasColumn('piggy_bank_repetitions', 'target_date')) {
+                $table->renameColumn('targetdate', 'target_date');
+            }
+            if (Schema::hasColumn('piggy_bank_repetitions', 'startdate_tz') && !Schema::hasColumn('piggy_bank_repetitions', 'start_date_tz')) {
+                $table->renameColumn('startdate_tz', 'start_date_tz');
+            }
+            if (Schema::hasColumn('piggy_bank_repetitions', 'targetdate_tz') && !Schema::hasColumn('piggy_bank_repetitions', 'target_date_tz')) {
+                $table->renameColumn('targetdate_tz', 'target_date_tz');
+            }
         });
 
         // create table account_piggy_bank
-        Schema::create('account_piggy_bank', static function (Blueprint $table): void {
-            $table->id();
-            $table->integer('account_id', false, true);
-            $table->integer('piggy_bank_id', false, true);
-            $table->decimal('current_amount', 32, 12)->default('0');
-            $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
-            $table->foreign('piggy_bank_id')->references('id')->on('piggy_banks')->onDelete('cascade');
-            $table->unique(['account_id', 'piggy_bank_id'], 'unique_piggy_save');
-        });
+        if (!Schema::hasTable('account_piggy_bank')) {
+            Schema::create('account_piggy_bank', static function (Blueprint $table): void {
+                $table->id();
+                $table->integer('account_id', false, true);
+                $table->integer('piggy_bank_id', false, true);
+                $table->decimal('current_amount', 32, 12)->default('0');
+                $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
+                $table->foreign('piggy_bank_id')->references('id')->on('piggy_banks')->onDelete('cascade');
+                $table->unique(['account_id', 'piggy_bank_id'], 'unique_piggy_save');
+            });
+        }
 
     }
 

database/migrations/2024_12_19_061003_add_native_amount_column.php

@@ -41,8 +41,6 @@ return new class () extends Migration {
             'piggy_banks'        => ['native_target_amount'], // works
             'transactions'       => ['native_amount', 'native_foreign_amount'], // works
 
-            // TODO button to recalculate all native amounts on selected pages?
-
         ];
 
     /**
@@ -52,9 +50,11 @@ return new class () extends Migration {
     {
         foreach ($this->tables as $table => $fields) {
             foreach ($fields as $field) {
-                Schema::table($table, static function (Blueprint $table) use ($field): void {
+                Schema::table($table, static function (Blueprint $tableObject) use ($table, $field): void {
                     // add amount column
-                    $table->decimal($field, 32, 12)->nullable();
+                    if (!Schema::hasColumn($table, $field)) {
+                        $tableObject->decimal($field, 32, 12)->nullable();
+                    }
                 });
             }
         }

database/seeders/TransactionCurrencySeeder.php

@@ -42,6 +42,9 @@ class TransactionCurrencySeeder extends Seeder
         $currencies[] = ['code' => 'PLN', 'name' => 'Polish złoty', 'symbol' => 'zł', 'decimal_places' => 2];
         $currencies[] = ['code' => 'TRY', 'name' => 'Turkish lira', 'symbol' => '₺', 'decimal_places' => 2];
         $currencies[] = ['code' => 'DKK', 'name' => 'Dansk krone', 'symbol' => 'kr.', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'ISK', 'name' => 'Íslensk króna', 'symbol' => 'kr.', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'NOK', 'name' => 'Norsk krone', 'symbol' => 'kr.', 'decimal_places' => 2];
+        $currencies[] = ['code' => 'SEK', 'name' => 'Svensk krona', 'symbol' => 'kr.', 'decimal_places' => 2];
         $currencies[] = ['code' => 'RON', 'name' => 'Romanian leu', 'symbol' => 'lei', 'decimal_places' => 2];
 
         // american currencies

package-lock.json

@@ -2591,9 +2591,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.0.tgz",
-            "integrity": "sha512-Eeao7ewDq79jVEsrtWIj5RNqB8p2knlm9fhR6uJ2gqP7UfbLrTrxevudVrEPDM7Wkpn/HpRC2QfazH7MXLz3vQ==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.6.tgz",
+            "integrity": "sha512-+GcCXtOQoWuC7hhX1P00LqjjIiS/iOouHXhMdiDSnq/1DGTox4SpUvO52Xm+div6+106r+TcvOeo/cxvyEyTgg==",
             "cpu": [
                 "arm"
             ],
@@ -2605,9 +2605,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.0.tgz",
-            "integrity": "sha512-yVh0Kf1f0Fq4tWNf6mWcbQBCLDpDrDEl88lzPgKhrgTcDrTtlmun92ywEF9dCjmYO3EFiSuJeeo9cYRxl2FswA==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.6.tgz",
+            "integrity": "sha512-E8+2qCIjciYUnCa1AiVF1BkRgqIGW9KzJeesQqVfyRITGQN+dFuoivO0hnro1DjT74wXLRZ7QF8MIbz+luGaJA==",
             "cpu": [
                 "arm64"
             ],
@@ -2619,9 +2619,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.0.tgz",
-            "integrity": "sha512-gCs0ErAZ9s0Osejpc3qahTsqIPUDjSKIyxK/0BGKvL+Tn0n3Kwvj8BrCv7Y5sR1Ypz1K2qz9Ny0VvkVyoXBVUQ==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.6.tgz",
+            "integrity": "sha512-z9Ib+OzqN3DZEjX7PDQMHEhtF+t6Mi2z/ueChQPLS/qUMKY7Ybn5A2ggFoKRNRh1q1T03YTQfBTQCJZiepESAg==",
             "cpu": [
                 "arm64"
             ],
@@ -2633,9 +2633,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.0.tgz",
-            "integrity": "sha512-aIB5Anc8hngk15t3GUkiO4pv42ykXHfmpXGS+CzM9CTyiWyT8HIS5ygRAy7KcFb/wiw4Br+vh1byqcHRTfq2tQ==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.6.tgz",
+            "integrity": "sha512-PShKVY4u0FDAR7jskyFIYVyHEPCPnIQY8s5OcXkdU8mz3Y7eXDJPdyM/ZWjkYdR2m0izD9HHWA8sGcXn+Qrsyg==",
             "cpu": [
                 "x64"
             ],
@@ -2647,9 +2647,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.0.tgz",
-            "integrity": "sha512-kpdsUdMlVJMRMaOf/tIvxk8TQdzHhY47imwmASOuMajg/GXpw8GKNd8LNwIHE5Yd1onehNpcUB9jHY6wgw9nHQ==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.6.tgz",
+            "integrity": "sha512-YSwyOqlDAdKqs0iKuqvRHLN4SrD2TiswfoLfvYXseKbL47ht1grQpq46MSiQAx6rQEN8o8URtpXARCpqabqxGQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2661,9 +2661,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.0.tgz",
-            "integrity": "sha512-D0RDyHygOBCQiqookcPevrvgEarN0CttBecG4chOeIYCNtlKHmf5oi5kAVpXV7qs0Xh/WO2RnxeicZPtT50V0g==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.6.tgz",
+            "integrity": "sha512-HEP4CgPAY1RxXwwL5sPFv6BBM3tVeLnshF03HMhJYCNc6kvSqBgTMmsEjb72RkZBAWIqiPUyF1JpEBv5XT9wKQ==",
             "cpu": [
                 "x64"
             ],
@@ -2675,9 +2675,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.0.tgz",
-            "integrity": "sha512-mCIw8j5LPDXmCOW8mfMZwT6F/Kza03EnSr4wGYEswrEfjTfVsFOxvgYfuRMxTuUF/XmRb9WSMD5GhCWDe2iNrg==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.6.tgz",
+            "integrity": "sha512-88fSzjC5xeH9S2Vg3rPgXJULkHcLYMkh8faix8DX4h4TIAL65ekwuQMA/g2CXq8W+NJC43V6fUpYZNjaX3+IIg==",
             "cpu": [
                 "arm"
             ],
@@ -2689,9 +2689,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.0.tgz",
-            "integrity": "sha512-AwwldAu4aCJPob7zmjuDUMvvuatgs8B/QiVB0KwkUarAcPB3W+ToOT+18TQwY4z09Al7G0BvCcmLRop5zBLTag==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.6.tgz",
+            "integrity": "sha512-wM4ztnutBqYFyvNeR7Av+reWI/enK9tDOTKNF+6Kk2Q96k9bwhDDOlnCUNRPvromlVXo04riSliMBs/Z7RteEg==",
             "cpu": [
                 "arm"
             ],
@@ -2703,9 +2703,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.0.tgz",
-            "integrity": "sha512-e7kDUGVP+xw05pV65ZKb0zulRploU3gTu6qH1qL58PrULDGxULIS0OSDQJLH7WiFnpd3ZKUU4VM3u/Z7Zw+e7Q==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.6.tgz",
+            "integrity": "sha512-9RyprECbRa9zEjXLtvvshhw4CMrRa3K+0wcp3KME0zmBe1ILmvcVHnypZ/aIDXpRyfhSYSuN4EPdCCj5Du8FIA==",
             "cpu": [
                 "arm64"
             ],
@@ -2717,9 +2717,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.0.tgz",
-            "integrity": "sha512-SXYJw3zpwHgaBqTXeAZ31qfW/v50wq4HhNVvKFhRr5MnptRX2Af4KebLWR1wpxGJtLgfS2hEPuALRIY3LPAAcA==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.6.tgz",
+            "integrity": "sha512-qTmklhCTyaJSB05S+iSovfo++EwnIEZxHkzv5dep4qoszUMX5Ca4WM4zAVUMbfdviLgCSQOu5oU8YoGk1s6M9Q==",
             "cpu": [
                 "arm64"
             ],
@@ -2731,9 +2731,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.0.tgz",
-            "integrity": "sha512-e5XiCinINCI4RdyU3sFyBH4zzz7LiQRvHqDtRe9Dt8o/8hTBaYpdPimayF00eY2qy5j4PaaWK0azRgUench6WQ==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.6.tgz",
+            "integrity": "sha512-4Qmkaps9yqmpjY5pvpkfOerYgKNUGzQpFxV6rnS7c/JfYbDSU0y6WpbbredB5cCpLFGJEqYX40WUmxMkwhWCjw==",
             "cpu": [
                 "loong64"
             ],
@@ -2745,9 +2745,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.0.tgz",
-            "integrity": "sha512-3SWN3e0bAsm9ToprLFBSro8nJe6YN+5xmB11N4FfNf92wvLye/+Rh5JGQtKOpwLKt6e61R1RBc9g+luLJsc23A==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.6.tgz",
+            "integrity": "sha512-Zsrtux3PuaxuBTX/zHdLaFmcofWGzaWW1scwLU3ZbW/X+hSsFbz9wDIp6XvnT7pzYRl9MezWqEqKy7ssmDEnuQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -2759,9 +2759,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.0.tgz",
-            "integrity": "sha512-B1Oqt3GLh7qmhvfnc2WQla4NuHlcxAD5LyueUi5WtMc76ZWY+6qDtQYqnxARx9r+7mDGfamD+8kTJO0pKUJeJA==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.6.tgz",
+            "integrity": "sha512-aK+Zp+CRM55iPrlyKiU3/zyhgzWBxLVrw2mwiQSYJRobCURb781+XstzvA8Gkjg/hbdQFuDw44aUOxVQFycrAg==",
             "cpu": [
                 "riscv64"
             ],
@@ -2773,9 +2773,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.0.tgz",
-            "integrity": "sha512-UfUCo0h/uj48Jq2lnhX0AOhZPSTAq3Eostas+XZ+GGk22pI+Op1Y6cxQ1JkUuKYu2iU+mXj1QjPrZm9nNWV9rg==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.6.tgz",
+            "integrity": "sha512-WoKLVrY9ogmaYPXwTH326+ErlCIgMmsoRSx6bO+l68YgJnlOXhygDYSZe/qbUJCSiCiZAQ+tKm88NcWuUXqOzw==",
             "cpu": [
                 "s390x"
             ],
@@ -2787,9 +2787,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.0.tgz",
-            "integrity": "sha512-chZLTUIPbgcpm+Z7ALmomXW8Zh+wE2icrG+K6nt/HenPLmtwCajhQC5flNSk1Xy5EDMt/QAOz2MhzfOfJOLSiA==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.6.tgz",
+            "integrity": "sha512-Sht4aFvmA4ToHd2vFzwMFaQCiYm2lDFho5rPcvPBT5pCdC+GwHG6CMch4GQfmWTQ1SwRKS0dhDYb54khSrjDWw==",
             "cpu": [
                 "x64"
             ],
@@ -2801,9 +2801,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.0.tgz",
-            "integrity": "sha512-jo0UolK70O28BifvEsFD/8r25shFezl0aUk2t0VJzREWHkq19e+pcLu4kX5HiVXNz5qqkD+aAq04Ct8rkxgbyQ==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.6.tgz",
+            "integrity": "sha512-zmmpOQh8vXc2QITsnCiODCDGXFC8LMi64+/oPpPx5qz3pqv0s6x46ps4xoycfUiVZps5PFn1gksZzo4RGTKT+A==",
             "cpu": [
                 "x64"
             ],
@@ -2815,9 +2815,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.0.tgz",
-            "integrity": "sha512-Vmg0NhAap2S54JojJchiu5An54qa6t/oKT7LmDaWggpIcaiL8WcWHEN6OQrfTdL6mQ2GFyH7j2T5/3YPEDOOGA==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.6.tgz",
+            "integrity": "sha512-3/q1qUsO/tLqGBaD4uXsB6coVGB3usxw3qyeVb59aArCgedSF66MPdgRStUd7vbZOsko/CgVaY5fo2vkvPLWiA==",
             "cpu": [
                 "arm64"
             ],
@@ -2829,9 +2829,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.0.tgz",
-            "integrity": "sha512-CV2aqhDDOsABKHKhNcs1SZFryffQf8vK2XrxP6lxC99ELZAdvsDgPklIBfd65R8R+qvOm1SmLaZ/Fdq961+m7A==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.6.tgz",
+            "integrity": "sha512-oLHxuyywc6efdKVTxvc0135zPrRdtYVjtVD5GUm55I3ODxhU/PwkQFD97z16Xzxa1Fz0AEe4W/2hzRtd+IfpOA==",
             "cpu": [
                 "ia32"
             ],
@@ -2843,9 +2843,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.0.tgz",
-            "integrity": "sha512-g2ASy1QwHP88y5KWvblUolJz9rN+i4ZOsYzkEwcNfaNooxNUXG+ON6F5xFo0NIItpHqxcdAyls05VXpBnludGw==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.6.tgz",
+            "integrity": "sha512-0PVwmgzZ8+TZ9oGBmdZoQVXflbvuwzN/HRclujpl4N/q3i+y0lqLw8n1bXA8ru3sApDjlmONaNAuYr38y1Kr9w==",
             "cpu": [
                 "x64"
             ],
@@ -3051,9 +3051,9 @@
             "license": "MIT"
         },
         "node_modules/@types/http-proxy": {
-            "version": "1.17.15",
-            "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
-            "integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
+            "version": "1.17.16",
+            "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
+            "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3133,9 +3133,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.13.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.0.tgz",
-            "integrity": "sha512-ClIbNe36lawluuvq3+YYhnIN2CELi+6q8NpnM7PYp4hBn/TatfboPgVSm2rwKRfnV2M+Ty9GWDFI64KEe+kysA==",
+            "version": "22.13.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
+            "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4448,9 +4448,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001696",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz",
-            "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==",
+            "version": "1.0.30001698",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001698.tgz",
+            "integrity": "sha512-xJ3km2oiG/MbNU8G6zIq6XRZ6HtAOVXsbOrP/blGazi52kc5Yy7b6sDA5O+FbROzRrV7BSTllLHuNvmawYUJjw==",
             "dev": true,
             "funding": [
                 {
@@ -5663,9 +5663,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.90",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz",
-            "integrity": "sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==",
+            "version": "1.5.96",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.96.tgz",
+            "integrity": "sha512-8AJUW6dh75Fm/ny8+kZKJzI1pgoE8bKLZlzDU2W1ENd+DXKJrx7I7l9hb8UWR4ojlnb5OlixMt00QWiYJoVw1w==",
             "dev": true,
             "license": "ISC"
         },
@@ -5720,9 +5720,9 @@
             }
         },
         "node_modules/enhanced-resolve": {
-            "version": "5.18.0",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
-            "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
+            "version": "5.18.1",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+            "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -7159,9 +7159,9 @@
             "license": "MIT"
         },
         "node_modules/import-fresh": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+            "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8387,9 +8387,9 @@
             }
         },
         "node_modules/object-inspect": {
-            "version": "1.13.3",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
-            "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
+            "version": "1.13.4",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+            "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -9183,9 +9183,9 @@
             }
         },
         "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
-            "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+            "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -9213,9 +9213,9 @@
             }
         },
         "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
-            "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+            "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -9987,9 +9987,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.34.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.0.tgz",
-            "integrity": "sha512-+4C/cgJ9w6sudisA0nZz0+O7lTP9a3CzNLsoDwaRumM8QHwghUsu6tqHXiTmNUp/rqNiM14++7dkzHDyCRs0Jg==",
+            "version": "4.34.6",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.6.tgz",
+            "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10003,25 +10003,25 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.34.0",
-                "@rollup/rollup-android-arm64": "4.34.0",
-                "@rollup/rollup-darwin-arm64": "4.34.0",
-                "@rollup/rollup-darwin-x64": "4.34.0",
-                "@rollup/rollup-freebsd-arm64": "4.34.0",
-                "@rollup/rollup-freebsd-x64": "4.34.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.34.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.34.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.34.0",
-                "@rollup/rollup-linux-arm64-musl": "4.34.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.34.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.34.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.34.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.34.0",
-                "@rollup/rollup-linux-x64-gnu": "4.34.0",
-                "@rollup/rollup-linux-x64-musl": "4.34.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.34.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.34.0",
-                "@rollup/rollup-win32-x64-msvc": "4.34.0",
+                "@rollup/rollup-android-arm-eabi": "4.34.6",
+                "@rollup/rollup-android-arm64": "4.34.6",
+                "@rollup/rollup-darwin-arm64": "4.34.6",
+                "@rollup/rollup-darwin-x64": "4.34.6",
+                "@rollup/rollup-freebsd-arm64": "4.34.6",
+                "@rollup/rollup-freebsd-x64": "4.34.6",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.34.6",
+                "@rollup/rollup-linux-arm-musleabihf": "4.34.6",
+                "@rollup/rollup-linux-arm64-gnu": "4.34.6",
+                "@rollup/rollup-linux-arm64-musl": "4.34.6",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.34.6",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.34.6",
+                "@rollup/rollup-linux-riscv64-gnu": "4.34.6",
+                "@rollup/rollup-linux-s390x-gnu": "4.34.6",
+                "@rollup/rollup-linux-x64-gnu": "4.34.6",
+                "@rollup/rollup-linux-x64-musl": "4.34.6",
+                "@rollup/rollup-win32-arm64-msvc": "4.34.6",
+                "@rollup/rollup-win32-ia32-msvc": "4.34.6",
+                "@rollup/rollup-win32-x64-msvc": "4.34.6",
                 "fsevents": "~2.3.2"
             }
         },
@@ -10077,9 +10077,9 @@
             "license": "MIT"
         },
         "node_modules/sass": {
-            "version": "1.83.4",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.4.tgz",
-            "integrity": "sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==",
+            "version": "1.84.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.84.0.tgz",
+            "integrity": "sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10168,9 +10168,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
-            "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
+            "version": "7.7.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
             "dev": true,
             "license": "ISC",
             "bin": {
@@ -10871,9 +10871,9 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.37.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
-            "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
+            "version": "5.38.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.38.1.tgz",
+            "integrity": "sha512-GWANVlPM/ZfYzuPHjq0nxT+EbOEDDN3Jwhwdg1D8TU8oSkktp8w64Uq4auuGLxFSoNTRDncTq2hQHX1Ld9KHkA==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -11297,15 +11297,15 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.0.11",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.11.tgz",
-            "integrity": "sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==",
+            "version": "6.1.0",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz",
+            "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "esbuild": "^0.24.2",
-                "postcss": "^8.4.49",
-                "rollup": "^4.23.0"
+                "postcss": "^8.5.1",
+                "rollup": "^4.30.1"
             },
             "bin": {
                 "vite": "bin/vite.js"

phpunit.xml

@@ -45,6 +45,9 @@
         <testsuite name="integration">
             <directory suffix="Test.php">./tests/integration</directory>
         </testsuite>
+        <testsuite name="feature">
+            <directory suffix="Test.php">./tests/feature</directory>
+        </testsuite>
     </testsuites>
     <source>
         <include>

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

@@ -33,15 +33,33 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12 col-xs-12">
+            <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12 col-xs-12" v-if="currencies.length < 2">
+                <div class="box box-default" v-for="currency in currencies" :key="currency.id">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ $t('firefly.not_enough_currencies') }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <p>
+                            {{ $t('firefly.not_enough_currencies_enabled') }}
+                        </p>
+                    </div>
+                </div>
+            </div>
+            <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12 col-xs-12" v-if="currencies.length > 1">
                 <div class="box box-default" v-for="currency in currencies" :key="currency.id">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ currency.name }}</h3>
                     </div>
                     <div class="box-body">
-                        <ul v-if="currencies.length > 0">
+                        <ul v-if="currencies.length > 1">
                             <li v-for="sub in currencies" :key="sub.id" v-show="sub.id !== currency.id">
-                                <a :href="'exchange-rates/' + currency.code + '/' + sub.code" :title="$t('firefly.exchange_rates_from_to', {from: currency.name, to: sub.name})">{{ $t('firefly.exchange_rates_from_to', {from: currency.name, to: sub.name}) }}</a>
+                                <a :href="'exchange-rates/' + currency.code + '/' + sub.code"
+                                   :title="$t('firefly.exchange_rates_from_to', {from: currency.name, to: sub.name})">{{
+                                        $t('firefly.exchange_rates_from_to', {
+                                            from: currency.name,
+                                            to: sub.name
+                                        })
+                                    }}</a>
                             </li>
                         </ul>
                     </div>
@@ -57,6 +75,7 @@ export default {
     data() {
         return {
             currencies: [],
+            page: 1,
         };
     },
     mounted() {
@@ -65,6 +84,7 @@ export default {
     methods: {
         getCurrencies: function () {
             this.currencies = [];
+            // start with page one, loop for the rest.
             this.downloadCurrencies(1);
         },
         downloadCurrencies: function (page) {
@@ -72,12 +92,14 @@ export default {
                 for (let i in response.data.data) {
                     if (response.data.data.hasOwnProperty(i)) {
                         let current = response.data.data[i];
-                        let currency = {
-                            id: current.id,
-                            name: current.attributes.name,
-                            code: current.attributes.code,
-                        };
-                        this.currencies.push(currency);
+                        if (current.attributes.enabled) {
+                            let currency = {
+                                id: current.id,
+                                name: current.attributes.name,
+                                code: current.attributes.code,
+                            };
+                            this.currencies.push(currency);
+                        }
                     }
                 }
 

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

@@ -42,6 +42,27 @@
                         <h3 class="box-title">{{ $t('firefly.header_exchange_rates_table') }}</h3>
                     </div>
                     <div class="box-body no-padding">
+                        <nav v-if="totalPages > 1">
+                            <ul class="pagination">
+                                <li v-if="1 === this.page" class="page-item disabled" aria-disabled="true" :aria-label="$t('pagination.previous')">
+                                    <span class="page-link" aria-hidden="true">&lsaquo;</span>
+                                </li>
+                                <li class="page-item" v-if="1 !== this.page">
+                                    <a class="page-link" :href="'/exchange-rates/'+from_code+'/'+to_code+'?page=' + (this.page-1)" rel="prev" :aria-label="$t('pagination.next')">&lsaquo;</a>
+                                </li>
+                                <li v-for="item in this.totalPages" :class="item === page ? 'page-item active' : 'page-item'" aria-current="page">
+                                    <span v-if="item === page" class="page-link" v-text="item"></span>
+                                    <a v-if="item !== page" class="page-link" :href="'/exchange-rates/'+from_code+'/'+to_code+'?page=' + item" v-text="item"></a>
+                                </li>
+                                <li v-if="totalPages !== page" class="page-item">
+                                    <a class="page-link" :href="'/exchange-rates/'+from_code+'/'+to_code+'?page=' + (this.page+1)" rel="next" :aria-label="$t('pagination.next')">&rsaquo;</a>
+                                </li>
+                                <li v-if="totalPages === page" class="page-item disabled" aria-disabled="true" :aria-label="$t('pagination.next')">
+                                    <span class="page-link" aria-hidden="true">&rsaquo;</span>
+                                </li>
+                            </ul>
+                        </nav>
+
                         <table class="table table-responsive table-hover">
                             <thead>
                             <tr>
@@ -76,10 +97,10 @@
                                     >
                                 </td>
                                 <td>
-                                    <input type="number" class="form-control" min="0" v-model="rate.rate">
+                                    <input type="number" class="form-control" min="0" step="any" v-model="rate.rate">
                                 </td>
                                 <td>
-                                    <input type="number" class="form-control" min="0" v-model="rate.inverse">
+                                    <input type="number" class="form-control" min="0" step="any" v-model="rate.inverse">
                                 </td>
                                 <td>
                                     <div class="btn-group">
@@ -98,6 +119,28 @@
                             </tr>
                             </tbody>
                         </table>
+
+                        <nav v-if="totalPages > 1">
+                            <ul class="pagination">
+                                <li v-if="1 === this.page" class="page-item disabled" aria-disabled="true" :aria-label="$t('pagination.previous')">
+                                    <span class="page-link" aria-hidden="true">&lsaquo;</span>
+                                </li>
+                                <li class="page-item" v-if="1 !== this.page">
+                                    <a class="page-link" :href="'/exchange-rates/'+from_code+'/'+to_code+'?page=' + (this.page-1)" rel="prev" :aria-label="$t('pagination.next')">&lsaquo;</a>
+                                </li>
+                                <li v-for="item in this.totalPages" :class="item === page ? 'page-item active' : 'page-item'" aria-current="page">
+                                    <span v-if="item === page" class="page-link" v-text="item"></span>
+                                    <a v-if="item !== page" class="page-link" :href="'/exchange-rates/'+from_code+'/'+to_code+'?page=' + item" v-text="item"></a>
+                                </li>
+                                <li v-if="totalPages !== page" class="page-item">
+                                    <a class="page-link" :href="'/exchange-rates/'+from_code+'/'+to_code+'?page=' + (this.page+1)" rel="next" :aria-label="$t('pagination.next')">&rsaquo;</a>
+                                </li>
+                                <li v-if="totalPages === page" class="page-item disabled" aria-disabled="true" :aria-label="$t('pagination.next')">
+                                    <span class="page-link" aria-hidden="true">&rsaquo;</span>
+                                </li>
+                            </ul>
+                        </nav>
+
                     </div>
                 </div>
             </div>
@@ -167,16 +210,26 @@ export default {
             loading: true,
             posting: false,
             updating: false,
+            page: 1,
+            totalPages: 1,
         };
     },
     mounted() {
         // get from and to code from URL
         this.newDate = format(new Date, 'yyyy-MM-dd');
         let parts = window.location.href.split('/');
-        this.from_code = parts[parts.length - 2].substring(0, 3);
-        this.to_code = parts[parts.length - 1].substring(0, 3);
+        this.from_code = parts[parts.length - 2];
+        this.to_code = parts[parts.length - 1];
+
+        const params = new Proxy(new URLSearchParams(window.location.search), {
+            get: (searchParams, prop) => searchParams.get(prop),
+        });
+        this.page = parseInt(params.page ?? 1);
+
+
         this.downloadCurrencies();
-        this.downloadRates(1);
+        this.rates = [];
+        this.downloadRates(this.page);
     },
     methods: {
         submitRate: function(e) {
@@ -203,16 +256,11 @@ export default {
             return ('' === this.rates[index].rate && '' === this.rates[index].inverse) || this.updating;
         },
         updateRate: function (index) {
-            // console.log('Update!');
-            // console.log(this.rates[index].key);
             let parts = this.spliceKey(this.rates[index].key);
             if (0 === parts.length) {
                 return;
             }
             if ('' !== this.rates[index].rate) {
-                // update rate
-                // console.log('Rate is ' + this.rates[index].rate);
-                // console.log('ID is ' + this.rates[index].rate_id);
                 this.updating = true;
                 axios.put("./api/v1/exchange-rates/" + this.rates[index].rate_id, {rate: this.rates[index].rate})
                     .then(() => {
@@ -220,9 +268,6 @@ export default {
                     });
             }
             if ('' !== this.rates[index].inverse) {
-                // update inverse
-                // console.log('Inverse is ' + this.rates[index].inverse);
-                // console.log('Inverse ID is ' + this.rates[index].inverse_id);
                 this.updating = true;
                 axios.put("./api/v1/exchange-rates/" + this.rates[index].inverse_id, {rate: this.rates[index].inverse})
                     .then(() => {
@@ -281,7 +326,6 @@ export default {
         },
         downloadRates: function (page) {
             this.tempRates = {};
-            this.rates = [];
             this.loading = true;
             axios.get("./api/v1/exchange-rates/rates/" + this.from_code + '/' + this.to_code + '?page=' + page).then((response) => {
                 for (let i in response.data.data) {
@@ -334,13 +378,10 @@ export default {
 
                     }
                 }
-                if (parseInt(response.data.meta.pagination.current_page) < parseInt(response.data.meta.pagination.total_pages)) {
-                    this.downloadRates(page + 1);
-                }
-                if (parseInt(response.data.meta.pagination.current_page) === parseInt(response.data.meta.pagination.total_pages)) {
-                    this.loading = false;
-                    this.rates = Object.values(this.tempRates);
-                }
+                this.totalPages = parseInt(response.data.meta.pagination.total_pages);
+                this.loading = false;
+                this.rates = Object.values(this.tempRates);
+                console.log('Do not download more pages. Now on page ' + this.page + ' of ' + this.totalPages);
             });
         }
     },

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438",
         "single_split": "\u0420\u0430\u0437\u0434\u0435\u043b",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f #{ID}(\"{title}\")<\/a> \u0431\u0435\u0448\u0435 \u0437\u0430\u043f\u0438\u0441\u0430\u043d\u0430.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Dividir",
         "single_split": "Divisi\u00f3",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "La <a href=\"transactions\/show\/{ID}\">Transacci\u00f3 #{ID} (\"{title}\")<\/a> s'ha desat.",
         "webhook_stored_link": "S'ha desat <a href=\"webhooks\/show\/{ID}\">el Webook #{ID} (\"{title}\")<\/a> correctament.",
         "webhook_updated_link": "S'ha actualitzat el <a href=\"webhooks\/show\/{ID}\">Webook #{ID}<\/a> (\"{title}\").",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Rozd\u011blit",
         "single_split": "Rozd\u011blit",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> byl ulo\u017een.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") byl aktualizov\u00e1n.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Opdel",
         "single_split": "Opdel",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Ist abgestimmt",
         "split": "Teilen",
         "single_split": "Teilen",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Buchung #{ID} (\"{title}\")<\/a> wurde gespeichert.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> wurde gespeichert.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") wurde aktualisiert.",
@@ -138,7 +140,7 @@
         "visit_webhook_url": "Webhook-URL besuchen",
         "reset_webhook_secret": "Webhook Secret zur\u00fccksetzen",
         "header_exchange_rates": "Wechselkurse",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
+        "exchange_rates_intro": "Firefly III unterst\u00fctzt das Herunterladen und Verwenden von Wechselkursen. Lesen Sie mehr dar\u00fcber in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\"> der Dokumentation<\/a>.",
         "exchange_rates_from_to": "Zwischen {from} und {to} (und umgekehrt)",
         "exchange_rates_intro_rates": "Firefly III verwendet die folgenden Wechselkurse. Der Kehrwert wird automatisch berechnet, wenn er nicht angegeben wurde. Wenn f\u00fcr das Datum der Transaktion kein Wechselkurs vorhanden ist, sucht Firefly III in der Vergangenheit nach einem Kurs. Wenn keine vorhanden sind, wird der Kurs \u201e1\u201c verwendet.",
         "header_exchange_rates_rates": "Wechselkurse",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "\u0394\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
         "single_split": "\u0394\u03b9\u03b1\u03c7\u03c9\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0397 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae #{ID} (\"{title}\")<\/a> \u03ad\u03c7\u03b5\u03b9 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03c4\u03b5\u03af.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> \u03ad\u03c7\u03b5\u03b9 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03c4\u03b5\u03af.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">\u03a4\u03bf Webhook #{ID}<\/a> (\"{title}\") \u03ad\u03c7\u03b5\u03b9 \u03b5\u03bd\u03b7\u03bc\u03b5\u03c1\u03c9\u03b8\u03b5\u03af.",

resources/assets/v1/src/locales/en-gb.json

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Split",
         "single_split": "Split",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Split",
         "single_split": "Split",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Separar",
         "single_split": "Divisi\u00f3n",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">La transacci\u00f3n #{ID} (\"{title}\")<\/a> ha sido almacenada.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">El webhook #{ID} (\"{title}\")<\/a> ha sido almacenado.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">El webhook #{ID} (\"{title}\")<\/a> ha sido actualizado.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Jaa",
         "single_split": "Jako",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Tapahtuma #{ID} (\"{title}\")<\/a> on tallennettu.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Est rapproch\u00e9",
         "split": "S\u00e9paration",
         "single_split": "S\u00e9paration unique",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">L'op\u00e9ration n\u00b0{ID} (\"{title}\")<\/a> a \u00e9t\u00e9 enregistr\u00e9e.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Le Webhook #{ID} (\"{title}\")<\/a> a \u00e9t\u00e9 enregistr\u00e9.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Le webhook #{ID}<\/a> (\"{title}\") a \u00e9t\u00e9 mis \u00e0 jour.",
@@ -138,7 +140,7 @@
         "visit_webhook_url": "Visiter l'URL du webhook",
         "reset_webhook_secret": "R\u00e9initialiser le secret du webhook",
         "header_exchange_rates": "Taux de change",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
+        "exchange_rates_intro": "Firefly III prend en charge le chargement et l'utilisation des taux de change. En savoir plus \u00e0 ce sujet dans <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">la documentation<\/a>.",
         "exchange_rates_from_to": "Entre {from} et {to} (et l'inverse)",
         "exchange_rates_intro_rates": "Firefly III utilise les taux de change suivants. L'inverse est calcul\u00e9 automatiquement lorsqu'il n'est pas fourni. Si aucun taux de change n'existe pour la date de la transaction, Firefly III reviendra dans le temps pour en trouver un. Si aucun n'est pr\u00e9sent, le taux \"1\" sera utilis\u00e9.",
         "header_exchange_rates_rates": "Taux de change",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Feloszt\u00e1s",
         "single_split": "Feloszt\u00e1s",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> mentve.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> elt\u00e1rolva.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") friss\u00edtve.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Pisah",
         "single_split": "Pisah",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Dividi",
         "single_split": "Divisione",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "La <a href=\"transactions\/show\/{ID}\">transazione #{ID} (\"{title}\")<\/a> \u00e8 stata salvata.",
         "webhook_stored_link": "Il <a href=\"webhooks\/show\/{ID}\">webhook #{ID} (\"{title}\")<\/a> \u00e8 stato archiviato.",
         "webhook_updated_link": "Il <a href=\"webhooks\/show\/{ID}\">webhook #{ID} (\"{title}\")<\/a> \u00e8 stato aggiornato.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "\u5206\u5272",
         "single_split": "\u5206\u5272",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u53d6\u5f15 #{ID}\u300c{title}\u300d<\/a> \u304c\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f\u3002",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> \u304c\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f\u3002",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> \u304c\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f\u3002",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "\ub098\ub204\uae30",
         "single_split": "\ub098\ub204\uae30",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\uac70\ub798 #{ID} (\"{title}\")<\/a>\uac00 \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">\uc6f9\ud6c5 #{ID} (\"{title}\")<\/a>\uc774 \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">\uc6f9\ud6c5 #{ID}<\/a> (\"{title}\")\uc774 \uc5c5\ub370\uc774\ud2b8 \ub418\uc5c8\uc2b5\ub2c8\ub2e4.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Del opp",
         "single_split": "Del opp",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaksjon #{ID} (\"{title}\")<\/a> har blitt lagret.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> er lagret.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") er oppdatert.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is afgestemd",
         "split": "Splitsen",
         "single_split": "Split",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transactie #{ID} (\"{title}\")<\/a> is opgeslagen.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} ({title})<\/a> is opgeslagen.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} ({title})<\/a> is ge\u00fcpdatet.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Del opp",
         "single_split": "Del opp",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaksjon #{ID} (\"{title}\")<\/a> har vorte lagra.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> er lagra.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") er oppdatert.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Podziel",
         "single_split": "Podzia\u0142",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakcja #{ID} (\"{title}\")<\/a> zosta\u0142a zapisana.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> zosta\u0142 zapisany.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") zosta\u0142 zaktualizowany.",
@@ -28,7 +30,7 @@
         "apply_rules_checkbox": "Zastosuj regu\u0142y",
         "fire_webhooks_checkbox": "Uruchom webhooki",
         "no_budget_pointer": "Wygl\u0105da na to, \u017ce nie masz jeszcze bud\u017cet\u00f3w. Powiniene\u015b utworzy\u0107 kilka na stronie <a href=\"budgets\">bud\u017cet\u00f3w<\/a>. Bud\u017cety mog\u0105 Ci pom\u00f3c \u015bledzi\u0107 wydatki.",
-        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
+        "no_bill_pointer": "Wygl\u0105da na to, \u017ce nie masz jeszcze subskrypcji. Powiniene\u015b utworzy\u0107 j\u0105 na stronie <a href=\"subscriptions\">subskrypcji<\/a>. Subskrypcje mog\u0105 pom\u00f3c Ci \u015bledzi\u0107 wydatki.",
         "source_account": "Konto \u017ar\u00f3d\u0142owe",
         "hidden_fields_preferences": "Mo\u017cesz w\u0142\u0105czy\u0107 wi\u0119cej opcji transakcji w swoich <a href=\"preferences\">ustawieniach<\/a>.",
         "destination_account": "Konto docelowe",
@@ -151,7 +153,7 @@
         "url": "URL",
         "active": "Aktywny",
         "interest_date": "Data odsetek",
-        "administration_currency": "Native currency",
+        "administration_currency": "Waluta natywna",
         "title": "Tytu\u0142",
         "date": "Data",
         "book_date": "Data ksi\u0119gowania",
@@ -166,12 +168,12 @@
         "webhook_delivery": "Dor\u0119czenie",
         "from_currency_to_currency": "{from} &rarr; {to}",
         "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Rate"
+        "rate": "Kurs"
     },
     "list": {
         "title": "Tytu\u0142",
         "active": "Jest aktywny?",
-        "native_currency": "Native currency",
+        "native_currency": "Waluta natywna",
         "trigger": "Wyzwalacz",
         "response": "Odpowied\u017a",
         "delivery": "Dor\u0119czenie",

resources/assets/v1/src/locales/pt-br.json

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Dividir",
         "single_split": "Divis\u00e3o",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transa\u00e7\u00e3o #{ID} (\"{title}\")<\/a> foi salva.",
         "webhook_stored_link": "<a href=\"transactions\/show\/{ID}\">Webhooh #{ID} (\"{title}\")<\/a> foi salva.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") foi atualizado.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Dividir",
         "single_split": "Divis\u00e3o",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">A transa\u00e7\u00e3o #{ID} (\"{title}\")<\/a> foi guardada.",
         "webhook_stored_link": "<a href=\"transactions\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> foi guardado.",
         "webhook_updated_link": "<a href=\"transactions\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> foi guardado.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "\u00cemparte",
         "single_split": "\u00cemparte",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Tranzac\u021bia #{ID} (\"{title}\")<\/a> a fost stocat\u0103.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> a fost stocat.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") a fost actualizat.",

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

@@ -1,10 +1,10 @@
 {
     "firefly": {
         "administrations_page_title": "\u0424\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u0435 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b",
-        "administrations_index_menu": "Financial administrations",
-        "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.",
-        "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.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "administrations_index_menu": "\u0424\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u0435 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u044b",
+        "temp_administrations_introduction": "Firefly III \u0432\u0441\u043a\u043e\u0440\u0435 \u043f\u043e\u043b\u0443\u0447\u0438\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u043c\u0438 \u0444\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u044b\u043c\u0438 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f\u043c\u0438. \u0421\u0435\u0439\u0447\u0430\u0441 \u0443 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u043d\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0437\u0430\u0434\u0430\u0442\u044c \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u044d\u0442\u043e\u0439 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0438 \u0435\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443. \u042d\u0442\u043e \u0437\u0430\u043c\u0435\u043d\u044f\u0435\u0442 \u043f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440, \u0432 \u043a\u043e\u0442\u043e\u0440\u043e\u043c \u0432\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043b\u0438 \"\u0432\u0430\u043b\u044e\u0442\u0443 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e\". \u0412 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0432\u0440\u0435\u043c\u044f \u044d\u0442\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0441\u0432\u044f\u0437\u0430\u043d\u0430 \u0441 \u0444\u0438\u043d\u0430\u043d\u0441\u043e\u0432\u043e\u0439 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0435\u0439 \u0438 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0440\u0430\u0437\u043b\u0438\u0447\u043d\u043e\u0439 \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430.",
+        "administration_currency_form_help": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u043d\u044f\u0442\u044c \u043c\u043d\u043e\u0433\u043e \u0432\u0440\u0435\u043c\u0435\u043d\u0438, \u0435\u0441\u043b\u0438 \u0432\u044b \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443, \u043f\u043e\u0442\u043e\u043c\u0443 \u0447\u0442\u043e \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0440\u0435\u043e\u0431\u0440\u0430\u0437\u043e\u0432\u0430\u043d\u0430 \u0432 \u043d\u043e\u0432\u0443\u044e \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0432\u0430\u043b\u044e\u0442\u0443.",
+        "administrations_page_edit_sub_title_js": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0444\u0438\u043d\u0430\u043d\u0441\u0430\u043c\u0438 \"{title}\"",
         "table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
         "welcome_back": "\u0427\u0442\u043e \u043f\u0440\u043e\u0438\u0441\u0445\u043e\u0434\u0438\u0442 \u0441 \u043c\u043e\u0438\u043c\u0438 \u0444\u0438\u043d\u0430\u043d\u0441\u0430\u043c\u0438?",
         "flash_error": "\u041e\u0448\u0438\u0431\u043a\u0430!",
@@ -18,6 +18,8 @@
         "is_reconciled": "\u0421\u0432\u0435\u0440\u0435\u043d\u043e",
         "split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u044c",
         "single_split": "\u0420\u0430\u0437\u0434\u0435\u043b\u0451\u043d\u043d\u0430\u044f \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f #{ID} (\"{title}\")<\/a> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0430.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">\u0412\u0435\u0431-\u0445\u0443\u043a #{ID} (\"{title}\")<\/a> \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">\u0412\u0435\u0431-\u0445\u0443\u043a #{ID} (\"{title}\")<\/a> \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d.",
@@ -138,7 +140,7 @@
         "visit_webhook_url": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c URL \u0432\u0435\u0431\u0445\u0443\u043a\u0430",
         "reset_webhook_secret": "",
         "header_exchange_rates": "\u041a\u0443\u0440\u0441\u044b \u0432\u0430\u043b\u044e\u0442",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
+        "exchange_rates_intro": "Firefly III \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0443 \u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u043a\u0443\u0440\u0441\u043e\u0432 \u043e\u0431\u043c\u0435\u043d\u0430. \u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 \u043e\u0431 \u044d\u0442\u043e\u043c \u0447\u0438\u0442\u0430\u0439\u0442\u0435 \u0432 <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">\u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u0438<\/a>.",
         "exchange_rates_from_to": "\u041c\u0435\u0436\u0434\u0443 {from} \u0438 {to} (\u0438 \u043d\u0430\u043e\u0431\u043e\u0440\u043e\u0442)",
         "exchange_rates_intro_rates": "Firefly III \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043e\u0431\u043c\u0435\u043d\u043d\u044b\u0435 \u043a\u0443\u0440\u0441\u044b. \u041e\u0431\u0440\u0430\u0442\u043d\u044b\u0439 \u043a\u0443\u0440\u0441 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u0440\u0430\u0441\u0441\u0447\u0438\u0442\u044b\u0432\u0430\u0435\u0442\u0441\u044f, \u043a\u043e\u0433\u0434\u0430 \u043e\u043d \u043d\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d. \u0415\u0441\u043b\u0438 \u043d\u0430 \u0434\u0430\u0442\u0443 \u0441\u0434\u0435\u043b\u043a\u0438 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u043e\u0431\u043c\u0435\u043d\u043d\u043e\u0433\u043e \u043a\u0443\u0440\u0441\u0430, \u0442\u043e Firefly III \u0432\u0435\u0440\u043d\u0435\u0442\u0441\u044f \u0432 \u043d\u0443\u0436\u043d\u043e\u0435 \u0432\u0440\u0435\u043c\u044f. \u0415\u0441\u043b\u0438 \u0438\u0445 \u043d\u0435\u0442, \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u043a\u0443\u0440\u0441 \"1\".",
         "header_exchange_rates_rates": "\u041a\u0443\u0440\u0441\u044b \u0432\u0430\u043b\u044e\u0442",
@@ -151,7 +153,7 @@
         "url": "\u0421\u0441\u044b\u043b\u043a\u0430",
         "active": "\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0439",
         "interest_date": "\u0414\u0430\u0442\u0430 \u043d\u0430\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u044f \u043f\u0440\u043e\u0446\u0435\u043d\u0442\u043e\u0432",
-        "administration_currency": "Native currency",
+        "administration_currency": "\u041e\u0441\u043d\u043e\u0432\u043d\u0430\u044f \u0432\u0430\u043b\u044e\u0442\u0430",
         "title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
         "date": "\u0414\u0430\u0442\u0430",
         "book_date": "\u0414\u0430\u0442\u0430 \u0431\u0440\u043e\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f",
@@ -171,7 +173,7 @@
     "list": {
         "title": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
         "active": "\u0410\u043a\u0442\u0438\u0432\u0435\u043d?",
-        "native_currency": "Native currency",
+        "native_currency": "\u041e\u0441\u043d\u043e\u0432\u043d\u0430\u044f \u0432\u0430\u043b\u044e\u0442\u0430",
         "trigger": "\u0421\u043e\u0431\u044b\u0442\u0438\u0435",
         "response": "\u041e\u0442\u0432\u0435\u0442",
         "delivery": "\u0414\u043e\u0441\u0442\u0430\u0432\u043a\u0430",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Roz\u00fa\u010dtova\u0165",
         "single_split": "Roz\u00fa\u010dtova\u0165",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakcia #{ID} (\"{title}\")<\/a> bola ulo\u017een\u00e1.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Je usklajena",
         "split": "Razdeli",
         "single_split": "Razdeli",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakcija \u0161t. #{ID} (\"{title}\")<\/a> je bila shranjena.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> je bil shranjen.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") je bil posodobljen.",
@@ -138,7 +140,7 @@
         "visit_webhook_url": "Obi\u0161\u010dite URL webhooka",
         "reset_webhook_secret": "Ponastavi skrivno kodo webhooka",
         "header_exchange_rates": "Menjalni te\u010daji",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
+        "exchange_rates_intro": "Firefly III podpira prenos in uporabo menjalnih te\u010dajev. Preberite ve\u010d o tem v <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">dokumentaciji<\/a>.",
         "exchange_rates_from_to": "Med {from} in {to} (in obratno)",
         "exchange_rates_intro_rates": "Firefly III uporablja naslednje menjalne te\u010daje. Obratna vrednost se samodejno izra\u010duna, \u010de ni na voljo. \u010ce na dan transakcije ni menjalnega te\u010daja, se bo Firefly III vrnil v preteklost, da bi ga na\u0161el. \u010ce jih ni, se uporabi te\u010daj \"1\".",
         "header_exchange_rates_rates": "Menjalni te\u010daji",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Dela",
         "single_split": "Dela",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaktion #{ID} (\"{title}\")<\/a> sparades.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "B\u00f6l",
         "single_split": "B\u00f6l",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0130\u015flem #{ID} (\"{title}\")<\/a> sakl\u0131 olmu\u015ftur.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "\u0420\u043e\u0437\u0434\u0456\u043b\u0438\u0442\u0438",
         "single_split": "\u0420\u043e\u0437\u0434\u0456\u043b\u0438\u0442\u0438",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u0422\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0456\u044f #{ID} (\"{title}\")<\/a> \u0431\u0443\u043b\u0430 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0430.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">\u0412\u0435\u0431\u0445\u0443\u043a #{ID} (\"{title}\")<\/a> \u0431\u0443\u0432 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0438\u0439.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">\u0412\u0435\u0431\u0445\u0443\u043a #{ID}<\/a> (\"{title}\") \u0431\u0443\u0432 \u043e\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0439.",

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

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "Chia ra",
         "single_split": "Chia ra",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Giao d\u1ecbch #{ID} (\"{title}\")<\/a> \u0111\u00e3 \u0111\u01b0\u1ee3c l\u01b0u tr\u1eef.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> \u0111\u00e3 \u0111\u01b0\u1ee3c l\u01b0u tr\u1eef.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") \u0111\u00e3 \u0111\u01b0\u1ee3c c\u1eadp nh\u1eadt.",

resources/assets/v1/src/locales/zh-cn.json

@@ -18,6 +18,8 @@
         "is_reconciled": "\u5df2\u6838\u9500",
         "split": "\u62c6\u5206",
         "single_split": "\u62c6\u5206",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">\u4ea4\u6613 #{ID} (\u201c{title}\u201d)<\/a> \u5df2\u4fdd\u5b58\u3002",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">\u63a8\u9001 #{ID} (\"{title}\")<\/a> \u5df2\u4fdd\u5b58.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">\u63a8\u9001 #{ID}<\/a> (\"{title}\") \u5df2\u66f4\u65b0.",

resources/assets/v1/src/locales/zh-tw.json

@@ -18,6 +18,8 @@
         "is_reconciled": "Is reconciled",
         "split": "\u5206\u5272",
         "single_split": "\u62c6\u5206",
+        "not_enough_currencies": "Not enough currencies",
+        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> has been stored.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") has been updated.",

resources/lang/en_US/firefly.php

@@ -733,7 +733,7 @@ return [
     // END
     'general_search_error'                                    => 'An error occurred while searching. Please check the log files for more information.',
     'search_box'                                              => 'Search',
-    'search_box_intro'                                        => 'Welcome to the search function of Firefly III. Enter your search query in the box. Make sure you check out the help file because the search is pretty advanced.',
+    'search_box_intro'                                        => 'Welcome to the search function of Firefly III. Enter your search query in the box. <a href="https://docs.firefly-iii.org/how-to/firefly-iii/features/search/">Make sure you check out the help file</a> because the search is pretty advanced.',
     'search_error'                                            => 'Error while searching',
     'search_searching'                                        => 'Searching ...',
     'search_results'                                          => 'Search results',
@@ -1474,6 +1474,8 @@ return [
     'help_rate_form'                                          => 'On this day, how many {to} will you get for one {from}?',
     'save_new_rate'                                           => 'Save new rate',
     'add_new_rate'                                            => 'Add a new exchange rate',
+    'not_enough_currencies'                                   => 'Not enough currencies',
+    'not_enough_currencies_enabled'                           => 'If you have just one currency enabled, there is no need to add exchange rates.',
 
     // Financial administrations
     'administration_index'                                    => 'Financial administration',

resources/views/errors/500.blade.php

@@ -30,11 +30,11 @@
                     {{ trans('errors.github_help') }}
                 </h4>
                 <p>
-                    {{ trans('errors.github_instructions') }} |raw
+                    {!! trans('errors.github_instructions') !!}
                 </p>
                 <ol>
                     <li>{{ trans('errors.use_search') }}</li>
-                    <li>{{ trans('errors.include_info', ['link' => route('debug') ]) }}</li> |raw
+                    <li>{!!  trans('errors.include_info', ['link' => route('debug') ]) !!}</li>
                     <li>{{ trans('errors.tell_more') }}</li>
                     <li>{{ trans('errors.include_logs') }}</li>
                     <li>{{ trans('errors.what_did_you_do') }}</li>

resources/views/errors/DatabaseException.blade.php

@@ -30,11 +30,11 @@
                     {{ trans('errors.github_help') }}
                 </h4>
                 <p>
-                    {{ trans('errors.github_instructions') }} |raw
+                    {!! trans('errors.github_instructions') !!}
                 </p>
                 <ol>
                     <li>{{ trans('errors.use_search') }}</li>
-                    <li>{{ trans('errors.include_info', ['link' => route('debug') ]) }}</li>
+                    <li>{!!  trans('errors.include_info', ['link' => route('debug') ]) !!}</li>
                     <li>{{ trans('errors.tell_more') }}</li>
                     <li>{{ trans('errors.include_logs') }}</li>
                     <li>{{ trans('errors.what_did_you_do') }}</li>

resources/views/errors/FireflyException.blade.php

@@ -30,11 +30,11 @@
                     {{ trans('errors.github_help') }}
                 </h4>
                 <p>
-                    {{ trans('errors.github_instructions') }} |raw
+                    {!! trans('errors.github_instructions') !!}
                 </p>
                 <ol>
                     <li>{{ trans('errors.use_search') }}</li>
-                    <li>{{ trans('errors.include_info', ['link' => route('debug') ]) }}</li>
+                    <li>{!!  trans('errors.include_info', ['link' => route('debug') ]) !!}</li>
                     <li>{{ trans('errors.tell_more') }}</li>
                     <li>{{ trans('errors.include_logs') }}</li>
                     <li>{{ trans('errors.what_did_you_do') }}</li>

resources/views/list/bills.twig

@@ -97,10 +97,16 @@
                     first pay date is in the past.
                     #}
                     {% if entry.paid_dates|length == 0 and entry.pay_dates|length > 0 and entry.active %}
-                        <td class="paid_in_period text-warning">
-                            {{ entry.next_expected_match_diff }}
-                            <!-- {{ trans('firefly.bill_expected_date', {date: entry.next_expected_match_diff }) }} -->
-                        </td>
+                        {% if entry.next_expected_match_diff == trans('firefly.not_expected_period') %} {# terrible code, you should sue me for this. #}
+                            <td class="paid_in_period text-muted">
+                                {{ entry.next_expected_match_diff }}
+                            </td>
+                        {% else %}
+                            <td class="paid_in_period text-warning">
+                                {{ entry.next_expected_match_diff }}
+                                <!-- {{ trans('firefly.bill_expected_date', {date: entry.next_expected_match_diff }) }} -->
+                            </td>
+                        {% endif %}
                         <td class="expected_in_period hidden-sm hidden-xs">
 
                             {% for date in entry.pay_dates %}

resources/views/piggy-banks/edit.twig

@@ -36,8 +36,8 @@
                         <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
                     </div>
                     <div class="box-body">
-                        {{ ExpandedForm.date('startdate') }}
-                        {{ ExpandedForm.date('targetdate') }}
+                        {{ ExpandedForm.date('start_date') }}
+                        {{ ExpandedForm.date('target_date') }}
                         {{ ExpandedForm.textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')}) }}
                         {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
                         {{ ExpandedForm.objectGroup() }}

resources/views/piggy-banks/show.twig

@@ -71,8 +71,8 @@
                         <tr>
                             <td>{{ 'start_date'|_ }}</td>
                             <td>
-                                {% if piggyBank.startdate %}
-                                    {{ piggyBank.startdate.isoFormat(monthAndDayFormat) }}
+                                {% if piggyBank.start_date %}
+                                    {{ piggyBank.start_date.isoFormat(monthAndDayFormat) }}
                                 {% else %}
                                     <em>{{ 'no_start_date'|_ }}</em>
                                 {% endif %}
@@ -81,14 +81,14 @@
                         <tr>
                             <td>{{ 'target_date'|_ }}</td>
                             <td>
-                                {% if piggyBank.targetdate %}
-                                    {{ piggyBank.targetdate.isoFormat(monthAndDayFormat) }}
+                                {% if piggyBank.target_date %}
+                                    {{ piggyBank.target_date.isoFormat(monthAndDayFormat) }}
                                 {% else %}
                                     <em>{{ 'no_target_date'|_ }}</em>
                                 {% endif %}
                             </td>
                         </tr>
-                        {% if piggyBank.targetdate and piggy.save_per_month %}
+                        {% if piggyBank.target_date and piggy.save_per_month %}
                             <tr>
                                 <td>{{ 'suggested_amount'|_ }}</td>
                                 <td>

resources/views/v2/errors/FireflyException.blade.php

@@ -30,11 +30,11 @@
                     {{ trans('errors.github_help') }}
                 </h4>
                 <p>
-                    {{ trans('errors.github_instructions') }} |raw
+                    {!! trans('errors.github_instructions') !!}
                 </p>
                 <ol>
                     <li>{{ trans('errors.use_search') }}</li>
-                    <li>{{ trans('errors.include_info', ['link' => route('debug') ]) }}</li>
+                    <li>{!!  trans('errors.include_info', ['link' => route('debug') ]) !!}</li>
                     <li>{{ trans('errors.tell_more') }}</li>
                     <li>{{ trans('errors.include_logs') }}</li>
                     <li>{{ trans('errors.what_did_you_do') }}</li>

tests/feature/Http/Home/IndexControllerTest.php.disabled

@@ -0,0 +1,53 @@
+<?php
+/*
+ * IndexControllerTest.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\feature\Http\Home;
+
+
+use FireflyIII\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\feature\TestCase;
+
+class IndexControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    /**
+     * A basic test example.
+     */
+    public function test_the_application_returns_a_successful_response(): void
+    {
+        $user = $this->createUser();
+        $response = $this->actingAs($user)->get('/');
+
+        $response->assertStatus(302);
+    }
+
+    public function test_debug(): void
+    {
+        $user = $this->createUser();
+        $response = $this->actingAs($user)->get('/debug');
+
+        $response->assertStatus(200);
+    }
+}

tests/feature/TestCase.php

@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * TestCase.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace Tests\feature;
+
+use FireflyIII\User;
+use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+
+abstract class TestCase extends BaseTestCase
+{
+    protected $seed = true;
+
+    protected function createUser(): User
+    {
+        return User::create(
+            [
+                'email'    => 'james@firefly',
+                'password' => 'secret',
+            ]
+        );
+
+    }
+}

tests/unit/Support/Search/QueryParser/AbstractQueryParserInterfaceParseQueryTest.php

@@ -192,7 +192,7 @@ abstract class AbstractQueryParserInterfaceParseQueryTest extends TestCase
     {
         $actual = $this->createParser()->parse($query);
 
-        self::assertSame($expected, $actual);
+        self::assertObjectEquals($expected, $actual);
 
     }
 }

tests/unit/Support/Search/QueryParser/GdbotsQueryParserParseQueryTest.php.disabled

@@ -13,7 +13,6 @@ use FireflyIII\Support\Search\QueryParser\QueryParserInterface;
  * @group search
  *
  * @internal
- *
  * @coversNothing
  */
 final class GdbotsQueryParserParseQueryTest extends AbstractQueryParserInterfaceParseQueryTest