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

Signed-off-by: James Cole <james@firefly-iii.org>

.env.example

@@ -189,7 +189,7 @@ SEND_REPORT_JOURNALS=true
 ENABLE_EXTERNAL_MAP=false
 
 #
-# Enable or disable exchange rate conversion. This function isn't used yet by Firefly III
+# Enable or disable exchange rate conversion.
 #
 ENABLE_EXCHANGE_RATES=false
 

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

@@ -34,6 +34,7 @@ use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class AccountController
@@ -83,8 +84,8 @@ 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();
+        // set date to subday + end-of-day for account balance. so it is at $date 23:59:59
+        $date->subDay()->endOfDay();
 
         /** @var Account $account */
         foreach ($result as $account) {
@@ -92,6 +93,8 @@ class AccountController extends Controller
             $currency        = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency;
             $useCurrency     = $currency;
             if (in_array($account->accountType->type, $this->balanceTypes, true)) {
+                // this one is correct.
+                Log::debug(sprintf('accounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
                 $balance         = Steam::finalAccountBalance($account, $date);
                 $key             = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? 'native_balance' : 'balance';
                 $useCurrency     = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? $this->nativeCurrency : $currency;
@@ -104,15 +107,20 @@ class AccountController extends Controller
             }
 
             $return[]        = [
-                'id'                      => (string) $account->id,
-                'name'                    => $account->name,
-                'name_with_balance'       => $nameWithBalance,
-                'type'                    => $account->accountType->type,
-                'currency_id'             => (string) $useCurrency->id,
-                'currency_name'           => $useCurrency->name,
-                'currency_code'           => $useCurrency->code,
-                'currency_symbol'         => $useCurrency->symbol,
-                'currency_decimal_places' => $useCurrency->decimal_places,
+                'id'                              => (string) $account->id,
+                'name'                            => $account->name,
+                'name_with_balance'               => $nameWithBalance,
+                'type'                            => $account->accountType->type,
+                'currency_id'                     => (string) $useCurrency->id,
+                'currency_name'                   => $useCurrency->name,
+                'currency_code'                   => $useCurrency->code,
+                'currency_symbol'                 => $useCurrency->symbol,
+                'currency_decimal_places'         => $useCurrency->decimal_places,
+                'account_currency_id'             => (string) $currency->id,
+                'account_currency_name'           => $currency->name,
+                'account_currency_code'           => $currency->code,
+                'account_currency_symbol'         => $currency->symbol,
+                'account_currency_decimal_places' => $currency->decimal_places,
             ];
         }
 

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

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
@@ -41,6 +42,8 @@ class TransactionController extends Controller
     private TransactionGroupRepositoryInterface $groupRepository;
     private JournalRepositoryInterface          $repository;
 
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+
     /**
      * TransactionController constructor.
      */
@@ -51,10 +54,12 @@ class TransactionController extends Controller
             function ($request, $next) {
                 /** @var User $user */
                 $user                  = auth()->user();
+                $userGroup             = $this->validateUserGroup($request);
                 $this->repository      = app(JournalRepositoryInterface::class);
                 $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
                 $this->repository->setUser($user);
                 $this->groupRepository->setUser($user);
+                $this->groupRepository->setUserGroup($userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Controller.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Transformers\V2\AbstractTransformer;
 use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
@@ -59,6 +60,7 @@ abstract class Controller extends BaseController
     use AuthorizesRequests;
     use DispatchesJobs;
     use ValidatesRequests;
+    use ValidatesUserGroupTrait;
 
     protected const string CONTENT_TYPE      = 'application/vnd.api+json';
     protected const string JSON_CONTENT_TYPE = 'application/json';

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

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\Transaction;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Transaction\StoreRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Events\StoredTransactionGroup;
 use FireflyIII\Exceptions\DuplicateTransactionException;
 use FireflyIII\Exceptions\FireflyException;
@@ -37,6 +38,7 @@ use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use League\Fractal\Resource\Item;
 
@@ -49,6 +51,8 @@ class StoreController extends Controller
 
     private TransactionGroupRepositoryInterface $groupRepository;
 
+    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
+
     /**
      * TransactionController constructor.
      */
@@ -59,9 +63,11 @@ class StoreController extends Controller
             function ($request, $next) {
                 /** @var User $admin */
                 $admin                 = auth()->user();
+                $userGroup             = $this->validateUserGroup($request);
 
                 $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
                 $this->groupRepository->setUser($admin);
+                $this->groupRepository->setUserGroup($userGroup);
 
                 return $next($request);
             }
@@ -79,61 +85,58 @@ class StoreController extends Controller
     public function store(StoreRequest $request): JsonResponse
     {
         app('log')->debug('Now in API StoreController::store()');
-        $data          = $request->getAll();
-        $data['user']  = auth()->user()->id;
+        $data               = $request->getAll();
+        $data['user']       = auth()->user();
+        $data['user_group'] = $this->userGroup;
 
-        Log::channel('audit')
-            ->info('Store new transaction over API.', $data)
-        ;
+        Log::channel('audit')->info('Store new transaction over API.', $data);
 
         try {
             $transactionGroup = $this->groupRepository->store($data);
         } catch (DuplicateTransactionException $e) {
             app('log')->warning('Caught a duplicate transaction. Return error message.');
-            $validator = \Validator::make(
-                ['transactions' => [['description' => $e->getMessage()]]],
-                ['transactions.0.description' => new IsDuplicateTransaction()]
-            );
+            $validator = Validator::make(['transactions' => [['description' => $e->getMessage()]]], ['transactions.0.description' => new IsDuplicateTransaction()]);
 
             throw new ValidationException($validator);
         } catch (FireflyException $e) {
             app('log')->warning('Caught an exception. Return error message.');
             app('log')->error($e->getMessage());
             $message   = sprintf('Internal exception: %s', $e->getMessage());
-            $validator = \Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]);
+            $validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]);
 
             throw new ValidationException($validator);
         }
         app('preferences')->mark();
-        $applyRules    = $data['apply_rules'] ?? true;
-        $fireWebhooks  = $data['fire_webhooks'] ?? true;
+        $applyRules         = $data['apply_rules'] ?? true;
+        $fireWebhooks       = $data['fire_webhooks'] ?? true;
         event(new StoredTransactionGroup($transactionGroup, $applyRules, $fireWebhooks));
 
-        $manager       = $this->getManager();
+        $manager            = $this->getManager();
 
         /** @var User $admin */
-        $admin         = auth()->user();
+        $admin              = auth()->user();
 
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
-        $collector     = app(GroupCollectorInterface::class);
+        $collector          = app(GroupCollectorInterface::class);
         $collector
             ->setUser($admin)
+            ->setUserGroup($this->userGroup)
             // filter on transaction group.
             ->setTransactionGroup($transactionGroup)
             // all info needed for the API:
             ->withAPIInformation()
         ;
 
-        $selectedGroup = $collector->getGroups()->first();
+        $selectedGroup      = $collector->getGroups()->first();
         if (null === $selectedGroup) {
             throw new FireflyException('200032: Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
         }
 
         /** @var TransactionGroupTransformer $transformer */
-        $transformer   = app(TransactionGroupTransformer::class);
+        $transformer        = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
-        $resource      = new Item($selectedGroup, $transformer, 'transactions');
+        $resource           = new Item($selectedGroup, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }

app/Console/Commands/Correction/ConvertsDatesToUTC.php

@@ -21,25 +21,6 @@
  */
 
 declare(strict_types=1);
-/*
- * ConvertDatesToUTC.php
- * Copyright (c) 2024 james@firefly-iii.org.
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see https://www.gnu.org/licenses/.
- */
 
 namespace FireflyIII\Console\Commands\Correction;
 

app/Console/Commands/Correction/CorrectsAmounts.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\AutoBudget;
 use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Models\Bill;
@@ -33,8 +34,14 @@ use FireflyIII\Models\CurrencyExchangeRate;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\RecurrenceTransaction;
 use FireflyIII\Models\RuleTrigger;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class CorrectsAmounts extends Command
 {
@@ -45,6 +52,8 @@ class CorrectsAmounts extends Command
 
     public function handle(): int
     {
+        // transfers must not have foreign currency info if both accounts have the same currency.
+        $this->correctTransfers();
         // auto budgets must be positive
         $this->fixAutoBudgets();
         // available budgets must be positive
@@ -62,6 +71,7 @@ class CorrectsAmounts extends Command
         // rule_triggers must be positive or zero (amount_less, amount_more, amount_is)
         $this->fixRuleTriggers();
 
+
         return 0;
     }
 
@@ -182,4 +192,63 @@ class CorrectsAmounts extends Command
 
         return false;
     }
+
+    private function correctTransfers(): void
+    {
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        $type       = TransactionType::where('type', TransactionTypeEnum::TRANSFER->value)->first();
+        $journals   = TransactionJournal::where('transaction_type_id', $type->id)->get();
+
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            $repository->setUser($journal->user);
+            $native         = Amount::getNativeCurrencyByUserGroup($journal->userGroup);
+
+            /** @var null|Transaction $source */
+            $source         = $journal->transactions()->where('amount', '<', 0)->first();
+
+            /** @var null|Transaction $destination */
+            $destination    = $journal->transactions()->where('amount', '>', 0)->first();
+            if (null === $source || null === $destination) {
+                continue;
+            }
+            if (null === $source->foreign_currency_id || null === $destination->foreign_currency_id) {
+                continue;
+            }
+            $sourceAccount  = $source->account;
+            $destAccount    = $destination->account;
+            if (null === $sourceAccount || null === $destAccount) {
+                continue;
+            }
+            $sourceCurrency = $repository->getAccountCurrency($sourceAccount) ?? $native;
+            $destCurrency   = $repository->getAccountCurrency($destAccount) ?? $native;
+
+            if ($sourceCurrency->id === $destCurrency->id) {
+                Log::debug('Both accounts have the same currency. Removing foreign currency info.');
+                $source->foreign_currency_id      = null;
+                $source->foreign_amount           = null;
+                $source->save();
+                $destination->foreign_currency_id = null;
+                $destination->foreign_amount      = null;
+                $destination->save();
+
+                continue;
+            }
+
+            // validate source
+            if ($destCurrency->id !== $source->foreign_currency_id) {
+                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $source->id, $source->foreignCurrency->code, $destCurrency->code));
+                $source->foreign_currency_id = $destCurrency->id;
+                $source->save();
+            }
+
+            // validate destination:
+            if ($sourceCurrency->id !== $destination->foreign_currency_id) {
+                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $destination->id, $destination->foreignCurrency->code, $sourceCurrency->code));
+                $destination->foreign_currency_id = $sourceCurrency->id;
+                $destination->save();
+            }
+        }
+    }
 }

app/Console/Commands/Correction/CorrectsTimezoneInformation.php

@@ -21,25 +21,6 @@
  */
 
 declare(strict_types=1);
-/*
- * AddTimezonesToDates.php
- * Copyright (c) 2024 james@firefly-iii.org.
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see https://www.gnu.org/licenses/.
- */
 
 namespace FireflyIII\Console\Commands\Correction;
 

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/Factory/TagFactory.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Factory;
 
 use FireflyIII\Models\Location;
 use FireflyIII\Models\Tag;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 
 /**
@@ -34,6 +35,7 @@ use FireflyIII\User;
 class TagFactory
 {
     private User $user;
+    private UserGroup $userGroup;
 
     public function findOrCreate(string $tag): ?Tag
     {
@@ -101,6 +103,12 @@ class TagFactory
 
     public function setUser(User $user): void
     {
-        $this->user = $user;
+        $this->user      = $user;
+        $this->userGroup = $user->userGroup;
+    }
+
+    public function setUserGroup(UserGroup $userGroup): void
+    {
+        $this->userGroup = $userGroup;
     }
 }

app/Factory/TransactionFactory.php

@@ -31,7 +31,6 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Rules\UniqueIban;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
-use FireflyIII\User;
 use Illuminate\Database\QueryException;
 
 /**
@@ -216,12 +215,4 @@ class TransactionFactory
     {
         $this->reconciled = $reconciled;
     }
-
-    /**
-     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
-     */
-    public function setUser(User $user): void
-    {
-        // empty function.
-    }
 }

app/Factory/TransactionGroupFactory.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Factory;
 use FireflyIII\Exceptions\DuplicateTransactionException;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 
 /**
@@ -36,6 +37,7 @@ class TransactionGroupFactory
 {
     private TransactionJournalFactory $journalFactory;
     private User                      $user;
+    private UserGroup $userGroup;
 
     /**
      * TransactionGroupFactory constructor.
@@ -54,7 +56,8 @@ class TransactionGroupFactory
     public function create(array $data): TransactionGroup
     {
         app('log')->debug('Now in TransactionGroupFactory::create()');
-        $this->journalFactory->setUser($this->user);
+        $this->journalFactory->setUser($data['user']);
+        $this->journalFactory->setUserGroup($data['user_group']);
         $this->journalFactory->setErrorOnHash($data['error_if_duplicate_hash'] ?? false);
 
         try {
@@ -76,7 +79,7 @@ class TransactionGroupFactory
 
         $group        = new TransactionGroup();
         $group->user()->associate($this->user);
-        $group->userGroup()->associate($data['user_group'] ?? $this->user->userGroup);
+        $group->userGroup()->associate($data['user_group']);
         $group->title = $title;
         $group->save();
 
@@ -92,4 +95,9 @@ class TransactionGroupFactory
     {
         $this->user = $user;
     }
+
+    public function setUserGroup(UserGroup $userGroup): void
+    {
+        $this->userGroup = $userGroup;
+    }
 }

app/Factory/TransactionJournalFactory.php

@@ -34,6 +34,7 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionJournalMeta;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -69,6 +70,7 @@ class TransactionJournalFactory
     private PiggyBankRepositoryInterface       $piggyRepository;
     private TransactionTypeRepositoryInterface $typeRepository;
     private User                               $user;
+    private UserGroup $userGroup;
 
     /**
      * Constructor.
@@ -176,7 +178,6 @@ class TransactionJournalFactory
         if (true === FireflyConfig::get('utc', false)->data) {
             $carbon->setTimezone('UTC');
         }
-        // $carbon->setTimezone('UTC');
 
         try {
             // validate source and destination using a new Validator.
@@ -228,7 +229,7 @@ class TransactionJournalFactory
         $journal               = TransactionJournal::create(
             [
                 'user_id'                 => $this->user->id,
-                'user_group_id'           => $this->user->user_group_id,
+                'user_group_id'           => $this->userGroup->id,
                 'transaction_type_id'     => $type->id,
                 'bill_id'                 => $billId,
                 'transaction_currency_id' => $currency->id,
@@ -244,7 +245,6 @@ class TransactionJournalFactory
 
         /** Create two transactions. */
         $transactionFactory    = app(TransactionFactory::class);
