Merge pull request #10642 from firefly-iii/release-1753333227

🤖 Automatically merge the PR into the develop branch.

.github/workflows/sonarcloud.yml

@@ -1,71 +0,0 @@
-name: 'Code - Run Sonarcloud'
-on:
-  pull_request:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-env:
-  DB_CONNECTION: sqlite
-  APP_KEY: TestTestTestTestTestTestTestTest
-jobs:
-  sonarcloud:
-    name: SonarCloud
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup PHP with Xdebug
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.4'
-          coverage: xdebug
-          extensions: >-
-            bcmath
-            curl
-            fileinfo
-            iconv
-            intl
-            json
-            sqlite3
-            mbstring
-            openssl
-            pdo
-            session
-            simplexml
-            sodium
-            tokenizer
-            xml
-            xmlwriter
-
-      - name: Copy standard configuration
-        run: cp .env.testing .env
-
-      - name: Install Composer dependencies
-        run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
-
-      - name: "Create database file"
-        run: |
-          touch storage/database/database.sqlite
-          wget -q https://github.com/firefly-iii/test-fixtures/raw/refs/heads/main/test-database.sqlite -O storage/database/database.sqlite
-
-      - name: "Upgrades the database to the latest version"
-        run: |
-          php artisan firefly-iii:upgrade-database
-          chmod 600 storage/oauth-public.key
-          chmod 600 storage/oauth-private.key
-
-      - name: "Integrity Database Report"
-        run: php artisan firefly-iii:report-integrity
-
-      - name: "Run tests with coverage"
-        run: composer coverage
-
-      - name: Fix code coverage paths
-        run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
-
-      - name: SonarCloud Scan
-        uses: SonarSource/sonarqube-scan-action@v5.2.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

app/Repositories/Bill/BillRepository.php

@@ -312,11 +312,23 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface
         Log::debug(sprintf('Search for linked journals between %s and %s', $start->toW3cString(), $end->toW3cString()));
 
         return $bill->transactionJournals()
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->leftJoin('transaction_currencies AS currency', 'currency.id', '=', 'transactions.transaction_currency_id')
+            ->leftJoin('transaction_currencies AS foreign_currency', 'foreign_currency.id', '=', 'transactions.foreign_currency_id')
+            ->where('transactions.amount', '>', 0)
             ->before($end)->after($start)->get(
                 [
                     'transaction_journals.id',
                     'transaction_journals.date',
                     'transaction_journals.transaction_group_id',
+                    'transactions.transaction_currency_id',
+                    'currency.code AS transaction_currency_code',
+                    'currency.decimal_places AS transaction_currency_decimal_places',
+                    'transactions.foreign_currency_id',
+                    'foreign_currency.code AS foreign_currency_code',
+                    'foreign_currency.decimal_places AS foreign_currency_decimal_places',
+                    'transactions.amount',
+                    'transactions.foreign_amount',
                 ]
             )
         ;

app/Transformers/AccountTransformer.php

@@ -67,8 +67,8 @@ class AccountTransformer extends AbstractTransformer
         }
 
         // get account type:
-        $accountType                                                  = (string) config(sprintf('firefly.shortNamesByFullName.%s', $account->full_account_type));
-        $liabilityType                                                = (string) config(sprintf('firefly.shortLiabilityNameByFullName.%s', $account->full_account_type));
+        $accountType                                                  = (string)config(sprintf('firefly.shortNamesByFullName.%s', $account->full_account_type));
+        $liabilityType                                                = (string)config(sprintf('firefly.shortLiabilityNameByFullName.%s', $account->full_account_type));
         $liabilityType                                                = '' === $liabilityType ? null : strtolower($liabilityType);
 
         $liabilityDirection                                           = $account->meta['liability_direction'] ?? null;
@@ -89,10 +89,10 @@ class AccountTransformer extends AbstractTransformer
             $native = null;
         }
 
-        $decimalPlaces                                                = (int) $account->meta['currency']?->decimal_places;
+        $decimalPlaces                                                = (int)$account->meta['currency']?->decimal_places;
         $decimalPlaces                                                = 0 === $decimalPlaces ? 2 : $decimalPlaces;
-        $openingBalance                                               = Steam::bcround($openingBalance, $decimalPlaces);
-        $includeNetWorth                                              = 1 === (int) ($account->meta['include_net_worth'] ?? 0);
+        $openingBalanceRounded                                        = Steam::bcround($openingBalance, $decimalPlaces);
+        $includeNetWorth                                              = 1 === (int)($account->meta['include_net_worth'] ?? 0);
         $longitude                                                    = $account->meta['location']['longitude'] ?? null;
         $latitude                                                     = $account->meta['location']['latitude'] ?? null;
         $zoomLevel                                                    = $account->meta['location']['zoom_level'] ?? null;
@@ -112,8 +112,55 @@ class AccountTransformer extends AbstractTransformer
         $currentBalance                                               = Steam::bcround($finalBalance['balance'] ?? '0', $decimalPlaces);
         $nativeCurrentBalance                                         = $this->convertToNative ? Steam::bcround($finalBalance['native_balance'] ?? '0', $native->decimal_places) : null;
 
