Auto commit for release 'branch-v6.2' on 2024-12-27

# Conflicts:
#	app/Http/Controllers/Chart/AccountController.php
#	app/Support/Steam.php

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

@@ -116,7 +116,7 @@ class AccountController extends Controller
             ];
             // TODO this code is also present in the V2 chart account controller so this method is due to be deprecated.
             $currentStart = clone $start;
-            $range        = app('steam')->finalAccountBalanceInRange($account, $start, clone $end);
+            $range        = app('steam')->finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
             // 2022-10-11 this method no longer converts to float.
             $previous     = array_values($range)[0];
             while ($currentStart <= $end) {

app/Api/V1/Controllers/Controller.php

@@ -50,11 +50,12 @@ abstract class Controller extends BaseController
     use DispatchesJobs;
     use ValidatesRequests;
 
-    protected const string CONTENT_TYPE = 'application/vnd.api+json';
+    protected const string CONTENT_TYPE    = 'application/vnd.api+json';
 
     /** @var array<int, string> */
     protected array        $allowedSort;
     protected ParameterBag $parameters;
+    protected bool        $convertToNative = false;
 
     /**
      * Controller constructor.
@@ -67,8 +68,10 @@ abstract class Controller extends BaseController
             function ($request, $next) {
                 $this->parameters = $this->getParameters();
                 if (auth()->check()) {
-                    $language = app('steam')->getLanguage();
+                    $language              = app('steam')->getLanguage();
+                    $this->convertToNative = app('preferences')->get('convert_to_native', false)->data;
                     app()->setLocale($language);
+
                 }
 
                 return $next($request);

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

@@ -118,7 +118,7 @@ class AccountController extends Controller
             'native_entries'                 => [],
         ];
         $currentStart   = clone $params['start'];
-        $range          = app('steam')->finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $currency);
+        $range          = app('steam')->finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToNative);
 
         $previous       = array_values($range)[0]['balance'];
         $previousNative = array_values($range)[0]['native_balance'];

app/Api/V2/Controllers/Controller.php

@@ -54,9 +54,10 @@ class Controller extends BaseController
 {
     use ValidatesUserGroupTrait;
 
-    protected const string CONTENT_TYPE   = 'application/vnd.api+json';
-    protected array        $acceptedRoles = [UserRoleEnum::READ_ONLY];
+    protected const string CONTENT_TYPE     = 'application/vnd.api+json';
+    protected array        $acceptedRoles   = [UserRoleEnum::READ_ONLY];
     protected ParameterBag $parameters;
+    protected bool         $convertToNative = false;
 
     public function __construct()
     {

app/Console/Commands/Correction/ConvertsDatesToUTC.php

@@ -1,5 +1,25 @@
 <?php
 
+/*
+ * ConvertsDatesToUTC.php
+ * Copyright (c) 2024 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
 declare(strict_types=1);
 /*
  * ConvertDatesToUTC.php
@@ -21,7 +41,7 @@ declare(strict_types=1);
  * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-namespace FireflyIII\Console\Commands\Integrity;
+namespace FireflyIII\Console\Commands\Correction;
 
 use Carbon\Carbon;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
@@ -31,7 +51,7 @@ use Illuminate\Database\QueryException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
-class ConvertDatesToUTC extends Command
+class ConvertsDatesToUTC extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -47,13 +67,17 @@ class ConvertDatesToUTC extends Command
      *
      * @var string
      */
-    protected $signature   = 'firefly-iii:migrate-to-utc';
+    protected $signature   = 'correction:convert-to-utc';
 
     /**
      * Execute the console command.
      */
     public function handle(): int
     {
+        $this->friendlyWarning('Please do not use this command.');
+
+        return 0;
+
         /**
          * @var string $model
          * @var array  $fields

app/Console/Commands/Correction/CorrectsAccountOrder.php

@@ -29,15 +29,12 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class FixAccountOrder
- */
-class FixAccountOrder extends Command
+class CorrectsAccountOrder extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Make sure account order is correct.';
-    protected $signature   = 'firefly-iii:fix-account-order';
+    protected $signature   = 'correction:account-order';
 
     private AccountRepositoryInterface $repository;
 
@@ -54,8 +51,6 @@ class FixAccountOrder extends Command
             $this->repository->resetAccountOrder();
         }
 
-        $this->friendlyPositive('All accounts are ordered correctly');
-
         return 0;
     }
 

app/Console/Commands/Correction/CorrectsAccountTypes.php

@@ -36,15 +36,12 @@ use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
 
-/**
- * Class FixAccountTypes
- */
-class FixAccountTypes extends Command
+class CorrectsAccountTypes extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Make sure all journals have the correct from/to account types.';
-    protected $signature   = 'firefly-iii:fix-account-types';
+    protected $signature   = 'correction:account-types';
     private int            $count;
     private array          $expected;
     private AccountFactory $factory;
@@ -120,9 +117,6 @@ class FixAccountTypes extends Command
                 }
             }
         }