-        $transactionFactory->setUser($this->user);
         $transactionFactory->setJournal($journal);
         $transactionFactory->setAccount($sourceAccount);
         $transactionFactory->setCurrency($currency);
@@ -263,7 +263,6 @@ class TransactionJournalFactory
 
         /** @var TransactionFactory $transactionFactory */
         $transactionFactory    = app(TransactionFactory::class);
-        $transactionFactory->setUser($this->user);
         $transactionFactory->setJournal($journal);
         $transactionFactory->setAccount($destinationAccount);
         $transactionFactory->setAccountInformation($destInfo);
@@ -404,7 +403,8 @@ class TransactionJournalFactory
      */
     public function setUser(User $user): void
     {
-        $this->user = $user;
+        $this->user      = $user;
+        $this->userGroup = $user->userGroup;
         $this->currencyRepository->setUser($this->user);
         $this->tagFactory->setUser($user);
         $this->billRepository->setUser($this->user);
@@ -414,6 +414,18 @@ class TransactionJournalFactory
         $this->accountRepository->setUser($this->user);
     }
 
+    public function setUserGroup(UserGroup $userGroup): void
+    {
+        $this->userGroup = $userGroup;
+        $this->currencyRepository->setUserGroup($userGroup);
+        $this->tagFactory->setUserGroup($userGroup);
+        $this->billRepository->setUserGroup($userGroup);
+        $this->budgetRepository->setUserGroup($userGroup);
+        $this->categoryRepository->setUserGroup($userGroup);
+        $this->piggyRepository->setUserGroup($userGroup);
+        $this->accountRepository->setUserGroup($userGroup);
+    }
+
     private function reconciliationSanityCheck(?Account $sourceAccount, ?Account $destinationAccount): array
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -33,6 +33,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Facades\Steam;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class MonthReportGenerator.
@@ -52,10 +53,9 @@ class MonthReportGenerator implements ReportGeneratorInterface
     {
         $auditData   = [];
         $dayBefore   = clone $this->start;
-        $dayBefore->subDay();
 
-        // move to end of day
-        $dayBefore->endOfDay();
+        // set date to subday + end-of-day for account balance. so it is at $date 23:59:59
+        $dayBefore->subDay()->endOfDay();
 
         /** @var Account $account */
         foreach ($this->accounts as $account) {
@@ -136,6 +136,8 @@ class MonthReportGenerator implements ReportGeneratorInterface
         ;
         $journals          = $collector->getExtractedJournals();
         $journals          = array_reverse($journals, true);
+        // this call is correct.
+        Log::debug(sprintf('getAuditReport: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
         $dayBeforeBalance  = Steam::finalAccountBalance($account, $date);
         $startBalance      = $dayBeforeBalance['balance'];
         $defaultCurrency   = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
@@ -170,6 +172,8 @@ class MonthReportGenerator implements ReportGeneratorInterface
             $journals[$index]['invoice_date']   = $journalRepository->getMetaDateById($journal['transaction_journal_id'], 'invoice_date');
         }
         $locale            = app('steam')->getLocale();
+        // call is correct.
+        Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String()));
 
         return [
             'journals'         => $journals,

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

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Handlers\Observer;
 
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Attachment;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
@@ -81,6 +82,8 @@ class AccountObserver
         foreach ($account->piggyBanks()->get() as $piggy) {
             $piggy->accounts()->detach($account);
         }
+
+        /** @var Attachment $attachment */
         foreach ($account->attachments()->get() as $attachment) {
             $repository->destroy($attachment);
         }

app/Handlers/Observer/BillObserver.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Observer;
 
+use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
@@ -46,6 +47,7 @@ class BillObserver
         $repository->setUser($bill->user);
 
         //        app('log')->debug('Observe "deleting" of a bill.');
+        /** @var Attachment $attachment */
         foreach ($bill->attachments()->get() as $attachment) {
             $repository->destroy($attachment);
         }

app/Handlers/Observer/BudgetObserver.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Observer;
 
+use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
@@ -39,6 +40,7 @@ class BudgetObserver
         $repository   = app(AttachmentRepositoryInterface::class);
         $repository->setUser($budget->user);
 
+        /** @var Attachment $attachment */
         foreach ($budget->attachments()->get() as $attachment) {
             $repository->destroy($attachment);
         }

app/Handlers/Observer/CategoryObserver.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Observer;
 
+use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 
@@ -38,6 +39,7 @@ class CategoryObserver
         $repository = app(AttachmentRepositoryInterface::class);
         $repository->setUser($category->user);
 
+        /** @var Attachment $attachment */
         foreach ($category->attachments()->get() as $attachment) {
             $repository->destroy($attachment);
         }

app/Handlers/Observer/PiggyBankObserver.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Observer;
 
+use FireflyIII\Models\Attachment;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
@@ -50,6 +51,7 @@ class PiggyBankObserver
         $repository = app(AttachmentRepositoryInterface::class);
         $repository->setUser($piggyBank->accounts()->first()->user);
 
+        /** @var Attachment $attachment */
         foreach ($piggyBank->attachments()->get() as $attachment) {
             $repository->destroy($attachment);
         }

app/Handlers/Observer/RecurrenceObserver.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Observer;
 
+use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 
@@ -38,6 +39,7 @@ class RecurrenceObserver
         $repository = app(AttachmentRepositoryInterface::class);
         $repository->setUser($recurrence->user);
 
+        /** @var Attachment $attachment */
         foreach ($recurrence->attachments()->get() as $attachment) {
             $repository->destroy($attachment);
         }

app/Handlers/Observer/TagObserver.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Observer;
 
+use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 
@@ -38,6 +39,7 @@ class TagObserver
         $repository = app(AttachmentRepositoryInterface::class);
         $repository->setUser($tag->user);
 
+        /** @var Attachment $attachment */
         foreach ($tag->attachments()->get() as $attachment) {
             $repository->destroy($attachment);
         }

app/Handlers/Observer/TransactionJournalObserver.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Handlers\Observer;
 
+use FireflyIII\Models\Attachment;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 
@@ -45,6 +46,8 @@ class TransactionJournalObserver
                 $transaction->delete();
             }
         });
+
+        /** @var Attachment $attachment */
         foreach ($transactionJournal->attachments()->get() as $attachment) {
             $repository->destroy($attachment);
         }

app/Helpers/Collector/Extensions/AccountCollection.php

@@ -258,7 +258,12 @@ trait AccountCollection
                 if (null === $account) {
                     continue;
                 }