+        // set up balances array:
+        $balances                                                     = [];
+        $balances[]
+                                                                      = [
+                                                                          'type'                    => 'current',
+                                                                          'amount'                  => $currentBalance,
+                                                                          'currency_id'             => $account->meta['currency_id'] ?? null,
+                                                                          'currency_code'           => $account->meta['currency']?->code,
+                                                                          'currency_symbol'         => $account->meta['currency']?->symbol,
+                                                                          'currency_decimal_places' => $account->meta['currency']?->decimal_places,
+                                                                          'date'                    => $date->toAtomString(),
+                                                                      ];
+        if (null !== $nativeCurrentBalance) {
+            $balances[] = [
+                'type'                     => 'native_current',
+                'amount'                   => $nativeCurrentBalance,
+                'currency_id'              => $native instanceof TransactionCurrency ? (string)$native->id : null,
+                'currency_code'            => $native?->code,
+                'currency_symbol'          => $native?->symbol,
+                'ccurrency_decimal_places' => $native?->decimal_places,
+                'date'                     => $date->toAtomString(),
+
+            ];
+        }
+        if (null !== $openingBalance) {
+            $balances[] = [
+                'type'                    => 'opening',
+                'amount'                  => $openingBalanceRounded,
+                'currency_id'             => $account->meta['currency_id'] ?? null,
+                'currency_code'           => $account->meta['currency']?->code,
+                'currency_symbol'         => $account->meta['currency']?->symbol,
+                'currency_decimal_places' => $account->meta['currency']?->decimal_places,
+                'date'                    => $openingBalanceDate,
+            ];
+        }
+        if (null !== $account->virtual_balance) {
+            $balances[] = [
+                'type'                    => 'virtual',
+                'amount'                  => Steam::bcround($account->virtual_balance, $decimalPlaces),
+                'currency_id'             => $account->meta['currency_id'] ?? null,
+                'currency_code'           => $account->meta['currency']?->code,
+                'currency_symbol'         => $account->meta['currency']?->symbol,
+                'currency_decimal_places' => $account->meta['currency']?->decimal_places,
+                'date'                    => $date->toAtomString(),
+            ];
+        }
+
         return [
-            'id'                             => (string) $account->id,
+            'id'                             => (string)$account->id,
             'created_at'                     => $account->created_at->toAtomString(),
             'updated_at'                     => $account->updated_at->toAtomString(),
             'active'                         => $account->active,
@@ -125,7 +172,7 @@ class AccountTransformer extends AbstractTransformer
             'currency_code'                  => $account->meta['currency']?->code,
             'currency_symbol'                => $account->meta['currency']?->symbol,
             'currency_decimal_places'        => $account->meta['currency']?->decimal_places,
-            'native_currency_id'             => $native instanceof TransactionCurrency ? (string) $native->id : null,
+            'native_currency_id'             => $native instanceof TransactionCurrency ? (string)$native->id : null,
             'native_currency_code'           => $native?->code,
             'native_currency_symbol'         => $native?->symbol,
             'native_currency_decimal_places' => $native?->decimal_places,
@@ -140,7 +187,7 @@ class AccountTransformer extends AbstractTransformer
             'bic'                            => $account->meta['BIC'] ?? null,
             'virtual_balance'                => Steam::bcround($account->virtual_balance, $decimalPlaces),
             'native_virtual_balance'         => $this->convertToNative ? Steam::bcround($account->native_virtual_balance, $native->decimal_places) : null,
-            'opening_balance'                => $openingBalance,
+            'opening_balance'                => $openingBalanceRounded,
             'native_opening_balance'         => $nativeOpeningBalance,
             'opening_balance_date'           => $openingBalanceDate,
             'liability_type'                 => $liabilityType,
@@ -153,6 +200,7 @@ class AccountTransformer extends AbstractTransformer
             'latitude'                       => $latitude,
             'zoom_level'                     => $zoomLevel,
             'last_activity'                  => array_key_exists('last_activity', $account->meta) ? $account->meta['last_activity']->toAtomString() : null,
+            'balances'                       => $balances,
             'links'                          => [
                 [
                     'rel' => 'self',
@@ -165,7 +213,7 @@ class AccountTransformer extends AbstractTransformer
     private function getAccountRole(Account $account, string $accountType): ?string
     {
         $accountRole = $account->meta['account_role'] ?? null;
-        if ('asset' !== $accountType || '' === (string) $accountRole) {
+        if ('asset' !== $accountType || '' === (string)$accountRole) {
             return null;
         }
 
@@ -201,7 +249,7 @@ class AccountTransformer extends AbstractTransformer
                 }
                 $monthlyPaymentDate = $object->toAtomString();
             }
-            if (10 !== strlen((string) $monthlyPaymentDate)) {
+            if (10 !== strlen((string)$monthlyPaymentDate)) {
                 $monthlyPaymentDate = Carbon::parse($monthlyPaymentDate, config('app.timezone'))->toAtomString();
             }
         }

app/Transformers/BillTransformer.php

@@ -32,8 +32,10 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Models\BillDateCalculator;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class BillTransformer
@@ -150,11 +152,11 @@ class BillTransformer extends AbstractTransformer
             'id'                             => $bill->id,
             'created_at'                     => $bill->created_at->toAtomString(),
             'updated_at'                     => $bill->updated_at->toAtomString(),
-            'currency_id'                    => (string) $bill->transaction_currency_id,
+            'currency_id'                    => (string)$bill->transaction_currency_id,
             'currency_code'                  => $currency->code,
             'currency_symbol'                => $currency->symbol,
             'currency_decimal_places'        => $currency->decimal_places,
-            'native_currency_id'             => null === $default ? null : (string) $default->id,
+            'native_currency_id'             => null === $default ? null : (string)$default->id,
             'native_currency_code'           => $default?->code,
             'native_currency_symbol'         => $default?->symbol,
             'native_currency_decimal_places' => $default?->decimal_places,
@@ -171,7 +173,7 @@ class BillTransformer extends AbstractTransformer
             'active'                         => $bill->active,
             'order'                          => $bill->order,
             'notes'                          => $notes,
-            'object_group_id'                => null !== $objectGroupId ? (string) $objectGroupId : null,
+            'object_group_id'                => null !== $objectGroupId ? (string)$objectGroupId : null,
             'object_group_order'             => $objectGroupOrder,
             'object_group_title'             => $objectGroupTitle,
 
@@ -194,9 +196,9 @@ class BillTransformer extends AbstractTransformer
      */
     protected function paidData(Bill $bill): array
     {
-        app('log')->debug(sprintf('Now in paidData for bill #%d', $bill->id));
+        Log::debug(sprintf('Now in paidData for bill #%d', $bill->id));
         if (null === $this->parameters->get('start') || null === $this->parameters->get('end')) {
-            app('log')->debug('parameters are NULL, return empty array');
+            Log::debug('parameters are NULL, return empty array');
 
             return [];
         }
@@ -217,27 +219,40 @@ class BillTransformer extends AbstractTransformer
         $searchStart->startOfDay();
         $searchEnd->endOfDay();
 
-        app('log')->debug(sprintf('Parameters are start: %s end: %s', $start->format('Y-m-d'), $end->format('Y-m-d')));
-        app('log')->debug(sprintf('Search parameters are: start: %s', $searchStart->format('Y-m-d')));
+        Log::debug(sprintf('Parameters are start: %s end: %s', $start->format('Y-m-d'), $end->format('Y-m-d')));
+        Log::debug(sprintf('Search parameters are: start: %s', $searchStart->format('Y-m-d')));
 
         // Get from database when bill was paid.
         $set          = $this->repository->getPaidDatesInRange($bill, $searchStart, $searchEnd);
-        app('log')->debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count()));
+        Log::debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count()));
 
         // Grab from array the most recent payment. If none exist, fall back to the start date and pretend *that* was the last paid date.
-        app('log')->debug(sprintf('Grab last paid date from function, return %s if it comes up with nothing.', $start->format('Y-m-d')));
+        Log::debug(sprintf('Grab last paid date from function, return %s if it comes up with nothing.', $start->format('Y-m-d')));
         $lastPaidDate = $this->lastPaidDate($set, $start);