-        if (0 === $this->count) {
-            $this->friendlyPositive('All account types are OK');
-        }
         if (0 !== $this->count) {
             app('log')->debug(sprintf('%d journals had to be fixed.', $this->count));
             $this->friendlyInfo(sprintf('Acted on %d transaction(s)', $this->count));

app/Console/Commands/Correction/CorrectsAmounts.php

@@ -36,15 +36,12 @@ use FireflyIII\Models\RuleTrigger;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 
-/**
- * Class ReportSkeleton
- */
-class CorrectAmounts extends Command
+class CorrectsAmounts extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'This command makes sure positive and negative amounts are recorded correctly.';
-    protected $signature   = 'firefly-iii:fix-amount-pos-neg';
+    protected $signature   = 'correction:amounts';
 
     public function handle(): int
     {
@@ -72,7 +69,6 @@ class CorrectAmounts extends Command
     {
         $count = AutoBudget::where('amount', '<', 0)->update(['amount' => DB::raw('amount * -1')]);
         if (0 === $count) {
-            $this->friendlyPositive('All auto budget amounts are positive.');
 
             return;
         }
@@ -83,7 +79,6 @@ class CorrectAmounts extends Command
     {
         $count = AvailableBudget::where('amount', '<', 0)->update(['amount' => DB::raw('amount * -1')]);
         if (0 === $count) {
-            $this->friendlyPositive('All available budget amounts are positive.');
 
             return;
         }
@@ -96,7 +91,6 @@ class CorrectAmounts extends Command
         $count += Bill::where('amount_max', '<', 0)->update(['amount_max' => DB::raw('amount_max * -1')]);
         $count += Bill::where('amount_min', '<', 0)->update(['amount_min' => DB::raw('amount_min * -1')]);
         if (0 === $count) {
-            $this->friendlyPositive('All bill amounts are positive.');
 
             return;
         }
@@ -107,7 +101,6 @@ class CorrectAmounts extends Command
     {
         $count = BudgetLimit::where('amount', '<', 0)->update(['amount' => DB::raw('amount * -1')]);
         if (0 === $count) {
-            $this->friendlyPositive('All budget limit amounts are positive.');
 
             return;
         }
@@ -118,7 +111,6 @@ class CorrectAmounts extends Command
     {
         $count = CurrencyExchangeRate::where('rate', '<', 0)->update(['rate' => DB::raw('rate * -1')]);
         if (0 === $count) {
-            $this->friendlyPositive('All currency exchange rates are positive.');
 
             return;
         }
@@ -129,7 +121,6 @@ class CorrectAmounts extends Command
     {
         $count = PiggyBank::where('target_amount', '<', 0)->update(['target_amount' => DB::raw('target_amount * -1')]);
         if (0 === $count) {
-            $this->friendlyPositive('All piggy bank amounts are positive.');
 
             return;
         }
@@ -142,7 +133,6 @@ class CorrectAmounts extends Command
         $count += RecurrenceTransaction::where('amount', '<', 0)->update(['amount' => DB::raw('amount * -1')]);
         $count += RecurrenceTransaction::where('foreign_amount', '<', 0)->update(['foreign_amount' => DB::raw('foreign_amount * -1')]);
         if (0 === $count) {
-            $this->friendlyPositive('All recurring transaction amounts are positive.');
 
             return;
         }
@@ -165,7 +155,6 @@ class CorrectAmounts extends Command
             }
         }
         if (0 === $fixed) {
-            $this->friendlyPositive('All rule trigger amounts are positive.');
 
             return;
         }

app/Console/Commands/Correction/CorrectsCurrencies.php

@@ -37,15 +37,12 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\Console\Command\Command as CommandAlias;
 
-/**
- * Class EnableCurrencies
- */
-class EnableCurrencies extends Command
+class CorrectsCurrencies extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Enables all currencies in use.';
-    protected $signature   = 'firefly-iii:enable-currencies';
+    protected $signature   = 'correction:currencies';
 
     /**
      * Execute the console command.

app/Console/Commands/Correction/CorrectsDatabase.php

@@ -27,14 +27,11 @@ namespace FireflyIII\Console\Commands\Correction;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 
-/**
- * Class CorrectDatabase
- */
-class CorrectDatabase extends Command
+class CorrectsDatabase extends Command
 {
     use ShowsFriendlyMessages;
 
-    protected $description = 'Will correct the integrity of your database, if necessary.';
+    protected $description = 'Will validate and correct the integrity of your database, if necessary.';
     protected $signature   = 'firefly-iii:correct-database';
 
     /**
@@ -49,32 +46,36 @@ class CorrectDatabase extends Command
             return 1;
         }
         $commands = [
-            'firefly-iii:fix-piggies',
-            'firefly-iii:create-link-types',
-            'firefly-iii:create-access-tokens',
-            'firefly-iii:remove-bills',
-            'firefly-iii:fix-amount-pos-neg',
-            'firefly-iii:enable-currencies',
-            'firefly-iii:fix-transfer-budgets',
-            'firefly-iii:fix-uneven-amount',
-            'firefly-iii:delete-zero-amount',
-            'firefly-iii:delete-orphaned-transactions',
-            'firefly-iii:delete-empty-journals',
-            'firefly-iii:delete-empty-groups',
-            'firefly-iii:fix-account-types',
-            'firefly-iii:fix-ibans',
-            'firefly-iii:fix-account-order',
-            'firefly-iii:rename-meta-fields',
-            'firefly-iii:fix-ob-currencies',
-            'firefly-iii:fix-long-descriptions',
-            'firefly-iii:fix-recurring-transactions',
-            'firefly-iii:upgrade-group-information',
-            // 'firefly-iii:fix-transaction-types', // very resource heavy.
-            'firefly-iii:fix-frontpage-accounts',
-            // new!
-            'firefly-iii:unify-group-accounts',
-            'firefly-iii:trigger-credit-recalculation',
-            'firefly-iii:migrate-preferences',
+            'correction:restore-oauth-keys',
+            'correction:timezones',
+            'correction:create-group-memberships',
+            'correction:group-information',
+            'correction:piggy-banks',
+            'correction:link-types',
+            'correction:access-tokens',
+            'correction:bills',
+            'correction:amounts',
+            'correction:currencies',
+            'correction:transfer-budgets',
+            'correction:uneven-amounts',
+            'correction:zero-amounts',
+            'correction:orphaned-transactions',
+            'correction:empty-journals',
+            'correction:empty-groups',
+            'correction:account-types',
+            'correction:ibans',
+            'correction:account-order',
+            'correction:meta-fields',
+            'correction:opening-balance-currencies',
+            'correction:long-descriptions',
+            'correction:recurring-transactions',
+            'correction:frontpage-accounts',
+            'correction:group-accounts',
+            'correction:recalculates-liabilities',
+            'correction:preferences',
+            // 'correction:transaction-types', // resource heavy, disabled.
+            // 'correction:recalculate-native-amounts', // not necessary, disabled.
+            'firefly-iii:report-integrity',
         ];
         foreach ($commands as $command) {
             $this->friendlyLine(sprintf('Now executing command "%s"', $command));

app/Console/Commands/Correction/CorrectsFrontpageAccounts.php

@@ -31,15 +31,12 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class FixFrontpageAccounts
- */
-class FixFrontpageAccounts extends Command
+class CorrectsFrontpageAccounts extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Fixes a preference that may include deleted accounts or accounts of another type.';
-    protected $signature   = 'firefly-iii:fix-frontpage-accounts';
+    protected $signature   = 'correction:frontpage-accounts';
 
     /**
      * Execute the console command.
@@ -55,7 +52,6 @@ class FixFrontpageAccounts extends Command
                 $this->fixPreference($preference);
             }
         }
-        $this->friendlyPositive('Account preferences are OK');
 
         return 0;
     }

app/Console/Commands/Correction/CorrectsGroupAccounts.php

@@ -34,12 +34,12 @@ use Illuminate\Console\Command;
 /**
  * Class FixGroupAccounts
  */
-class FixGroupAccounts extends Command
+class CorrectsGroupAccounts extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Unify the source / destination accounts of split groups.';
-    protected $signature   = 'firefly-iii:unify-group-accounts';
+    protected $signature   = 'correction:group-accounts';
 
     /**
      * Execute the console command.
@@ -64,8 +64,6 @@ class FixGroupAccounts extends Command
             $handler->unifyAccounts($event);
         }
 
-        $this->friendlyPositive('Updated possible inconsistent transaction groups.');
-
         return 0;
     }
 }

app/Console/Commands/Correction/CorrectsGroupInformation.php

@@ -1,8 +1,8 @@
 <?php
 
 /*
- * UpdateGroupInformation.php
- * Copyright (c) 2022 james@firefly-iii.org
+ * CorrectsGroupInformation.php
+ * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -17,12 +17,12 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands\Integrity;
+namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\Account;
@@ -45,15 +45,12 @@ use FireflyIII\User;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 
-/**
- * Class UpdateGroupInformation
- */
-class UpdateGroupInformation extends Command
+class CorrectsGroupInformation extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Makes sure that every object is linked to a group';
-    protected $signature   = 'firefly-iii:upgrade-group-information';
+    protected $signature   = 'correction:group-information';
 
     /**
      * Execute the console command.

app/Console/Commands/Correction/CorrectsIbans.php

@@ -30,15 +30,12 @@ use FireflyIII\Models\AccountType;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 
-/**
- * Class FixIbans
- */
-class FixIbans extends Command
+class CorrectsIbans extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Removes spaces from IBANs';
-    protected $signature   = 'firefly-iii:fix-ibans';
+    protected $signature   = 'correction:ibans';
     private int $count     = 0;
 
     /**
@@ -49,9 +46,6 @@ class FixIbans extends Command
         $accounts = Account::whereNotNull('iban')->get();
         $this->filterIbans($accounts);
         $this->countAndCorrectIbans($accounts);
-        if (0 === $this->count) {
-            $this->friendlyPositive('All IBANs are valid.');
-        }
 
         return 0;
     }

app/Console/Commands/Correction/CorrectsLongDescriptions.php

@@ -28,24 +28,22 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 
-/**
- * Class FixLongDescriptions
- */
-class FixLongDescriptions extends Command
+class CorrectsLongDescriptions extends Command
 {
     use ShowsFriendlyMessages;
 
     private const int MAX_LENGTH = 1000;
     protected $description       = 'Fixes long descriptions in journals and groups.';
-    protected $signature         = 'firefly-iii:fix-long-descriptions';
+    protected $signature         = 'correction:long-descriptions';
 
     /**
      * Execute the console command.
      */
     public function handle(): int
     {
-        $journals = TransactionJournal::get(['id', 'description']);
+        $journals = TransactionJournal::where(DB::raw('LENGTH(description)'), '>', self::MAX_LENGTH)->get(['id', 'description']);
         $count    = 0;
 
         /** @var TransactionJournal $journal */
@@ -58,7 +56,7 @@ class FixLongDescriptions extends Command
             }
         }
 
-        $groups   = TransactionGroup::get(['id', 'title']);
+        $groups   = TransactionGroup::where(DB::raw('LENGTH(title)'), '>', self::MAX_LENGTH)->get(['id', 'title']);
 
         /** @var TransactionGroup $group */
         foreach ($groups as $group) {
@@ -69,9 +67,6 @@ class FixLongDescriptions extends Command
                 ++$count;
             }
         }
-        if (0 === $count) {
-            $this->friendlyPositive('All transaction group and journal title lengths are within bounds.');
-        }
 
         return 0;
     }

app/Console/Commands/Correction/CorrectsMetaDataFields.php

@@ -26,16 +26,14 @@ namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 
-/**
- * Class RenameMetaFields
- */
-class RenameMetaFields extends Command
+class CorrectsMetaDataFields extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Rename changed meta fields.';
-    protected $signature   = 'firefly-iii:rename-meta-fields';
+    protected $signature   = 'correction:meta-fields';
 
     private int $count     = 0;
 
@@ -61,9 +59,6 @@ class RenameMetaFields extends Command
         foreach ($changes as $original => $update) {
             $this->rename($original, $update);
         }
-        if (0 === $this->count) {
-            $this->friendlyPositive('All meta fields are correct.');
-        }
         if (0 !== $this->count) {
             $this->friendlyInfo(sprintf('Renamed %d meta field(s).', $this->count));
         }
@@ -73,7 +68,7 @@ class RenameMetaFields extends Command
 
     private function rename(string $original, string $update): void
     {
-        $total = \DB::table('journal_meta')
+        $total = DB::table('journal_meta')
             ->where('name', '=', $original)
             ->update(['name' => $update])
         ;

app/Console/Commands/Correction/CorrectsNativeAmounts.php

@@ -46,13 +46,13 @@ use Illuminate\Database\Query\Builder as DatabaseBuilder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
-class RecalculateNativeAmounts extends Command
+class CorrectsNativeAmounts extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Recalculate native amounts for all objects.';
 
-    protected $signature   = 'firefly-iii:recalculate-native-amounts';
+    protected $signature   = 'correction:recalculate-native-amounts';
 
     /**
      * Execute the console command.

app/Console/Commands/Correction/CorrectsOpeningBalanceCurrencies.php

@@ -35,15 +35,12 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 
-/**
- * Class CorrectOpeningBalanceCurrencies
- */
-class CorrectOpeningBalanceCurrencies extends Command
+class CorrectsOpeningBalanceCurrencies extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Will make sure that opening balance transaction currencies match the account they\'re for.';
-    protected $signature   = 'firefly-iii:fix-ob-currencies';
+    protected $signature   = 'correction:opening-balance-currencies';
 
     /**
      * Execute the console command.
@@ -62,10 +59,6 @@ class CorrectOpeningBalanceCurrencies extends Command
             $message = sprintf('Corrected %d opening balance transaction(s).', $count);
             $this->friendlyInfo($message);
         }
-        if (0 === $count) {
-            $message = 'There was nothing to fix in the opening balance transactions.';
-            $this->friendlyPositive($message);
-        }
 
         return 0;
     }

app/Console/Commands/Correction/CorrectsPiggyBanks.php

@@ -34,12 +34,12 @@ use Illuminate\Console\Command;
  *
  * Class FixPiggies
  */
-class FixPiggies extends Command
+class CorrectsPiggyBanks extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Fixes common issues with piggy banks.';
-    protected $signature   = 'firefly-iii:fix-piggies';
+    protected $signature   = 'correction:piggy-banks';
 
     /**
      * Execute the console command.
@@ -66,9 +66,6 @@ class FixPiggies extends Command
                 continue;
             }
         }
-        if (0 === $count) {
-            $this->friendlyPositive('All piggy bank events are OK.');
-        }
         if (0 !== $count) {
             $this->friendlyInfo(sprintf('Fixed %d piggy bank event(s).', $count));
         }

app/Console/Commands/Correction/CorrectsPreferences.php

@@ -28,11 +28,11 @@ use FireflyIII\User;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Command\Command as CommandAlias;
 
-class MigratePreferences extends Command
+class CorrectsPreferences extends Command
 {
     protected $description = 'Give Firefly III preferences a user group ID so they can be made administration specific.';
 
-    protected $signature   = 'firefly-iii:migrate-preferences';
+    protected $signature   = 'correction:preferences';
 
     /**
      * Execute the console command.
@@ -50,7 +50,7 @@ class MigratePreferences extends Command
                 if (null === $preference) {
                     continue;
                 }
-                if (null !== $preference->user_group_id) {
+                if (null === $preference->user_group_id) {
                     $preference->user_group_id = $user->user_group_id;
                     $preference->save();
                     ++$count;

app/Console/Commands/Correction/CorrectsRecurringTransactions.php

@@ -33,15 +33,12 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class FixRecurringTransactions
- */
-class FixRecurringTransactions extends Command
+class CorrectsRecurringTransactions extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description                      = 'Fixes recurring transactions with the wrong transaction type.';
-    protected $signature                        = 'firefly-iii:fix-recurring-transactions';
+    protected $signature                        = 'correction:recurring-transactions';
     private int                          $count = 0;
     private RecurringRepositoryInterface $recurringRepos;
     private UserRepositoryInterface      $userRepos;
@@ -53,9 +50,6 @@ class FixRecurringTransactions extends Command
     {
         $this->stupidLaravel();
         $this->correctTransactions();
-        if (0 === $this->count) {
-            $this->friendlyPositive('All recurring transactions are OK.');
-        }
 
         return 0;
     }

app/Console/Commands/Correction/CorrectsTimezoneInformation.php

@@ -1,5 +1,25 @@
 <?php
 
+/*
+ * CorrectsTimezoneInformation.php
+ * Copyright (c) 2024 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
 declare(strict_types=1);
 /*
  * AddTimezonesToDates.php
@@ -21,7 +41,7 @@ declare(strict_types=1);
  * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-namespace FireflyIII\Console\Commands\Integrity;
+namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\AccountBalance;
@@ -41,7 +61,7 @@ use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Log;
 
-class AddTimezonesToDates extends Command
+class CorrectsTimezoneInformation extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -73,7 +93,7 @@ class AddTimezonesToDates extends Command
      *
      * @var string
      */
-    protected $signature   = 'firefly-iii:add-timezones-to-dates';
+    protected $signature   = 'correction:timezones';
 
     /**
      * Execute the console command.
@@ -107,8 +127,6 @@ class AddTimezonesToDates extends Command
             Log::error($e->getMessage());
         }
         if (0 === $count) {
-            $this->friendlyPositive(sprintf('Timezone information is present in field "%s" of model "%s".', $field, $shortModel));
-
             return;
         }
         $this->friendlyInfo(sprintf('Adding timezone information to field "%s" of model "%s".', $field, $shortModel));

app/Console/Commands/Correction/CorrectsTransactionTypes.php

@@ -34,15 +34,12 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
-/**
- * Class FixTransactionTypes
- */
-class FixTransactionTypes extends Command
+class CorrectsTransactionTypes extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Make sure all transactions are of the correct type, based on source + dest.';
-    protected $signature   = 'firefly-iii:fix-transaction-types';
+    protected $signature   = 'correction:transaction-types';
 
     /**
      * Execute the console command.

app/Console/Commands/Correction/CorrectsTransferBudgets.php

@@ -32,12 +32,12 @@ use Illuminate\Console\Command;
 /**
  * Class TransferBudgets
  */
-class TransferBudgets extends Command
+class CorrectsTransferBudgets extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Removes budgets from transfers.';
-    protected $signature   = 'firefly-iii:fix-transfer-budgets';
+    protected $signature   = 'correction:transfer-budgets';
 
     /**
      * Execute the console command.
@@ -60,10 +60,6 @@ class TransferBudgets extends Command
             $entry->budgets()->sync([]);
             ++$count;
         }
-        if (0 === $count) {
-            $message = 'No invalid budget/journal entries.';
-            $this->friendlyPositive($message);
-        }
         if (0 !== $count) {
             $message = sprintf('Corrected %d invalid budget/journal entries (entry).', $count);
             app('log')->debug($message);

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -36,12 +36,12 @@ use Illuminate\Support\Facades\Log;
 /**
  * Class FixUnevenAmount
  */
-class FixUnevenAmount extends Command
+class CorrectsUnevenAmount extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Fix journals with uneven amounts.';
-    protected $signature   = 'firefly-iii:fix-uneven-amount';
+    protected $signature   = 'correction:uneven-amounts';
     private int $count;
 
     /**
@@ -118,11 +118,6 @@ class FixUnevenAmount extends Command
                 ++$count;
             }
         }
-        if (0 === $count) {
-            $this->friendlyPositive('No "old style" foreign currency transfers.');
-
-            return;
-        }
     }
 
     private function fixUnevenAmounts(): void
@@ -164,9 +159,6 @@ class FixUnevenAmount extends Command
                 $this->fixJournal($entry->transaction_journal_id);
             }
         }
-        if (0 === $this->count) {
-            $this->friendlyPositive('Database amount integrity is OK');
-        }
     }
 
     private function fixJournal(int $param): void
@@ -291,8 +283,6 @@ class FixUnevenAmount extends Command
             Log::debug(sprintf('Can skip foreign currency transfer #%d.', $journal->id));
         }
         if (0 === $count) {
-            $this->friendlyPositive('Journal currency integrity is OK');
-
             return;
         }
 

app/Console/Commands/Correction/CreatesAccessTokens.php

@@ -32,13 +32,13 @@ use Illuminate\Console\Command;
 /**
  * Class CreateAccessTokens
  */
-class CreateAccessTokens extends Command
+class CreatesAccessTokens extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Creates user access tokens which are used for command line access to personal data.';
 
-    protected $signature   = 'firefly-iii:create-access-tokens';
+    protected $signature   = 'correction:access-tokens';
 
     /**
      * Execute the console command.
@@ -64,9 +64,6 @@ class CreateAccessTokens extends Command
                 ++$count;
             }
         }
-        if (0 === $count) {
-            $this->friendlyPositive('Verified access tokens.');
-        }
 
         return 0;
     }

app/Console/Commands/Correction/CreatesGroupMemberships.php

@@ -1,8 +1,8 @@
 <?php
 
 /*
- * CreateGroupMemberships.php
- * Copyright (c) 2023 james@firefly-iii.org
+ * CreatesGroupMemberships.php
+ * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -17,12 +17,12 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands\Integrity;
+namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Enums\UserRoleEnum;
@@ -33,16 +33,13 @@ use FireflyIII\Models\UserRole;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class CreateGroupMemberships
- */
-class CreateGroupMemberships extends Command
+class CreatesGroupMemberships extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '560_create_group_memberships';
     protected $description          = 'Update group memberships';
-    protected $signature            = 'firefly-iii:create-group-memberships';
+    protected $signature            = 'correction:create-group-memberships';
 
     /**
      * Execute the console command.
@@ -52,7 +49,6 @@ class CreateGroupMemberships extends Command
     public function handle(): int
     {
         $this->createGroupMemberships();
-        $this->friendlyPositive('Validated group memberships');
 
         return 0;
     }

app/Console/Commands/Correction/CreatesLinkTypes.php

@@ -31,13 +31,13 @@ use Illuminate\Console\Command;
 /**
  * Class CreateLinkTypes. Created all link types in case a migration hasn't fired.
  */
-class CreateLinkTypes extends Command
+class CreatesLinkTypes extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Creates all link types.';
 
-    protected $signature   = 'firefly-iii:create-link-types';
+    protected $signature   = 'correction:link-types';
 
     /**
      * Execute the console command.
@@ -66,9 +66,6 @@ class CreateLinkTypes extends Command
             $link->editable = false;
             $link->save();
         }
-        if (0 === $count) {
-            $this->friendlyPositive('All link types are OK');
-        }
 
         return 0;
     }

app/Console/Commands/Correction/RemovesBills.php

@@ -32,12 +32,12 @@ use Illuminate\Console\Command;
 /**
  * Class RemoveBills
  */
-class RemoveBills extends Command
+class RemovesBills extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Remove bills from transactions that shouldn\'t have one.';
-    protected $signature   = 'firefly-iii:remove-bills';
+    protected $signature   = 'correction:bills';
 
     /**
      * Execute the console command.
@@ -60,7 +60,6 @@ class RemoveBills extends Command
         if ($journals->count() > 0) {
             $this->friendlyInfo('Fixed all transaction journals so they have correct bill information.');
         }
-        $this->friendlyPositive('All bills and journals are OK');
 
         return 0;
     }

app/Console/Commands/Correction/RemovesEmptyGroups.php

@@ -32,12 +32,12 @@ use Illuminate\Console\Command;
 /**
  * Class DeleteEmptyGroups
  */
-class DeleteEmptyGroups extends Command
+class RemovesEmptyGroups extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Delete empty transaction groups.';
-    protected $signature   = 'firefly-iii:delete-empty-groups';
+    protected $signature   = 'correction:empty-groups';
 
     /**
      * Execute the console command.
@@ -61,9 +61,6 @@ class DeleteEmptyGroups extends Command
                 TransactionGroup::whereNull('deleted_at')->whereIn('id', $chunk)->delete();
             }
         }
-        if (0 === $total) {
-            $this->friendlyInfo('Verified there are no empty groups.');
-        }
 
         return 0;
     }

app/Console/Commands/Correction/RemovesEmptyJournals.php

@@ -33,13 +33,13 @@ use Illuminate\Database\QueryException;
 /**
  * Class DeleteEmptyJournals
  */
-class DeleteEmptyJournals extends Command
+class RemovesEmptyJournals extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Delete empty and uneven transaction journals.';
 
-    protected $signature   = 'firefly-iii:delete-empty-journals';
+    protected $signature   = 'correction:empty-journals';
 
     /**
      * Execute the console command.
@@ -82,9 +82,6 @@ class DeleteEmptyJournals extends Command
                 ++$total;
             }
         }
-        if (0 === $total) {
-            $this->friendlyPositive('No uneven transaction journals.');
-        }
     }
 
     private function deleteEmptyJournals(): void
@@ -107,8 +104,5 @@ class DeleteEmptyJournals extends Command
             $this->friendlyInfo(sprintf('Deleted empty transaction journal #%d', $entry->id));
             ++$count;
         }
-        if (0 === $count) {
-            $this->friendlyPositive('No empty transaction journals.');
-        }
     }
 }

app/Console/Commands/Correction/RemovesOrphanedTransactions.php

@@ -32,13 +32,13 @@ use Illuminate\Console\Command;
 /**
  * Deletes transactions where the journal has been deleted.
  */
-class DeleteOrphanedTransactions extends Command
+class RemovesOrphanedTransactions extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Deletes orphaned transactions.';
 
-    protected $signature   = 'firefly-iii:delete-orphaned-transactions';
+    protected $signature   = 'correction:orphaned-transactions';
 
     /**
      * Execute the console command.
@@ -63,7 +63,7 @@ class DeleteOrphanedTransactions extends Command
         ;
         $count = $set->count();
         if (0 === $count) {
-            $this->friendlyPositive('No orphaned journals.');
+            // $this->friendlyPositive('No orphaned journals.');
 
             return;
         }
@@ -116,9 +116,6 @@ class DeleteOrphanedTransactions extends Command
                 ++$count;
             }
         }
-        if (0 === $count) {
-            $this->friendlyPositive('No orphaned transactions.');
-        }
     }
 
     private function deleteFromOrphanedAccounts(): void
@@ -147,8 +144,5 @@ class DeleteOrphanedTransactions extends Command
             );
             ++$count;
         }
-        if (0 === $count) {
-            $this->friendlyPositive('No orphaned accounts.');
-        }
     }
 }

app/Console/Commands/Correction/RemovesZeroAmount.php

@@ -29,16 +29,13 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 
-/**
- * Class DeleteZeroAmount
- */
-class DeleteZeroAmount extends Command
+class RemovesZeroAmount extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Delete transactions with zero amount.';
 
-    protected $signature   = 'firefly-iii:delete-zero-amount';
+    protected $signature   = 'correction:zero-amounts';
 
     /**
      * Execute the console command.
@@ -56,9 +53,6 @@ class DeleteZeroAmount extends Command
 
             Transaction::where('transaction_journal_id', $journal->id)->delete();
         }
-        if (0 === $journals->count()) {
-            $this->friendlyPositive('No zero-amount transaction journals.');
-        }
 
         return 0;
     }

app/Console/Commands/Correction/RestoresOAuthKeys.php

@@ -1,8 +1,8 @@
 <?php
 
-/**
- * RestoreOAuthKeys.php
- * Copyright (c) 2020 james@firefly-iii.org
+/*
+ * RestoresOAuthKeys.php
+ * Copyright (c) 2024 james@firefly-iii.org.
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -17,12 +17,12 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
 declare(strict_types=1);
 
-namespace FireflyIII\Console\Commands\Integrity;
+namespace FireflyIII\Console\Commands\Correction;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Support\System\OAuthKeys;
@@ -31,12 +31,12 @@ use Illuminate\Console\Command;
 /**
  * Class RestoreOAuthKeys
  */
-class RestoreOAuthKeys extends Command
+class RestoresOAuthKeys extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Will restore the OAuth keys generated for the system.';
-    protected $signature   = 'firefly-iii:restore-oauth-keys';
+    protected $signature   = 'correction:restore-oauth-keys';
 
     /**
      * Execute the console command.
@@ -76,7 +76,6 @@ class RestoreOAuthKeys extends Command
 
             return;
         }
-        $this->friendlyPositive('OAuth keys are OK');
     }
 
     private function keysInDatabase(): bool

app/Console/Commands/Correction/TriggersCreditCalculation.php

@@ -28,13 +28,10 @@ use FireflyIII\Models\Account;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use Illuminate\Console\Command;
 
-/**
- * Class CorrectionSkeleton
- */
-class TriggerCreditCalculation extends Command
+class TriggersCreditCalculation extends Command
 {
     protected $description = 'Triggers the credit recalculation service for liabilities.';
-    protected $signature   = 'firefly-iii:trigger-credit-recalculation';
+    protected $signature   = 'correction:recalculates-liabilities';
 
     /**
      * Execute the console command.

app/Console/Commands/Integrity/ReportsEmptyObjects.php

@@ -34,13 +34,13 @@ use Illuminate\Console\Command;
 /**
  * Class ReportEmptyObjects
  */
-class ReportEmptyObjects extends Command
+class ReportsEmptyObjects extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Reports on empty database objects.';
 
-    protected $signature   = 'firefly-iii:report-empty-objects';
+    protected $signature   = 'integrity:empty-objects';
 
     /**
      * Execute the console command.

app/Console/Commands/Integrity/ReportsIntegrity.php

@@ -30,7 +30,7 @@ use Illuminate\Console\Command;
 /**
  * Class ReportIntegrity
  */
-class ReportIntegrity extends Command
+class ReportsIntegrity extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -48,11 +48,9 @@ class ReportIntegrity extends Command
             return 1;
         }
         $commands = [
-            'firefly-iii:add-timezones-to-dates',
-            'firefly-iii:create-group-memberships',
-            'firefly-iii:report-empty-objects',
-            'firefly-iii:report-sum',
-            'firefly-iii:upgrade-group-information',
+            // 'firefly-iii:add-timezones-to-dates',
+            'integrity:empty-objects',
+            'integrity:total-sums',
         ];
         foreach ($commands as $command) {
             $this->friendlyLine(sprintf('Now executing %s', $command));

app/Console/Commands/Integrity/ReportsSums.php

@@ -32,12 +32,12 @@ use Illuminate\Console\Command;
 /**
  * Class ReportSkeleton
  */
-class ReportSum extends Command
+class ReportsSums extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Report on the total sum of transactions. Must be 0.';
-    protected $signature   = 'firefly-iii:report-sum';
+    protected $signature   = 'integrity:total-sums';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/AddsTransactionIdentifiers.php

@@ -32,16 +32,13 @@ use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 
-/**
- * Class TransactionIdentifier
- */
-class TransactionIdentifier extends Command
+class AddsTransactionIdentifiers extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '480_transaction_identifier';
     protected $description          = 'Fixes transaction identifiers.';
-    protected $signature            = 'firefly-iii:transaction-identifiers {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-transaction-identifiers {--F|force : Force the execution of this command.}';
     private JournalCLIRepositoryInterface $cliRepository;
     private int                           $count;
 

app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php

@@ -30,15 +30,12 @@ use FireflyIII\Models\Preference;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 
-/**
- * Class DecryptDatabase
- */
-class DecryptDatabase extends Command
+class RemovesDatabaseDecryption extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Decrypts the database.';
-    protected $signature   = 'firefly-iii:decrypt-all';
+    protected $signature   = 'upgrade:480-decrypt-all';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/RepairsAccountBalances.php

@@ -28,16 +28,13 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
 
-/**
- * Class CorrectionSkeleton
- */
-class CorrectAccountBalance extends Command
+class RepairsAccountBalances extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '610_correct_balances';
     protected $description          = 'Recalculate all account balance amounts';
-    protected $signature            = 'firefly-iii:correct-account-balance {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:610-account-balances {--F|force : Force the execution of this command.}';
 
     public function handle(): int
     {

app/Console/Commands/Upgrade/RepairsPostgresSequences.php

@@ -27,16 +27,13 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 
-/**
- * Class FixPostgresSequences
- */
-class FixPostgresSequences extends Command
+class RepairsPostgresSequences extends Command
 {
     use ShowsFriendlyMessages;
 
     protected $description = 'Fixes issues with PostgreSQL sequences.';
 
-    protected $signature   = 'firefly-iii:fix-pgsql-sequences';
+    protected $signature   = 'upgrade:600-pgsql-sequences';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradeSkeleton.php.stub

@@ -14,7 +14,7 @@ class UpgradeSkeleton extends Command
 
     protected $description = 'SOME DESCRIPTION';
 
-    protected $signature = 'firefly-iii:UPGRSKELETON {--F|force : Force the execution of this command.}';
+    protected $signature = 'upgrade:UPGRSKELETON {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php

@@ -36,17 +36,14 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class AccountCurrencies
- */
-class AccountCurrencies extends Command
+class UpgradesAccountCurrencies extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '480_account_currencies';
 
     protected $description          = 'Give all accounts proper currency info.';
-    protected $signature            = 'firefly-iii:account-currencies {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-account-currencies {--F|force : Force the execution of this command.}';
     private AccountRepositoryInterface $accountRepos;
     private int                        $count;
     private UserRepositoryInterface    $userRepos;

app/Console/Commands/Upgrade/UpgradesAccountMetaData.php

@@ -29,10 +29,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\AccountMeta;
 use Illuminate\Console\Command;
 
-/**
- * Class RenameAccountMeta
- */
-class RenameAccountMeta extends Command
+class UpgradesAccountMetaData extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -40,7 +37,7 @@ class RenameAccountMeta extends Command
 
     protected $description          = 'Rename account meta-data to new format.';
 
-    protected $signature            = 'firefly-iii:rename-account-meta {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-account-meta {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesAttachments.php

@@ -30,10 +30,7 @@ use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Note;
 use Illuminate\Console\Command;
 
-/**
- * Class MigrateAttachments
- */
-class MigrateAttachments extends Command
+class UpgradesAttachments extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -41,7 +38,7 @@ class MigrateAttachments extends Command
 
     protected $description          = 'Migrates attachment meta-data.';
 
-    protected $signature            = 'firefly-iii:migrate-attachments {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-attachments {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesBillsToRules.php

@@ -36,10 +36,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class MigrateToRules
- */
-class MigrateToRules extends Command
+class UpgradesBillsToRules extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -47,7 +44,7 @@ class MigrateToRules extends Command
 
     protected $description          = 'Migrate bills to rules.';
 
-    protected $signature            = 'firefly-iii:bills-to-rules {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-bills-to-rules {--F|force : Force the execution of this command.}';
     private BillRepositoryInterface      $billRepository;
     private int                          $count;
     private RuleGroupRepositoryInterface $ruleGroupRepository;

app/Console/Commands/Upgrade/UpgradesBudgetLimitPeriods.php

@@ -28,10 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\BudgetLimit;
 use Illuminate\Console\Command;
 
-/**
- * Class AppendBudgetLimitPeriods
- */
-class AppendBudgetLimitPeriods extends Command
+class UpgradesBudgetLimitPeriods extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -39,7 +36,7 @@ class AppendBudgetLimitPeriods extends Command
 
     protected $description          = 'Append budget limits with their (estimated) timeframe.';
 
-    protected $signature            = 'firefly-iii:budget-limit-periods {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:550-budget-limit-periods {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesBudgetLimits.php

@@ -31,10 +31,7 @@ use FireflyIII\Models\BudgetLimit;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class BudgetLimitCurrency
- */
-class BudgetLimitCurrency extends Command
+class UpgradesBudgetLimits extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -42,7 +39,7 @@ class BudgetLimitCurrency extends Command
 
     protected $description          = 'Give budget limits a currency';
 
-    protected $signature            = 'firefly-iii:bl-currency {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-budget-limit-currencies {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesCreditCardLiabilities.php

@@ -31,16 +31,13 @@ use FireflyIII\Models\AccountType;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 
-/**
- * Class CCLiabilities
- */
-class CCLiabilities extends Command
+class UpgradesCreditCardLiabilities extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '480_cc_liabilities';
     protected $description          = 'Convert old credit card liabilities.';
-    protected $signature            = 'firefly-iii:cc-liabilities {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-cc-liabilities {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesCurrencyPreferences.php

@@ -32,10 +32,7 @@ use FireflyIII\User;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 
-/**
- * Class UpgradeCurrencyPreferences
- */
-class UpgradeCurrencyPreferences extends Command
+class UpgradesCurrencyPreferences extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -43,7 +40,7 @@ class UpgradeCurrencyPreferences extends Command
 
     protected $description          = 'Upgrade user currency preferences';
 
-    protected $signature            = 'firefly-iii:upgrade-currency-preferences {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:610-currency-preferences {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesDatabase.php

@@ -29,10 +29,7 @@ set_time_limit(0);
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 
-/**
- * Class UpgradeDatabase
- */
-class UpgradeDatabase extends Command
+class UpgradesDatabase extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -46,33 +43,30 @@ class UpgradeDatabase extends Command
     {
         $this->callInitialCommands();
         $commands = [
-            'firefly-iii:transaction-identifiers',
-            'firefly-iii:migrate-to-groups',
-            'firefly-iii:account-currencies',
-            'firefly-iii:transfer-currencies',
-            'firefly-iii:other-currencies',
-            'firefly-iii:migrate-notes',
-            'firefly-iii:migrate-attachments',
-            'firefly-iii:bills-to-rules',
-            'firefly-iii:bl-currency',
-            'firefly-iii:cc-liabilities',
-            'firefly-iii:back-to-journals',
-            'firefly-iii:rename-account-meta',
-            'firefly-iii:migrate-recurrence-meta',
-            'firefly-iii:migrate-tag-locations',
-            'firefly-iii:migrate-recurrence-type',
-            'firefly-iii:upgrade-liabilities',
-            'firefly-iii:liabilities-600',
-            'firefly-iii:budget-limit-periods',
-            'firefly-iii:migrate-rule-actions',
-            'firefly-iii:restore-oauth-keys',
-            'firefly-iii:correct-account-balance',
-            // also just in case, some integrity commands:
-            'firefly-iii:add-timezones-to-dates',
-            'firefly-iii:create-group-memberships',
-            'firefly-iii:upgrade-group-information',
-            'firefly-iii:upgrade-currency-preferences',
-            'firefly-iii:upgrade-multi-piggies',
+            'upgrade:480-transaction-identifiers',
+            'upgrade:480-migrate-to-groups',
+            'upgrade:480-account-currencies',
+            'upgrade:480-transfer-currencies',
+            'upgrade:480-currency-information',
+            'upgrade:480-notes',
+            'upgrade:480-attachments',
+            'upgrade:480-bills-to-rules',
+            'upgrade:480-budget-limit-currencies',
+            'upgrade:480-cc-liabilities',
+            'upgrade:480-journal-meta-data',
+            'upgrade:480-account-meta',
+            'upgrade:481-recurrence-meta',
+            'upgrade:500-tag-locations',
+            'upgrade:550-recurrence-type',
+            'upgrade:560-liabilities',
+            'upgrade:600-liabilities',
+            'upgrade:550-budget-limit-periods',
+            'upgrade:600-rule-actions',
+            'upgrade:610-account-balance',
+            'upgrade:610-currency-preferences',
+            'upgrade:610-currency-preferences',
+            'upgrade:620-piggy-banks',
+            'upgrade:620-native-amounts',
             'firefly-iii:correct-database',
         ];
         $args     = [];
@@ -94,7 +88,7 @@ class UpgradeDatabase extends Command
     private function callInitialCommands(): void
     {
         $this->call('migrate', ['--seed' => true, '--force' => true, '--no-interaction' => true]);
-        $this->call('firefly-iii:fix-pgsql-sequences');
-        $this->call('firefly-iii:decrypt-all');
+        $this->call('upgrade:600-pgsql-sequences');
+        $this->call('upgrade:480-decrypt-all');
     }
 }

app/Console/Commands/Upgrade/UpgradesJournalMetaData.php

@@ -32,10 +32,7 @@ use FireflyIII\Models\TransactionJournal;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 
-/**
- * Class BackToJournals
- */
-class BackToJournals extends Command
+class UpgradesJournalMetaData extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -43,7 +40,7 @@ class BackToJournals extends Command
 
     protected $description          = 'Move meta data back to journals, not individual transactions.';
 
-    protected $signature            = 'firefly-iii:back-to-journals {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-journal-meta-data {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.
@@ -71,7 +68,7 @@ class BackToJournals extends Command
 
     private function isMigrated(): bool
     {
-        $configVar = app('fireflyconfig')->get(MigrateToGroups::CONFIG_NAME, false);
+        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
 
         return (bool) $configVar->data;
     }

app/Console/Commands/Upgrade/UpgradesJournalNotes.php

@@ -29,10 +29,7 @@ use FireflyIII\Models\Note;
 use FireflyIII\Models\TransactionJournalMeta;
 use Illuminate\Console\Command;
 
-/**
- * Class MigrateJournalNotes
- */
-class MigrateJournalNotes extends Command
+class UpgradesJournalNotes extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -40,7 +37,7 @@ class MigrateJournalNotes extends Command
 
     protected $description          = 'Migrate notes for transaction journals.';
 
-    protected $signature            = 'firefly-iii:migrate-notes {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-notes {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesLiabilities.php

@@ -34,16 +34,13 @@ use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class UpgradeLiabilities
- */
-class UpgradeLiabilities extends Command
+class UpgradesLiabilities extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '560_upgrade_liabilities';
     protected $description          = 'Upgrade liabilities to new 5.6.0 structure.';
-    protected $signature            = 'firefly-iii:upgrade-liabilities {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:560-liabilities {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesLiabilitiesEight.php

@@ -35,16 +35,13 @@ use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use FireflyIII\User;
 use Illuminate\Console\Command;
 
-/**
- * Class UpgradeLiabilitiesEight
- */
-class UpgradeLiabilitiesEight extends Command
+class UpgradesLiabilitiesEight extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '600_upgrade_liabilities';
     protected $description          = 'Upgrade liabilities to new 6.0.0 structure.';
-    protected $signature            = 'firefly-iii:liabilities-600 {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:600-liabilities {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.
@@ -201,32 +198,9 @@ class UpgradeLiabilitiesEight extends Command
 
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            //            $delete = false;
-            //            /** @var Transaction $source */
-            //            $source = $journal->transactions()->where('amount', '<', 0)->first();
-            //            /** @var Transaction $dest */
-            //            $dest = $journal->transactions()->where('amount', '>', 0)->first();
-
-            /**
-             * // if source is this liability and destination is expense, remove transaction.
-             * // if source is revenue and destination is liability, remove transaction.
-             * if ($source->account_id === $account->id && $dest->account->accountType->type === AccountType::EXPENSE) {
-             * $delete = true;
-             * }
-             * if ($dest->account_id === $account->id && $source->account->accountType->type === AccountType::REVENUE) {
-             * $delete = true;
-             * }
-             *
-             * // overruled. No transaction will be deleted, ever.
-             * // code is kept in place, so I can revisit my reasoning.
-             * $delete = false;
-             */
-
-            //            if ($delete) {
             $service = app(TransactionGroupDestroyService::class);
             $service->destroy($journal->transactionGroup);
             ++$count;
-            //            }
         }
 
         return $count;

app/Console/Commands/Upgrade/UpgradesMultiPiggyBanks.php

@@ -30,15 +30,15 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 
-class UpgradeMultiPiggyBanks extends Command
+class UpgradesMultiPiggyBanks extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '620_make_multi_piggies';
 
-    protected $description          = 'Upgrade piggybanks so they can use multiple accounts.';
+    protected $description          = 'Upgrade piggy banks so they can use multiple accounts.';
 
-    protected $signature            = 'firefly-iii:upgrade-multi-piggies {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:620-piggy-banks {--F|force : Force the execution of this command.}';
     private AccountRepositoryInterface   $accountRepository;
     private PiggyBankRepositoryInterface $repository;
 

app/Console/Commands/Upgrade/UpgradesNativeAmounts.php

@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * UpgradesNativeAmounts.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\Upgrade;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+
+class UpgradesNativeAmounts extends Command
+{
+    use ShowsFriendlyMessages;
+    public const string CONFIG_NAME = '620_native_amounts';
+
+    protected $description          = 'Runs the native amounts calculations.';
+
+    protected $signature            = 'upgrade:620-native-amounts {--F|force : Force the execution of this command.}';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        if ($this->isExecuted() && true !== $this->option('force')) {
+            $this->friendlyInfo('This command has already been executed.');
+
+            return 0;
+        }
+
+        Artisan::call('correction:recalculate-native-amounts');
+
+        $this->markAsExecuted();
+
+
+        return 0;
+    }
+
+    private function isExecuted(): bool
+    {
+        $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
+        if (null !== $configVar) {
+            return (bool)$configVar->data;
+        }
+
+        return false;
+    }
+
+    private function markAsExecuted(): void
+    {
+        app('fireflyconfig')->set(self::CONFIG_NAME, true);
+    }
+}

app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php

@@ -30,10 +30,7 @@ use FireflyIII\Models\RecurrenceMeta;
 use FireflyIII\Models\RecurrenceTransactionMeta;
 use Illuminate\Console\Command;
 
-/**
- * Class MigrateRecurrenceMeta
- */
-class MigrateRecurrenceMeta extends Command
+class UpgradesRecurrenceMetaData extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -41,7 +38,7 @@ class MigrateRecurrenceMeta extends Command
 
     protected $description          = 'Migrate recurrence meta data';
 
-    protected $signature            = 'firefly-iii:migrate-recurrence-meta {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:481-recurrence-meta {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesRecurrenceType.php

@@ -27,10 +27,7 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
 
-/**
- * Class MigrateRecurrenceType
- */
-class MigrateRecurrenceType extends Command
+class UpgradesRecurrenceType extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -38,7 +35,7 @@ class MigrateRecurrenceType extends Command
 
     protected $description          = 'Migrate transaction type of recurring transaction.';
 
-    protected $signature            = 'firefly-iii:migrate-recurrence-type {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:550-recurrence-type {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesRuleActions.php

@@ -27,7 +27,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\RuleAction;
 use Illuminate\Console\Command;
 
-class MigrateRuleActions extends Command
+class UpgradesRuleActions extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -35,7 +35,7 @@ class MigrateRuleActions extends Command
 
     protected $description          = 'Migrate rule actions away from expression engine';
 
-    protected $signature            = 'firefly-iii:migrate-rule-actions {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:600-rule-actions {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesTagLocations.php

@@ -29,10 +29,7 @@ use FireflyIII\Models\Location;
 use FireflyIII\Models\Tag;
 use Illuminate\Console\Command;
 
-/**
- * Class MigrateTagLocations
- */
-class MigrateTagLocations extends Command
+class UpgradesTagLocations extends Command
 {
     use ShowsFriendlyMessages;
 
@@ -40,7 +37,7 @@ class MigrateTagLocations extends Command
 
     protected $description          = 'Migrate tag locations.';
 
-    protected $signature            = 'firefly-iii:migrate-tag-locations {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:500-tag-locations {--F|force : Force the execution of this command.}';
 
     /**
      * Execute the console command.

app/Console/Commands/Upgrade/UpgradesToGroups.php

@@ -36,20 +36,13 @@ use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
 
-/**
- * This command will take split transactions and migrate them to "transaction groups".
- *
- * It will only run once, but can be forced to run again.
- *
- * Class MigrateToGroups
- */
-class MigrateToGroups extends Command
+class UpgradesToGroups extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '480_migrated_to_groups';
     protected $description          = 'Migrates a pre-4.7.8 transaction structure to the 4.7.8+ transaction structure.';
-    protected $signature            = 'firefly-iii:migrate-to-groups {--F|force : Force the migration, even if it fired before.}';
+    protected $signature            = 'upgrade:480-migrate-to-groups {--F|force : Force the migration, even if it fired before.}';
     private JournalCLIRepositoryInterface $cliRepository;
     private int                           $count;
     private TransactionGroupFactory       $groupFactory;

app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php

@@ -34,16 +34,13 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use Illuminate\Console\Command;
 
-/**
- * Class TransferCurrenciesCorrections
- */
-class TransferCurrenciesCorrections extends Command
+class UpgradesTransferCurrencies extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '480_transfer_currencies';
     protected $description          = 'Updates transfer currency information.';
-    protected $signature            = 'firefly-iii:transfer-currencies {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-transfer-currencies {--F|force : Force the execution of this command.}';
     private array                         $accountCurrencies;
     private AccountRepositoryInterface    $accountRepos;
     private JournalCLIRepositoryInterface $cliRepos;

app/Console/Commands/Upgrade/UpgradesVariousCurrencyInformation.php

@@ -36,16 +36,13 @@ use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use Illuminate\Console\Command;
 
-/**
- * Class OtherCurrenciesCorrections
- */
-class OtherCurrenciesCorrections extends Command
+class UpgradesVariousCurrencyInformation extends Command
 {
     use ShowsFriendlyMessages;
 
     public const string CONFIG_NAME = '480_other_currencies';
     protected $description          = 'Update all journal currency information.';
-    protected $signature            = 'firefly-iii:other-currencies {--F|force : Force the execution of this command.}';
+    protected $signature            = 'upgrade:480-currency-information {--F|force : Force the execution of this command.}';
     private array                         $accountCurrencies;
     private AccountRepositoryInterface    $accountRepos;
     private JournalCLIRepositoryInterface $cliRepos;

app/Http/Controllers/Account/IndexController.php

@@ -27,8 +27,8 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\BasicDataSupport;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
@@ -99,8 +99,8 @@ class IndexController extends Controller
             function (Account $account) use ($activities, $startBalances, $endBalances): void {
                 $currency                   = $this->repository->getAccountCurrency($account);
                 $account->lastActivityDate  = $this->isInArrayDate($activities, $account->id);
-                $account->startBalances     = $this->getBalance($account, $currency, $startBalances);
-                $account->endBalances       = $this->getBalance($account, $currency, $endBalances);
+                $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->interestPeriod    = (string) trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
@@ -163,8 +163,8 @@ class IndexController extends Controller
                 $interest                     = '' === $interest ? '0' : $interest;
                 $currency                     = $this->repository->getAccountCurrency($account);
 
-                $account->startBalances       = $this->getBalance($account, $currency, $startBalances);
-                $account->endBalances         = $this->getBalance($account, $currency, $endBalances);
+                $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->lastActivityDate    = $this->isInArrayDate($activities, $account->id);
                 $account->interest            = app('steam')->bcround($interest, 4);
@@ -175,7 +175,7 @@ class IndexController extends Controller
                 $account->location            = $this->repository->getLocation($account);
                 $account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction');
                 $account->current_debt        = $this->repository->getMetaValue($account, 'current_debt') ?? '-';
-                $account->currency            = $currency;
+                $account->currency            = $currency ?? $this->defaultCurrency;
                 $account->iban                = implode(' ', str_split((string) $account->iban, 4));
 
 
@@ -194,23 +194,6 @@ class IndexController extends Controller
         return view('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
     }
 
-    private function getBalance(Account $account, ?TransactionCurrency $currency, array $balances): array
-    {
-        if (!array_key_exists($account->id, $balances)) {
-            return [];
-        }
-        $set = $balances[$account->id];
-
-        if ($this->convertToNative && $this->defaultCurrency->id === $currency?->id) {
-            unset($set['native_balance'], $set[$this->defaultCurrency->code]);
-        }
-        if ($this->convertToNative && null !== $currency && $this->defaultCurrency->id !== $currency->id) {
-            unset($set['balance']);
-        }
-
-        return $set;
-    }
-
     private function subtract(array $startBalances, array $endBalances)
     {
         $result = [];

app/Http/Controllers/Account/ShowController.php

@@ -30,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\PeriodOverview;
 use Illuminate\Contracts\View\Factory;
@@ -90,7 +91,7 @@ class ShowController extends Controller
         // @var Carbon $end
         $end   ??= session('end');
 
-        if ($end < $start) {
+        if ($end->lt($start)) {
             [$start, $end] = [$end, $start];
         }
         $location         = $this->repository->getLocation($account);
@@ -99,7 +100,8 @@ class ShowController extends Controller
         $subTitleIcon     = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type));
         $page             = (int) $request->get('page');
         $pageSize         = (int) app('preferences')->get('listPageSize', 50)->data;
-        $currency         = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
+        $accountCurrency  = $this->repository->getAccountCurrency($account);
+        $currency         = $accountCurrency ?? Amount::getDefaultCurrency();
         $fStart           = $start->isoFormat($this->monthAndDayFormat);
         $fEnd             = $end->isoFormat($this->monthAndDayFormat);
         $subTitle         = (string) trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
@@ -129,7 +131,7 @@ class ShowController extends Controller
 
         $groups->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]));
         $showAll          = false;
-        $balance          = Steam::finalAccountBalance($account, $end)['balance'];
+        $balances         = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency);
 
         return view(
             'accounts.show',
@@ -148,7 +150,7 @@ class ShowController extends Controller
                 'end',
                 'chartUrl',
                 'location',
-                'balance'
+                'balances'
             )
         );
     }
@@ -165,33 +167,34 @@ class ShowController extends Controller
         if (!$this->isEditableAccount($account)) {
             return $this->redirectAccountToAccount($account);
         }
-        $location     = $this->repository->getLocation($account);
-        $isLiability  = $this->repository->isLiability($account);
-        $attachments  = $this->repository->getAttachments($account);
-        $objectType   = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
-        $end          = today(config('app.timezone'));
-        $today        = today(config('app.timezone'));
-        $start        = $this->repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
-        $subTitleIcon = config('firefly.subIconsByIdentifier.'.$account->accountType->type);
-        $page         = (int) $request->get('page');
-        $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
-        $currency     = $this->repository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
-        $subTitle     = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]);
-        $periods      = new Collection();
+        $location        = $this->repository->getLocation($account);
+        $isLiability     = $this->repository->isLiability($account);
+        $attachments     = $this->repository->getAttachments($account);
+        $objectType      = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
+        $end             = today(config('app.timezone'));
+        $today           = today(config('app.timezone'));
+        $accountCurrency = $this->repository->getAccountCurrency($account);
+        $start           = $this->repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();
+        $subTitleIcon    = config('firefly.subIconsByIdentifier.'.$account->accountType->type);
+        $page            = (int) $request->get('page');
+        $pageSize        = (int) app('preferences')->get('listPageSize', 50)->data;
+        $currency        = $this->repository->getAccountCurrency($account) ?? Amount::getDefaultCurrency();
+        $subTitle        = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]);
+        $periods         = new Collection();
 
         /** @var GroupCollectorInterface $collector */