-                $balance   = Steam::finalAccountBalance($account, $transaction['date']);
+                // the balance must be found BEFORE the transaction date.
+                // so sub one second. This is not perfect, but works well enough.
+                $date      = clone $transaction['date'];
+                $date->subSecond();
+                Log::debug(sprintf('accountBalanceIs: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
+                $balance   = Steam::finalAccountBalance($account, $date);
                 $result    = bccomp($balance['balance'], $value);
                 Log::debug(sprintf('"%s" vs "%s" is %d', $balance['balance'], $value, $result));
 

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/Report/NetWorth.php

@@ -79,6 +79,7 @@ class NetWorth implements NetWorthInterface
         Log::debug(sprintf('Now in byAccounts("%s", "%s")', $ids, $date->format('Y-m-d H:i:s')));
         $default         = Amount::getNativeCurrency();
         $netWorth        = [];
+        Log::debug(sprintf('NetWorth: finalAccountsBalance("%s")', $date->format('Y-m-d H:i:s')));
         $balances        = Steam::finalAccountsBalance($accounts, $date);
 
         /** @var Account $account */
@@ -159,6 +160,7 @@ class NetWorth implements NetWorthInterface
          */
         $accounts = $this->getAccounts();
         $return   = [];
+        Log::debug(sprintf('SumNetWorth: finalAccountsBalance("%s")', $date->format('Y-m-d H:i:s')));
         $balances = Steam::finalAccountsBalance($accounts, $date);
         foreach ($accounts as $account) {
             $currency                     = $this->getRepository()->getAccountCurrency($account);

app/Http/Controllers/Account/IndexController.php

@@ -33,6 +33,7 @@ use FireflyIII\Support\Http\Controllers\BasicDataSupport;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -90,9 +91,11 @@ class IndexController extends Controller
         $start->subDay();
 
         $ids           = $accounts->pluck('id')->toArray();
-        $startBalances = app('steam')->finalAccountsBalance($accounts, $start);
-        $endBalances   = app('steam')->finalAccountsBalance($accounts, $end);
-        $activities    = app('steam')->getLastActivities($ids);
+        Log::debug(sprintf('inactive start: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('inactive end: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
+        $startBalances = Steam::finalAccountsBalance($accounts, $start);
+        $endBalances   = Steam::finalAccountsBalance($accounts, $end);
+        $activities    = Steam::getLastActivities($ids);
 
 
         $accounts->each(
@@ -102,7 +105,7 @@ class IndexController extends Controller
                 $account->startBalances     = Steam::filterAccountBalance($startBalances[$account->id] ?? [], $account, $this->convertToNative, $currency);
                 $account->endBalances       = Steam::filterAccountBalance($endBalances[$account->id] ?? [], $account, $this->convertToNative, $currency);
                 $account->differences       = $this->subtract($account->startBalances, $account->endBalances);
-                $account->interest          = app('steam')->bcround($this->repository->getMetaValue($account, 'interest'), 4);
+                $account->interest          = Steam::bcround($this->repository->getMetaValue($account, 'interest'), 4);
                 $account->interestPeriod    = (string) trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
                 $account->accountTypeString = (string) trans(sprintf('firefly.account_type_%s', $account->accountType->type));
                 $account->current_debt      = '0';
@@ -153,9 +156,11 @@ class IndexController extends Controller
         $start->subDay();
 
         $ids           = $accounts->pluck('id')->toArray();
-        $startBalances = app('steam')->finalAccountsBalance($accounts, $start);
-        $endBalances   = app('steam')->finalAccountsBalance($accounts, $end);
-        $activities    = app('steam')->getLastActivities($ids);
+        Log::debug(sprintf('index start: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('index end: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
+        $startBalances = Steam::finalAccountsBalance($accounts, $start);
+        $endBalances   = Steam::finalAccountsBalance($accounts, $end);
+        $activities    = Steam::getLastActivities($ids);
 
 
         $accounts->each(
@@ -168,7 +173,7 @@ class IndexController extends Controller
                 $account->endBalances         = Steam::filterAccountBalance($endBalances[$account->id] ?? [], $account, $this->convertToNative, $currency);
                 $account->differences         = $this->subtract($account->startBalances, $account->endBalances);
                 $account->lastActivityDate    = $this->isInArrayDate($activities, $account->id);
-                $account->interest            = app('steam')->bcround($interest, 4);
+                $account->interest            = Steam::bcround($interest, 4);
                 $account->interestPeriod      = (string) trans(
                     sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period'))
                 );

app/Http/Controllers/Account/ReconcileController.php

@@ -39,6 +39,7 @@ use FireflyIII\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -113,7 +114,10 @@ class ReconcileController extends Controller
         $end->endOfDay();
 
         $startDate       = clone $start;
-        $startDate->subDay()->endOfDay();
+        $startDate->subDay()->endOfDay(); // this is correct, subday endofday ends at 23:59:59
+        // both are validated and are correct.
+        Log::debug(sprintf('reconcile: Call finalAccountBalance with date/time "%s"', $startDate->toIso8601String()));
+        Log::debug(sprintf('reconcile2: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
         $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));

app/Http/Controllers/Account/ShowController.php

@@ -37,6 +37,7 @@ use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -120,12 +121,7 @@ class ShowController extends Controller
 
         /** @var GroupCollectorInterface $collector */
         $collector        = app(GroupCollectorInterface::class);
-        $collector
-            ->setAccounts(new Collection([$account]))
-            ->setLimit($pageSize)
-            ->setPage($page)->withAccountInformation()->withCategoryInformation()
-            ->setRange($start, $end)
-        ;
+        $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page)->withAccountInformation()->withCategoryInformation()->setRange($start, $end);
 
         // this search will not include transaction groups where this asset account (or liability)
         // is just part of ONE of the journals. To force this:
@@ -135,7 +131,14 @@ class ShowController extends Controller
 
         $groups->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]));
         $showAll          = false;
-        $balances         = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency);
+        // correct
+        $now              = today()->endOfDay();
+        if ($now->gt($end) || $now->lt($start)) {
+            $now = $end;
+        }
+
+        Log::debug(sprintf('show: Call finalAccountBalance with date/time "%s"', $now->toIso8601String()));
+        $balances         = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $now), $account, $this->convertToNative, $accountCurrency);
 
         return view(
             'accounts.show',
@@ -200,6 +203,8 @@ class ShowController extends Controller
         $groups->setPath(route('accounts.show.all', [$account->id]));
         $chartUrl        = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $showAll         = true;
+        // correct
+        Log::debug(sprintf('showAll: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
         $balances        = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency);
 
         return view(

app/Http/Controllers/Chart/AccountController.php

@@ -109,6 +109,8 @@ class AccountController extends Controller
         $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
+        Log::debug(sprintf('expenseAccounts: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('expenseAccounts: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
         $startBalances = Steam::finalAccountsBalance($accounts, $start);
         $endBalances   = Steam::finalAccountsBalance($accounts, $end);
 
@@ -139,7 +141,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   = 3 !== strlen($searchCode) ? $this->defaultCurrency->code : $searchCode;
+                $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.
@@ -335,7 +337,7 @@ class AccountController extends Controller
         $start          = clone session('start', today(config('app.timezone'))->startOfMonth());
         $end            = clone session('end', today(config('app.timezone'))->endOfMonth());
         $defaultSet     = $repository->getAccountsByType([AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value])->pluck('id')->toArray();
-        Log::debug('Default set is ', $defaultSet);
+        // Log::debug('Default set is ', $defaultSet);
         $frontpage      = app('preferences')->get('frontpageAccounts', $defaultSet);
         $frontpageArray = !is_array($frontpage->data) ? [] : $frontpage->data;
         Log::debug('Frontpage preference set is ', $frontpageArray);
@@ -345,6 +347,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));
     }
 
@@ -419,8 +424,8 @@ class AccountController extends Controller
     {
         $start->startOfDay();
         $end->endOfDay();
+        // TODO not sure if these date ranges will work as expected.
         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');
         $cache->addProperty($start);
@@ -449,7 +454,7 @@ class AccountController extends Controller
         $range           = Steam::filterAccountBalances($range, $account, $this->convertToNative, $accountCurrency);
 
         // temp, get end balance.
-        Log::debug('temp get end balance');
+        Log::debug(sprintf('period: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
         Steam::finalAccountBalance($account, $end);
         Log::debug('END temp get end balance done');
 
@@ -502,7 +507,7 @@ class AccountController extends Controller
         $chartData       = [];
 
         foreach ($return as $key => $info) {
-            if (3 === strlen($key)) {
+            if ('balance' !== $key && 'native_balance' !== $key) {
                 // assume it's a currency:
                 $setCurrency             = $this->currencyRepository->findByCode($key);
                 $info['currency_symbol'] = $setCurrency->symbol;
@@ -572,6 +577,8 @@ class AccountController extends Controller
         $accountNames  = $this->extractNames($accounts);
 
         // grab all balances
+        Log::debug(sprintf('revAccounts: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('revAccounts: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
         $startBalances = Steam::finalAccountsBalance($accounts, $start);
         $endBalances   = Steam::finalAccountsBalance($accounts, $end);
 
@@ -603,7 +610,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   = 3 !== strlen($searchCode) ? $this->defaultCurrency->code : $searchCode;
+                $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/Chart/BudgetController.php

@@ -168,15 +168,14 @@ class BudgetController extends Controller
         }
         $locale                                 = app('steam')->getLocale();
         $entries                                = [];
-        $amount                                 = $budgetLimit->amount;
+        $amount                                 = $budgetLimit->amount ?? '0';
         $budgetCollection                       = new Collection([$budget]);
         $currency                               = $budgetLimit->transactionCurrency;
         if ($this->convertToNative) {
-            $amount   = $budgetLimit->native_amount;
+            $amount   = $budgetLimit->native_amount ?? '0';
             $currency = $this->defaultCurrency;
         }
 
-
         while ($start <= $end) {
             $current          = clone $start;
             $expenses         = $this->opsRepository->sumExpenses($current, $current, null, $budgetCollection, $budgetLimit->transactionCurrency);

app/Http/Controllers/Chart/ReportController.php

@@ -100,7 +100,10 @@ class ReportController extends Controller
 
         while ($current < $end) {
             // get balances by date, grouped by currency.
-            $result = $helper->byAccounts($filtered, $current);
+            $balanceCurrent = clone $current;
+            $balanceCurrent->subDay()->endOfDay(); // go to correct moment.
+            Log::debug(sprintf('Call byAccounts("%s")', $balanceCurrent->format('Y-m-d H:i:s')));
+            $result         = $helper->byAccounts($filtered, $balanceCurrent);
 
             // loop result, add to array.
             /** @var array $netWorthItem */

app/Http/Controllers/DebugController.php

@@ -259,7 +259,7 @@ class DebugController extends Controller
         $system = $this->getSystemInformation();
         $docker = $this->getBuildInfo();
         $app    = $this->getAppInfo();
-        $user   = $this->getuserInfo();
+        $user   = $this->getUserInfo();
 
         return (string) view('partials.debug-table', compact('system', 'docker', 'app', 'user'));
     }

app/Http/Controllers/Json/ReconcileController.php

@@ -189,21 +189,29 @@ class ReconcileController extends Controller
         if ($end->lt($start)) {
             [$end, $start] = [$start, $end];
         }
-        $start->startOfDay();
+        $start->endOfDay();
         $end->endOfDay();
         $startDate      = clone $start;
         $startDate->subDay();
 
         $currency       = $this->accountRepos->getAccountCurrency($account) ?? $this->defaultCurrency;
+        // correct
+        Log::debug(sprintf('transactions: Call finalAccountBalance with date/time "%s"', $startDate->toIso8601String()));
+        Log::debug(sprintf('transactions2: Call finalAccountBalance with date/time "%s"', $end->toIso8601String()));
         $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;
+        $selectionStart->startOfDay();
         $selectionStart->subDays(3);
         $selectionEnd   = clone $end;
+        $selectionEnd->endOfDay();
         $selectionEnd->addDays(3);
 
+        // to make sure the bar is in the right place:
+        $start->startOfDay();
+
         // grab transactions:
         /** @var GroupCollectorInterface $collector */
         $collector      = app(GroupCollectorInterface::class);

app/Http/Controllers/Preferences/NotificationsController.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * NotificationsController.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 FireflyIII\Http\Controllers\Preferences;
+
+use FireflyIII\Http\Controllers\Controller;
+
+class NotificationsController extends Controller {}

app/Http/Controllers/ReportController.php

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

app/Http/Controllers/Transaction/ConvertController.php

@@ -43,6 +43,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -223,7 +224,9 @@ class ConvertController extends Controller
         // group accounts:
         /** @var Account $account */
         foreach ($accountList as $account) {
-            $balance                     = Steam::finalAccountBalance($account, today()->endOfDay())['balance'];
+            $date                        = today()->endOfDay();
+            Log::debug(sprintf('getLiabilities: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
+            $balance                     = Steam::finalAccountBalance($account, $date)['balance'];
             $currency                    = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency;
             $role                        = 'l_'.$account->accountType->type;
             $key                         = (string) trans('firefly.opt_group_'.$role);
@@ -245,7 +248,9 @@ class ConvertController extends Controller
         // group accounts:
         /** @var Account $account */
         foreach ($accountList as $account) {
-            $balance                     = Steam::finalAccountBalance($account, today()->endOfDay())['balance'];
+            $date                        = today()->endOfDay();
+            Log::debug(sprintf('getAssetAccounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
+            $balance                     = Steam::finalAccountBalance($account, $date)['balance'];
             $currency                    = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency;
             $role                        = (string) $this->accountRepository->getMetaValue($account, 'account_role');
             if ('' === $role) {

app/Jobs/CreateRecurringTransactions.php

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

app/Models/TransactionJournal.php

@@ -112,6 +112,11 @@ class TransactionJournal extends Model
         return $this->belongsTo(User::class);
     }
 
+    public function userGroup(): BelongsTo
+    {
+        return $this->belongsTo(UserGroup::class);
+    }
+
     public function attachments(): MorphMany
     {
         return $this->morphMany(Attachment::class, 'attachable');

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/Account/AccountRepository.php

@@ -40,6 +40,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use FireflyIII\Services\Internal\Update\AccountUpdateService;
 use FireflyIII\Support\Facades\Steam;
+use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
@@ -51,7 +52,7 @@ use Illuminate\Support\Collection;
  */
 class AccountRepository implements AccountRepositoryInterface
 {
-    private User $user;
+    use UserGroupTrait;
 
     /**
      * Moved here from account CRUD.

app/Repositories/Account/AccountRepositoryInterface.php

@@ -30,6 +30,7 @@ use FireflyIII\Models\Location;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Collection;
@@ -149,6 +150,8 @@ interface AccountRepositoryInterface
 
     public function setUser(null|Authenticatable|User $user): void;
 
+    public function setUserGroup(UserGroup $userGroup): void;
+
     public function store(array $data): Account;
 
     public function update(Account $account, array $data): Account;

app/Repositories/Account/AccountTasker.php

@@ -29,9 +29,11 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class AccountTasker.
@@ -46,10 +48,13 @@ class AccountTasker implements AccountTaskerInterface
     public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array
     {
         $yesterday       = clone $start;
-        $yesterday->subDay();
-        $startSet        = app('steam')->finalAccountsBalance($accounts, $yesterday);
-        $endSet          = app('steam')->finalAccountsBalance($accounts, $end);
-        app('log')->debug('Start of accountreport');
+        $yesterday->subDay()->endOfDay(); // exactly up until $start but NOT including.
+        $end->endOfDay(); // needs to be end of day to be correct.
+        Log::debug(sprintf('getAccountReport: finalAccountsBalance("%s")', $yesterday->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('getAccountReport: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
+        $startSet        = Steam::finalAccountsBalance($accounts, $yesterday);
+        $endSet          = Steam::finalAccountsBalance($accounts, $end);
+        Log::debug('Start of accountreport');
 
         /** @var AccountRepositoryInterface $repository */
         $repository      = app(AccountRepositoryInterface::class);
@@ -90,10 +95,10 @@ class AccountTasker implements AccountTaskerInterface
             $entry['end_balance']                   = $endSet[$account->id]['balance'] ?? '0';
 
             // first journal exists, and is on start, then this is the actual opening balance:
-            if (null !== $first && $first->date->isSameDay($start) && TransactionTypeEnum::OPENING_BALANCE->value === $first->transactionType->type) {
-                app('log')->debug(sprintf('Date of first journal for %s is %s', $account->name, $first->date->format('Y-m-d')));
+            if (null !== $first && $first->date->isSameDay($yesterday) && TransactionTypeEnum::OPENING_BALANCE->value === $first->transactionType->type) {
+                Log::debug(sprintf('Date of first journal for %s is %s', $account->name, $first->date->format('Y-m-d')));
                 $entry['start_balance'] = $first->transactions()->where('account_id', $account->id)->first()->amount;
-                app('log')->debug(sprintf('Account %s was opened on %s, so opening balance is %f', $account->name, $start->format('Y-m-d'), $entry['start_balance']));
+                Log::debug(sprintf('Account %s was opened on %s, so opening balance is %f', $account->name, $yesterday->format('Y-m-d'), $entry['start_balance']));
             }
             $return['sums'][$currency->id]['start'] = bcadd($return['sums'][$currency->id]['start'], $entry['start_balance']);
             $return['sums'][$currency->id]['end']   = bcadd($return['sums'][$currency->id]['end'], $entry['end_balance']);
@@ -173,7 +178,7 @@ class AccountTasker implements AccountTaskerInterface
             ];
             $report['accounts'][$key]['sum'] = bcadd($report['accounts'][$key]['sum'], $journal['amount']);
 
-            app('log')->debug(sprintf('Sum for %s is now %s', $journal['destination_account_name'], $report['accounts'][$key]['sum']));
+            Log::debug(sprintf('Sum for %s is now %s', $journal['destination_account_name'], $report['accounts'][$key]['sum']));
 
             ++$report['accounts'][$key]['count'];
         }

app/Repositories/Bill/BillRepository.php

@@ -38,8 +38,7 @@ use FireflyIII\Services\Internal\Destroy\BillDestroyService;
 use FireflyIII\Services\Internal\Update\BillUpdateService;
 use FireflyIII\Support\CacheProperties;
 use FireflyIII\Support\Facades\Amount;
-use FireflyIII\User;
-use Illuminate\Contracts\Auth\Authenticatable;
+use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
@@ -51,8 +50,7 @@ use Illuminate\Support\Facades\Log;
 class BillRepository implements BillRepositoryInterface
 {
     use CreatesObjectGroups;
-
-    private User $user;
+    use UserGroupTrait;
 
     public function billEndsWith(string $query, int $limit): Collection
     {
@@ -294,13 +292,6 @@ class BillRepository implements BillRepositoryInterface
         return $result;
     }
 
-    public function setUser(null|Authenticatable|User $user): void
-    {
-        if ($user instanceof User) {
-            $this->user = $user;
-        }
-    }
-
     public function getPaginator(int $size): LengthAwarePaginator
     {
         return $this->user->bills()

app/Repositories/Bill/BillRepositoryInterface.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Bill;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Bill;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -40,6 +41,8 @@ interface BillRepositoryInterface
 
     public function billStartsWith(string $query, int $limit): Collection;
 
+    public function setUserGroup(UserGroup $userGroup): void;
+
     /**
      * Add correct order to bills.
      */

app/Repositories/Budget/BudgetRepository.php

@@ -41,8 +41,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\BudgetDestroyService;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
-use FireflyIII\User;
-use Illuminate\Contracts\Auth\Authenticatable;
+use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
@@ -52,7 +51,7 @@ use Illuminate\Support\Facades\Log;
  */
 class BudgetRepository implements BudgetRepositoryInterface
 {
-    private User $user;
+    use UserGroupTrait;
 
     public function budgetEndsWith(string $query, int $limit): Collection
     {
@@ -154,13 +153,6 @@ class BudgetRepository implements BudgetRepositoryInterface
         return $return;
     }
 
-    public function setUser(null|Authenticatable|User $user): void
-    {
-        if ($user instanceof User) {
-            $this->user = $user;
-        }
-    }
-
     public function getActiveBudgets(): Collection
     {
         return $this->user->budgets()->where('active', true)

app/Repositories/Budget/BudgetRepositoryInterface.php

@@ -27,6 +27,7 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\AutoBudget;
 use FireflyIII\Models\Budget;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Collection;
@@ -40,6 +41,8 @@ interface BudgetRepositoryInterface
 
     public function budgetStartsWith(string $query, int $limit): Collection;
 
+    public function setUserGroup(UserGroup $userGroup): void;
+
     /**
      * Returns the amount that is budgeted in a period.
      */

app/Repositories/Budget/OperationsRepository.php

@@ -214,7 +214,6 @@ class OperationsRepository implements OperationsRepositoryInterface
         Log::debug(sprintf('Start of %s.', __METHOD__));
         // this collector excludes all transfers TO liabilities (which are also withdrawals)
         // because those expenses only become expenses once they move from the liability to the friend.
-
         // 2024-12-24 disable the exclusion for now.
 
         $repository = app(AccountRepositoryInterface::class);
@@ -245,7 +244,7 @@ class OperationsRepository implements OperationsRepositoryInterface
         }
         if (null !== $currency) {
             Log::debug(sprintf('Limit to currency %s', $currency->code));
-            $collector->setNormalCurrency($currency);
+            $collector->setCurrency($currency);
         }
         $collector->setBudgets($budgets);
         $journals   = $collector->getExtractedJournals();

app/Repositories/Category/CategoryRepository.php

@@ -33,6 +33,7 @@ use FireflyIII\Models\RecurrenceTransactionMeta;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Services\Internal\Destroy\CategoryDestroyService;
 use FireflyIII\Services\Internal\Update\CategoryUpdateService;
+use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Collection;
@@ -43,7 +44,7 @@ use Illuminate\Support\Facades\Log;
  */
 class CategoryRepository implements CategoryRepositoryInterface
 {
-    private User $user;
+    use UserGroupTrait;
 
     public function categoryEndsWith(string $query, int $limit): Collection
     {

app/Repositories/Category/CategoryRepositoryInterface.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Category;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Category;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Collection;
@@ -88,6 +89,8 @@ interface CategoryRepositoryInterface
 
     public function setUser(null|Authenticatable|User $user): void;
 
+    public function setUserGroup(UserGroup $userGroup): void;
+
     /**
      * @throws FireflyException
      */

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -36,6 +36,7 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Facades\Steam;
+use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Collection;
@@ -48,7 +49,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
 {
     use ModifiesPiggyBanks;
 
-    private User $user;
+    use UserGroupTrait;
 
     public function destroyAll(): void
     {
@@ -370,6 +371,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
     public function leftOnAccount(PiggyBank $piggyBank, Account $account, Carbon $date): string
     {
         Log::debug(sprintf('leftOnAccount("%s","%s","%s")', $piggyBank->name, $account->name, $date->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('leftOnAccount: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
         $balance = Steam::finalAccountBalance($account, $date)['balance'];
 
         Log::debug(sprintf('Balance is: %s', $balance));

app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Collection;
@@ -137,6 +138,8 @@ interface PiggyBankRepositoryInterface
 
     public function setUser(null|Authenticatable|User $user): void;
 
+    public function setUserGroup(UserGroup $userGroup): void;
+
     /**
      * Store new piggy bank.
      *

app/Repositories/TransactionGroup/TransactionGroupRepository.php

@@ -43,8 +43,7 @@ use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService;
 use FireflyIII\Services\Internal\Update\GroupUpdateService;
 use FireflyIII\Support\NullArrayObject;
-use FireflyIII\User;
-use Illuminate\Contracts\Auth\Authenticatable;
+use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 
@@ -53,7 +52,7 @@ use Illuminate\Support\Collection;
  */
 class TransactionGroupRepository implements TransactionGroupRepositoryInterface
 {
-    private User $user;
+    use UserGroupTrait;
 
     public function countAttachments(int $journalId): int
     {
@@ -163,13 +162,6 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
         return $result;
     }
 
-    public function setUser(null|Authenticatable|User $user): void
-    {
-        if ($user instanceof User) {
-            $this->user = $user;
-        }
-    }
-
     /**
      * Get the note text for a journal (by ID).
      */
@@ -408,7 +400,8 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
     {
         /** @var TransactionGroupFactory $factory */
         $factory = app(TransactionGroupFactory::class);
-        $factory->setUser($this->user);
+        $factory->setUser($data['user']);
+        $factory->setUserGroup($data['user_group']);
 
         try {
             return $factory->create($data);

app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php

@@ -28,6 +28,7 @@ use FireflyIII\Exceptions\DuplicateTransactionException;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Location;
 use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
@@ -99,6 +100,8 @@ interface TransactionGroupRepositoryInterface
 
     public function setUser(null|Authenticatable|User $user): void;
 
+    public function setUserGroup(UserGroup $userGroup): void;
+
     /**
      * Create a new transaction group.
      *

app/Services/Internal/Support/AccountServiceTrait.php

@@ -659,9 +659,10 @@ trait AccountServiceTrait
 
         // submit to factory:
         $submission = [
-            'group_title'  => null,
-            'user'         => $account->user_id,
-            'transactions' => [
+            'group_title'   => null,
+            'user'          => $account->user,
+            'user_group'    => $account->user->userGroup,
+            'transactions'  => [
                 [
                     'type'             => 'Opening balance',
                     'date'             => $openingBalanceDate,
@@ -669,7 +670,8 @@ trait AccountServiceTrait
                     'source_name'      => $sourceName,
                     'destination_id'   => $destId,
                     'destination_name' => $destName,
-                    'user'             => $account->user_id,
+                    'user'             => $account->user,
+                    'user_group'       => $account->user->userGroup,
                     'currency_id'      => $currency->id,
                     'order'            => 0,
                     'amount'           => $amount,

app/Support/Chart/Budget/FrontpageChartGenerator.php

@@ -203,8 +203,7 @@ class FrontpageChartGenerator
             $amount = $limit->native_amount;
             Log::debug(sprintf('Amount is now "%s".', $amount));
         }
-
-
+        $amount                     = null === $amount ? '0' : $amount;
         $sumSpent                   = bcmul($entry['sum'], '-1'); // spent
         $data[0]['entries'][$title] ??= '0';
         $data[1]['entries'][$title] ??= '0';

app/Support/Http/Api/ExchangeRateConverter.php

@@ -88,6 +88,11 @@ class ExchangeRateConverter
 
             return '1';
         }
+        if ($from->id === $to->id) {
+            Log::debug('ExchangeRateConverter: From and to are the same, return "1".');
+
+            return '1';
+        }
         $rate = $this->getRate($from, $to, $date);
 
         return '0' === $rate ? '1' : $rate;
@@ -103,7 +108,7 @@ class ExchangeRateConverter
 
         // find in cache
         if (null !== $res) {
-            Log::debug(sprintf('ExchangeRateConverter: Return cached rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d')));
+            Log::debug(sprintf('ExchangeRateConverter: Return cached rate from %s to %s on %s.', $from->code, $to->code, $date->format('Y-m-d')));
 
             return $res;
         }
@@ -112,7 +117,7 @@ class ExchangeRateConverter
         $rate   = $this->getFromDB($from->id, $to->id, $date->format('Y-m-d'));
         if (null !== $rate) {
             Cache::forever($key, $rate);
-            Log::debug(sprintf('ExchangeRateConverter: Return DB rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d')));
+            Log::debug(sprintf('ExchangeRateConverter: Return DB rate from %s to %s on %s.', $from->code, $to->code, $date->format('Y-m-d')));
 
             return $rate;
         }
@@ -122,7 +127,7 @@ class ExchangeRateConverter
         if (null !== $rate) {
             $rate = bcdiv('1', $rate);
             Cache::forever($key, $rate);
-            Log::debug(sprintf('ExchangeRateConverter: Return inverse DB rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d')));
+            Log::debug(sprintf('ExchangeRateConverter: Return inverse DB rate from %s to %s on %s.', $from->code, $to->code, $date->format('Y-m-d')));
 
             return $rate;
         }
@@ -133,14 +138,14 @@ class ExchangeRateConverter
 
         // combined (if present), they can be used to calculate the necessary conversion rate.
         if (0 === bccomp('0', $first) || 0 === bccomp('0', $second)) {
-            Log::warning(sprintf('$first is "%s" and $second is "%s"', $first, $second));
+            Log::warning(sprintf('There is not enough information to convert %s to %s on date %s', $from->code, $to->code, $date->format('Y-m-d')));
 
             return '1';
         }
 
         $second = bcdiv('1', $second);
         $rate   = bcmul($first, $second);
-        Log::debug(sprintf('ExchangeRateConverter: Return DB rate from #%d to #%d on %s.', $from->id, $to->id, $date->format('Y-m-d')));
+        Log::debug(sprintf('ExchangeRateConverter: Return DB rate from %s to %s on %s.', $from->code, $to->code, $date->format('Y-m-d')));
         Cache::forever($key, $rate);
 
         return $rate;
@@ -154,6 +159,8 @@ class ExchangeRateConverter
     private function getFromDB(int $from, int $to, string $date): ?string
     {
         if ($from === $to) {
+            Log::debug('ExchangeRateConverter: From and to are the same, return "1".');
+
             return '1';
         }
         $key          = sprintf('cer-%d-%d-%s', $from, $to, $date);
@@ -173,7 +180,7 @@ class ExchangeRateConverter
             if ('' === $rate) {
                 return null;
             }
-            Log::debug(sprintf('ExchangeRateConverter: Found !cached! rate from #%d to #%d on %s.', $from, $to, $date));
+            Log::debug(sprintf('ExchangeRateConverter: Found cached rate from #%d to #%d on %s.', $from, $to, $date));
 
             return $rate;
         }

app/Support/Http/Api/ValidatesUserGroupTrait.php

@@ -38,6 +38,8 @@ use Illuminate\Support\Facades\Log;
  */
 trait ValidatesUserGroupTrait
 {
+    protected ?UserGroup $userGroup = null;
+
     /**
      * An "undocumented" filter
      *
@@ -59,7 +61,7 @@ trait ValidatesUserGroupTrait
         $user        = auth()->user();
         $groupId     = 0;
         if (!$request->has('user_group_id')) {
-            $groupId = $user->user_group_id;
+            $groupId = (int) $user->user_group_id;
             Log::debug(sprintf('validateUserGroup: no user group submitted, use default group #%d.', $groupId));
         }
         if ($request->has('user_group_id')) {
@@ -98,6 +100,7 @@ trait ValidatesUserGroupTrait
         foreach ($roles as $role) {
             if ($user->hasRoleInGroupOrOwner($group, $role)) {
                 Log::debug(sprintf('validateUserGroup: User has role "%s" in group #%d, return the group.', $role->value, $groupId));
+                $this->userGroup = $group;
 
                 return $group;
             }

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
@@ -57,7 +58,7 @@ trait ChartGeneration
         if ($cache->has()) {
             return $cache->get();
         }
-        app('log')->debug('Regenerate chart.account.account-balance-chart from scratch.');
+        Log::debug('Regenerate chart.account.account-balance-chart from scratch.');
         $locale          = app('steam')->getLocale();
 
         /** @var GeneratorInterface $generator */
@@ -69,12 +70,16 @@ 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';
+            $field        = $convertToNative ? 'native_balance' : 'balance';
             $currency     = $useNative ? $default : $currency;
+            Log::debug(sprintf('Will use field %s', $field));
             $currentSet   = [
                 'label'           => $account->name,
                 'currency_symbol' => $currency->symbol,
@@ -82,8 +87,9 @@ 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];
+            Log::debug(sprintf('Start balance for account #%d ("%s) is', $account->id, $account->name), $previous);
             while ($currentStart <= $end) {
                 $format                        = $currentStart->format('Y-m-d');
                 $label                         = trim($currentStart->isoFormat((string) trans('config.month_and_day_js', [], $locale)));

app/Support/Report/Summarizer/TransactionSummarizer.php

@@ -51,6 +51,7 @@ class TransactionSummarizer
 
     public function groupByCurrencyId(array $journals, string $method = 'negative'): array
     {
+        Log::debug(sprintf('Now in groupByCurrencyId(array, "%s")', $method));
         $array = [];
         foreach ($journals as $journal) {
             $field                 = 'amount';
@@ -61,6 +62,10 @@ class TransactionSummarizer
             $currencySymbol        = $journal['currency_symbol'];
             $currencyCode          = $journal['currency_code'];
             $currencyDecimalPlaces = $journal['currency_decimal_places'];
+
+            // prepare foreign currency info:
+            $foreignCurrencyId     = 0;
+
             if ($this->convertToNative) {
                 // if convert to native, use the native amount yes or no?
                 $useNative  = $this->default->id !== (int) $journal['currency_id'];
@@ -85,8 +90,18 @@ class TransactionSummarizer
                 }
             }
             if (!$this->convertToNative) {
-                // default to the normal amount, but also
+                Log::debug(sprintf('Journal #%d also includes foreign amount (foreign is %s)', $journal['transaction_journal_id'], $journal['foreign_currency_code']));
+                // use foreign amount?
+                $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+                if (0 !== $foreignCurrencyId) {
+                    $foreignCurrencyName          = $journal['foreign_currency_name'];
+                    $foreignCurrencySymbol        = $journal['foreign_currency_symbol'];
+                    $foreignCurrencyCode          = $journal['foreign_currency_code'];
+                    $foreignCurrencyDecimalPlaces = $journal['foreign_currency_decimal_places'];
+                }
             }
+
+            // first process normal amount
             $amount                = (string) ($journal[$field] ?? '0');
             $array[$currencyId] ??= [
                 'sum'                     => '0',
@@ -96,12 +111,34 @@ class TransactionSummarizer
                 'currency_code'           => $currencyCode,
                 'currency_decimal_places' => $currencyDecimalPlaces,
             ];
+
             if ('positive' === $method) {
                 $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->positive($amount));
             }
             if ('negative' === $method) {
                 $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->negative($amount));
             }
+
+            // then process foreign amount, if it exists.
+            if (0 !== $foreignCurrencyId) {
+                $amount = (string) ($journal['foreign_amount'] ?? '0');
+                $array[$foreignCurrencyId] ??= [
+                    'sum'                     => '0',
+                    'currency_id'             => $foreignCurrencyId,
+                    'currency_name'           => $foreignCurrencyName,
+                    'currency_symbol'         => $foreignCurrencySymbol,
+                    'currency_code'           => $foreignCurrencyCode,
+                    'currency_decimal_places' => $foreignCurrencyDecimalPlaces,
+                ];
+
+                if ('positive' === $method) {
+                    $array[$foreignCurrencyId]['sum'] = bcadd($array[$foreignCurrencyId]['sum'], app('steam')->positive($amount));
+                }
+                if ('negative' === $method) {
+                    $array[$foreignCurrencyId]['sum'] = bcadd($array[$foreignCurrencyId]['sum'], app('steam')->negative($amount));
+                }
+            }
+
             // $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->{$method}($amount));
             // Log::debug(sprintf('Journal #%d adds amount %s %s', $journal['transaction_journal_id'], $currencyCode, $amount));
         }

app/Support/Repositories/UserGroup/UserGroupTrait.php

@@ -24,30 +24,48 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\Repositories\UserGroup;
 
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\GroupMembership;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Trait UserGroupTrait
  */
 trait UserGroupTrait
 {
-    protected User      $user;
-    protected UserGroup $userGroup;
+    protected ?User      $user      = null;
+    protected ?UserGroup $userGroup = null;
 
     public function getUserGroup(): UserGroup
     {
         return $this->userGroup;
     }
 
+    public function checkUserGroupAccess(UserRoleEnum $role): bool
+    {
+        $result = $this->user->hasRoleInGroupOrOwner($this->userGroup, $role);
+        if ($result) {
+            Log::debug(sprintf('User #%d has role %s in group #%d or is owner/full.', $this->user->id, $role->value, $this->userGroup->id));
+
+            return true;
+        }
+        Log::warning(sprintf('User #%d DOES NOT have role %s in group #%d.', $this->user->id, $role->value, $this->userGroup->id));
+
+        return false;
+    }
+
     /**
      * TODO This method does not check if the user has access to this particular user group.
      */
     public function setUserGroup(UserGroup $userGroup): void
     {
+        if (null === $this->user) {
+            Log::warning(sprintf('User is not set in repository %s', static::class));
+        }
         $this->userGroup = $userGroup;
     }
 
@@ -62,7 +80,11 @@ trait UserGroupTrait
                 throw new FireflyException(sprintf('User #%d has no user group.', $user->id));
             }
             $this->userGroup = $user->userGroup;
+
+            return;
         }
+
+        throw new FireflyException(sprintf('Object is of class %s, not User.', get_class($user)));
     }
 
     /**
@@ -70,7 +92,7 @@ trait UserGroupTrait
      */
     public function setUserGroupById(int $userGroupId): void
     {
-        $memberships     = GroupMembership::where('user_id', $this->user->id)
+        $memberships = GroupMembership::where('user_id', $this->user->id)
             ->where('user_group_id', $userGroupId)
             ->count()
         ;
@@ -79,10 +101,10 @@ trait UserGroupTrait
         }
 
         /** @var null|UserGroup $userGroup */
-        $userGroup       = UserGroup::find($userGroupId);
+        $userGroup   = UserGroup::find($userGroupId);
         if (null === $userGroup) {
             throw new FireflyException(sprintf('Cannot find administration for user #%d', $this->user->id));
         }
-        $this->userGroup = $userGroup;
+        $this->setUserGroup($userGroup);
     }
 }

app/Support/Search/QueryParser/Node.php

@@ -55,4 +55,36 @@ 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 && $this 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())));
+
+                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!');
+
+                    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) {
+                        // In any other location, it's just a normal character
+                        $tokenUnderConstruction .= $char;
+                        $skipNext = true;
+                    }
+                    if ('' !== $tokenUnderConstruction && !$skipNext) { // @phpstan-ignore-line
+                        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

@@ -59,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->startOfDay();
+        $end->endOfDay();
         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
@@ -68,6 +68,7 @@ class Steam
         $cache->addProperty($account->id);
         $cache->addProperty('final-balance-in-range');
         $cache->addProperty($start);
+        $cache->addProperty($convertToNative);
         $cache->addProperty($end);
         if ($cache->has()) {
             return $cache->get();
@@ -75,13 +76,22 @@ class Steam
 
         $balances             = [];
         $formatted            = $start->format('Y-m-d');
-        $startBalance         = $this->finalAccountBalance($account, $start);
+        /*
+         * To make sure the start balance is correct, we need to get the balance at the exact end of the previous day.
+         * Since we just did "startOfDay" we can do subDay()->endOfDay() to get the correct moment.
+         * THAT will be the start balance.
+         */
+        $request              = clone $start;
+        $request->subDay()->endOfDay();
+        Log::debug(sprintf('finalAccountBalanceInRange: Call finalAccountBalance with date/time "%s"', $request->toIso8601String()));
+        $startBalance         = $this->finalAccountBalance($account, $request);
         $nativeCurrency       = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
         $accountCurrency      = $this->getAccountCurrency($account);
         $hasCurrency          = null !== $accountCurrency;
         $currency             = $accountCurrency ?? $nativeCurrency;
         Log::debug(sprintf('Currency is %s', $currency->code));
 
+
         // set start balances:
         $startBalance[$currency->code] ??= '0';
         if ($hasCurrency) {
@@ -100,6 +110,7 @@ class Steam
         Log::debug('Final start balance: ', $startBalance);
 
         // sums up the balance changes per day.
+        Log::debug(sprintf('Date >= %s and <= %s', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
         $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'))
@@ -125,6 +136,7 @@ class Steam
         foreach ($set as $entry) {
             // 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);
 
@@ -135,7 +147,9 @@ class Steam
             /** @var TransactionCurrency $entryCurrency */
             $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')));
+
+            // add amount to current balance in currency code.
             $currentBalance[$entryCurrency->code]        ??= '0';
             $currentBalance[$entryCurrency->code] = bcadd($sumOfDay, $currentBalance[$entryCurrency->code]);
 
@@ -144,13 +158,18 @@ class Steam
                 $currentBalance['balance'] = bcadd($currentBalance['balance'], $sumOfDay);
             }
             // if convert to native add the converted amount to "native_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) {
                 $nativeSumOfDay                   = $converter->convert($entryCurrency, $nativeCurrency, $carbon, $sumOfDay);
                 $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $nativeSumOfDay);
+                if ($currency->id === $entryCurrency->id) {
+                    $currentBalance['balance'] = bcadd($currentBalance['balance'], $sumOfDay);
+                }
+
             }
-            // add final $currentBalance array to the big one.
-            $balances[$carbon->format('Y-m-d')]   = $currentBalance;
-            Log::debug('Updated entry', $currentBalance);
+            // just set it.
+            $balances[$carbonKey]                 = $currentBalance;
+            Log::debug(sprintf('Updated entry [%s]', $carbonKey), $currentBalance);
         }
         $cache->store($balances);
         Log::debug('End of method');
@@ -160,6 +179,7 @@ class Steam
 
     public function finalAccountsBalance(Collection $accounts, Carbon $date): array
     {
+        Log::debug(sprintf('finalAccountsBalance: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
         $balances = [];
         foreach ($accounts as $account) {
             $balances[$account->id] = $this->finalAccountBalance($account, $date);
@@ -256,6 +276,8 @@ class Steam
     }
 
     /**
+     * Returns smaller than or equal to, so be careful with END OF DAY.
+     *
      * 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
@@ -268,14 +290,15 @@ class Steam
      */
     public function finalAccountBalance(Account $account, Carbon $date): array
     {
+
         $cache             = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty($date);
         if ($cache->has()) {
+            //            Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
             return $cache->get();
         }
-
-        Log::debug(sprintf('Now in finalAccountBalance(#%d, "%s", "%s")', $account->id, $account->name, $date->format('Y-m-d H:i:s')));
+        Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
 
         $native            = Amount::getNativeCurrencyByUserGroup($account->user->userGroup);
         $convertToNative   = Amount::convertToNative($account->user);
@@ -352,8 +375,8 @@ 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));
-                unset($set['native_balance'], $set[$defaultCurrency->code]);
+                Log::debug(sprintf('Unset [%s] for account #%d (no longer unset "native_balance")', $defaultCurrency->code, $account->id));
+                unset($set[$defaultCurrency->code]);
             }
             // todo rethink this logic.
             if (null !== $currency && $defaultCurrency->id !== $currency->id) {

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;
@@ -112,8 +114,13 @@ class AmountFormat extends AbstractExtension
             static function (string $amount, string $code, ?bool $coloured = null): string {
                 $coloured ??= true;
 
-                /** @var TransactionCurrency $currency */
+                /** @var null|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

@@ -31,6 +31,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Search\OperatorQuerySearch;
+use Illuminate\Support\Facades\Log;
 use League\CommonMark\GithubFlavoredMarkdownConverter;
 use Route;
 use Twig\Extension\AbstractExtension;
@@ -67,11 +68,13 @@ class General extends AbstractExtension
 
                 /** @var Carbon $date */
                 $date            = session('end', today(config('app.timezone'))->endOfMonth());
+                Log::debug(sprintf('twig balance: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
                 $info            = Steam::finalAccountBalance($account, $date);
                 $currency        = Steam::getAccountCurrency($account);
                 $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/AccountTransformer.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
+use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -106,6 +107,7 @@ class AccountTransformer extends AbstractTransformer
             $order = null;
         }
         // balance, native balance, virtual balance, native virtual balance?
+        Log::debug(sprintf('transform: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
         $finalBalance                                                 = Steam::finalAccountBalance($account, $date);
         if ($convertToNative) {
             $finalBalance['balance'] = $finalBalance[$currencyCode] ?? '0';

app/Transformers/PiggyBankEventTransformer.php

@@ -54,7 +54,7 @@ class PiggyBankEventTransformer extends AbstractTransformer
     public function transform(PiggyBankEvent $event): array
     {
         // get account linked to piggy bank
-        $account   = $event->piggyBank->account;
+        $account   = $event->piggyBank->accounts()->first();
 
         // set up repositories.
         $this->repository->setUser($account->user);

app/Transformers/V2/AccountTransformer.php

@@ -183,6 +183,8 @@ class AccountTransformer extends AbstractTransformer
         $bEnd   = [];
 
         try {
+            Log::debug(sprintf('v2 transformer: finalAccountsBalance("%s")', $start->format('Y-m-d H:i:s')));
+            Log::debug(sprintf('v2 transformer: finalAccountsBalance("%s")', $end->format('Y-m-d H:i:s')));
             $bStart = app('steam')->finalAccountsBalance($accounts, $start);
             $bEnd   = app('steam')->finalAccountsBalance($accounts, $end);
         } catch (FireflyException $e) {

changelog.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.2.6 - 2025-02-13
+
+### Fixed
+
+- [Issue 9797](https://github.com/firefly-iii/firefly-iii/issues/9797) (All account charts show a horizontal line) reported by @avee87
+- [Issue 9806](https://github.com/firefly-iii/firefly-iii/issues/9806) (Exchange Rates table fails to load when language is not English) reported by @polter-rnd
+- [Issue 9807](https://github.com/firefly-iii/firefly-iii/issues/9807) (Start Date of Reconciliation Period Incorrectly Excludes Transactions for That Day) reported by @pwschattenberg
+- [Issue 9808](https://github.com/firefly-iii/firefly-iii/issues/9808) (Default financial report line graph shows a different balance than the text) reported by @mtaygur
+- [Issue 9810](https://github.com/firefly-iii/firefly-iii/issues/9810) (Foreign amount not taken into consideration for budget spent/leaving) reported by @M4xS0ch
+- [Issue 9821](https://github.com/firefly-iii/firefly-iii/issues/9821) (piggy events api 500 error) reported by @4e868df3
+- [Issue 9826](https://github.com/firefly-iii/firefly-iii/issues/9826) (Wrong account balance) reported by @fabienfitoussi
+
+## 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 9784](https://github.com/firefly-iii/firefly-iii/issues/9784) (Transfers with external currency not considered for account balance?) reported by @pvieira84
+- [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._

composer.lock

@@ -1874,16 +1874,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.41.3",
+            "version": "v11.42.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "3ef433d5865f30a19b6b1be247586068399b59cc"
+                "reference": "006375ba67e830e87daa7b52ab65163ba3508d26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/3ef433d5865f30a19b6b1be247586068399b59cc",
-                "reference": "3ef433d5865f30a19b6b1be247586068399b59cc",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/006375ba67e830e87daa7b52ab65163ba3508d26",
+                "reference": "006375ba67e830e87daa7b52ab65163ba3508d26",
                 "shasum": ""
             },
             "require": {
@@ -1991,11 +1991,11 @@
                 "league/flysystem-read-only": "^3.25.1",
                 "league/flysystem-sftp-v3": "^3.25.1",
                 "mockery/mockery": "^1.6.10",
-                "orchestra/testbench-core": "^9.6",
+                "orchestra/testbench-core": "^9.9.4",
                 "pda/pheanstalk": "^5.0.6",
                 "php-http/discovery": "^1.15",
-                "phpstan/phpstan": "^1.11.5",
-                "phpunit/phpunit": "^10.5.35|^11.3.6",
+                "phpstan/phpstan": "^2.0",
+                "phpunit/phpunit": "^10.5.35|^11.3.6|^12.0.1",
                 "predis/predis": "^2.3",
                 "resend/resend-php": "^0.10.0",
                 "symfony/cache": "^7.0.3",
@@ -2027,7 +2027,7 @@
                 "mockery/mockery": "Required to use mocking (^1.6).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
                 "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^10.5.35|^11.3.6|^12.0.1).",
                 "predis/predis": "Required to use the predis connector (^2.3).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
@@ -2085,7 +2085,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-01-30T13:25:22+00:00"
+            "time": "2025-02-11T17:17:56+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2165,16 +2165,16 @@
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.4",
+            "version": "v0.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "abeaa2ba4294247d5409490d1ca1bc6248087011"
+                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/abeaa2ba4294247d5409490d1ca1bc6248087011",
-                "reference": "abeaa2ba4294247d5409490d1ca1bc6248087011",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/57b8f7efe40333cdb925700891c7d7465325d3b1",
+                "reference": "57b8f7efe40333cdb925700891c7d7465325d3b1",
                 "shasum": ""
             },
             "require": {
@@ -2218,9 +2218,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.4"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.5"
             },
-            "time": "2025-01-24T15:41:01+00:00"
+            "time": "2025-02-11T13:34:40+00:00"
         },
         {
             "name": "laravel/sanctum",
@@ -2288,16 +2288,16 @@
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v2.0.2",
+            "version": "v2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "2e1a362527783bcab6c316aad51bf36c5513ae44"
+                "reference": "f379c13663245f7aa4512a7869f62eb14095f23f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/2e1a362527783bcab6c316aad51bf36c5513ae44",
-                "reference": "2e1a362527783bcab6c316aad51bf36c5513ae44",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f379c13663245f7aa4512a7869f62eb14095f23f",
+                "reference": "f379c13663245f7aa4512a7869f62eb14095f23f",
                 "shasum": ""
             },
             "require": {
@@ -2345,7 +2345,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2025-01-24T15:42:37+00:00"
+            "time": "2025-02-11T15:03:05+00:00"
         },
         {
             "name": "laravel/slack-notification-channel",
@@ -3703,16 +3703,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "3.8.4",
+            "version": "3.8.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon.git",
-                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58"
+                "reference": "b1a53a27898639579a67de42e8ced5d5386aa9a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
-                "reference": "129700ed449b1f02d70272d2ac802357c8c30c58",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/b1a53a27898639579a67de42e8ced5d5386aa9a4",
+                "reference": "b1a53a27898639579a67de42e8ced5d5386aa9a4",
                 "shasum": ""
             },
             "require": {
@@ -3788,8 +3788,8 @@
             ],
             "support": {
                 "docs": "https://carbon.nesbot.com/docs",
-                "issues": "https://github.com/briannesbitt/Carbon/issues",
-                "source": "https://github.com/briannesbitt/Carbon"
+                "issues": "https://github.com/CarbonPHP/carbon/issues",
+                "source": "https://github.com/CarbonPHP/carbon"
             },
             "funding": [
                 {
@@ -3805,7 +3805,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-27T09:25:35+00:00"
+            "time": "2025-02-11T16:28:45+00:00"
         },
         {
             "name": "nette/schema",
@@ -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",
@@ -10973,16 +10973,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.12.1",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
+                "reference": "024473a478be9df5fdaca2c793f2232fe788e414"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
-                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414",
+                "reference": "024473a478be9df5fdaca2c793f2232fe788e414",
                 "shasum": ""
             },
             "require": {
@@ -11021,7 +11021,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0"
             },
             "funding": [
                 {
@@ -11029,7 +11029,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-08T17:47:46+00:00"
+            "time": "2025-02-12T12:17:51+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -11344,16 +11344,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.2",
+            "version": "2.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "7d08f569e582ade182a375c366cbd896eccadd3a"
+                "reference": "8f99e18eb775dbaf6460c95fa0b65312da9c746a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7d08f569e582ade182a375c366cbd896eccadd3a",
-                "reference": "7d08f569e582ade182a375c366cbd896eccadd3a",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f99e18eb775dbaf6460c95fa0b65312da9c746a",
+                "reference": "8f99e18eb775dbaf6460c95fa0b65312da9c746a",
                 "shasum": ""
             },
             "require": {
@@ -11398,7 +11398,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-21T14:54:06+00:00"
+            "time": "2025-02-10T08:25:21+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.4',
+    'version'                      => 'develop/2025-02-12',
     '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

@@ -159,7 +159,7 @@ return new class () extends Migration {
         Schema::dropIfExists('account_piggy_bank');
     }
 
-    protected static function hasForeign(string $table, string $column)
+    protected static function hasForeign(string $table, string $column): bool
     {
 
         $foreignKeysDefinitions = Schema::getForeignKeys($table);

package-lock.json

@@ -79,9 +79,9 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz",
-            "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+            "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -89,22 +89,23 @@
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz",
-            "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.8.tgz",
+            "integrity": "sha512-l+lkXCHS6tQEc5oUpK28xBOZ6+HwaH7YwoYQbLFiYb4nS2/l1tKnZEtEWkD0GuiYdvArf9qBS0XlQGXzPMsNqQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@ampproject/remapping": "^2.2.0",
                 "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.5",
+                "@babel/generator": "^7.26.8",
                 "@babel/helper-compilation-targets": "^7.26.5",
                 "@babel/helper-module-transforms": "^7.26.0",
                 "@babel/helpers": "^7.26.7",
-                "@babel/parser": "^7.26.7",
-                "@babel/template": "^7.25.9",
-                "@babel/traverse": "^7.26.7",
-                "@babel/types": "^7.26.7",
+                "@babel/parser": "^7.26.8",
+                "@babel/template": "^7.26.8",
+                "@babel/traverse": "^7.26.8",
+                "@babel/types": "^7.26.8",
+                "@types/gensync": "^1.0.0",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -130,14 +131,14 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
-            "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.8.tgz",
+            "integrity": "sha512-ef383X5++iZHWAXX0SXQR6ZyQhw/0KtTkrTz61WXRhFM6dhpHulO/RJz79L8S6ugZHJkOOkUrUdxgdF2YiPFnA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.26.5",
-                "@babel/types": "^7.26.5",
+                "@babel/parser": "^7.26.8",
+                "@babel/types": "^7.26.8",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
                 "jsesc": "^3.0.2"
@@ -442,13 +443,13 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
-            "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.8.tgz",
+            "integrity": "sha512-TZIQ25pkSoaKEYYaHbbxkfL36GNsQ6iFiBbeuzAkLnXayKR1yP1zFe+NxuZWWsUyvt8icPU9CCq0sgWGXR1GEw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.26.7"
+                "@babel/types": "^7.26.8"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -667,15 +668,15 @@
             }
         },
         "node_modules/@babel/plugin-transform-async-generator-functions": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
-            "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz",
+            "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9",
+                "@babel/helper-plugin-utils": "^7.26.5",
                 "@babel/helper-remap-async-to-generator": "^7.25.9",
-                "@babel/traverse": "^7.25.9"
+                "@babel/traverse": "^7.26.8"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1340,14 +1341,14 @@
             }
         },
         "node_modules/@babel/plugin-transform-runtime": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz",
-            "integrity": "sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.26.8.tgz",
+            "integrity": "sha512-H0jlQxFMI0Q8SyGPsj9pO3ygVQRxPkIGytsL3m1Zqca8KrCPpMlvh+e2dxknqdfS8LFwBw+PpiYPD9qy/FPQpA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-module-imports": "^7.25.9",
-                "@babel/helper-plugin-utils": "^7.25.9",
+                "@babel/helper-plugin-utils": "^7.26.5",
                 "babel-plugin-polyfill-corejs2": "^0.4.10",
                 "babel-plugin-polyfill-corejs3": "^0.10.6",
                 "babel-plugin-polyfill-regenerator": "^0.6.1",
@@ -1420,13 +1421,13 @@
             }
         },
         "node_modules/@babel/plugin-transform-template-literals": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
-            "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz",
+            "integrity": "sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
+                "@babel/helper-plugin-utils": "^7.26.5"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1519,13 +1520,13 @@
             }
         },
         "node_modules/@babel/preset-env": {
-            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.7.tgz",
-            "integrity": "sha512-Ycg2tnXwixaXOVb29rana8HNPgLVBof8qqtNQ9LE22IoyZboQbGSxI6ZySMdW3K5nAe6gu35IaJefUJflhUFTQ==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.8.tgz",
+            "integrity": "sha512-um7Sy+2THd697S4zJEfv/U5MHGJzkN2xhtsR3T/SWRbVSic62nbISh51VVfU9JiO/L/Z97QczHTaFVkOU8IzNg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/compat-data": "^7.26.5",
+                "@babel/compat-data": "^7.26.8",
                 "@babel/helper-compilation-targets": "^7.26.5",
                 "@babel/helper-plugin-utils": "^7.26.5",
                 "@babel/helper-validator-option": "^7.25.9",
@@ -1539,7 +1540,7 @@
                 "@babel/plugin-syntax-import-attributes": "^7.26.0",
                 "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
                 "@babel/plugin-transform-arrow-functions": "^7.25.9",
-                "@babel/plugin-transform-async-generator-functions": "^7.25.9",
+                "@babel/plugin-transform-async-generator-functions": "^7.26.8",
                 "@babel/plugin-transform-async-to-generator": "^7.25.9",
                 "@babel/plugin-transform-block-scoped-functions": "^7.26.5",
                 "@babel/plugin-transform-block-scoping": "^7.25.9",
@@ -1582,7 +1583,7 @@
                 "@babel/plugin-transform-shorthand-properties": "^7.25.9",
                 "@babel/plugin-transform-spread": "^7.25.9",
                 "@babel/plugin-transform-sticky-regex": "^7.25.9",
-                "@babel/plugin-transform-template-literals": "^7.25.9",
+                "@babel/plugin-transform-template-literals": "^7.26.8",
                 "@babel/plugin-transform-typeof-symbol": "^7.26.7",
                 "@babel/plugin-transform-unicode-escapes": "^7.25.9",
                 "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
@@ -1590,9 +1591,9 @@
                 "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
                 "@babel/preset-modules": "0.1.6-no-external-plugins",
                 "babel-plugin-polyfill-corejs2": "^0.4.10",
-                "babel-plugin-polyfill-corejs3": "^0.10.6",
+                "babel-plugin-polyfill-corejs3": "^0.11.0",
                 "babel-plugin-polyfill-regenerator": "^0.6.1",
-                "core-js-compat": "^3.38.1",
+                "core-js-compat": "^3.40.0",
                 "semver": "^6.3.1"
             },
             "engines": {
@@ -1602,6 +1603,20 @@
                 "@babel/core": "^7.0.0-0"
             }
         },
+        "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
+            "version": "0.11.1",
+            "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz",
+            "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-define-polyfill-provider": "^0.6.3",
+                "core-js-compat": "^3.40.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+            }
+        },
         "node_modules/@babel/preset-env/node_modules/semver": {
             "version": "6.3.1",
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -1640,32 +1655,32 @@
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
-            "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.8.tgz",
+            "integrity": "sha512-iNKaX3ZebKIsCvJ+0jd6embf+Aulaa3vNBqZ41kM7iTWjx5qzWKXGHiJUW3+nTpQ18SG11hdF8OAzKrpXkb96Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/code-frame": "^7.25.9",
-                "@babel/parser": "^7.25.9",
-                "@babel/types": "^7.25.9"
+                "@babel/code-frame": "^7.26.2",
+                "@babel/parser": "^7.26.8",
+                "@babel/types": "^7.26.8"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
-            "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.8.tgz",
+            "integrity": "sha512-nic9tRkjYH0oB2dzr/JoGIm+4Q6SuYeLEiIiZDwBscRMYFJ+tMAz98fuel9ZnbXViA2I0HVSSRRK8DW5fjXStA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.5",
-                "@babel/parser": "^7.26.7",
-                "@babel/template": "^7.25.9",
-                "@babel/types": "^7.26.7",
+                "@babel/generator": "^7.26.8",
+                "@babel/parser": "^7.26.8",
+                "@babel/template": "^7.26.8",
+                "@babel/types": "^7.26.8",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -1674,9 +1689,9 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.26.7",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
-            "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
+            "version": "7.26.8",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.8.tgz",
+            "integrity": "sha512-eUuWapzEGWFEpHFxgEaBG8e3n6S8L3MSu0oda755rOfabWPnh0Our1AozNFVUxGFIhbKgd1ksprsoDGMinTOTA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2591,9 +2606,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.2.tgz",
-            "integrity": "sha512-6Fyg9yQbwJR+ykVdT9sid1oc2ewejS6h4wzQltmJfSW53N60G/ah9pngXGANdy9/aaE/TcUFpWosdm7JXS1WTQ==",
+            "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 +2620,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.2.tgz",
-            "integrity": "sha512-K5GfWe+vtQ3kyEbihrimM38UgX57UqHp+oME7X/EX9Im6suwZfa7Hsr8AtzbJvukTpwMGs+4s29YMSO3rwWtsw==",
+            "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 +2634,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.2.tgz",
-            "integrity": "sha512-PSN58XG/V/tzqDb9kDGutUruycgylMlUE59f40ny6QIRNsTEIZsrNQTJKUN2keMMSmlzgunMFqyaGLmly39sug==",
+            "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 +2648,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.2.tgz",
-            "integrity": "sha512-gQhK788rQJm9pzmXyfBB84VHViDERhAhzGafw+E5mUpnGKuxZGkMVDa3wgDFKT6ukLC5V7QTifzsUKdNVxp5qQ==",
+            "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 +2662,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.2.tgz",
-            "integrity": "sha512-eiaHgQwGPpxLC3+zTAcdKl4VsBl3r0AiJOd1Um/ArEzAjN/dbPK1nROHrVkdnoE6p7Svvn04w3f/jEZSTVHunA==",
+            "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 +2676,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.2.tgz",
-            "integrity": "sha512-lhdiwQ+jf8pewYOTG4bag0Qd68Jn1v2gO1i0mTuiD+Qkt5vNfHVK/jrT7uVvycV8ZchlzXp5HDVmhpzjC6mh0g==",
+            "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 +2690,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.2.tgz",
-            "integrity": "sha512-lfqTpWjSvbgQP1vqGTXdv+/kxIznKXZlI109WkIFPbud41bjigjNmOAAKoazmRGx+k9e3rtIdbq2pQZPV1pMig==",
+            "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 +2704,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.2.tgz",
-            "integrity": "sha512-RGjqULqIurqqv+NJTyuPgdZhka8ImMLB32YwUle2BPTDqDoXNgwFjdjQC59FbSk08z0IqlRJjrJ0AvDQ5W5lpw==",
+            "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 +2718,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.2.tgz",
-            "integrity": "sha512-ZvkPiheyXtXlFqHpsdgscx+tZ7hoR59vOettvArinEspq5fxSDSgfF+L5wqqJ9R4t+n53nyn0sKxeXlik7AY9Q==",
+            "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 +2732,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.2.tgz",
-            "integrity": "sha512-UlFk+E46TZEoxD9ufLKDBzfSG7Ki03fo6hsNRRRHF+KuvNZ5vd1RRVQm8YZlGsjcJG8R252XFK0xNPay+4WV7w==",
+            "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 +2746,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.2.tgz",
-            "integrity": "sha512-hJhfsD9ykx59jZuuoQgYT1GEcNNi3RCoEmbo5OGfG8RlHOiVS7iVNev9rhLKh7UBYq409f4uEw0cclTXx8nh8Q==",
+            "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 +2760,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.2.tgz",
-            "integrity": "sha512-g/O5IpgtrQqPegvqopvmdCF9vneLE7eqYfdPWW8yjPS8f63DNam3U4ARL1PNNB64XHZDHKpvO2Giftf43puB8Q==",
+            "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 +2774,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.2.tgz",
-            "integrity": "sha512-bSQijDC96M6PuooOuXHpvXUYiIwsnDmqGU8+br2U7iPoykNi9JtMUpN7K6xml29e0evK0/g0D1qbAUzWZFHY5Q==",
+            "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 +2788,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.2.tgz",
-            "integrity": "sha512-49TtdeVAsdRuiUHXPrFVucaP4SivazetGUVH8CIxVsNsaPHV4PFkpLmH9LeqU/R4Nbgky9lzX5Xe1NrzLyraVA==",
+            "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 +2802,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.2.tgz",
-            "integrity": "sha512-j+jFdfOycLIQ7FWKka9Zd3qvsIyugg5LeZuHF6kFlXo6MSOc6R1w37YUVy8VpAKd81LMWGi5g9J25P09M0SSIw==",
+            "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 +2816,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.2.tgz",
-            "integrity": "sha512-aDPHyM/D2SpXfSNCVWCxyHmOqN9qb7SWkY1+vaXqMNMXslZYnwh9V/UCudl6psyG0v6Ukj7pXanIpfZwCOEMUg==",
+            "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 +2830,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.2.tgz",
-            "integrity": "sha512-LQRkCyUBnAo7r8dbEdtNU08EKLCJMgAk2oP5H3R7BnUlKLqgR3dUjrLBVirmc1RK6U6qhtDw29Dimeer8d5hzQ==",
+            "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 +2844,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.2.tgz",
-            "integrity": "sha512-wt8OhpQUi6JuPFkm1wbVi1BByeag87LDFzeKSXzIdGcX4bMLqORTtKxLoCbV57BHYNSUSOKlSL4BYYUghainYA==",
+            "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 +2858,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.2.tgz",
-            "integrity": "sha512-rUrqINax0TvrPBXrFKg0YbQx18NpPN3NNrgmaao9xRNbTwek7lOXObhx8tQy8gelmQ/gLaGy1WptpU2eKJZImg==",
+            "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"
             ],
@@ -3032,6 +3047,13 @@
                 "@types/send": "*"
             }
         },
+        "node_modules/@types/gensync": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/@types/gensync/-/gensync-1.0.4.tgz",
+            "integrity": "sha512-C3YYeRQWp2fmq9OryX+FoDy8nXS6scQ7dPptD8LnFDAUNcKWJjXQKDNJD3HVm+kOUsXhTOkpi69vI4EuAr95bA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@types/glob": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
@@ -3051,9 +3073,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": {
@@ -4158,9 +4180,9 @@
             "license": "MIT"
         },
         "node_modules/bootstrap5-autocomplete": {
-            "version": "1.1.35",
-            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.35.tgz",
-            "integrity": "sha512-vZAOef3lGrpGGnnIKTJlqiqv6wsx0Wr31/mc010mJmHF1eXJd28jzfGn7ol8eOI/7FiDcm3wd/1VTWku40vLbQ==",
+            "version": "1.1.36",
+            "resolved": "https://registry.npmjs.org/bootstrap5-autocomplete/-/bootstrap5-autocomplete-1.1.36.tgz",
+            "integrity": "sha512-fZpklymmrwAls3n6YDMua2msnBB4pwmJgJgqMayHLfnvvc2dhKWwp/qu0pGJI99S8TwC+ZDjYtEsfl+4/FEZhg==",
             "license": "MIT"
         },
         "node_modules/bootstrap5-tags": {
@@ -4448,9 +4470,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001697",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001697.tgz",
-            "integrity": "sha512-GwNPlWJin8E+d7Gxq96jxM6w0w+VFeyyXRsjU58emtkYqnbwHqXm5uT2uCmO0RQE9htWknOP4xtBlLmM/gWxvQ==",
+            "version": "1.0.30001699",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001699.tgz",
+            "integrity": "sha512-b+uH5BakXZ9Do9iK+CkDmctUSEqZl+SP056vc5usa0PL+ev5OHw003rZXcnjNDv3L8P5j6rwT6C0BPKSikW08w==",
             "dev": true,
             "funding": [
                 {
@@ -4735,9 +4757,9 @@
             }
         },
         "node_modules/compression": {
-            "version": "1.7.5",
-            "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
-            "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
+            "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5663,9 +5685,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.92",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.92.tgz",
-            "integrity": "sha512-BeHgmNobs05N1HMmMZ7YIuHfYBGlq/UmvlsTgg+fsbFs9xVMj+xJHFg19GN04+9Q+r8Xnh9LXqaYIyEWElnNgQ==",
+            "version": "1.5.97",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.97.tgz",
+            "integrity": "sha512-HKLtaH02augM7ZOdYRuO19rWDeY+QSJ1VxnXFa/XDFLf07HvM90pALIJFgrO+UVaajI3+aJMMpojoUTLZyQ7JQ==",
             "dev": true,
             "license": "ISC"
         },
@@ -8854,9 +8876,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.5.1",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
-            "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
+            "version": "8.5.2",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz",
+            "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==",
             "dev": true,
             "funding": [
                 {
@@ -9183,9 +9205,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 +9235,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 +10009,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.34.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.2.tgz",
-            "integrity": "sha512-sBDUoxZEaqLu9QeNalL8v3jw6WjPku4wfZGyTU7l7m1oC+rpRihXc/n/H+4148ZkGz5Xli8CHMns//fFGKvpIQ==",
+            "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 +10025,25 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.34.2",
-                "@rollup/rollup-android-arm64": "4.34.2",
-                "@rollup/rollup-darwin-arm64": "4.34.2",
-                "@rollup/rollup-darwin-x64": "4.34.2",
-                "@rollup/rollup-freebsd-arm64": "4.34.2",
-                "@rollup/rollup-freebsd-x64": "4.34.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.34.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.34.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.34.2",
-                "@rollup/rollup-linux-arm64-musl": "4.34.2",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.34.2",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.34.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.34.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.34.2",
-                "@rollup/rollup-linux-x64-gnu": "4.34.2",
-                "@rollup/rollup-linux-x64-musl": "4.34.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.34.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.34.2",
-                "@rollup/rollup-win32-x64-msvc": "4.34.2",
+                "@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 +10099,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": {
@@ -10871,9 +10893,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.2",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.38.2.tgz",
+            "integrity": "sha512-w8CXxxbFA5zfNsR/i8HZq5bvn18AK0O9jj7hyo1YqkovLxEFa0uP0LCVGZRqiRaKRFxXhELBp8SteeAjEnfeJg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -11297,15 +11319,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>
@@ -74,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

@@ -218,8 +218,8 @@ export default {
         // 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),
@@ -381,7 +381,7 @@ export default {
                 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);
+                // console.log('Do not download more pages. Now on page ' + this.page + ' of ' + this.totalPages);
             });
         }
     },

resources/assets/v1/src/components/transactions/AccountSelect.vue

@@ -36,7 +36,6 @@
             class="form-control"
             data-role="input"
             type="text"
-            v-on:keypress="handleEnter"
             v-on:submit.prevent>
         <span class="input-group-btn">
             <button
@@ -217,7 +216,7 @@ export default {
           }
         },
         selectedItem: function (e) {
-          // console.log('In SelectedItem()');
+          console.log('In SelectedItem()');
           if (typeof this.name === 'undefined') {
             // console.log('Is undefined');
             return;
@@ -239,12 +238,6 @@ export default {
           this.name = '';
           // some event?
           this.$emit('clear:value')
-        },
-        handleEnter: function (e) {
-          // TODO feels sloppy. Can be removed.
-          if (e.keyCode === 13) {
-            //e.preventDefault();
-          }
         }
       }
 }

resources/assets/v1/src/components/transactions/CreateTransaction.vue

@@ -922,6 +922,12 @@ export default {
                     allowed_types: this.transactions[index].source_account.allowed_types,
                     default_allowed_types: ['Asset account', 'Revenue account', 'Loan', 'Debt', 'Mortgage']
                 };
+                if(model.hasOwnProperty('account_currency_id') && null !== model.account_currency_id) {
+                    this.transactions[index].source_account.currency_id = model.account_currency_id;
+                    this.transactions[index].source_account.currency_name = model.account_currency_name;
+                    this.transactions[index].source_account.currency_code = model.account_currency_code;
+                    this.transactions[index].source_account.currency_decimal_places = model.account_currency_decimal_places;
+                }
 
                 // force types on destination selector.
                 this.transactions[index].destination_account.allowed_types = window.allowedOpposingTypes.source[model.type];
@@ -946,6 +952,12 @@ export default {
                     allowed_types: this.transactions[index].destination_account.allowed_types,
                     default_allowed_types: ['Asset account', 'Expense account', 'Loan', 'Debt', 'Mortgage']
                 };
+                if(model.hasOwnProperty('account_currency_id') && null !== model.account_currency_id) {
+                    this.transactions[index].destination_account.currency_id = model.account_currency_id;
+                    this.transactions[index].destination_account.currency_name = model.account_currency_name;
+                    this.transactions[index].destination_account.currency_code = model.account_currency_code;
+                    this.transactions[index].destination_account.currency_decimal_places = model.account_currency_decimal_places;
+                }
 
                 // force types on destination selector.
                 this.transactions[index].source_account.allowed_types = window.allowedOpposingTypes.destination[model.type];

resources/assets/v1/src/components/transactions/EditTransaction.vue

@@ -155,8 +155,8 @@
                                                     v-bind:title="$t('form.foreign_amount')"
                                     ></foreign-amount>
                                     <reconciled v-show="isReconciled"
-                                        v-model="transaction.reconciled"
-                                        :error="transaction.errors.reconciled"
+                                                v-model="transaction.reconciled"
+                                                :error="transaction.errors.reconciled"
                                     ></reconciled>
                                 </div>
                                 <div class="col-lg-4">
@@ -322,6 +322,12 @@ export default {
                 currency_decimal_places: model.currency_decimal_places,
                 allowed_types: this.transactions[index].source_account.allowed_types
             };
+            if(model.hasOwnProperty('account_currency_id') && null !== model.account_currency_id) {
+                this.transactions[index].source_account.currency_id = model.account_currency_id;
+                this.transactions[index].source_account.currency_name = model.account_currency_name;
+                this.transactions[index].source_account.currency_code = model.account_currency_code;
+                this.transactions[index].source_account.currency_decimal_places = model.account_currency_decimal_places;
+            }
         },
         selectedDestinationAccount(index, model) {
             if (typeof model === 'string') {
@@ -341,6 +347,12 @@ export default {
                 currency_decimal_places: model.currency_decimal_places,
                 allowed_types: this.transactions[index].destination_account.allowed_types
             };
+            if(model.hasOwnProperty('account_currency_id') && null !== model.account_currency_id) {
+                this.transactions[index].destination_account.currency_id = model.account_currency_id;
+                this.transactions[index].destination_account.currency_name = model.account_currency_name;
+                this.transactions[index].destination_account.currency_code = model.account_currency_code;
+                this.transactions[index].destination_account.currency_decimal_places = model.account_currency_decimal_places;
+            }
         },
         clearSource(index) {
             // reset source account:
@@ -437,7 +449,7 @@ export default {
             //console.log('EditTransaction: processIncomingGroupRow()');
             this.setTransactionType(transaction.type);
 
-            if(true === transaction.reconciled) {
+            if (true === transaction.reconciled) {
                 this.isReconciled = true;
             }
 
@@ -528,7 +540,16 @@ export default {
                     allowed_types: window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]
                 }
             };
-            if(null === transaction.foreign_amount) {
+            // if transaction type is transfer, the destination currency_id etc. MUST match the actual account currency info.
+            if ('transfer' === transaction.type && null !== transaction.foreign_currency_code) {
+                result.destination_account.currency_id = transaction.foreign_currency_id;
+                result.destination_account.currency_name = transaction.foreign_currency_name;
+                result.destination_account.currency_code = transaction.foreign_currency_code;
+                result.destination_account.currency_decimal_places = transaction.foreign_currency_decimal_places;
+            }
+
+
+            if (null === transaction.foreign_amount) {
                 result.foreign_amount.amount = '';
             }
             this.transactions.push(result);
@@ -736,7 +757,7 @@ export default {
             if (parseInt(row.piggy_bank) > 0) {
                 currentArray.piggy_bank_id = parseInt(row.piggy_bank);
             }
-            if(this.isReconciled && !this.storeAsNew && true === row.reconciled) {
+            if (this.isReconciled && !this.storeAsNew && true === row.reconciled) {
                 // drop content from array:
                 delete currentArray.source_id;
                 delete currentArray.source_name;
@@ -748,7 +769,7 @@ export default {
                 delete currentArray.currency_id;
                 currentArray.reconciled = true;
             }
-            if(true === row.isReconciled) {
+            if (true === row.isReconciled) {
                 this.isReconciled = false;
             }
 
@@ -801,10 +822,16 @@ export default {
                 this.setDefaultErrors();
                 // do message if update or new:
                 if (this.storeAsNew) {
-                    this.success_message = this.$t('firefly.transaction_new_stored_link', {ID: groupId, title: this.escapeHtml(title)});
+                    this.success_message = this.$t('firefly.transaction_new_stored_link', {
+                        ID: groupId,
+                        title: this.escapeHtml(title)
+                    });
                     this.error_message = '';
                 } else {
-                    this.success_message = this.$t('firefly.transaction_updated_link', {ID: groupId, title: this.escapeHtml(title)});
+                    this.success_message = this.$t('firefly.transaction_updated_link', {
+                        ID: groupId,
+                        title: this.escapeHtml(title)
+                    });
                     this.error_message = '';
                 }
             } else {

resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue

@@ -19,205 +19,213 @@
   -->
 
 <template>
-  <!--
-  Show if:
-  - one or more currencies.
-  -->
-  <div v-if="this.enabledCurrencies.length >= 1" class="form-group" v-bind:class="{ 'has-error': hasError()}">
-    <div class="col-sm-8 col-sm-offset-4 text-sm">
-      {{ $t('form.foreign_amount') }}
-    </div>
-    <div class="col-sm-4">
-      <select ref="currency_select" class="form-control" name="foreign_currency[]" @input="handleInput">
-        <option
-            v-for="currency in this.enabledCurrencies"
-            :label="currency.attributes.name"
-            :selected="parseInt(value.currency_id) === parseInt(currency.id)"
-            :value="currency.id"
+    <!--
+    Show if:
+    - one or more currencies.
+    -->
+    <div v-if="this.enabledCurrencies.length >= 1" class="form-group" v-bind:class="{ 'has-error': hasError()}">
+        <div class="col-sm-8 col-sm-offset-4 text-sm">
+            {{ $t('form.foreign_amount') }}
+        </div>
+        <div class="col-sm-4">
+            <select ref="currency_select" class="form-control" name="foreign_currency[]" @input="handleInput">
+                <option
+                    v-for="currency in this.enabledCurrencies"
+                    :label="currency.attributes.name"
+                    :selected="parseInt(value.currency_id) === parseInt(currency.id)"
+                    :value="currency.id"
 
-        >
-          {{ currency.attributes.name }}
-        </option>
-      </select>
-    </div>
-    <div class="col-sm-8">
-      <div class="input-group">
-        <input v-if="this.enabledCurrencies.length > 0" ref="amount" :placeholder="this.title" :title="this.title" :value="value.amount" autocomplete="off"
-               class="form-control" name="foreign_amount[]"
-               step="any" type="number" @input="handleInput">
-        <span class="input-group-btn">
+                >
+                    {{ currency.attributes.name }}
+                </option>
+            </select>
+        </div>
+        <div class="col-sm-8">
+            <div class="input-group">
+                <input v-if="this.enabledCurrencies.length > 0" ref="amount" :placeholder="this.title"
+                       :title="this.title" :value="value.amount" autocomplete="off"
+                       class="form-control" name="foreign_amount[]"
+                       step="any" type="number" @input="handleInput">
+                <span class="input-group-btn">
                 <button
                     class="btn btn-default"
                     tabIndex="-1"
                     type="button"
                     v-on:click="clearAmount"><i class="fa fa-trash-o"></i></button>
                 </span>
-      </div>
-      <ul v-for="error in this.error" class="list-unstyled">
-        <li class="text-danger">{{ error }}</li>
-      </ul>
+            </div>
+            <ul v-for="error in this.error" class="list-unstyled">
+                <li class="text-danger">{{ error }}</li>
+            </ul>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
 export default {
-  name: "ForeignAmountSelect",
+    name: "ForeignAmountSelect",
 
-  props: ['source', 'destination', 'transactionType', 'value', 'error', 'no_currency', 'title',],
-  mounted() {
-    this.liability = false;
-    this.loadCurrencies();
+    props: ['source', 'destination', 'transactionType', 'value', 'error', 'no_currency', 'title',],
+    mounted() {
+        this.liability = false;
+        // console.log('I am mounted with a ' + this.transactionType + ' transaction type and currency id!');
+        // console.log(this.value);
+        this.loadCurrencies();
+    },
+    data() {
+        return {
+            currencies: [],
+            enabledCurrencies: [],
+            exclude: null,
+            // liability overrules the drop-down list if the source or dest is a liability
+            liability: false
+        }
+    },
+    watch: {
+        source: function () {
+            // console.log('ForeignAmountSelect watch source');
+            this.changeData();
+        },
+        destination: function () {
+            // console.log('ForeignAmountSelect watch destination');
+            this.changeData();
+        },
+        transactionType: function () {
+            // console.log('ForeignAmountSelect watch transaction type (is now ' + this.transactionType + ')');
+            this.changeData();
+        }
+    },
+    methods: {
+        clearAmount: function () {
+            this.$refs.amount.value = '';
+            this.$emit('input', this.$refs.amount.value);
+            // some event?
+            this.$emit('clear:amount')
+        },
+        hasError: function () {
+            //console.log('ForeignAmountSelect hasError');
+            return this.error.length > 0;
+        },
+        handleInput(e) {
+            // console.log('ForeignAmountSelect handleInput');
+            let obj = {
+                amount: this.$refs.amount.value,
+                currency_id: this.$refs.currency_select.value,
+            };
+            // console.log(obj);
+            this.$emit('input', obj
+            );
+        },
+        changeData: function () {
+            // console.log('ForeignAmountSelect changeData');
+            this.enabledCurrencies = [];
+            let destType = this.destination.type ? this.destination.type.toLowerCase() : 'invalid';
+            let srcType = this.source.type ? this.source.type.toLowerCase() : 'invalid';
+            let tType = this.transactionType ? this.transactionType.toLowerCase() : 'invalid';
+            let liabilities = ['loan', 'debt', 'mortgage'];
+            let sourceIsLiability = liabilities.indexOf(srcType) !== -1;
+            let destIsLiability = liabilities.indexOf(destType) !== -1;
 
-  },
-  data() {
-    return {
-      currencies: [],
-      enabledCurrencies: [],
-      exclude: null,
-      // liability overrules the drop down list if the source or dest is a liability
-      liability: false
+            // console.log(srcType + ' (source) is a liability: ' + sourceIsLiability);
+            // console.log(destType + ' (dest) is a liability: ' + destIsLiability);
+            // console.log('tType: ' + tType);
+            if (tType === 'transfer' || destIsLiability || sourceIsLiability) {
+                // console.log('Source is liability OR dest is liability, OR transfer. Lock list on currency of destination.');
+                // console.log('Length of currencies is ' + this.currencies.length);
+                // console.log(this.currencies);
+                this.liability = true;
+                // lock dropdown list on currencyID of destination.
+                for (const key in this.currencies) {
+                    if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
+
+                        if (
+                            parseInt(this.currencies[key].id) === parseInt(this.destination.currency_id)
+                        ) {
+                            // console.log('Enable currency!!');
+                            // console.log(this.destination);
+                            // console.log(this.currencies[key]);
+                            this.enabledCurrencies.push(this.currencies[key]);
+                        }
+                    }
+                }
+                // console.log('Enabled currencies length is now ' + this.enabledCurrencies.length);
+                return;
+            }
+
+            // if type is withdrawal, list all but skip the source account ID.
+            if (tType === 'withdrawal' && this.source && false === sourceIsLiability) {
+                for (const key in this.currencies) {
+                    if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
+                        if (this.source.currency_id !== this.currencies[key].id) {
+                            this.enabledCurrencies.push(this.currencies[key]);
+                        }
+                    }
+                }
+                return;
+            }
+
+            // if type is deposit, list all but skip the source account ID.
+            if (tType === 'deposit' && this.destination) {
+                for (const key in this.currencies) {
+                    if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
+                        if (this.destination.currency_id !== this.currencies[key].id) {
+                            this.enabledCurrencies.push(this.currencies[key]);
+                        }
+                    }
+                }
+                return;
+            }
+            for (const key in this.currencies) {
+                if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
+                    this.enabledCurrencies.push(this.currencies[key]);
+                }
+            }
+        },
+        loadCurrencies: function () {
+            // console.log('loadCurrencies');
+            // reset list of currencies:
+            this.currencies = [
+                {
+                    id: 0,
+                    attributes: {
+                        name: this.no_currency,
+                        enabled: true
+                    },
+                }
+            ];
+
+            this.enabledCurrencies = [
+                {
+                    attributes: {
+                        name: this.no_currency,
+                        enabled: true
+                    },
+                    id: 0,
+                }
+            ];
+
+            this.getCurrencies(1);
+        },
+        getCurrencies: function (page) {
+            let url = document.getElementsByTagName('base')[0].href + "api/v1/currencies?page=" + page;
+            axios.get(url, {}).then((res) => {
+
+                for (const key in res.data.data) {
+                    if (res.data.data.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
+                        if (res.data.data[key].attributes.enabled) {
+                            // console.log(res.data.data[key].attributes);
+                            this.currencies.push(res.data.data[key]);
+                            this.enabledCurrencies.push(res.data.data[key]);
+                        }
+                    }
+                }
+                if (res.data.meta.pagination.current_page < res.data.meta.pagination.total_pages) {
+                    this.getCurrencies(res.data.meta.pagination.current_page + 1);
+                    return;
+                }
+                this.changeData();
+            });
+        }
     }
-  },
-  watch: {
-    source: function () {
-      //console.log('ForeignAmountSelect watch source');
-      this.changeData();
-    },
-    destination: function () {
-      //console.log('ForeignAmountSelect watch destination');
-      this.changeData();
-    },
-    transactionType: function () {
-      //console.log('ForeignAmountSelect watch transaction type (is now ' + this.transactionType + ')');
-      this.changeData();
-    }
-  },
-  methods: {
-    clearAmount: function () {
-      this.$refs.amount.value = '';
-      this.$emit('input', this.$refs.amount.value);
-      // some event?
-      this.$emit('clear:amount')
-    },
-    hasError: function () {
-      //console.log('ForeignAmountSelect hasError');
-      return this.error.length > 0;
-    },
-    handleInput(e) {
-      //console.log('ForeignAmountSelect handleInput');
-      let obj = {
-        amount: this.$refs.amount.value,
-        currency_id: this.$refs.currency_select.value,
-      };
-      // console.log(obj);
-      this.$emit('input', obj
-      );
-    },
-    changeData: function () {
-      // console.log('ForeignAmountSelect changeData');
-      this.enabledCurrencies = [];
-      let destType = this.destination.type ? this.destination.type.toLowerCase() : 'invalid';
-      let srcType = this.source.type ? this.source.type.toLowerCase() : 'invalid';
-      let tType = this.transactionType ? this.transactionType.toLowerCase() : 'invalid';
-      let liabilities = ['loan', 'debt', 'mortgage'];
-      let sourceIsLiability = liabilities.indexOf(srcType) !== -1;
-      let destIsLiability = liabilities.indexOf(destType) !== -1;
-
-      // console.log(srcType + ' (source) is a liability: ' + sourceIsLiability);
-      // console.log(destType + ' (dest) is a liability: ' + destIsLiability);
-
-      if (tType === 'transfer' || destIsLiability || sourceIsLiability) {
-        // console.log('Source is liability OR dest is liability, OR transfer. Lock list on currency of destination.');
-        // console.log('Length of currencies is ' + this.currencies.length);
-        // console.log(this.currencies);
-        this.liability = true;
-        // lock dropdown list on currencyID of destination.
-        for (const key in this.currencies) {
-          if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-            // console.log('this.currencies[key].id = ' + this.currencies[key].id);
-            // console.log('this.destination.currency_id = ' + this.destination.currency_id);
-            if (parseInt(this.currencies[key].id) === parseInt(this.destination.currency_id)) {
-              this.enabledCurrencies.push(this.currencies[key]);
-            }
-          }
-        }
-        // console.log('Enabled currencies length is now ' + this.enabledCurrencies.length);
-        return;
-      }
-
-      // if type is withdrawal, list all but skip the source account ID.
-      if (tType === 'withdrawal' && this.source && false === sourceIsLiability) {
-        for (const key in this.currencies) {
-          if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-            if (this.source.currency_id !== this.currencies[key].id) {
-              this.enabledCurrencies.push(this.currencies[key]);
-            }
-          }
-        }
-        return;
-      }
-
-      // if type is deposit, list all but skip the source account ID.
-      if (tType === 'deposit' && this.destination) {
-        for (const key in this.currencies) {
-          if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-            if (this.destination.currency_id !== this.currencies[key].id) {
-              this.enabledCurrencies.push(this.currencies[key]);
-            }
-          }
-        }
-        return;
-      }
-      for (const key in this.currencies) {
-        if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-          this.enabledCurrencies.push(this.currencies[key]);
-        }
-      }
-    },
-    loadCurrencies: function () {
-      // reset list of currencies:
-      this.currencies = [
-        {
-          id: 0,
-          attributes: {
-            name: this.no_currency,
-            enabled: true
-          },
-        }
-      ];
-
-      this.enabledCurrencies = [
-        {
-          attributes: {
-            name: this.no_currency,
-            enabled: true
-          },
-          id: 0,
-        }
-      ];
-
-      this.getCurrencies(1);
-    },
-    getCurrencies: function(page) {
-      // console.log('loadCurrencies on page ' + page);
-      let url = document.getElementsByTagName('base')[0].href + "api/v1/currencies?page=" + page;
-      axios.get(url, {}).then((res) => {
-
-        for (const key in res.data.data) {
-          if (res.data.data.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-            if (res.data.data[key].attributes.enabled) {
-              // console.log(res.data.data[key].attributes);
-              this.currencies.push(res.data.data[key]);
-              this.enabledCurrencies.push(res.data.data[key]);
-            }
-          }
-        }
-        if(res.data.meta.pagination.current_page < res.data.meta.pagination.total_pages) {
-          this.getCurrencies(res.data.meta.pagination.current_page + 1);
-        }
-      });
-    }
-  }
 }
 </script>

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": "Nicht gen\u00fcgend W\u00e4hrungen",
+        "not_enough_currencies_enabled": "Wenn Sie nur eine W\u00e4hrung aktiviert haben, ist es nicht erforderlich, Wechselkurse hinzuzuf\u00fcgen.",
         "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.",

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": "Pas assez de devises",
+        "not_enough_currencies_enabled": "Si vous n'avez qu'une seule devise activ\u00e9e, il n'y a pas besoin d'ajouter des taux de change.",
         "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.",

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": "Nincs el\u00e9g p\u00e9nznem",
+        "not_enough_currencies_enabled": "Amennyiben csak egyetlen p\u00e9nznem enged\u00e9lyezett, akkor nincs sz\u00fcks\u00e9g \u00e1rfolyam be\u00e1ll\u00edt\u00e1sokra.",
         "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",