-        app('log')->debug(sprintf('Result of lastPaidDate is %s', $lastPaidDate->format('Y-m-d')));
+        Log::debug(sprintf('Result of lastPaidDate is %s', $lastPaidDate->format('Y-m-d')));
 
         // At this point the "next match" is exactly after the last time the bill was paid.
         $result       = [];
         foreach ($set as $entry) {
-            $result[] = [
-                'transaction_group_id'   => (string) $entry->transaction_group_id,
-                'transaction_journal_id' => (string) $entry->id,
-                'date'                   => $entry->date->format('Y-m-d'),
-                'date_object'            => $entry->date,
+            $array    = [
+                'transaction_group_id'             => (string)$entry->transaction_group_id,
+                'transaction_journal_id'           => (string)$entry->id,
+                'date'                             => $entry->date->format('Y-m-d'),
+                'date_object'                      => $entry->date,
+                'currency_id'                      => $entry->transaction_currency_id,
+                'currency_code'                    => $entry->transaction_currency_code,
+                'currency_decimal_places'          => $entry->transaction_currency_decimal_places,
+                'amount'                           => Steam::bcround($entry->amount, $entry->transaction_currency_decimal_places),
             ];
+            if (null !== $entry->foreign_amount && null !== $entry->foreign_currency_code) {
+                $array['foreign_currency_id']             = $entry->foreign_currency_id;
+                $array['foreign_currency_code']           = $entry->foreign_currency_code;
+                $array['foreign_currency_decimal_places'] = $entry->foreign_currency_decimal_places;
+                $array['foreign_amount']                  = Steam::bcround($entry->foreign_amount, $entry->foreign_currency_decimal_places);
+            }
+
+            $result[] = $array;
+
         }
 
         return $result;
@@ -265,7 +280,7 @@ class BillTransformer extends AbstractTransformer
 
     private function getLastPaidDate(array $paidData): ?Carbon
     {
-        app('log')->debug('getLastPaidDate()');
+        Log::debug('getLastPaidDate()');
         $return = null;
         foreach ($paidData as $entry) {
             if (null !== $return) {
@@ -274,15 +289,15 @@ class BillTransformer extends AbstractTransformer
                 if ($current->gt($return)) {
                     $return = clone $current;
                 }
-                app('log')->debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
+                Log::debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
             }
             if (null === $return) {
                 /** @var Carbon $return */
                 $return = $entry['date_object'];
-                app('log')->debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
+                Log::debug(sprintf('Last paid date is: %s', $return->format('Y-m-d')));
             }
         }
-        app('log')->debug(sprintf('Last paid date is: "%s"', $return?->format('Y-m-d')));
+        Log::debug(sprintf('Last paid date is: "%s"', $return?->format('Y-m-d')));
 
         return $return;
     }

composer.lock

@@ -1879,16 +1879,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v12.20.0",
+            "version": "v12.21.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "1b9a00f8caf5503c92aa436279172beae1a484ff"
+                "reference": "ac8c4e73bf1b5387b709f7736d41427e6af1c93b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/1b9a00f8caf5503c92aa436279172beae1a484ff",
-                "reference": "1b9a00f8caf5503c92aa436279172beae1a484ff",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/ac8c4e73bf1b5387b709f7736d41427e6af1c93b",
+                "reference": "ac8c4e73bf1b5387b709f7736d41427e6af1c93b",
                 "shasum": ""
             },
             "require": {
@@ -2090,7 +2090,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-07-08T15:02:21+00:00"
+            "time": "2025-07-22T15:41:55+00:00"
         },
         {
             "name": "laravel/passport",
@@ -2229,16 +2229,16 @@
         },
         {
             "name": "laravel/sanctum",
-            "version": "v4.1.2",
+            "version": "v4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "e4c09e69aecd5a383e0c1b85a6bb501c997d7491"
+                "reference": "fd6df4f79f48a72992e8d29a9c0ee25422a0d677"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/e4c09e69aecd5a383e0c1b85a6bb501c997d7491",
-                "reference": "e4c09e69aecd5a383e0c1b85a6bb501c997d7491",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/fd6df4f79f48a72992e8d29a9c0ee25422a0d677",
+                "reference": "fd6df4f79f48a72992e8d29a9c0ee25422a0d677",
                 "shasum": ""
             },
             "require": {
@@ -2289,7 +2289,7 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2025-07-01T15:49:32+00:00"
+            "time": "2025-07-09T19:45:24+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -2619,16 +2619,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.7.0",
+            "version": "2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405"
+                "reference": "10732241927d3971d28e7ea7b5712721fa2296ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
-                "reference": "6fbb36d44824ed4091adbcf4c7d4a3923cdb3405",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/10732241927d3971d28e7ea7b5712721fa2296ca",
+                "reference": "10732241927d3971d28e7ea7b5712721fa2296ca",
                 "shasum": ""
             },
             "require": {
@@ -2657,7 +2657,7 @@
                 "symfony/process": "^5.4 | ^6.0 | ^7.0",
                 "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
-                "vimeo/psalm": "^4.24.0 || ^5.0.0"
+                "vimeo/psalm": "^4.24.0 || ^5.0.0 || ^6.0.0"
             },
             "suggest": {
                 "symfony/yaml": "v2.3+ required if using the Front Matter extension"
@@ -2722,7 +2722,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-05-05T12:20:28+00:00"
+            "time": "2025-07-20T12:47:49+00:00"
         },
         {
             "name": "league/config",
@@ -5101,16 +5101,16 @@
         },
         {
             "name": "predis/predis",
-            "version": "v3.0.1",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/predis/predis.git",
-                "reference": "34fb0a7da0330df1bab4280fcac4afdeeccc3edf"
+                "reference": "202e0c5322b906ec4c761c0cefebad6d0959a699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/34fb0a7da0330df1bab4280fcac4afdeeccc3edf",
-                "reference": "34fb0a7da0330df1bab4280fcac4afdeeccc3edf",
+                "url": "https://api.github.com/repos/predis/predis/zipball/202e0c5322b906ec4c761c0cefebad6d0959a699",
+                "reference": "202e0c5322b906ec4c761c0cefebad6d0959a699",
                 "shasum": ""
             },
             "require": {
@@ -5152,7 +5152,7 @@
             ],
             "support": {
                 "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v3.0.1"
+                "source": "https://github.com/predis/predis/tree/v3.1.0"
             },
             "funding": [
                 {
@@ -5160,7 +5160,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-05-16T18:30:32+00:00"
+            "time": "2025-07-22T15:37:44+00:00"
         },
         {
             "name": "psr/cache",
@@ -9840,16 +9840,16 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.15.4",
+            "version": "v3.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "c0667ea91f7185f1e074402c5788195e96bf8106"
+                "reference": "f265cf5e38577d42311f1a90d619bcd3740bea23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c0667ea91f7185f1e074402c5788195e96bf8106",
-                "reference": "c0667ea91f7185f1e074402c5788195e96bf8106",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/f265cf5e38577d42311f1a90d619bcd3740bea23",
+                "reference": "f265cf5e38577d42311f1a90d619bcd3740bea23",
                 "shasum": ""
             },
             "require": {
@@ -9857,7 +9857,7 @@
                 "illuminate/session": "^9|^10|^11|^12",
                 "illuminate/support": "^9|^10|^11|^12",
                 "php": "^8.1",
-                "php-debugbar/php-debugbar": "~2.1.1",
+                "php-debugbar/php-debugbar": "~2.2.0",
                 "symfony/finder": "^6|^7"
             },
             "require-dev": {
@@ -9877,7 +9877,7 @@
                     ]
                 },
                 "branch-alias": {
-                    "dev-master": "3.15-dev"
+                    "dev-master": "3.16-dev"
                 }
             },
             "autoload": {
@@ -9909,7 +9909,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.15.4"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.16.0"
             },
             "funding": [
                 {
@@ -9921,7 +9921,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-04-16T06:32:06+00:00"
+            "time": "2025-07-14T11:56:43+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -10944,16 +10944,16 @@
         },
         {
             "name": "php-debugbar/php-debugbar",
-            "version": "v2.1.6",
+            "version": "v2.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-debugbar/php-debugbar.git",
-                "reference": "16fa68da5617220594aa5e33fa9de415f94784a0"
+                "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/16fa68da5617220594aa5e33fa9de415f94784a0",
-                "reference": "16fa68da5617220594aa5e33fa9de415f94784a0",
+                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/3146d04671f51f69ffec2a4207ac3bdcf13a9f35",
+                "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35",
                 "shasum": ""
             },
             "require": {
@@ -10961,6 +10961,9 @@
                 "psr/log": "^1|^2|^3",
                 "symfony/var-dumper": "^4|^5|^6|^7"
             },
+            "replace": {
+                "maximebf/debugbar": "self.version"
+            },
             "require-dev": {
                 "dbrekelmans/bdi": "^1",
                 "phpunit/phpunit": "^8|^9",
@@ -10975,7 +10978,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -11008,9 +11011,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-debugbar/php-debugbar/issues",
-                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.1.6"
+                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.2.4"
             },
-            "time": "2025-02-21T17:47:03+00:00"
+            "time": "2025-07-22T14:01:30+00:00"
         },
         {
             "name": "phpstan/extension-installer",
@@ -11062,16 +11065,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.18",
+            "version": "2.1.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "ee1f390b7a70cdf74a2b737e554f68afea885db7"
+                "reference": "473a8c30e450d87099f76313edcbb90852f9afdf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ee1f390b7a70cdf74a2b737e554f68afea885db7",
-                "reference": "ee1f390b7a70cdf74a2b737e554f68afea885db7",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/473a8c30e450d87099f76313edcbb90852f9afdf",
+                "reference": "473a8c30e450d87099f76313edcbb90852f9afdf",
                 "shasum": ""
             },
             "require": {
@@ -11116,7 +11119,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-07-17T17:22:31+00:00"
+            "time": "2025-07-21T19:58:24+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
@@ -11167,16 +11170,16 @@
         },
         {
             "name": "phpstan/phpstan-strict-rules",
-            "version": "2.0.4",
+            "version": "2.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-strict-rules.git",
-                "reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a"
+                "reference": "f9f77efa9de31992a832ff77ea52eb42d675b094"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
-                "reference": "3e139cbe67fafa3588e1dbe27ca50f31fdb6236a",
+                "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/f9f77efa9de31992a832ff77ea52eb42d675b094",
+                "reference": "f9f77efa9de31992a832ff77ea52eb42d675b094",
                 "shasum": ""
             },
             "require": {
@@ -11209,9 +11212,9 @@
             "description": "Extra strict and opinionated rules for PHPStan",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.4"
+                "source": "https://github.com/phpstan/phpstan-strict-rules/tree/2.0.6"
             },