-        $collector    = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
         $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page)->withAccountInformation()->withCategoryInformation();
 
         // this search will not include transaction groups where this asset account (or liability)
         // is just part of ONE of the journals. To force this:
         $collector->setExpandGroupSearch(true);
 
-        $groups       = $collector->getPaginatedGroups();
+        $groups          = $collector->getPaginatedGroups();
         $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;
-        $balance      = Steam::finalAccountBalance($account, $end)['balance'];
+        $chartUrl        = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
+        $showAll         = true;
+        $balances        = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $end), $account, $this->convertToNative, $accountCurrency);
 
         return view(
             'accounts.show',
@@ -211,7 +214,7 @@ class ShowController extends Controller
                 'subTitle',
                 'start',
                 'end',
-                'balance'
+                'balances'
             )
         );
     }

app/Http/Controllers/Bill/IndexController.php

@@ -71,29 +71,30 @@ class IndexController extends Controller
     {
         $this->cleanupObjectGroups();
         $this->repository->correctOrder();
-        $start           = session('start');
-        $end             = session('end');
-        $collection      = $this->repository->getBills();
-        $total           = $collection->count();
+        $start       = session('start');
+        $end         = session('end');
+        $collection  = $this->repository->getBills();
+        $total       = $collection->count();
 
-        $defaultCurrency = app('amount')->getDefaultCurrency();
-        $parameters      = new ParameterBag();
+        $parameters  = new ParameterBag();
         // sub one day from temp start so the last paid date is one day before it should be.
-        $tempStart       = clone $start;
+        $tempStart   = clone $start;
         // 2023-06-23 do not sub one day from temp start, fix is in BillTransformer::payDates instead
         // $tempStart->subDay();
         $parameters->set('start', $tempStart);
         $parameters->set('end', $end);
+        $parameters->set('convertToNative', $this->convertToNative);
+        $parameters->set('defaultCurrency', $this->defaultCurrency);
 
         /** @var BillTransformer $transformer */
-        $transformer     = app(BillTransformer::class);
+        $transformer = app(BillTransformer::class);
         $transformer->setParameters($parameters);
 
         // loop all bills, convert to array and add rules and stuff.
-        $rules           = $this->repository->getRulesForBills($collection);
+        $rules       = $this->repository->getRulesForBills($collection);
 
         // make bill groups:
-        $bills           = [
+        $bills       = [
             0 => [ // the index is the order, not the ID.
                 'object_group_id'    => 0,
                 'object_group_title' => (string) trans('firefly.default_group_title_name'),
@@ -112,7 +113,7 @@ class IndexController extends Controller
                 'bills'              => [],
             ];
 
-            $currency                         = $bill->transactionCurrency ?? $defaultCurrency;
+            $currency                         = $bill->transactionCurrency ?? $this->defaultCurrency;
             $array['currency_id']             = $currency->id;
             $array['currency_name']           = $currency->name;
             $array['currency_symbol']         = $currency->symbol;
@@ -122,14 +123,13 @@ class IndexController extends Controller
             $array['rules']                   = $rules[$bill['id']] ?? [];
             $bills[$groupOrder]['bills'][]    = $array;
         }
-
         // order by key
         ksort($bills);
 
         // summarise per currency / per group.
-        $sums            = $this->getSums($bills);
-        $totals          = $this->getTotals($sums);
-        $today           = now()->startOfDay();
+        $sums        = $this->getSums($bills);
+        $totals      = $this->getTotals($sums);
+        $today       = now()->startOfDay();
 
         return view('bills.index', compact('bills', 'sums', 'total', 'totals', 'today'));
     }

app/Http/Controllers/Chart/AccountController.php

@@ -30,7 +30,6 @@ use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -418,83 +417,111 @@ class AccountController extends Controller
      */
     public function period(Account $account, Carbon $start, Carbon $end): JsonResponse
     {
-        $chartData  = [];
-        $cache      = new CacheProperties();
+        Log::debug(sprintf('Now in period("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d')));
+        $chartData       = [];
+        $cache           = new CacheProperties();
         $cache->addProperty('chart.account.period');
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($this->convertToNative);
         $cache->addProperty($account->id);
         if ($cache->has()) {
-            return response()->json($cache->get());
-        }
-        $currencies = $this->accountRepository->getUsedCurrencies($account);
-
-        // if the account is not expense or revenue, just use the account's default currency.
-        if (!in_array($account->accountType->type, [AccountType::REVENUE, AccountType::EXPENSE], true)) {
-            $currencies = [$this->accountRepository->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency()];
+            // return response()->json($cache->get());
         }
 
-        /** @var TransactionCurrency $currency */
-        foreach ($currencies as $currency) {
-            $chartData[] = $this->periodByCurrency($start, $end, $account, $currency);
-        }
-
-        $data       = $this->generator->multiSet($chartData);
-        $cache->store($data);
-
-        return response()->json($data);
-    }
-
-    /**
-     * @throws FireflyException
-     */
-    private function periodByCurrency(Carbon $start, Carbon $end, Account $account, TransactionCurrency $currency): array
-    {
-        Log::debug(sprintf('Now in periodByCurrency("%s", "%s", %s, "%s")', $start->format('Y-m-d'), $end->format('Y-m-d'), $account->id, $currency->code));
-        $locale            = app('steam')->getLocale();
-        $step              = $this->calculateStep($start, $end);
-        $result            = [
-            'label'           => sprintf('%s (%s)', $account->name, $currency->symbol),
-            'currency_symbol' => $currency->symbol,
-            'currency_code'   => $currency->code,
-        ];
-        $entries           = [];
-        $current           = clone $start;
+        // collect and filter balances for the entire period.
+        $step            = $this->calculateStep($start, $end);
         Log::debug(sprintf('Step is %s', $step));
+        $locale          = app('steam')->getLocale();
+        $return          = [];
 
         // fix for issue https://github.com/firefly-iii/firefly-iii/issues/8041
         // have to make sure this chart is always based on the balance at the END of the period.
         // This period depends on the size of the chart
-        $current           = app('navigation')->endOfX($current, $step, null);
-        Log::debug(sprintf('$current date is %s', $current->format('Y-m-d')));
-        if ('1D' === $step) {
-            // per day the entire period, balance for every day.
-            $format   = (string) trans('config.month_and_day_js', [], $locale);
-            $range    = app('steam')->finalAccountBalanceInRange($account, $start, $end);
-            $previous = array_values($range)[0];
-            while ($end >= $current) {
-                $theDate         = $current->format('Y-m-d');
-                $balance         = $range[$theDate]['balance'] ?? $previous;
-                $label           = $current->isoFormat($format);
-                $entries[$label] = (float) $balance;
-                $previous        = $balance;
-                $current->addDay();
-            }
-        }
-        if ('1W' === $step || '1M' === $step || '1Y' === $step) {
-            while ($end >= $current) {
-                Log::debug(sprintf('Current is: %s', $current->format('Y-m-d')));
-                $balance         = Steam::finalAccountBalance($account, $current)[$currency->code] ?? '0';
-                $label           = app('navigation')->periodShow($current, $step);
-                $entries[$label] = $balance;
-                $current         = app('navigation')->addPeriod($current, $step, 0);
-                // here too, to fix #8041, the data is corrected to the end of the period.
-                $current         = app('navigation')->endOfX($current, $step, null);
-            }
-        }
-        $result['entries'] = $entries;
+        $current         = clone $start;
+        $current         = app('navigation')->endOfX($current, $step, null);
+        $format          = (string) trans('config.month_and_day_js', [], $locale);
+        $accountCurrency = $this->accountRepository->getAccountCurrency($account);
 
-        return $result;
+        Log::debug('One');
+        $range           = Steam::finalAccountBalanceInRange($account, $start, $end, $this->convertToNative);
+        Log::debug('Two');
+        $range           = Steam::filterAccountBalances($range, $account, $this->convertToNative, $accountCurrency);
+        Log::debug('Three');
+
+        // temp, get end balance.
+        Log::debug('temp get end balance');
+        Steam::finalAccountBalance($account, $end);
+        Log::debug('END temp get end balance done');
+
+        $previous        = array_values($range)[0];
+        $accountCurrency ??= $this->defaultCurrency; // do this AFTER getting the balances.
+        Log::debug('Start chart loop.');
+
+        $newRange        = [];
+        $expectedIndex   = 0;
+        Log::debug('Balances exist at:');
+        foreach ($range as $key => $value) {
+            $newRange[] = ['date' => $key, 'info' => $value];
+            Log::debug(sprintf(' - %s', $key));
+        }
+        $carbon          = Carbon::createFromFormat('Y-m-d', $newRange[0]['date']);
+        while ($end->gte($current)) {
+            $momentBalance = $previous;
+            $theDate       = $current->format('Y-m-d');
+            while ($carbon->lte($current) && array_key_exists($expectedIndex, $newRange)) {
+                $momentBalance = $newRange[$expectedIndex]['info'];
+                Log::debug(sprintf('Expected index is %d!, date is %s, current is %s', $expectedIndex, $carbon->format('Y-m-d'), $current->format('Y-m-d')));
+                $carbon        = Carbon::createFromFormat('Y-m-d', $newRange[$expectedIndex]['date']);
+                ++$expectedIndex;
+            }
+
+            $return        = $this->updateChartKeys($return, $momentBalance);
+            $previous      = $momentBalance;
+
+            Log::debug(sprintf('Now at %s', $theDate), $momentBalance);
+
+
+            // process each balance thing.
+            foreach ($momentBalance as $key => $amount) {
+                $label                           = $current->isoFormat($format);
+                $return[$key]['entries'][$label] = $amount;
+            }
+            $current       = app('navigation')->addPeriod($current, $step, 0);
+            // here too, to fix #8041, the data is corrected to the end of the period.
+            $current       = app('navigation')->endOfX($current, $step, null);
+            Log::debug(sprintf('Next moment is %s', $current->format('Y-m-d')));
+
+        }
+        Log::debug('End of chart loop.');
+        // second loop (yes) to create nice array with info! Yay!
+        $chartData       = [];
+
+        foreach ($return as $key => $info) {
+            if (3 === strlen($key)) {
+                // assume it's a currency:
+                $setCurrency             = $this->currencyRepository->findByCode($key);
+                $info['currency_symbol'] = $setCurrency->symbol;
+                $info['currency_code']   = $setCurrency->code;
+                $info['label']           = sprintf('%s (%s)', $account->name, $setCurrency->symbol);
+            }
+            if ('balance' === $key) {
+                $info['currency_symbol'] = $accountCurrency->symbol;
+                $info['currency_code']   = $accountCurrency->code;
+                $info['label']           = sprintf('%s (%s)', $account->name, $accountCurrency->symbol);
+            }
+            if ('native_balance' === $key) {
+                $info['currency_symbol'] = $this->defaultCurrency->symbol;
+                $info['currency_code']   = $this->defaultCurrency->code;
+                $info['label']           = sprintf('%s (%s) (%s)', $account->name, (string) trans('firefly.sum'), $this->defaultCurrency->symbol);
+            }
+            $chartData[] = $info;
+        }
+
+        $data            = $this->generator->multiSet($chartData);
+        $cache->store($data);
+
+        return response()->json($data);
     }
 
     /**
@@ -633,4 +660,15 @@ class AccountController extends Controller
 
         return response()->json($data);
     }
+
+    private function updateChartKeys(array $array, array $balances): array
+    {
+        foreach (array_keys($balances) as $key) {
+            $array[$key] ??= [
+                'key' => $key,
+            ];
+        }
+
+        return $array;
+    }
 }

app/Http/Controllers/Chart/BillController.php

@@ -109,8 +109,9 @@ class BillController extends Controller
         $cache      = new CacheProperties();
         $cache->addProperty('chart.bill.single');
         $cache->addProperty($bill->id);
+        $cache->addProperty($this->convertToNative);
         if ($cache->has()) {
-            return response()->json($cache->get());
+            // return response()->json($cache->get());
         }
         $locale     = app('steam')->getLocale();
 
@@ -132,42 +133,55 @@ class BillController extends Controller
                 return 0;
             }
         );
+        $currency   = $bill->transactionCurrency;
+        if ($this->convertToNative) {
+            $currency = $this->defaultCurrency;
+        }
 
         $chartData  = [
             [
                 'type'            => 'line',
                 'label'           => (string) trans('firefly.min-amount'),
-                'currency_symbol' => $bill->transactionCurrency->symbol,
-                'currency_code'   => $bill->transactionCurrency->code,
+                'currency_symbol' => $currency->symbol,
+                'currency_code'   => $currency->code,
                 'entries'         => [],
             ],
             [
                 'type'            => 'line',
                 'label'           => (string) trans('firefly.max-amount'),
-                'currency_symbol' => $bill->transactionCurrency->symbol,
-                'currency_code'   => $bill->transactionCurrency->code,
+                'currency_symbol' => $currency->symbol,
+                'currency_code'   => $currency->code,
                 'entries'         => [],
             ],
             [
                 'type'            => 'bar',
                 'label'           => (string) trans('firefly.journal-amount'),
-                'currency_symbol' => $bill->transactionCurrency->symbol,
-                'currency_code'   => $bill->transactionCurrency->code,
+                'currency_symbol' => $currency->symbol,
+                'currency_code'   => $currency->code,
                 'entries'         => [],
             ],
         ];
         $currencyId = $bill->transaction_currency_id;
+        $amountMin  = $bill->amount_min;
+        $amountMax  = $bill->amount_max;
+        if ($this->convertToNative && $currencyId !== $this->defaultCurrency->id) {
+            $amountMin = $bill->native_amount_min;
+            $amountMax = $bill->native_amount_max;
+        }
         foreach ($journals as $journal) {
             $date                           = $journal['date']->isoFormat((string) trans('config.month_and_day_js', [], $locale));
-            $chartData[0]['entries'][$date] = $bill->amount_min; // minimum amount of bill
-            $chartData[1]['entries'][$date] = $bill->amount_max; // maximum amount of bill
+            $chartData[0]['entries'][$date] = $amountMin; // minimum amount of bill
+            $chartData[1]['entries'][$date] = $amountMax; // maximum amount of bill
 
             // append amount because there are more than one per moment:
             if (!array_key_exists($date, $chartData[2]['entries'])) {
                 $chartData[2]['entries'][$date] = '0';
             }
             $amount                         = bcmul($journal['amount'], '-1');
-            if ($currencyId === $journal['foreign_currency_id']) {
+            if ($this->convertToNative && $currencyId !== $journal['currency_id']) {
+                $amount = bcmul($journal['native_amount'], '-1');
+            }
+            if ($this->convertToNative && $currencyId === $journal['foreign_currency_id']) {
                 $amount = bcmul($journal['foreign_amount'], '-1');
             }
 

app/Http/Controllers/Chart/CategoryController.php

@@ -193,11 +193,11 @@ class CategoryController extends Controller
 
             $chartData[$inKey]
                           = [
-                    'label'           => sprintf('%s (%s)', (string) trans('firefly.earned'), $currencyInfo['currency_name']),
-                    'entries'         => [],
-                    'type'            => 'bar',
-                    'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
-                ];
+                              'label'           => sprintf('%s (%s)', (string) trans('firefly.earned'), $currencyInfo['currency_name']),
+                              'entries'         => [],
+                              'type'            => 'bar',
+                              'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
+                          ];
             // loop empty periods:
             foreach (array_keys($periods) as $period) {
                 $label                                 = $periods[$period];

app/Http/Controllers/Controller.php

@@ -54,7 +54,7 @@ abstract class Controller extends BaseController
     protected string $dateTimeFormat;
     protected string $monthAndDayFormat;
     protected bool $convertToNative = false;
-    protected TransactionCurrency $defaultCurrency;
+    protected ?TransactionCurrency $defaultCurrency;
     protected string $monthFormat;
     protected string $redirectUrl = '/';
 
@@ -113,10 +113,11 @@ abstract class Controller extends BaseController
                 $this->monthFormat       = (string) trans('config.month_js', [], $locale);
                 $this->monthAndDayFormat = (string) trans('config.month_and_day_js', [], $locale);
                 $this->dateTimeFormat    = (string) trans('config.date_time_js', [], $locale);
-                $this->defaultCurrency   = app('amount')->getDefaultCurrency();
                 $darkMode                = 'browser';
+                $this->defaultCurrency   =null;
                 // get shown-intro-preference:
                 if (auth()->check()) {
+                    $this->defaultCurrency   = app('amount')->getDefaultCurrency();
                     $language  = Steam::getLanguage();
                     $locale    = Steam::getLocale();
                     $darkMode  = app('preferences')->get('darkMode', 'browser')->data;

app/Http/Controllers/Json/ReconcileController.php

@@ -123,10 +123,10 @@ class ReconcileController extends Controller
         Log::debug(sprintf('End balance: "%s"', $endBalance));
         Log::debug(sprintf('Cleared amount: "%s"', $clearedAmount));
         Log::debug(sprintf('Amount: "%s"', $amount));
-        $difference      = bcadd(bcadd(bcsub($startBalance, $endBalance), $clearedAmount), $amount);
+        $difference      = bcadd(bcadd(bcsub($startBalance ?? '0', $endBalance ?? '0'), $clearedAmount ?? '0'), $amount);
         $diffCompare     = bccomp($difference, '0');
         $countCleared    = count($clearedJournals);
-        $reconSum        = bcadd(bcadd($startBalance, $amount), $clearedAmount);
+        $reconSum        = bcadd(bcadd($startBalance ?? '0', $amount ?? '0'), $clearedAmount ?? '0');
 
         try {
             $view = view('accounts.reconcile.overview', compact('account', 'start', 'diffCompare', 'difference', 'end', 'clearedAmount', 'startBalance', 'endBalance', 'amount', 'route', 'countCleared', 'reconSum', 'selectedIds'))->render();

app/Http/Middleware/Installer.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Middleware;
 
-use DB;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\System\OAuthKeys;
 use Illuminate\Database\QueryException;

app/Jobs/DownloadExchangeRates.php

@@ -102,7 +102,7 @@ class DownloadExchangeRates implements ShouldQueue
         try {
             $res = $client->get($url);
         } catch (ConnectException|RequestException $e) {
-            app('log')->warning(sprintf('Trying to grab "%s" resulted in error "%d".', $url, $e->getMessage()));
+            app('log')->warning(sprintf('Trying to grab "%s" resulted in error "%s".', $url, $e->getMessage()));
 
             return;
         }

app/Models/Bill.php

@@ -47,19 +47,21 @@ class Bill extends Model
 
     protected $casts
                       = [
-            'created_at'      => 'datetime',
-            'updated_at'      => 'datetime',
-            'deleted_at'      => 'datetime',
-            'date'            => SeparateTimezoneCaster::class,
-            'end_date'        => SeparateTimezoneCaster::class,
-            'extension_date'  => SeparateTimezoneCaster::class,
-            'skip'            => 'int',
-            'automatch'       => 'boolean',
-            'active'          => 'boolean',
-            'name_encrypted'  => 'boolean',
-            'match_encrypted' => 'boolean',
-            'amount_min'      => 'string',
-            'amount_max'      => 'string',
+            'created_at'             => 'datetime',
+            'updated_at'             => 'datetime',
+            'deleted_at'             => 'datetime',
+            'date'                   => SeparateTimezoneCaster::class,
+            'end_date'               => SeparateTimezoneCaster::class,
+            'extension_date'         => SeparateTimezoneCaster::class,
+            'skip'                   => 'int',
+            'automatch'              => 'boolean',
+            'active'                 => 'boolean',
+            'name_encrypted'         => 'boolean',
+            'match_encrypted'        => 'boolean',
+            'amount_min'             => 'string',
+            'amount_max'             => 'string',
+            'native_amount_min'      => 'string',
+            'native_amount_max'      => 'string',
         ];
 
     protected $fillable
@@ -81,6 +83,8 @@ class Bill extends Model
             'extension_date',
             'end_date_tz',
             'extension_date_tz',
+            'native_amount_min',
+            'native_amount_max',
         ];
 
     protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted'];

app/Models/Preference.php

@@ -45,7 +45,7 @@ class Preference extends Model
             'data'       => 'array',
         ];
 
-    protected $fillable = ['user_id', 'data', 'name'];
+    protected $fillable = ['user_id', 'data', 'name', 'user_group_id'];
 
     /**
      * Route binder. Converts the key in the URL to the specified object (or throw 404).

app/Models/Transaction.php

@@ -46,19 +46,21 @@ class Transaction extends Model
 
     protected $casts
                       = [
-            'created_at'          => 'datetime',
-            'updated_at'          => 'datetime',
-            'deleted_at'          => 'datetime',
-            'identifier'          => 'int',
-            'encrypted'           => 'boolean', // model does not have these fields though
-            'bill_name_encrypted' => 'boolean',
-            'reconciled'          => 'boolean',
-            'balance_dirty'       => 'boolean',
-            'balance_before'      => 'string',
-            'balance_after'       => 'string',
-            'date'                => 'datetime',
-            'amount'              => 'string',
-            'foreign_amount'      => 'string',
+            'created_at'                 => 'datetime',
+            'updated_at'                 => 'datetime',
+            'deleted_at'                 => 'datetime',
+            'identifier'                 => 'int',
+            'encrypted'                  => 'boolean', // model does not have these fields though
+            'bill_name_encrypted'        => 'boolean',
+            'reconciled'                 => 'boolean',
+            'balance_dirty'              => 'boolean',
+            'balance_before'             => 'string',
+            'balance_after'              => 'string',
+            'date'                       => 'datetime',
+            'amount'                     => 'string',
+            'foreign_amount'             => 'string',
+            'native_amount'              => 'string',
+            'native_foreign_amount'      => 'string',
         ];
 
     protected $fillable

app/Repositories/Account/AccountRepository.php

@@ -431,11 +431,10 @@ class AccountRepository implements AccountRepositoryInterface
 
     public function getUsedCurrencies(Account $account): Collection
     {
-        $info        = $account->transactions()->get(['transaction_currency_id', 'foreign_currency_id'])->toArray();
+        $info        = $account->transactions()->distinct()->groupBy('transaction_currency_id')->get(['transaction_currency_id'])->toArray();
         $currencyIds = [];
         foreach ($info as $entry) {
             $currencyIds[] = (int) $entry['transaction_currency_id'];
-            $currencyIds[] = (int) $entry['foreign_currency_id'];
         }
         $currencyIds = array_unique($currencyIds);
 

app/Repositories/Bill/BillRepository.php

@@ -257,19 +257,25 @@ class BillRepository implements BillRepositoryInterface
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
             /** @var Transaction $transaction */
-            $transaction                = $journal->transactions()->where('amount', '<', 0)->first();
-            $currencyId                 = (int) $journal->transaction_currency_id;
-            $currency                   = $journal->transactionCurrency;
+            $transaction                       = $journal->transactions()->where('amount', '<', 0)->first();
+            $currencyId                        = (int) $journal->transaction_currency_id;
+            $currency                          = $journal->transactionCurrency;
             $result[$currencyId] ??= [
                 'sum'                     => '0',
+                'native_sum'              => '0',
                 'count'                   => 0,
                 'avg'                     => '0',
+                'native_avg'              => '0',
                 'currency_id'             => $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
             ];
-            $result[$currencyId]['sum'] = bcadd($result[$currencyId]['sum'], $transaction->amount);
+            $result[$currencyId]['sum']        = bcadd($result[$currencyId]['sum'], $transaction->amount);
+            $result[$currencyId]['native_sum'] = bcadd($result[$currencyId]['native_sum'], $transaction->native_amount ?? '0');
+            if ($journal->foreign_currency_id === Amount::getDefaultCurrency()->id) {
+                $result[$currencyId]['native_sum'] = bcadd($result[$currencyId]['native_sum'], $transaction->amount);
+            }
             ++$result[$currencyId]['count'];
         }
 