-            "time": "2025-03-18T11:42:40+00:00"
+            "time": "2025-07-21T12:19:29+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-07-20',
-    'build_time'                   => 1753007724,
+    'version'                      => 'develop/2025-07-24',
+    'build_time'                   => 1753333121,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 26,
 

package-lock.json

@@ -3141,9 +3141,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "24.0.15",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.15.tgz",
-            "integrity": "sha512-oaeTSbCef7U/z7rDeJA138xpG3NuKc64/rZ2qmUFkFJmnMsAPaluIifqyWd8hSSMxyP9oie3dLAqYPblag9KgA==",
+            "version": "24.1.0",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
+            "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3249,42 +3249,42 @@
             }
         },
         "node_modules/@vue/compiler-core": {
-            "version": "3.5.17",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.17.tgz",
-            "integrity": "sha512-Xe+AittLbAyV0pabcN7cP7/BenRBNcteM4aSDCtRvGw0d9OL+HG1u/XHLY/kt1q4fyMeZYXyIYrsHuPSiDPosA==",
+            "version": "3.5.18",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.18.tgz",
+            "integrity": "sha512-3slwjQrrV1TO8MoXgy3aynDQ7lslj5UqDxuHnrzHtpON5CBinhWjJETciPngpin/T3OuW3tXUf86tEurusnztw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.27.5",
-                "@vue/shared": "3.5.17",
+                "@babel/parser": "^7.28.0",
+                "@vue/shared": "3.5.18",
                 "entities": "^4.5.0",
                 "estree-walker": "^2.0.2",
                 "source-map-js": "^1.2.1"
             }
         },
         "node_modules/@vue/compiler-dom": {
-            "version": "3.5.17",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.17.tgz",
-            "integrity": "sha512-+2UgfLKoaNLhgfhV5Ihnk6wB4ljyW1/7wUIog2puUqajiC29Lp5R/IKDdkebh9jTbTogTbsgB+OY9cEWzG95JQ==",
+            "version": "3.5.18",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.18.tgz",
+            "integrity": "sha512-RMbU6NTU70++B1JyVJbNbeFkK+A+Q7y9XKE2EM4NLGm2WFR8x9MbAtWxPPLdm0wUkuZv9trpwfSlL6tjdIa1+A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-core": "3.5.17",
-                "@vue/shared": "3.5.17"
+                "@vue/compiler-core": "3.5.18",
+                "@vue/shared": "3.5.18"
             }
         },
         "node_modules/@vue/compiler-sfc": {
-            "version": "3.5.17",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.17.tgz",
-            "integrity": "sha512-rQQxbRJMgTqwRugtjw0cnyQv9cP4/4BxWfTdRBkqsTfLOHWykLzbOc3C4GGzAmdMDxhzU/1Ija5bTjMVrddqww==",
+            "version": "3.5.18",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.18.tgz",
+            "integrity": "sha512-5aBjvGqsWs+MoxswZPoTB9nSDb3dhd1x30xrrltKujlCxo48j8HGDNj3QPhF4VIS0VQDUrA1xUfp2hEa+FNyXA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.27.5",
-                "@vue/compiler-core": "3.5.17",
-                "@vue/compiler-dom": "3.5.17",
-                "@vue/compiler-ssr": "3.5.17",
-                "@vue/shared": "3.5.17",
+                "@babel/parser": "^7.28.0",
+                "@vue/compiler-core": "3.5.18",
+                "@vue/compiler-dom": "3.5.18",
+                "@vue/compiler-ssr": "3.5.18",
+                "@vue/shared": "3.5.18",
                 "estree-walker": "^2.0.2",
                 "magic-string": "^0.30.17",
                 "postcss": "^8.5.6",
@@ -3292,14 +3292,14 @@
             }
         },
         "node_modules/@vue/compiler-ssr": {
-            "version": "3.5.17",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.17.tgz",
-            "integrity": "sha512-hkDbA0Q20ZzGgpj5uZjb9rBzQtIHLS78mMilwrlpWk2Ep37DYntUz0PonQ6kr113vfOEdM+zTBuJDaceNIW0tQ==",
+            "version": "3.5.18",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.18.tgz",
+            "integrity": "sha512-xM16Ak7rSWHkM3m22NlmcdIM+K4BMyFARAfV9hYFl+SFuRzrZ3uGMNW05kA5pmeMa0X9X963Kgou7ufdbpOP9g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@vue/compiler-dom": "3.5.17",
-                "@vue/shared": "3.5.17"
+                "@vue/compiler-dom": "3.5.18",
+                "@vue/shared": "3.5.18"
             }
         },
         "node_modules/@vue/component-compiler-utils": {
@@ -3381,9 +3381,9 @@
             "license": "MIT"
         },
         "node_modules/@vue/shared": {
-            "version": "3.5.17",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-            "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+            "version": "3.5.18",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.18.tgz",
+            "integrity": "sha512-cZy8Dq+uuIXbxCZpuLd2GJdeSO/lIzIspC2WtkqIpje5QyFbvLaI5wZtdUjLHjGZrlVX6GilejatWwVYYRc8tA==",
             "dev": true,
             "license": "MIT"
         },