@@ -279,7 +285,8 @@ class BillRepository implements BillRepositoryInterface
          * @var array $arr
          */
         foreach ($result as $currencyId => $arr) {
-            $result[$currencyId]['avg'] = bcdiv($arr['sum'], (string) $arr['count']);
+            $result[$currencyId]['avg']        = bcdiv($arr['sum'], (string) $arr['count']);
+            $result[$currencyId]['native_avg'] = bcdiv($arr['native_sum'], (string) $arr['count']);
         }
 
         return $result;
@@ -379,14 +386,15 @@ class BillRepository implements BillRepositoryInterface
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
             /** @var null|Transaction $transaction */
-            $transaction                = $journal->transactions()->where('amount', '<', 0)->first();
+            $transaction                       = $journal->transactions()->where('amount', '<', 0)->first();
             if (null === $transaction) {
                 continue;
             }
-            $currencyId                 = (int) $journal->transaction_currency_id;
-            $currency                   = $journal->transactionCurrency;
+            $currencyId                        = (int) $journal->transaction_currency_id;
+            $currency                          = $journal->transactionCurrency;
             $result[$currencyId] ??= [
                 'sum'                     => '0',
+                'native_sum'              => '0',
                 'count'                   => 0,
                 'avg'                     => '0',
                 'currency_id'             => $currency->id,
@@ -394,7 +402,11 @@ class BillRepository implements BillRepositoryInterface
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
             ];
-            $result[$currencyId]['sum'] = bcadd($result[$currencyId]['sum'], $transaction->amount);
+            $result[$currencyId]['sum']        = bcadd($result[$currencyId]['sum'], $transaction->amount);
+            $result[$currencyId]['native_sum'] = bcadd($result[$currencyId]['native_sum'], $transaction->native_amount ?? '0');
+            if ($journal->foreign_currency_id === Amount::getDefaultCurrency()->id) {
+                $result[$currencyId]['native_sum'] = bcadd($result[$currencyId]['native_sum'], $transaction->amount);
+            }
             ++$result[$currencyId]['count'];
         }
 
@@ -404,7 +416,8 @@ class BillRepository implements BillRepositoryInterface
          * @var array $arr
          */
         foreach ($result as $currencyId => $arr) {
-            $result[$currencyId]['avg'] = bcdiv($arr['sum'], (string) $arr['count']);
+            $result[$currencyId]['avg']        = bcdiv($arr['sum'], (string) $arr['count']);
+            $result[$currencyId]['native_avg'] = bcdiv($arr['native_sum'], (string) $arr['count']);
         }
 
         return $result;

app/Support/Authentication/RemoteUserProvider.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\Authentication;
 
-use FireflyIII\Console\Commands\Integrity\CreateGroupMemberships;
+use FireflyIII\Console\Commands\Correction\CreateGroupMemberships;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Role;
 use FireflyIII\User;

app/Support/Http/Controllers/ChartGeneration.php

@@ -81,7 +81,7 @@ trait ChartGeneration
             ];
 
             $currentStart = clone $start;
-            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end);
+            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
             $previous     = array_values($range)[0];
             while ($currentStart <= $end) {
                 $format                        = $currentStart->format('Y-m-d');

app/Support/Steam.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -69,11 +70,12 @@ class Steam
         return $sum;
     }
 
-    public function finalAccountBalanceInRange(Account $account, Carbon $start, Carbon $end): array
+    public function finalAccountBalanceInRange(Account $account, Carbon $start, Carbon $end, bool $convertToNative): array
     {
         // expand period.
         $start->subDay()->startOfDay();
         $end->addDay()->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
         $cache                = new CacheProperties();
@@ -89,14 +91,23 @@ class Steam
         $formatted            = $start->format('Y-m-d');
         $startBalance         = $this->finalAccountBalance($account, $start);
         $defaultCurrency      = app('amount')->getDefaultCurrencyByUserGroup($account->user->userGroup);
-        $currency             = $this->getAccountCurrency($account) ?? $defaultCurrency;
+        $accountCurrency      = $this->getAccountCurrency($account);
+        $hasCurrency          = null !== $accountCurrency;
+        $currency             = $accountCurrency ?? $defaultCurrency;
+        Log::debug(sprintf('Currency is %s', $currency->code));
+        if (!$hasCurrency) {
+            Log::debug(sprintf('Also set start balance in %s', $defaultCurrency->code));
+            $startBalance[$defaultCurrency->code] ??= '0';
+        }
         $currencies           = [
             $currency->id        => $currency,
             $defaultCurrency->id => $defaultCurrency,
         ];
-        $startBalance[$defaultCurrency->code] ??= '0';
-        $startBalance[$currency->code]        ??= '0';
+
+
+        $startBalance[$currency->code] ??= '0';
         $balances[$formatted] = $startBalance;
+        Log::debug('Final start balance: ', $startBalance);
 
 
         // sums up the balance changes per day, for foreign, native and normal amounts.
@@ -113,10 +124,10 @@ class Steam
                 [ // @phpstan-ignore-line
                     'transaction_journals.date',
                     'transactions.transaction_currency_id',
-                    \DB::raw('SUM(transactions.amount) AS modified'),
+                    DB::raw('SUM(transactions.amount) AS modified'),
                     'transactions.foreign_currency_id',
-                    \DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
-                    \DB::raw('SUM(transactions.native_amount) AS modified_native'),
+                    DB::raw('SUM(transactions.foreign_amount) AS modified_foreign'),
+                    DB::raw('SUM(transactions.native_amount) AS modified_native'),
                 ]
             )
         ;
@@ -125,33 +136,55 @@ class Steam
 
         /** @var Transaction $entry */
         foreach ($set as $entry) {
-
             // normal, native and foreign amount
             $carbon                             = new Carbon($entry->date, $entry->date_tz);
             $modified                           = (string) (null === $entry->modified ? '0' : $entry->modified);
             $foreignModified                    = (string) (null === $entry->modified_foreign ? '0' : $entry->modified_foreign);
             $nativeModified                     = (string) (null === $entry->modified_native ? '0' : $entry->modified_native);
 
-            // add "modified" to amount if the currency id matches the account currency id.
-            if ($entry->transaction_currency_id === $currency->id) {
-                $currentBalance['balance']       = bcadd($currentBalance['balance'], $modified);
-                $currentBalance[$currency->code] = bcadd($currentBalance[$currency->code], $modified);
+            // find currency of this entry.
+            $currencies[$entry->transaction_currency_id] ??= TransactionCurrency::find($entry->transaction_currency_id);
+            $entryCurrency                      = $currencies[$entry->transaction_currency_id];
+
+            Log::debug(sprintf('Processing transaction(s) on date %s', $carbon->format('Y-m-d H:i:s')));
+
+            // if convert to native, if NOT convert to native.
+            if ($convertToNative) {
+                Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $this->bcround($modified, 2), $this->bcround($foreignModified, 2), $this->bcround($nativeModified, 2)));
+                // if the currency is the default currency add to native balance + currency balance
+                if ($entry->transaction_currency_id === $defaultCurrency->id) {
+                    Log::debug('Add amount to native.');
+                    $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $modified);
+                }
+
+                // add to native balance.
+                if ($entry->foreign_currency_id !== $defaultCurrency->id) {
+                    // this check is not necessary, because if the foreign currency is the same as the default currency, the native amount is zero.
+                    // so adding this would mean nothing.
+                    $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $nativeModified);
+                }
+                if ($entry->foreign_currency_id === $defaultCurrency->id) {
+                    $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $foreignModified);
+                }
+                // add to balance if is the same.
+                if ($entry->transaction_currency_id === $accountCurrency?->id) {
+                    $currentBalance['balance'] = bcadd($currentBalance['balance'], $modified);
+                }
+                // add currency balance
+                $currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified);
             }
-
-            // always add the native balance, even if it ends up at zero.
-            $currentBalance['native_balance']   = bcadd($currentBalance['native_balance'], $nativeModified);
-
-            // add modified foreign to the array
-            if (null !== $entry->foreign_currency_id) {
-                $foreignId                              = $entry->foreign_currency_id;
-                $currencies[$foreignId]                 ??= TransactionCurrency::find($foreignId);
-                $foreignCurrency                        = $currencies[$foreignId];
-                $currentBalance[$foreignCurrency->code] ??= '0';
-                $currentBalance[$foreignCurrency->code] = bcadd($currentBalance[$foreignCurrency->code], $foreignModified);
+            if (!$convertToNative) {
+                Log::debug(sprintf('Amount is %s %s, foreign amount is %s, native amount is %s', $entryCurrency->code, $modified, $foreignModified, $nativeModified));
+                // add to balance, as expected.
+                $currentBalance['balance']            = bcadd($currentBalance['balance'] ?? '0', $modified);
+                // add to GBP, as expected.
+                $currentBalance[$entryCurrency->code] = bcadd($currentBalance[$entryCurrency->code] ?? '0', $modified);
             }
             $balances[$carbon->format('Y-m-d')] = $currentBalance;
+            Log::debug('Updated entry', $currentBalance);
         }
         $cache->store($balances);
+        Log::debug('End of method');
 
         return $balances;
     }
@@ -297,7 +330,7 @@ class Steam
             if ($native->id === $accountCurrency?->id) {
                 $return['balance'] = bcadd('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance, $return['balance']);
             }
-            Log::debug(sprintf('balance is (%s only) %s (with virtual balance)', $native->code, $return['balance']));
+            Log::debug(sprintf('balance is (%s only) %s (with virtual balance)', $native->code, $this->bcround($return['balance'], 2)));
 
             // native balance
             $return['native_balance'] = (string) $account->transactions()
@@ -308,7 +341,7 @@ class Steam
             ;
             // plus native virtual balance.
             $return['native_balance'] = bcadd('' === (string) $account->native_virtual_balance ? '0' : $account->native_virtual_balance, $return['native_balance']);
-            Log::debug(sprintf('native_balance is (all transactions to %s) %s (with virtual balance)', $native->code, $return['native_balance']));
+            Log::debug(sprintf('native_balance is (all transactions to %s) %s (with virtual balance)', $native->code, $this->bcround($return['native_balance'])));
 
             // plus foreign transactions in THIS currency.
             $sum                      = (string) $account->transactions()
@@ -320,7 +353,7 @@ class Steam
             ;
             $return['native_balance'] = bcadd($return['native_balance'], $sum);
 
-            Log::debug(sprintf('Foreign amount transactions add (%s only) %s, total native_balance is now %s', $native->code, $sum, $return['native_balance']));
+            Log::debug(sprintf('Foreign amount transactions add (%s only) %s, total native_balance is now %s', $native->code, $this->bcround($sum), $this->bcround($return['native_balance'])));
         }
 
         // balance(s) in other (all) currencies.
@@ -351,8 +384,73 @@ class Steam
             $return['native_balance'] = $sum;
             unset($return['balance']);
         }
+        $final           = array_merge($return, $others);
+        Log::debug('Return is', $final);
 
-        return array_merge($return, $others);
+        return $final;
+    }
+
+    public function filterAccountBalances(array $total, Account $account, bool $convertToNative, ?TransactionCurrency $currency = null): array
+    {
+        Log::debug(sprintf('filterAccountBalances(#%d)', $account->id));
+        $return = [];
+        foreach ($total as $key => $value) {
+            $return[$key] = $this->filterAccountBalance($value, $account, $convertToNative, $currency);
+        }
+        Log::debug(sprintf('end of filterAccountBalances(#%d)', $account->id));
+
+        return $return;
+    }
+
+    public function filterAccountBalance(array $set, Account $account, bool $convertToNative, ?TransactionCurrency $currency = null): array
+    {
+        Log::debug(sprintf('filterAccountBalance(#%d)', $account->id), $set);
+        if (0 === count($set)) {
+            Log::debug(sprintf('Return empty array for account #%d', $account->id));
+
+            return [];
+        }
+        $defaultCurrency = app('amount')->getDefaultCurrency();
+        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]);
+            }
+            if (null !== $currency && $defaultCurrency->id !== $currency->id) {
+                Log::debug(sprintf('Unset balance for account #%d', $account->id));
+                unset($set['balance']);
+            }
+
+            if (null === $currency) {
+                Log::debug(sprintf('TEMP DO NOT Drop defaultCurrency balance for account #%d', $account->id));
+                // unset($set[$this->defaultCurrency->code]);
+            }
+        }
+
+        if (!$convertToNative) {
+            if (null === $currency) {
+                Log::debug(sprintf('Unset native_balance and make defaultCurrency balance the balance for account #%d', $account->id));
+                $set['balance'] = $set[$defaultCurrency->code] ?? '0';
+                unset($set['native_balance'], $set[$defaultCurrency->code]);
+            }
+
+            if (null !== $currency) {
+                Log::debug(sprintf('Unset native_balance + defaultCurrency + currencyCode balance for account #%d', $account->id));
+                unset($set['native_balance'], $set[$defaultCurrency->code], $set[$currency->code]);
+            }
+        }
+
+
+        // put specific value first in array.
+        if (array_key_exists('native_balance', $set)) {
+            $set = ['native_balance' => $set['native_balance']] + $set;
+        }
+        if (array_key_exists('balance', $set)) {
+            $set = ['balance' => $set['balance']] + $set;
+        }
+        Log::debug(sprintf('Return #%d', $account->id), $set);
+
+        return $set;
     }
 
     private function groupAndSumTransactions(array $array, string $group, string $field): array

app/Transformers/AccountTransformer.php

@@ -104,7 +104,7 @@ class AccountTransformer extends AbstractTransformer
             'currency_code'           => $currencyCode,
             'currency_symbol'         => $currencySymbol,
             'currency_decimal_places' => $decimalPlaces,
-            'current_balance'         => app('steam')->bcround(Steam::finalAccountBalance($account, $date)['balance'], $decimalPlaces),
+            'current_balance'         => app('steam')->bcround(Steam::finalAccountBalance($account, $date)['balance'] ?? '0', $decimalPlaces),
             'current_balance_date'    => $date->toAtomString(),
             'notes'                   => $this->repository->getNoteText($account),
             'monthly_payment_date'    => $monthlyPaymentDate,

app/Transformers/BillTransformer.php

@@ -30,6 +30,7 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Models\BillDateCalculator;
 use Illuminate\Support\Collection;
 
@@ -58,6 +59,8 @@ class BillTransformer extends AbstractTransformer
      */
     public function transform(Bill $bill): array
     {
+        $defaultCurrency   = $this->parameters->get('defaultCurrency') ?? Amount::getDefaultCurrency();
+
         $paidData          = $this->paidData($bill);
         $lastPaidDate      = $this->getLastPaidDate($paidData);
         $start             = $this->parameters->get('start') ?? today()->subYears(10);
@@ -149,6 +152,8 @@ class BillTransformer extends AbstractTransformer
             'name'                     => $bill->name,
             'amount_min'               => app('steam')->bcround($bill->amount_min, $currency->decimal_places),
             'amount_max'               => app('steam')->bcround($bill->amount_max, $currency->decimal_places),
+            'native_amount_min'        => app('steam')->bcround($bill->native_amount_min, $defaultCurrency->decimal_places),
+            'native_amount_max'        => app('steam')->bcround($bill->native_amount_max, $defaultCurrency->decimal_places),
             'date'                     => $bill->date->toAtomString(),
             'end_date'                 => $bill->end_date?->toAtomString(),
             'extension_date'           => $bill->extension_date?->toAtomString(),

composer.lock

@@ -820,16 +820,16 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "4.0.2",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
+                "reference": "b115554301161fa21467629f1e1391c1936de517"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
-                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b115554301161fa21467629f1e1391c1936de517",
+                "reference": "b115554301161fa21467629f1e1391c1936de517",
                 "shasum": ""
             },
             "require": {
@@ -875,7 +875,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.3"
             },
             "funding": [
                 {
@@ -883,7 +883,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-10-06T06:47:41+00:00"
+            "time": "2024-12-27T00:36:43+00:00"
         },
         {
             "name": "facade/ignition-contracts",
@@ -3176,13 +3176,13 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Laravel\\Ui\\UiServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
                 }
             },
             "autoload": {

package-lock.json

@@ -1709,9 +1709,9 @@
             }
         },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
-            "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+            "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
             "cpu": [
                 "ppc64"
             ],
@@ -1726,9 +1726,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz",
-            "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+            "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
             "cpu": [
                 "arm"
             ],
@@ -1743,9 +1743,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz",
-            "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+            "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
             "cpu": [
                 "arm64"
             ],
@@ -1760,9 +1760,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz",
-            "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+            "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
             "cpu": [
                 "x64"
             ],
@@ -1777,9 +1777,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz",
-            "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+            "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
             "cpu": [
                 "arm64"
             ],
@@ -1794,9 +1794,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz",
-            "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+            "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
             "cpu": [
                 "x64"
             ],
@@ -1811,9 +1811,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz",
-            "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+            "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
             "cpu": [
                 "arm64"
             ],
@@ -1828,9 +1828,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz",
-            "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+            "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
             "cpu": [
                 "x64"
             ],
@@ -1845,9 +1845,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz",
-            "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+            "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
             "cpu": [
                 "arm"
             ],
@@ -1862,9 +1862,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
-            "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+            "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
             "cpu": [
                 "arm64"
             ],
@@ -1879,9 +1879,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz",
-            "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+            "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
             "cpu": [
                 "ia32"
             ],
@@ -1896,9 +1896,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz",
-            "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+            "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
             "cpu": [
                 "loong64"
             ],
@@ -1913,9 +1913,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz",
-            "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+            "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
             "cpu": [
                 "mips64el"
             ],
@@ -1930,9 +1930,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz",
-            "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+            "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
             "cpu": [
                 "ppc64"
             ],
@@ -1947,9 +1947,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz",
-            "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+            "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
             "cpu": [
                 "riscv64"
             ],
@@ -1964,9 +1964,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz",
-            "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+            "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
             "cpu": [
                 "s390x"
             ],
@@ -1981,9 +1981,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz",
-            "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
+            "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
             "cpu": [
                 "x64"
             ],
@@ -1997,10 +1997,27 @@
                 "node": ">=18"
             }
         },
+        "node_modules/@esbuild/netbsd-arm64": {
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+            "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=18"
+            }
+        },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz",
-            "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+            "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
             "cpu": [
                 "x64"
             ],
@@ -2015,9 +2032,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz",
-            "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+            "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
             "cpu": [
                 "arm64"
             ],
@@ -2032,9 +2049,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz",
-            "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+            "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
             "cpu": [
                 "x64"
             ],
@@ -2049,9 +2066,9 @@
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz",
-            "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+            "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
             "cpu": [
                 "x64"
             ],
@@ -2066,9 +2083,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz",
-            "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+            "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2083,9 +2100,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz",
-            "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+            "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
             "cpu": [
                 "ia32"
             ],
@@ -2100,9 +2117,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
-            "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+            "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
             "cpu": [
                 "x64"
             ],