@@ -3931,14 +3931,14 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.10.0.tgz",
-            "integrity": "sha512-/1xYAC4MP/HEG+3duIhFr4ZQXR4sQXOIe+o6sdqzeykGLx6Upp/1p8MHqhINOvGeP7xyNHe7tsiJByc4SSVUxw==",
+            "version": "1.11.0",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz",
+            "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.0",
+                "form-data": "^4.0.4",
                 "proxy-from-env": "^1.1.0"
             }
         },
@@ -5694,9 +5694,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.187",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.187.tgz",
-            "integrity": "sha512-cl5Jc9I0KGUoOoSbxvTywTa40uspGJt/BDBoDLoxJRSBpWh4FFXBsjNRHfQrONsV/OoEjDfHUmZQa2d6Ze4YgA==",
+            "version": "1.5.190",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.190.tgz",
+            "integrity": "sha512-k4McmnB2091YIsdCgkS0fMVMPOJgxl93ltFzaryXqwip1AaxeDqKCGLxkXODDA5Ab/D+tV5EL5+aTx76RvLRxw==",
             "dev": true,
             "license": "ISC"
         },
@@ -12502,7 +12502,7 @@
             "devDependencies": {
                 "@johmun/vue-tags-input": "^2",
                 "@vue/compiler-sfc": "^3.5.11",
-                "axios": "^1.8",
+                "axios": "^1.11",
                 "bootstrap-sass": "^3",
                 "cross-env": "^7.0",
                 "font-awesome": "^4.7.0",

resources/assets/v1/package.json

@@ -16,7 +16,7 @@
     "devDependencies": {
         "@johmun/vue-tags-input": "^2",
         "@vue/compiler-sfc": "^3.5.11",
-        "axios": "^1.8",
+        "axios": "^1.11",
         "bootstrap-sass": "^3",
         "cross-env": "^7.0",
         "font-awesome": "^4.7.0",

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

@@ -1,11 +1,11 @@
 {
     "firefly": {
-        "administrations_page_title": "Financial administrations",
-        "administrations_index_menu": "Financial administrations",
+        "administrations_page_title": "Spr\u00e1va financ\u00ed",
+        "administrations_index_menu": "Spr\u00e1va financ\u00ed",
         "expires_at": "Expires at",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
-        "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
+        "temp_administrations_introduction": "Firefly III brzy z\u00edsk\u00e1 mo\u017enost spravovat v\u00edce spr\u00e1v financ\u00ed. Moment\u00e1ln\u011b m\u00e1te pouze jednu. M\u016f\u017eete nastavit n\u00e1zev t\u00e9to spr\u00e1vy a jej\u00ed m\u00edstn\u00ed m\u011bnu. Toto nahrazuje p\u0159edchoz\u00ed nastaven\u00ed, kde jste nastavovali \u201ev\u00fdchoz\u00ed m\u011bnu\u201c. Toto nastaven\u00ed je nyn\u00ed v\u00e1z\u00e1no na spr\u00e1vu financ\u00ed a m\u016f\u017ee se li\u0161it pro ka\u017edou spr\u00e1vu.",
+        "administration_currency_form_help": "Pokud zm\u011bn\u00edte m\u00edstn\u00ed m\u011bnu, m\u016f\u017ee na\u010dten\u00ed str\u00e1nky trvat d\u00e9le, proto\u017ee transakce mo\u017en\u00e1 bude pot\u0159eba p\u0159ev\u00e9st na va\u0161i (novou) m\u00edstn\u00ed m\u011bnu.",
+        "administrations_page_edit_sub_title_js": "Upravit spr\u00e1vu financ\u00ed \u201e{title}\u201c",
         "table": "Tabulka",
         "welcome_back": "Jak to jde?",
         "flash_error": "Chyba!",
@@ -20,14 +20,14 @@
         "split": "Rozd\u011blit",
         "single_split": "Rozd\u011blit",
         "not_enough_currencies": "Not enough currencies",
-        "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
+        "not_enough_currencies_enabled": "Pokud m\u00e1te povolenou pouze jednu m\u011bnu, nemus\u00edte p\u0159id\u00e1vat sm\u011bnn\u00e9 kurzy.",
         "transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakce #{ID} (\"{title}\")<\/a> byla ulo\u017eena.",
         "webhook_stored_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID} (\"{title}\")<\/a> byl ulo\u017een.",
         "webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") byl aktualizov\u00e1n.",
         "transaction_updated_link": "<a href=\"transactions\/show\/{ID}\">Transaction #{ID}<\/a> (\"{title}\") has been updated.",
         "transaction_new_stored_link": "<a href=\"transactions\/show\/{ID}\">Transakce #{ID}<\/a> byla ulo\u017eena.",
         "transaction_journal_information": "Informace o transakci",
-        "submission_options": "Submission options",
+        "submission_options": "Mo\u017enosti polo\u017eky",
         "apply_rules_checkbox": "Aplikovat pravidla",
         "fire_webhooks_checkbox": "Spustit webhooky",
         "no_budget_pointer": "<a href=\"budgets\">Zde<\/a> si m\u016f\u017eete spravovat rozpo\u010dty, kter\u00e9 v\u00e1m mohou pomoci sledovat v\u00fddaje.",
@@ -36,7 +36,7 @@
         "hidden_fields_preferences": "Dal\u0161\u00ed vlastnosti transakc\u00ed m\u016f\u017eete zaznamenat kdy\u017e je zapnete v <a href=\"preferences\">nastaven\u00ed<\/a>.",
         "destination_account": "C\u00edlov\u00fd \u00fa\u010det",
         "add_another_split": "P\u0159idat dal\u0161\u00ed roz\u00fa\u010dtov\u00e1n\u00ed",
-        "submission": "Submission",
+        "submission": "Polo\u017eka",
         "stored_journal": "\u00dasp\u011b\u0161n\u011b vytvo\u0159ena nov\u00e1 transakce \u201e:description\u201c",
         "create_another": "Po ulo\u017een\u00ed se vr\u00e1tit sem pro vytvo\u0159en\u00ed dal\u0161\u00ed.",
         "reset_after": "Po odesl\u00e1n\u00ed vymazat obsah formul\u00e1\u0159e",
@@ -75,24 +75,24 @@
         "profile_oauth_clients": "Klienti OAuth",
         "profile_oauth_no_clients": "Zat\u00edm jste nevytvo\u0159ili OAuth klienty.",
         "profile_oauth_clients_header": "Klienti",
-        "profile_oauth_client_id": "ID z\u00e1kazn\u00edka",
+        "profile_oauth_client_id": "ID klienta",
         "profile_oauth_client_name": "Jm\u00e9no",
-        "profile_oauth_client_secret": "Tajn\u00fd kl\u00ed\u010d",
+        "profile_oauth_client_secret": "Tajn\u00e9",
         "profile_oauth_create_new_client": "Vytvo\u0159it nov\u00e9ho klienta",
         "profile_oauth_create_client": "Vytvo\u0159it klienta",
         "profile_oauth_edit_client": "Upravit klienta",
         "profile_oauth_name_help": "N\u011bco \u010demu va\u0161i u\u017eivatel\u00e9 budou d\u016fv\u011b\u0159ovat.",
         "profile_oauth_redirect_url": "P\u0159esm\u011brovat URL adresu",
-        "profile_oauth_clients_external_auth": "Pokud pro ov\u011b\u0159ov\u00e1n\u00ed pou\u017e\u00edv\u00e1te extern\u00ed slu\u017ebu, nap\u0159\u00edklad Authelia, OAuth klienti nemus\u00ed fungovat spr\u00e1vn\u011b. M\u00edsto toho m\u016f\u017eete pou\u017e\u00edt Personal Access Token.",
+        "profile_oauth_clients_external_auth": "Pokud pro ov\u011b\u0159ov\u00e1n\u00ed pou\u017e\u00edv\u00e1te extern\u00ed slu\u017ebu, nap\u0159\u00edklad Authelia, OAuth klienti nemus\u00ed fungovat spr\u00e1vn\u011b. M\u00edsto toho m\u016f\u017eete pou\u017e\u00edt osobn\u00ed p\u0159\u00edstupov\u00fd token.",
         "profile_oauth_redirect_url_help": "Callback URL va\u0161\u00ed aplikace.",
         "profile_authorized_apps": "Authorized applications",
         "profile_authorized_clients": "Autorizovan\u00ed klienti",
         "profile_scopes": "Scopes",
         "profile_revoke": "Revoke",
-        "profile_personal_access_tokens": "Personal Access Token",
-        "profile_personal_access_token": "Personal Access Token",
-        "profile_personal_access_token_explanation": "Tohle je v\u00e1\u0161 nov\u00fd p\u0159\u00edstupov\u00fd token. Tohle je naposled kdy ho vid\u00edte, tak\u017ee ho neztra\u0165te! M\u016f\u017eete ho pou\u017e\u00edt pro vol\u00e1n\u00ed API.",
-        "profile_no_personal_access_token": "Je\u0161t\u011b jste nevytvo\u0159ili \u017e\u00e1dn\u00e9 p\u0159\u00edstupov\u00e9 tokeny.",
+        "profile_personal_access_tokens": "Osobn\u00ed p\u0159\u00edstupov\u00fd token",
+        "profile_personal_access_token": "Osobn\u00ed p\u0159\u00edstupov\u00e9 tokeny",
+        "profile_personal_access_token_explanation": "Zde je v\u00e1\u0161 nov\u00fd osobn\u00ed p\u0159\u00edstupov\u00fd token. Toto je jedin\u00fd okam\u017eik, kdy jej uvid\u00edte, tak\u017ee ho neztra\u0165te! Nyn\u00ed m\u016f\u017eete tento token pou\u017e\u00edt k odes\u00edl\u00e1n\u00ed po\u017eadavk\u016f na API.",
+        "profile_no_personal_access_token": "Zat\u00edm jste nevytvo\u0159ili \u017e\u00e1dn\u00e9 osobn\u00ed p\u0159\u00edstupov\u00e9 tokeny.",
         "profile_create_new_token": "Vytvo\u0159it nov\u00fd token",
         "profile_create_token": "Vytvo\u0159it token",
         "profile_create": "Vytvo\u0159it",
@@ -140,12 +140,12 @@
         "response": "Odpov\u011b\u010f",
         "visit_webhook_url": "Nav\u0161t\u00edvit URL webhooku",
         "reset_webhook_secret": "Restartovat tajn\u00fd kl\u00ed\u010d webhooku",
-        "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\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
-        "exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
-        "exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
-        "header_exchange_rates_rates": "Exchange rates",
-        "header_exchange_rates_table": "Table with exchange rates",
+        "header_exchange_rates": "Sm\u011bnn\u00e9 kurzy",
+        "exchange_rates_intro": "Firefly III podporuje stahov\u00e1n\u00ed a pou\u017e\u00edv\u00e1n\u00ed sm\u011bnn\u00fdch kurz\u016f. V\u00edce informac\u00ed o t\u00e9to funkci najdete <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">v dokumentaci<\/a>.",
+        "exchange_rates_from_to": "Mezi {from} a {to} (a opa\u010dn\u011b)",
+        "exchange_rates_intro_rates": "Firefly III pou\u017e\u00edv\u00e1 n\u00e1sleduj\u00edc\u00ed sm\u011bnn\u00e9 kurzy. Inverzn\u00ed kurz je automaticky vypo\u010d\u00edt\u00e1n, pokud nen\u00ed zad\u00e1n. Pokud pro datum transakce neexistuje sm\u011bnn\u00fd kurz, Firefly III se vr\u00e1t\u00ed zp\u011bt v \u010dase a pokus\u00ed se n\u011bjak\u00fd naj\u00edt. Pokud \u017e\u00e1dn\u00fd nenajde, pou\u017eije se kurz \u201e1\u201c.",
+        "header_exchange_rates_rates": "Sm\u011bnn\u00e9 kurzy",
+        "header_exchange_rates_table": "Tabulka se sm\u011bnn\u00fdmi kurzy",
         "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"
@@ -154,7 +154,7 @@
         "url": "URL",
         "active": "Aktivn\u00ed",
         "interest_date": "\u00darokov\u00e9 datum",
-        "administration_currency": "Native currency",
+        "administration_currency": "M\u00edstn\u00ed m\u011bna",
         "title": "N\u00e1zev",
         "date": "Datum",
         "book_date": "Datum rezervace",

resources/assets/v2/src/pages/accounts/index.js

@@ -315,7 +315,7 @@ let index = function () {
             // need to find the input thing
             console.log('Clicked edit button for account on index #' + index + ' and field ' + fieldName);
             const querySelector = 'input[data-field="' + fieldName + '"][data-index="' + index + '"]';
-            console.log(querySelector);
+            // console.log(querySelector);
             const newValue = document.querySelectorAll(querySelector)[0].value ?? '';
             if ('' === newValue) {
                 return;
@@ -352,12 +352,15 @@ let index = function () {
 
             // filter instructions
             let filters = {};
+            let type = this.filters.type;
+            let active = this.filters.active;
             for (let k in this.filters) {
                 if (this.filters.hasOwnProperty(k) && null !== this.filters[k]) {
                     filters[k] = this.filters[k];
                     //filters.push({column: k, filter: this.filters[k]});
                 }
             }
+            delete filters.type;
 
             // get start and end from the store:
             const start = new Date(window.store.get('start'));
@@ -367,24 +370,23 @@ let index = function () {
             let params = {
                 sort: sorting,
                 filter: filters,
+                active: active,
                 currentMoment: today,
-                // type: type,
-                page: {number: this.page},
+                type: type,
+                page: this.page,
                 startPeriod: start,
                 endPeriod: end
             };
 
             if (!this.tableColumns.balance_difference.enabled) {
                 delete params.startPeriod;
-                delete params.enPeriod;
+                delete params.endPeriod;
             }
             this.accounts = [];
             let groupedAccounts = {};
             // one page only.o
             (new Get()).index(params).then(response => {
-                console.log(response);
                 this.totalPages = response.meta.pagination.total_pages;
-                console.log('a');
                 for (let i = 0; i < response.data.length; i++) {
                     if (response.data.hasOwnProperty(i)) {
                         let current = response.data[i];
@@ -399,18 +401,14 @@ let index = function () {
                             account_number: null === current.attributes.account_number ? '' : current.attributes.account_number,
                             current_balance: current.attributes.current_balance,
                             currency_code: current.attributes.currency_code,
-                            //native_current_balance: current.attributes.native_current_balance,
-                            //native_currency_code: current.attributes.native_currency_code,
                             last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), i18next.t('config.month_and_day_fns')),
-                            //balance_difference: current.attributes.balance_difference,
-                            //native_balance_difference: current.attributes.native_balance_difference,
                             liability_type: current.attributes.liability_type,
                             liability_direction: current.attributes.liability_direction,
                             interest: current.attributes.interest,
                             interest_period: current.attributes.interest_period,
-                            //current_debt: current.attributes.current_debt,
                             balance: current.attributes.balance,
                             native_balance: current.attributes.native_balance,
+                            balances: current.attributes.balances,
                         };
                         // get group info:
                         let groupId = current.attributes.object_group_id;

resources/assets/v2/src/pages/dashboard/accounts.js

@@ -196,6 +196,14 @@ export default () => ({
                     (new Get).show(accountId, new Date(window.store.get('end'))).then((response) => {
                         let parent = response.data.data;
 
+                        // apply function to each element of parent:
+                        parent.attributes.balances = parent.attributes.balances.map((balance) => {
+                            balance.amount_formatted = formatMoney(balance.amount, balance.currency_code);
+                            return balance;
+                        });
+                        // console.log(parent);
+
+
                         // get groups for account:
                         const params = {
                             page: 1,
@@ -243,8 +251,7 @@ export default () => ({
                                 name: parent.attributes.name,
                                 order: parent.attributes.order,
                                 id: parent.id,
-                                balance: parent.attributes.balance,
-                                //native_balance: parent.attributes.native_balance,
+                                balances: parent.attributes.balances,
                                 groups: groups,
                             });
                             // console.log(parent.attributes);

resources/assets/v2/src/pages/dashboard/boxes.js

@@ -76,7 +76,7 @@ export default () => ({
                     continue;
                 }
                 let key = current.key;
-                console.log('NOT NATIVE');
+                // console.log('NOT NATIVE');
                 if (key.startsWith('balance-in-')) {
                     this.balanceBox.amounts.push(formatMoney(current.monetary_value, current.currency_code));
                     continue;

resources/assets/v2/src/pages/dashboard/subscriptions.js

@@ -31,6 +31,99 @@ let afterPromises = false;
 let apiData = [];
 let subscriptionData = {};
 
+function addObjectGroupInfo(data) {
+    let objectGroupId = parseInt(data.object_group_id);
+    if (!subscriptionData.hasOwnProperty(objectGroupId)) {
+        subscriptionData[objectGroupId] = {
+            id: objectGroupId,
+            title: null === data.object_group_title ? i18next.t('firefly.default_group_title_name_plain') : data.object_group_title,
+            order: parseInt(data.object_group_order),
+            payment_info: {},
+            bills: [],
+        };
+    }
+}
+
+function parsePayDates(list) {
+    let newList = [];
+    for(let i in list) {
+        if (list.hasOwnProperty(i)) {
+            let current = list[i];
+            // convert to date object:
+            newList.push(new Date(current));
+        }
+    }
+    return newList;
+}
+
+function parseBillInfo(data) {
+    let result = {
+        id: data.id,
+        name: data.attributes.name,
+        amount_min: data.attributes.amount_min,
+        amount_max: data.attributes.amount_max,
+        amount: (parseFloat(data.attributes.amount_max) + parseFloat(data.attributes.amount_min)) / 2,
+        currency_code: data.attributes.currency_code,
+        // paid transactions:
+        transactions: [],
+        // unpaid moments
+        pay_dates: parsePayDates(data.attributes.pay_dates),
+        paid: data.attributes.paid_dates.length > 0,
+    };
+    // set variables
+    result.expected_amount = formatMoney(result.amount, result.currency_code);
+    result.expected_times = i18next.t('firefly.subscr_expected_x_times', {
+        times: data.attributes.pay_dates.length,
+        amount: result.expected_amount
+    });
+    // console.log(result);
+    return result;
+}
+
+function parsePaidTransactions(paid_dates, bill) {
+    if( !paid_dates || paid_dates.length < 1) {
+        return [];
+    }
+    let result = [];
+    // add transactions (simpler version)
+    for (let i in paid_dates) {
+        if (paid_dates.hasOwnProperty(i)) {
+            const currentPayment = paid_dates[i];
+            // console.log(currentPayment);
+            // math: -100+(paid/expected)*100
+            let percentage = Math.round(-100 + ((parseFloat(currentPayment.amount) ) / parseFloat(bill.amount)) * 100);
+            let currentTransaction = {
+                amount: formatMoney(currentPayment.amount, currentPayment.currency_code),
+                percentage: percentage,
+                date: format(new Date(currentPayment.date), 'PP'),
+                foreign_amount: null,
+            };
+            if (null !== currentPayment.foreign_currency_code) {
+                currentTransaction.foreign_amount =  currentPayment.foreign_amount;
+                currentTransaction.foreign_currency_code = currentPayment.foreign_currency_code;
+            }
+
+            result.push(currentTransaction);
+        }
+    }
+    return result;
+}
+
+function isInRange(bill) {
+    let start = new Date(window.store.get('start'));
+    let end = new Date(window.store.get('end'));
+    for(let i in bill.pay_dates) {
+        if (bill.pay_dates.hasOwnProperty(i)) {
+            let currentDate = bill.pay_dates[i];
+            //console.log(currentDate);
+            if (currentDate >= start && currentDate <= end) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 function downloadSubscriptions(params) {
     const getter = new Get();
     return getter.list(params)
@@ -41,83 +134,25 @@ function downloadSubscriptions(params) {
             for (let i in data) {
                 if (data.hasOwnProperty(i)) {
                     let current = data[i];
-                    //console.log(current);
                     if (current.attributes.active && current.attributes.pay_dates.length > 0) {
-                        let objectGroupId = null === current.attributes.object_group_id ? 0 : current.attributes.object_group_id;
-                        let objectGroupTitle = null === current.attributes.object_group_title ? i18next.t('firefly.default_group_title_name_plain') : current.attributes.object_group_title;
-                        let objectGroupOrder = null === current.attributes.object_group_order ? 0 : current.attributes.object_group_order;
-                        if (!subscriptionData.hasOwnProperty(objectGroupId)) {
-                            subscriptionData[objectGroupId] = {
-                                id: objectGroupId,
-                                title: objectGroupTitle,
-                                order: objectGroupOrder,
-                                payment_info: {},
-                                bills: [],
-                            };
+                        // create or update object group
+                        let objectGroupId = parseInt(current.attributes.object_group_id);
+                        addObjectGroupInfo(current.attributes);
+
+                        // create and update the bill.
+                        let bill = parseBillInfo(current);
+
+                        // if not yet paid, and pay_dates is not in current rage, ignore it.
+                        if (false === bill.paid && !isInRange(bill)) {
+                            console.warn('Bill "'+bill.name+'" is not paid and not in range, ignoring: ');
+                            continue;
                         }
-                        // TODO this conversion needs to be inside some kind of a parsing class.
-                        let bill = {
-                            id: current.id,
-                            name: current.attributes.name,
-                            // amount
-                            amount_min: current.attributes.amount_min,
-                            amount_max: current.attributes.amount_max,
-                            amount: (parseFloat(current.attributes.amount_max) + parseFloat(current.attributes.amount_min)) / 2,
-                            currency_code: current.attributes.currency_code,
 
-                            // native amount
-                            // native_amount_min: current.attributes.native_amount_min,
-                            // native_amount_max: current.attributes.native_amount_max,
-                            // native_amount: (parseFloat(current.attributes.native_amount_max) + parseFloat(current.attributes.native_amount_min)) / 2,
-                            // native_currency_code: current.attributes.native_currency_code,
 
-                            // paid transactions:
-                            transactions: [],
-
-                            // unpaid moments
-                            pay_dates: current.attributes.pay_dates,
-                            paid: current.attributes.paid_dates.length > 0,
-                        };
-                        // set variables
-                        bill.expected_amount = formatMoney(bill.amount, bill.currency_code);
-                        bill.expected_times = i18next.t('firefly.subscr_expected_x_times', {
-                            times: current.attributes.pay_dates.length,
-                            amount: bill.expected_amount
-                        });
-
-                        // add transactions (simpler version)
-                        for (let iii in current.attributes.paid_dates) {
-                            if (current.attributes.paid_dates.hasOwnProperty(iii)) {
-                                const currentPayment = current.attributes.paid_dates[iii];
-                                let percentage = 100;
-                                // math: -100+(paid/expected)*100
-                                if (params.convertToNative) {
-                                    percentage = Math.round(-100 + ((parseFloat(currentPayment.native_amount) * -1) / parseFloat(bill.native_amount)) * 100);
-                                }
-                                if (!params.convertToNative) {
-                                    percentage = Math.round(-100 + ((parseFloat(currentPayment.amount) * -1) / parseFloat(bill.amount)) * 100);
-                                }
-                                // TODO fix me
-                                currentPayment.currency_code = 'EUR';
-                                console.log('Currency code: "'+currentPayment+'"');
-                                console.log(currentPayment);
-                                let currentTransaction = {
-                                    amount: formatMoney(currentPayment.amount, currentPayment.currency_code),
-                                    percentage: percentage,
-                                    date: format(new Date(currentPayment.date), 'PP'),
-                                    foreign_amount: null,
-                                };
-                                if (null !== currentPayment.foreign_currency_code) {
-                                    currentTransaction.foreign_amount =  currentPayment.foreign_amount;
-                                    currentTransaction.foreign_currency_code = currentPayment.foreign_currency_code;
-                                }
-
-                                bill.transactions.push(currentTransaction);
-                            }
-                        }
+                        bill.transactions = parsePaidTransactions(current.attributes.paid_dates, bill);
 
                         subscriptionData[objectGroupId].bills.push(bill);
-                        if (0 === current.attributes.paid_dates.length) {
+                        if (false === bill.paid) {
                             // bill is unpaid, count the "pay_dates" and multiply with the "amount".
                             // since bill is unpaid, this can only be in currency amount and native currency amount.
                             const totalAmount = current.attributes.pay_dates.length * bill.amount;
@@ -133,6 +168,7 @@ function downloadSubscriptions(params) {
                                     //native_unpaid: 0,
                                 };
                             }
+
                             subscriptionData[objectGroupId].payment_info[bill.currency_code].unpaid += totalAmount;
                             //subscriptionData[objectGroupId].payment_info[bill.currency_code].native_unpaid += totalNativeAmount;
                         }

resources/lang/en_US/firefly.php

@@ -1866,8 +1866,8 @@ return [
     'skip_help_text'                                                            => 'Use the skip field to create bi-monthly (skip = 1) or other custom intervals.',
     'subscription'                                                              => 'Subscription',
     'not_expected_period'                                                       => 'Not expected this period',
-    'subscriptions_in_group'                                                    => 'Subscriptions in group "%{title}"',
-    'subscr_expected_x_times'                                                   => 'Expect to pay %{amount} %{times} times this period',
+    'subscriptions_in_group'                                                    => 'Subscriptions in group "{{title}}"',
+    'subscr_expected_x_times'                                                   => 'Expect to pay {{amount}} {{times}} times this period',
     'not_or_not_yet'                                                            => 'Not (yet)',
     'visit_bill'                                                                => 'Visit subscription ":name" at Firefly III',
     'match_between_amounts'                                                     => 'Subscription matches transactions between :low and :high.',

resources/views/v2/partials/dashboard/account-list.blade.php

@@ -13,13 +13,13 @@
                            x-text="account.name"></a>
 
                         <span class="small">
-                            <template x-for="balance in account.balance">
-                                <span>x</span>
+                            <template x-for="balance in account.balances">
+                                <template x-if="balance.type === 'current'">
+                                    <span class="text-muted">(<span x-text="balance.amount_formatted"></span>)
+                                        </span>
+                                </template>
                             </template>
-                            <template x-for="balance in account.native_balance">
-                                <span>Y</span>
-                            </template>
-                                            </span>
+                        </span>
                     </h3>
                 </div>
                 <div class="card-body p-0">