@@ -5773,9 +5790,9 @@
             }
         },
         "node_modules/es-module-lexer": {
-            "version": "1.5.4",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
-            "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+            "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
             "dev": true,
             "license": "MIT"
         },
@@ -5793,9 +5810,9 @@
             }
         },
         "node_modules/esbuild": {
-            "version": "0.24.0",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
-            "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
+            "version": "0.24.2",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+            "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -5806,30 +5823,31 @@
                 "node": ">=18"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.24.0",
-                "@esbuild/android-arm": "0.24.0",
-                "@esbuild/android-arm64": "0.24.0",
-                "@esbuild/android-x64": "0.24.0",
-                "@esbuild/darwin-arm64": "0.24.0",
-                "@esbuild/darwin-x64": "0.24.0",
-                "@esbuild/freebsd-arm64": "0.24.0",
-                "@esbuild/freebsd-x64": "0.24.0",
-                "@esbuild/linux-arm": "0.24.0",
-                "@esbuild/linux-arm64": "0.24.0",
-                "@esbuild/linux-ia32": "0.24.0",
-                "@esbuild/linux-loong64": "0.24.0",
-                "@esbuild/linux-mips64el": "0.24.0",
-                "@esbuild/linux-ppc64": "0.24.0",
-                "@esbuild/linux-riscv64": "0.24.0",
-                "@esbuild/linux-s390x": "0.24.0",
-                "@esbuild/linux-x64": "0.24.0",
-                "@esbuild/netbsd-x64": "0.24.0",
-                "@esbuild/openbsd-arm64": "0.24.0",
-                "@esbuild/openbsd-x64": "0.24.0",
-                "@esbuild/sunos-x64": "0.24.0",
-                "@esbuild/win32-arm64": "0.24.0",
-                "@esbuild/win32-ia32": "0.24.0",
-                "@esbuild/win32-x64": "0.24.0"
+                "@esbuild/aix-ppc64": "0.24.2",
+                "@esbuild/android-arm": "0.24.2",
+                "@esbuild/android-arm64": "0.24.2",
+                "@esbuild/android-x64": "0.24.2",
+                "@esbuild/darwin-arm64": "0.24.2",
+                "@esbuild/darwin-x64": "0.24.2",
+                "@esbuild/freebsd-arm64": "0.24.2",
+                "@esbuild/freebsd-x64": "0.24.2",
+                "@esbuild/linux-arm": "0.24.2",
+                "@esbuild/linux-arm64": "0.24.2",
+                "@esbuild/linux-ia32": "0.24.2",
+                "@esbuild/linux-loong64": "0.24.2",
+                "@esbuild/linux-mips64el": "0.24.2",
+                "@esbuild/linux-ppc64": "0.24.2",
+                "@esbuild/linux-riscv64": "0.24.2",
+                "@esbuild/linux-s390x": "0.24.2",
+                "@esbuild/linux-x64": "0.24.2",
+                "@esbuild/netbsd-arm64": "0.24.2",
+                "@esbuild/netbsd-x64": "0.24.2",
+                "@esbuild/openbsd-arm64": "0.24.2",
+                "@esbuild/openbsd-x64": "0.24.2",
+                "@esbuild/sunos-x64": "0.24.2",
+                "@esbuild/win32-arm64": "0.24.2",
+                "@esbuild/win32-ia32": "0.24.2",
+                "@esbuild/win32-x64": "0.24.2"
             }
         },
         "node_modules/escalade": {
@@ -11255,13 +11273,13 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.0.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.5.tgz",
-            "integrity": "sha512-akD5IAH/ID5imgue2DYhzsEwCi0/4VKY31uhMLEYJwPP4TiUp8pL5PIK+Wo7H8qT8JY9i+pVfPydcFPYD1EL7g==",
+            "version": "6.0.6",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.6.tgz",
+            "integrity": "sha512-NSjmUuckPmDU18bHz7QZ+bTYhRR0iA72cs2QAxCqDpafJ0S6qetco0LB3WW2OxlMHS0JmAv+yZ/R3uPmMyGTjQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "esbuild": "0.24.0",
+                "esbuild": "^0.24.2",
                 "postcss": "^8.4.49",
                 "rollup": "^4.23.0"
             },

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Apply rules",
         "fire_webhooks_checkbox": "Fire webhooks",
         "no_budget_pointer": "\u0418\u0437\u0433\u043b\u0435\u0436\u0434\u0430 \u0432\u0441\u0435 \u043e\u0449\u0435 \u043d\u044f\u043c\u0430\u0442\u0435 \u0431\u044e\u0434\u0436\u0435\u0442\u0438. \u0422\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0441\u044a\u0437\u0434\u0430\u0434\u0435\u0442\u0435 \u043d\u044f\u043a\u043e\u0438 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430\u0442\u0430 <a href=\"budgets\"> \u0411\u044e\u0434\u0436\u0435\u0442\u0438 <\/a>. \u0411\u044e\u0434\u0436\u0435\u0442\u0438\u0442\u0435 \u043c\u043e\u0433\u0430\u0442 \u0434\u0430 \u0432\u0438 \u043f\u043e\u043c\u043e\u0433\u043d\u0430\u0442 \u0434\u0430 \u0441\u043b\u0435\u0434\u0438\u0442\u0435 \u0440\u0430\u0437\u0445\u043e\u0434\u0438\u0442\u0435 \u0441\u0438.",
-        "no_bill_pointer": "\u0418\u0437\u0433\u043b\u0435\u0436\u0434\u0430 \u0432\u0441\u0435 \u043e\u0449\u0435 \u043d\u044f\u043c\u0430\u0442\u0435 \u0441\u043c\u0435\u0442\u043a\u0438. \u0422\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0441\u044a\u0437\u0434\u0430\u0434\u0435\u0442\u0435 \u043d\u044f\u043a\u043e\u0438 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430\u0442\u0430 <a href=\"bills\"> \u0421\u043c\u0435\u0442\u043a\u0438 <\/a>. \u0421\u043c\u0435\u0442\u043a\u0438\u0442\u0435 \u043c\u043e\u0433\u0430\u0442 \u0434\u0430 \u0432\u0438 \u043f\u043e\u043c\u043e\u0433\u043d\u0430\u0442 \u0434\u0430 \u0441\u043b\u0435\u0434\u0438\u0442\u0435 \u0440\u0430\u0437\u0445\u043e\u0434\u0438\u0442\u0435 \u0441\u0438.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "\u0420\u0430\u0437\u0445\u043e\u0434\u043d\u0430 \u0441\u043c\u0435\u0442\u043a\u0430",
         "hidden_fields_preferences": "\u041c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u0442\u0435 \u043f\u043e\u0432\u0435\u0447\u0435 \u043e\u043f\u0446\u0438\u0438 \u0437\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 \u0432\u044a\u0432 \u0432\u0430\u0448\u0438\u0442\u0435 <a href=\"preferences\">\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438<\/a>.",
         "destination_account": "\u041f\u0440\u0438\u0445\u043e\u0434\u043d\u0430 \u0441\u043c\u0435\u0442\u043a\u0430",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
         "tags": "\u0415\u0442\u0438\u043a\u0435\u0442\u0438",
         "no_budget": "(\u0431\u0435\u0437 \u0431\u044e\u0434\u0436\u0435\u0442)",
-        "no_bill": "(\u043d\u044f\u043c\u0430 \u0441\u043c\u0435\u0442\u043a\u0430)",
+        "no_bill": "(no subscription)",
         "category": "\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
         "attachments": "\u041f\u0440\u0438\u043a\u0430\u0447\u0435\u043d\u0438 \u0444\u0430\u0439\u043b\u043e\u0432\u0435",
         "notes": "\u0411\u0435\u043b\u0435\u0436\u043a\u0438",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0442\u0435 \u043f\u0440\u0438\u0445\u043e\u0434\u043d\u0430\u0442\u0430 \u0441\u043c\u0435\u0442\u043a\u0430 \u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u0437\u0430 \u0441\u044a\u0433\u043b\u0430\u0441\u0443\u0432\u0430\u043d\u0435.",
         "source_account_reconciliation": "\u041d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0442\u0435 \u0440\u0430\u0437\u0445\u043e\u0434\u043d\u0430\u0442\u0430 \u0441\u043c\u0435\u0442\u043a\u0430 \u043d\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u0437\u0430 \u0441\u044a\u0433\u043b\u0430\u0441\u0443\u0432\u0430\u043d\u0435.",
         "budget": "\u0411\u044e\u0434\u0436\u0435\u0442",
-        "bill": "\u0421\u043c\u0435\u0442\u043a\u0430",
+        "bill": "Subscription",
         "you_create_withdrawal": "\u0421\u044a\u0437\u0434\u0430\u0432\u0430\u0442\u0435 \u0442\u0435\u0433\u043b\u0435\u043d\u0435.",
         "you_create_transfer": "\u0421\u044a\u0437\u0434\u0430\u0432\u0430\u0442\u0435 \u043f\u0440\u0435\u0445\u0432\u044a\u0440\u043b\u044f\u043d\u0435.",
         "you_create_deposit": "\u0421\u044a\u0437\u0434\u0430\u0432\u0430\u0442\u0435 \u0434\u0435\u043f\u043e\u0437\u0438\u0442.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Aplicar regles",
         "fire_webhooks_checkbox": "Disparar webhooks",
         "no_budget_pointer": "Sembla que encara no tens cap pressupost. N'hauries de crear alguns a la p\u00e0gina de <a href=\"budgets\">pressuposts<\/a>. Els pressupostos et poden ajudar a fer el seguiment de les teves despeses.",
-        "no_bill_pointer": "Sembla que encara no tens cap factura. N'hauries de crear alguna a la p\u00e0gina de <a href=\"bills\">factures<\/a>. Les factures et poden ajudar a fer el seguiment de les teves despeses.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Compte d'origen",
         "hidden_fields_preferences": "Pots habilitar m\u00e9s opcions de transacci\u00f3 a la <a href=\"preferences\">configuraci\u00f3<\/a>.",
         "destination_account": "Compte de dest\u00ed",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Com aquesta transacci\u00f3 est\u00e0 reconciliada, no podr\u00e0s actualitzar els comptes, ni les quantitats.",
         "tags": "Etiquetes",
         "no_budget": "(cap pressupost)",
-        "no_bill": "(cap factura)",
+        "no_bill": "(no subscription)",
         "category": "Categoria",
         "attachments": "Adjunts",
         "notes": "Notes",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "No pots editar el compte de dest\u00ed d'una transacci\u00f3 de reconciliaci\u00f3.",
         "source_account_reconciliation": "No pots editar el compte d'origen d'una transacci\u00f3 de consolidaci\u00f3.",
         "budget": "Pressupost",
-        "bill": "Factura",
+        "bill": "Subscription",
         "you_create_withdrawal": "Est\u00e0s creant una retirada.",
         "you_create_transfer": "Est\u00e0s creant una transfer\u00e8ncia.",
         "you_create_deposit": "Est\u00e0s creant un ingr\u00e9s.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Apply rules",
         "fire_webhooks_checkbox": "Fire webhooks",
         "no_budget_pointer": "Zd\u00e1 se, \u017ee je\u0161t\u011b nem\u00e1te \u017e\u00e1dn\u00e9 rozpo\u010dty. M\u011bli byste n\u011bkter\u00e9 vytvo\u0159it na <a href=\"budgets\">rozpo\u010dty<\/a>-. Rozpo\u010dty v\u00e1m mohou pomoci sledovat v\u00fddaje.",
-        "no_bill_pointer": "Zd\u00e1 se, \u017ee je\u0161t\u011b nem\u00e1te \u017e\u00e1dn\u00e9 \u00fa\u010dty. M\u011bli byste n\u011bkter\u00e9 vytvo\u0159it na <a href=\"bills\">\u00fa\u010dtech<\/a>. \u00da\u010dty v\u00e1m mohou pomoci sledovat v\u00fddaje.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Zdrojov\u00fd \u00fa\u010det",
         "hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.",
         "destination_account": "C\u00edlov\u00fd \u00fa\u010det",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
         "tags": "\u0160t\u00edtky",
         "no_budget": "(\u017e\u00e1dn\u00fd rozpo\u010det)",
-        "no_bill": "(no bill)",
+        "no_bill": "(no subscription)",
         "category": "Kategorie",
         "attachments": "P\u0159\u00edlohy",
         "notes": "Pozn\u00e1mky",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "C\u00edlov\u00fd \u00fa\u010det odsouhlasen\u00e9 transakce nelze upravit.",
         "source_account_reconciliation": "Nem\u016f\u017eete upravovat zdrojov\u00fd \u00fa\u010det srovn\u00e1vac\u00ed transakce.",
         "budget": "Rozpo\u010det",
-        "bill": "\u00da\u010det",
+        "bill": "Subscription",
         "you_create_withdrawal": "You're creating a withdrawal.",
         "you_create_transfer": "You're creating a transfer.",
         "you_create_deposit": "You're creating a deposit.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Apply rules",
         "fire_webhooks_checkbox": "Fire webhooks",
         "no_budget_pointer": "Det ser ud til, at du ikke har oprettet budgetter endnu. Du burde oprette nogle p\u00e5 <a href=\"\/budgets\">budgetsiden<\/a>. Budgetter kan hj\u00e6lpe dig med at holde styr p\u00e5 udgifter.",
-        "no_bill_pointer": "Du synes ikke at have nogen regninger endnu. Du b\u00f8r oprette nogle p\u00e5 <a href=\"bills\">regninger<\/a>-siden. Regninger kan hj\u00e6lpe dig med at holde styr p\u00e5 udgifterne.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Kildekonto",
         "hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.",
         "destination_account": "Destinationskonto",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
         "tags": "Etiketter",
         "no_budget": "(no budget)",
-        "no_bill": "(no bill)",
+        "no_bill": "(no subscription)",
         "category": "Kategori",
         "attachments": "Vedh\u00e6ftninger",
         "notes": "Noter",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "Du kan ikke redigere destinationskontoen p\u00e5 en afstemningstransaktion.",
         "source_account_reconciliation": "Du kan ikke redigere kildekontoen p\u00e5 en afstemningstransaktion.",
         "budget": "Budget",
-        "bill": "Regning",
+        "bill": "Subscription",
         "you_create_withdrawal": "You're creating a withdrawal.",
         "you_create_transfer": "You're creating a transfer.",
         "you_create_deposit": "You're creating a deposit.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Regeln anwenden",
         "fire_webhooks_checkbox": "Webhooks abfeuern",
         "no_budget_pointer": "Sie scheinen noch keine Budgets festgelegt zu haben. Sie sollten einige davon auf der Seite <a href=\"budgets\">Budgets<\/a> anlegen. Budgets k\u00f6nnen Ihnen dabei helfen, den \u00dcberblick \u00fcber die Ausgaben zu behalten.",
-        "no_bill_pointer": "Sie scheinen noch keine Rechnungen zu haben. Sie sollten einige auf der Seite <a href=\"bills\">Rechnungen<\/a> erstellen. Anhand der Rechnungen k\u00f6nnen Sie den \u00dcberblick \u00fcber Ihre Ausgaben behalten.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Quellkonto",
         "hidden_fields_preferences": "Sie k\u00f6nnen weitere Buchungsoptionen in Ihren <a href=\"preferences\">Einstellungen<\/a> aktivieren.",
         "destination_account": "Zielkonto",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Da diese Buchung abgeglichen ist, k\u00f6nnen Sie weder die Konten noch den\/die Betrag\/Betr\u00e4ge aktualisieren.",
         "tags": "Schlagw\u00f6rter",
         "no_budget": "(kein Budget)",
-        "no_bill": "(keine Belege)",
+        "no_bill": "(no subscription)",
         "category": "Kategorie",
         "attachments": "Anh\u00e4nge",
         "notes": "Notizen",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "Sie k\u00f6nnen das Zielkonto einer Kontenausgleichsbuchung nicht bearbeiten.",
         "source_account_reconciliation": "Sie k\u00f6nnen das Quellkonto einer Kontenausgleichsbuchung nicht bearbeiten.",
         "budget": "Budget",
-        "bill": "Rechnung",
+        "bill": "Subscription",
         "you_create_withdrawal": "Sie haben eine Ausgabe erstellt.",
         "you_create_transfer": "Sie erstellen eine Umbuchung.",
         "you_create_deposit": "Sie haben eine Einnahme erstellt.",
@@ -130,15 +130,15 @@
         "response": "Antwort",
         "visit_webhook_url": "Webhook-URL besuchen",
         "reset_webhook_secret": "Webhook Secret zur\u00fccksetzen",
-        "header_exchange_rates": "Exchange rates",
-        "exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
+        "header_exchange_rates": "Wechselkurse",
+        "exchange_rates_intro": "Firefly III unterst\u00fctzt das Herunterladen und Verwenden von Wechselkursen. Lesen Sie mehr dar\u00fcber in <a href=\u201ehttps:\/\/docs.firefly-iii.org\/LOL_NOT_FINISHED_YET_TODO\u201c>der Dokumentation<\/a>.",
+        "exchange_rates_from_to": "Zwischen {from} und {to} (und umgekehrt)",
         "exchange_rates_intro_rates": "Firefly III bla bla bla exchange rates. Inverse is automatically calculated if not provided. Will go back to last found rate.",
-        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Table with exchange rates",
-        "help_rate_form": "On this day, how many {to} will you get for one {from}?",
-        "add_new_rate": "Add a new exchange rate",
-        "save_new_rate": "Save new rate"
+        "header_exchange_rates_rates": "Wechselkurse",
+        "header_exchange_rates_table": "Tabelle mit Wechselkursen",
+        "help_rate_form": "An diesem Tag, wie viele {to} werden Sie f\u00fcr {from} bekommen?",
+        "add_new_rate": "Neuen Wechselkurs hinzuf\u00fcgen",
+        "save_new_rate": "Neuen Kurs speichern"
     },
     "form": {
         "url": "URL",
@@ -158,7 +158,7 @@
         "webhook_delivery": "Zustellung",
         "from_currency_to_currency": "{from} &rarr; {to}",
         "to_currency_from_currency": "{to} &rarr; {from}",
-        "rate": "Rate"
+        "rate": "Kurs"
     },
     "list": {
         "active": "Aktiv?",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Apply rules",
         "fire_webhooks_checkbox": "\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03c9\u03bd webhook",
         "no_budget_pointer": "\u03a6\u03b1\u03af\u03bd\u03b5\u03c4\u03b1\u03b9 \u03c0\u03c9\u03c2 \u03b4\u03b5\u03bd \u03ad\u03c7\u03b5\u03c4\u03b5 \u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03bf\u03cd\u03c2 \u03b1\u03ba\u03cc\u03bc\u03b7. \u03a0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03c3\u03b5\u03c4\u03b5 \u03ba\u03ac\u03c0\u03bf\u03b9\u03bf\u03bd \u03c3\u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1 <a href=\"budgets\">\u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03ce\u03bd<\/a>. \u039f\u03b9 \u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03bf\u03af \u03c3\u03b1\u03c2 \u03b2\u03bf\u03b7\u03b8\u03bf\u03cd\u03bd \u03bd\u03b1 \u03b5\u03c0\u03b9\u03b2\u03bb\u03ad\u03c0\u03b5\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03b4\u03b1\u03c0\u03ac\u03bd\u03b5\u03c2 \u03c3\u03b1\u03c2.",
-        "no_bill_pointer": "\u03a6\u03b1\u03af\u03bd\u03b5\u03c4\u03b1\u03b9 \u03c0\u03c9\u03c2 \u03b4\u03b5\u03bd \u03ad\u03c7\u03b5\u03c4\u03b5 \u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c0\u03ac\u03b3\u03b9\u03b1 \u03ad\u03be\u03bf\u03b4\u03b1 \u03b1\u03ba\u03cc\u03bc\u03b7. \u03a0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03c3\u03b5\u03c4\u03b5 \u03ba\u03ac\u03c0\u03bf\u03b9\u03bf \u03c3\u03c4\u03b7 \u03c3\u03b5\u03bb\u03af\u03b4\u03b1 <a href=\"bills\">\u03c0\u03ac\u03b3\u03b9\u03c9\u03bd \u03b5\u03be\u03cc\u03b4\u03c9\u03bd<\/a>. \u03a4\u03b1 \u03c0\u03ac\u03b3\u03b9\u03b1 \u03ad\u03be\u03bf\u03b4\u03b1 \u03c3\u03b1\u03c2 \u03b2\u03bf\u03b7\u03b8\u03bf\u03cd\u03bd \u03bd\u03b1 \u03b5\u03c0\u03b9\u03b2\u03bb\u03ad\u03c0\u03b5\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03b4\u03b1\u03c0\u03ac\u03bd\u03b5\u03c2 \u03c3\u03b1\u03c2.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7\u03c2",
         "hidden_fields_preferences": "\u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b5\u03c2 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ce\u03bd \u03c3\u03c4\u03b9\u03c2 <a href=\"\/preferences\">\u03c0\u03c1\u03bf\u03c4\u03b9\u03bc\u03ae\u03c3\u03b5\u03b9\u03c2<\/a>.",
         "destination_account": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc\u03c2 \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
         "tags": "\u0395\u03c4\u03b9\u03ba\u03ad\u03c4\u03b5\u03c2",
         "no_budget": "(\u03c7\u03c9\u03c1\u03af\u03c2 \u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03cc)",
-        "no_bill": "(\u03c7\u03c9\u03c1\u03af\u03c2 \u03c0\u03ac\u03b3\u03b9\u03bf \u03ad\u03be\u03bf\u03b4\u03bf)",
+        "no_bill": "(no subscription)",
         "category": "\u039a\u03b1\u03c4\u03b7\u03b3\u03bf\u03c1\u03af\u03b1",
         "attachments": "\u03a3\u03c5\u03bd\u03b7\u03bc\u03bc\u03ad\u03bd\u03b1",
         "notes": "\u03a3\u03b7\u03bc\u03b5\u03b9\u03ce\u03c3\u03b5\u03b9\u03c2",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd \u03c3\u03b5 \u03bc\u03b9\u03b1 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03c4\u03b1\u03ba\u03c4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2.",
         "source_account_reconciliation": "\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03cc \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7\u03c2 \u03c3\u03b5 \u03bc\u03b9\u03b1 \u03c3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03c4\u03b1\u03ba\u03c4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2.",
         "budget": "\u03a0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03cc\u03c2",
-        "bill": "\u03a0\u03ac\u03b3\u03b9\u03bf \u03ad\u03be\u03bf\u03b4\u03bf",
+        "bill": "Subscription",
         "you_create_withdrawal": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03b5\u03af\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7.",
         "you_create_transfer": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03b5\u03af\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03bc\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac.",
         "you_create_deposit": "\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03b5\u03af\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03ba\u03b1\u03c4\u03ac\u03b8\u03b5\u03c3\u03b7.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Apply rules",
         "fire_webhooks_checkbox": "Fire webhooks",
         "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
-        "no_bill_pointer": "You seem to have no bills yet. You should create some on the <a href=\"bills\">bills<\/a>-page. Bills can help you keep track of expenses.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Source account",
         "hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.",
         "destination_account": "Destination account",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
         "tags": "Tags",
         "no_budget": "(no budget)",
-        "no_bill": "(no bill)",
+        "no_bill": "(no subscription)",
         "category": "Category",
         "attachments": "Attachments",
         "notes": "Notes",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
         "source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
         "budget": "Budget",
-        "bill": "Bill",
+        "bill": "Subscription",
         "you_create_withdrawal": "You're creating a withdrawal.",
         "you_create_transfer": "You're creating a transfer.",
         "you_create_deposit": "You're creating a deposit.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Apply rules",
         "fire_webhooks_checkbox": "Fire webhooks",
         "no_budget_pointer": "You seem to have no budgets yet. You should create some on the <a href=\"budgets\">budgets<\/a>-page. Budgets can help you keep track of expenses.",
-        "no_bill_pointer": "You seem to have no bills yet. You should create some on the <a href=\"bills\">bills<\/a>-page. Bills can help you keep track of expenses.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Source account",
         "hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.",
         "destination_account": "Destination account",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
         "tags": "Tags",
         "no_budget": "(no budget)",
-        "no_bill": "(no bill)",
+        "no_bill": "(no subscription)",
         "category": "Category",
         "attachments": "Attachments",
         "notes": "Notes",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
         "source_account_reconciliation": "You can't edit the source account of a reconciliation transaction.",
         "budget": "Budget",
-        "bill": "Bill",
+        "bill": "Subscription",
         "you_create_withdrawal": "You're creating a withdrawal.",
         "you_create_transfer": "You're creating a transfer.",
         "you_create_deposit": "You're creating a deposit.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Aplicar reglas",
         "fire_webhooks_checkbox": "Disparar webhooks",
         "no_budget_pointer": "Parece que a\u00fan no tienes presupuestos. Debes crear algunos en la p\u00e1gina <a href=\"budgets\">presupuestos<\/a>. Los presupuestos pueden ayudarle a realizar un seguimiento de los gastos.",
-        "no_bill_pointer": "Parece que a\u00fan no tienes facturas. Deber\u00edas crear algunas en la p\u00e1gina de <a href=\"bills\">facturas<\/a>. Las facturas pueden ayudarte a llevar un seguimiento de los gastos.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Cuenta origen",
         "hidden_fields_preferences": "Puede habilitar m\u00e1s opciones de transacci\u00f3n en sus <a href=\"preferences\">ajustes <\/a>.",
         "destination_account": "Cuenta destino",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Debido a que esta transacci\u00f3n est\u00e1 reconciliada, no podr\u00e1 actualizar las cuentas, ni las cantidades.",
         "tags": "Etiquetas",
         "no_budget": "(sin presupuesto)",
-        "no_bill": "(sin factura)",
+        "no_bill": "(no subscription)",
         "category": "Categoria",
         "attachments": "Archivos adjuntos",
         "notes": "Notas",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "No puedes editar la cuenta de destino de una transacci\u00f3n de reconciliaci\u00f3n.",
         "source_account_reconciliation": "No puedes editar la cuenta de origen de una transacci\u00f3n de reconciliaci\u00f3n.",
         "budget": "Presupuesto",
-        "bill": "Factura",
+        "bill": "Subscription",
         "you_create_withdrawal": "Est\u00e1 creando un gasto.",
         "you_create_transfer": "Est\u00e1 creando una transferencia.",
         "you_create_deposit": "Est\u00e1 creando un ingreso.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Apply rules",
         "fire_webhooks_checkbox": "Fire webhooks",
         "no_budget_pointer": "Sinulla ei n\u00e4yt\u00e4 olevan viel\u00e4 budjetteja. Sinun pit\u00e4isi luoda joitakin <a href=\"budgets\">budjetit<\/a>-sivulla. Budjetit auttavat sinua pit\u00e4m\u00e4\u00e4n kirjaa kuluista.",
-        "no_bill_pointer": "Sinulla ei n\u00e4yt\u00e4 olevan viel\u00e4 laskuja. Sinun pit\u00e4isi luoda joitakin <a href=\"bills\">laskut<\/a>-sivulla. Laskut auttavat sinua pit\u00e4m\u00e4\u00e4n kirjaa kuluista.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "L\u00e4hdetili",
         "hidden_fields_preferences": "Voit ottaa k\u00e4ytt\u00f6\u00f6n lis\u00e4\u00e4 tapahtumavalintoja <a href=\"preferences\">asetuksissa<\/a>.",
         "destination_account": "Kohdetili",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
         "tags": "T\u00e4git",
         "no_budget": "(ei budjettia)",
-        "no_bill": "(ei laskua)",
+        "no_bill": "(no subscription)",
         "category": "Kategoria",
         "attachments": "Liitteet",
         "notes": "Muistiinpanot",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "Et voi muokata t\u00e4sm\u00e4ytystapahtuman kohdetili\u00e4.",
         "source_account_reconciliation": "Et voi muokata t\u00e4sm\u00e4ytystapahtuman l\u00e4hdetili\u00e4.",
         "budget": "Budjetti",
-        "bill": "Lasku",
+        "bill": "Subscription",
         "you_create_withdrawal": "Olet luomassa nostoa.",
         "you_create_transfer": "Olet luomassa siirtoa.",
         "you_create_deposit": "Olet luomassa talletusta.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Appliquer les r\u00e8gles",
         "fire_webhooks_checkbox": "Lancer les webhooks",
         "no_budget_pointer": "Vous semblez n\u2019avoir encore aucun budget. Vous devriez en cr\u00e9er un sur la page des <a href=\"budgets\">budgets<\/a>. Les budgets peuvent vous aider \u00e0 garder une trace des d\u00e9penses.",
-        "no_bill_pointer": "Vous semblez n'avoir encore aucune facture. Vous devriez en cr\u00e9er une sur la page <a href=\"bills\">factures<\/a>-. Les factures peuvent vous aider \u00e0 garder une trace des d\u00e9penses.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Compte source",
         "hidden_fields_preferences": "Vous pouvez activer plus d'options d'op\u00e9rations dans vos <a href=\"preferences\">param\u00e8tres<\/a>.",
         "destination_account": "Compte de destination",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Comme cette op\u00e9ration est rapproch\u00e9e, vous ne pourrez pas modifier les comptes, ni le(s) montant(s).",
         "tags": "Tags",
         "no_budget": "(pas de budget)",
-        "no_bill": "(aucune facture)",
+        "no_bill": "(no subscription)",
         "category": "Cat\u00e9gorie",
         "attachments": "Pi\u00e8ces jointes",
         "notes": "Notes",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "Vous ne pouvez pas modifier le compte de destination d'une op\u00e9ration de rapprochement.",
         "source_account_reconciliation": "Vous ne pouvez pas modifier le compte source d'une op\u00e9ration de rapprochement.",
         "budget": "Budget",
-        "bill": "Facture",
+        "bill": "Subscription",
         "you_create_withdrawal": "Vous saisissez une d\u00e9pense.",
         "you_create_transfer": "Vous saisissez un transfert.",
         "you_create_deposit": "Vous saisissez un d\u00e9p\u00f4t.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Apply rules",
         "fire_webhooks_checkbox": "Fire webhooks",
         "no_budget_pointer": "\u00dagy t\u0171nik, m\u00e9g nincsenek k\u00f6lts\u00e9gkeretek. K\u00f6lts\u00e9gkereteket a <a href=\"budgets\">k\u00f6lts\u00e9gkeretek<\/a> oldalon lehet l\u00e9trehozni. A k\u00f6lts\u00e9gkeretek seg\u00edtenek nyomon k\u00f6vetni a k\u00f6lts\u00e9geket.",
-        "no_bill_pointer": "\u00dagy t\u0171nik, m\u00e9g nincsenek k\u00f6lts\u00e9gkeretek. K\u00f6lts\u00e9gkereteket a <a href=\"bills\">k\u00f6lts\u00e9gkeretek<\/a> oldalon lehet l\u00e9trehozni. A k\u00f6lts\u00e9gkeretek seg\u00edtenek nyomon k\u00f6vetni a k\u00f6lts\u00e9geket.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Forr\u00e1s sz\u00e1mla",
         "hidden_fields_preferences": "A <a href=\"preferences\">be\u00e1ll\u00edt\u00e1sokban<\/a> t\u00f6bb mez\u0151 is enged\u00e9lyezhet\u0151.",
         "destination_account": "C\u00e9lsz\u00e1mla",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
         "tags": "C\u00edmk\u00e9k",
         "no_budget": "(nincs k\u00f6lts\u00e9gkeret)",
-        "no_bill": "(no bill)",
+        "no_bill": "(no subscription)",
         "category": "Kateg\u00f3ria",
         "attachments": "Mell\u00e9kletek",
         "notes": "Megjegyz\u00e9sek",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "Nem lehet szerkeszteni egy egyeztetett tranzakci\u00f3 c\u00e9lsz\u00e1ml\u00e1j\u00e1t.",
         "source_account_reconciliation": "Nem lehet szerkeszteni egy egyeztetett tranzakci\u00f3 forr\u00e1ssz\u00e1ml\u00e1j\u00e1t.",
         "budget": "K\u00f6lts\u00e9gkeret",
-        "bill": "Sz\u00e1mla",
+        "bill": "Subscription",
         "you_create_withdrawal": "Egy k\u00f6lts\u00e9g l\u00e9trehoz\u00e1sa.",
         "you_create_transfer": "Egy \u00e1tutal\u00e1s l\u00e9trehoz\u00e1sa.",
         "you_create_deposit": "Egy bev\u00e9tel l\u00e9trehoz\u00e1sa.",

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

@@ -21,7 +21,7 @@
         "apply_rules_checkbox": "Apply rules",
         "fire_webhooks_checkbox": "Fire webhooks",
         "no_budget_pointer": "Anda tampaknya belum memiliki anggaran. Anda harus membuat beberapa di halaman-<a href=\"budgets\">anggaran<\/a>. Anggaran dapat membantu anda melacak pengeluaran.",
-        "no_bill_pointer": "Anda tampaknya belum memiliki tagihan. Anda harus membuat beberapa di halaman-<a href=\"bills\">tagihan<\/a>. Tagihan dapat membantu anda melacak pengeluaran.",
+        "no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
         "source_account": "Akun sumber",
         "hidden_fields_preferences": "You can enable more transaction options in your <a href=\"preferences\">preferences<\/a>.",
         "destination_account": "Akun tujuan",
@@ -36,7 +36,7 @@
         "is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s).",
         "tags": "Tag",
         "no_budget": "(no budget)",
-        "no_bill": "(no bill)",
+        "no_bill": "(no subscription)",
         "category": "Kategori",
         "attachments": "Lampiran",
         "notes": "Notes",
@@ -52,7 +52,7 @@
         "destination_account_reconciliation": "You can't edit the destination account of a reconciliation transaction.",
         "source_account_reconciliation": "Anda tidak dapat mengedit akun sumber dari transaksi rekonsiliasi.",
         "budget": "Anggaran",
-        "bill": "Tagihan",
+        "bill": "Subscription",
         "you_create_withdrawal": "You're creating a withdrawal.",
         "you_create_transfer": "You're creating a transfer.",
         "you_create_deposit": "You're creating a deposit.",