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

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

.ci/php-cs-fixer/.php-cs-fixer.php

@@ -29,7 +29,7 @@ $paths = [
     $current . '/../../database',
     $current . '/../../routes',
     $current . '/../../tests',
-    $current . '/../../resources/lang',
+    $current . '/../../resources/lang/en_US',
 ];
 
 $finder = PhpCsFixer\Finder::create()
@@ -61,6 +61,7 @@ return $config->setRules(
         'comment_to_phpdoc'             => false, // breaks phpstan lines in combination with PHPStorm.
         'type_declaration_spaces'       => false,
         'cast_spaces'                   => false,
+        'phpdoc_to_comment' => false, // do not overrule single line comment style, breaks phpstan.
 
         // complex rules
         'array_syntax'                  => ['syntax' => 'short'],

.ci/phpcs.sh

@@ -26,10 +26,9 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 cd $SCRIPT_DIR/php-cs-fixer
 composer update --quiet
 rm -f .php-cs-fixer.cache
-PHP_CS_FIXER_IGNORE_ENV=true
-./vendor/bin/php-cs-fixer fix \
+PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix \
     --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
-    --format=txt \
+    --format=txt -v \
     --allow-risky=yes
 
 EXIT_CODE=$?

.ci/phpstan.neon

@@ -1,59 +1,36 @@
 parameters:
-  universalObjectCratesClasses:
-    - Illuminate\Database\Eloquent\Model
-  # TODO: slowly remove these parameters and fix the issues found.
-  reportUnmatchedIgnoredErrors: false
-  checkGenericClassInNonGenericObjectType: false  # remove this rule when all other issues are solved.
-  ignoreErrors:
-  # TODO: slowly remove these exceptions and fix the issues found.
-    - '#Dynamic call to static method#' # all the Laravel ORM things depend on this.
-    - '#Control structures using switch should not be used.#' # switch is fine in some cases.
-    - '#with no value type specified in iterable type array#' # remove this rule when all other issues are solved.
-    - '#has no value type specified in iterable type array#' # remove this rule when all other issues are solved.
-    - '#is not allowed to extend#'
-    - '#switch is forbidden to use#'
-    - '#is neither abstract nor final#'
-    - '#on left side of \?\?\= always exists and is not nullable#'
-    - '#has a nullable return type declaration#' # perhaps throw errors instead?
-    - '#with a nullable type declaration#' # decide what action should be if param is null.
-    - '#with null as default value#'
-    -
-        message: '#Constructor in [a-zA-Z0-9\\_]+ has parameter \$[a-zA-Z0-9\\_]+ with default value#'
-        paths:
-            - ../app/Exceptions/IntervalException.php
-            - ../app/Support/Navigation.php
-    -
-        message: '#but containers should not be injected#'
-        paths:
-            - ../app/Support/Authentication/RemoteUserGuard.php
-    -
-        message: '#Function compact\(\) should not be used#' # too useful in template rendering.
-        paths:
-            - ../app/Generator/Report/Account/MonthReportGenerator.php
-            - ../app/Generator/Report/Audit/MonthReportGenerator.php
-            - ../app/Generator/Report/Budget/MonthReportGenerator.php
-            - ../app/Generator/Report/Category/MonthReportGenerator.php
-            - ../app/Generator/Report/Standard/MonthReportGenerator.php
-            - ../app/Generator/Report/Standard/MultiYearReportGenerator.php
-            - ../app/Generator/Report/Standard/YearReportGenerator.php
-            - ../app/Generator/Report/Tag/MonthReportGenerator.php
-            - ../app/Http/Controllers/Account/*.php
-            - ../app/Http/Controllers/Admin/*.php
-            - ../app/Http/Controllers/*.php
-            - ../app/Support/ExpandedForm.php
-            - ../app/Support/Form/AccountForm.php
-            - ../app/Support/Form/CurrencyForm.php
-            - ../app/Support/Form/FormSupport.php
-    -
-        message: '#Either catch a more specific exception#'
-        paths:
-            - ../app/Support/Form/FormSupport.php
+  scanFiles:
+    - ../_ide_helper
   paths:
     - ../app
     - ../database
     - ../routes
     - ../config
     - ../bootstrap/app.php
+  universalObjectCratesClasses:
+    - Illuminate\Database\Eloquent\Model
+  # TODO: slowly remove these parameters and fix the issues found.
+  reportUnmatchedIgnoredErrors: true
+  ignoreErrors:
+  # TODO: slowly remove these exceptions and fix the issues found.
+    - '#Dynamic call to static method#' # all the Laravel ORM things depend on this.
+    - identifier: varTag.nativeType
+    - identifier: varTag.type
+    -
+        identifier: larastan.noEnvCallsOutsideOfConfig
+        path: ../app/Console/Commands/System/CreatesDatabase.php
+    - identifier: missingType.iterableValue # not interesting enough to fix.
+    - identifier: missingType.generics # not interesting enough to fix.
+    - "#Parameter \\#[1-2] \\$num[1-2] of function bc[a-z]+ expects numeric-string, [a-z\\-|&]+ given#"
+    - '#expects view-string, string given#'
+    - '#expects view-string\|null, string given#'
+
+    # phpstan can't handle this so we ignore them.
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::before#'
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::after#'
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::withTrashed#'
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::accountTypeIn#'
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\BelongsTo::withTrashed#'
 
   # The level 8 is the highest level. original was 5
   # 7 is more than enough, higher just leaves NULL things.

.env.example

@@ -176,6 +176,7 @@ MAILGUN_ENDPOINT=api.mailgun.net
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
+MAILERSEND_API_KEY=
 
 # Firefly III can send you the following messages.
 SEND_ERROR_MESSAGE=true
@@ -188,7 +189,7 @@ SEND_REPORT_JOURNALS=true
 ENABLE_EXTERNAL_MAP=false
 
 #
-# Enable or disable exchange rate conversion. This function isn't used yet by Firefly III
+# Enable or disable exchange rate conversion.
 #
 ENABLE_EXCHANGE_RATES=false
 
@@ -312,12 +313,24 @@ PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
 
+#
+# Disable or enable the running balance column data
+# Please disable this. It's a very experimental feature.
+#
+USE_RUNNING_BALANCE=false
+
 #
 # The v2 layout is very experimental. If it breaks you get to keep both parts.
 # Be wary of data loss.
 #
 FIREFLY_III_LAYOUT=v1
 
+#
+# Which Query Parser implementation to use for the search rngine and rules
+# 'new' is experimental, 'legacy' is the classic one
+#
+QUERY_PARSER_IMPLEMENTATION=legacy
+
 #
 # Please make sure this URL matches the external URL of your Firefly III installation.
 # It is used to validate specific requests and to generate URLs in emails.

.github/dependabot.yml

@@ -4,6 +4,7 @@ updates:
   # Check for updates to GitHub Actions every week
   - package-ecosystem: "github-actions"
     directory: "/"
+    labels: []
     schedule:
       interval: "weekly"
 
@@ -11,6 +12,7 @@ updates:
   - package-ecosystem: "composer"
     directory: "/" # Location of package manifests
     target-branch: develop
+    labels: []
     versioning-strategy: increase
     schedule:
       interval: "weekly"
@@ -18,6 +20,7 @@ updates:
   # yarn / JS updates
   - package-ecosystem: "npm"
     directory: "/"
+    labels: []
     target-branch: develop
     versioning-strategy: increase
     schedule:

.github/label-actions.yml

@@ -1,15 +1,29 @@
 # Configuration for Label Actions - https://github.com/dessant/label-actions
 
 # The `feature` label is added to issues
-feature:
+fixed:
   issues:
     # Post a comment, `{issue-author}` is an optional placeholder
     comment: |
-      Hi there! 
+      Hi there!
 
       This is an automatic reply. `Share and enjoy`
 
-      This issue has been marked as a feature request. The requested (new) feature will become a part of Firefly III or the data importer in due course.
+      This issue has been marked as fixed. Thanks for reporting! A new version will be released in due time. Unfortunately, [I cannot give an estimate](https://docs.firefly-iii.org/references/faq/firefly-iii/general/#when-will-you-release-version-the-next-version), but [the roadmap](https://roadmap.firefly-iii.org/) is available for your reading pleasure.
+
+      There is no need to close the issue. It will be closed automatically.
+
+      Thank you for your contributions.
+feature:
+  issues:
+    # Post a comment, `{issue-author}` is an optional placeholder
+    unlabel: feature
+    comment: |
+      Hi there!
+
+      This is an automatic reply. `Share and enjoy`
+
+      This issue has been marked as a feature request.
 
       If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
 
@@ -19,27 +33,28 @@ epic:
   issues:
     # Post a comment, `{issue-author}` is an optional placeholder
     comment: |
-      Hi there! 
+      Hi there!
 
       This is an automatic reply. `Share and enjoy`
 
       This issue has been marked as an epic. In epics, large amounts of works are collected that will be part of a major new feature. If you have more ideas that could be a part of this epic, feel free to reply.
 
-      *However*, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. 
+      *However*, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted.
 
       If you are merely interested in this epic's progress, you can subscribe to this issue to get updates.
 
       Thank you for your contributions.
 
 enhancement:
+  unlabel: enhancement
   issues:
     # Post a comment, `{issue-author}` is an optional placeholder
     comment: |
-      Hi there! 
+      Hi there!
 
       This is an automatic reply. `Share and enjoy`
 
-      This issue has been marked as an enhancement. The requested enhancement to an existing feature will become a part of Firefly III or the data importer in due course.
+      This issue has been marked as an enhancement.
 
       If you come across this issue, please be aware there is NO need to reply with "+1" or "me too" or "I need this too" or whatever. Such comments are not helpful, and do not influence [the roadmap](https://roadmap.firefly-iii.org/). Your comment may be :skull: deleted. You can subscribe to this issue to get updates.
 
@@ -49,7 +64,7 @@ triage:
   issues:
     # Post a comment, `{issue-author}` is an optional placeholder
     comment: |
-      Hi there! 
+      Hi there!
 
       This is an automatic reply. `Share and enjoy`
 
@@ -60,7 +75,7 @@ triage:
 needs-moar-debug:
   issues:
     comment: |
-      Hi there! 
+      Hi there!
 
       This is an automatic reply. `Share and enjoy`
 
@@ -78,7 +93,7 @@ needs-moar-debug:
 needs-moar-logs:
   issues:
     comment: |
-      Hi there! 
+      Hi there!
 
       This is an automatic reply. `Share and enjoy`
 
@@ -94,7 +109,7 @@ needs-moar-logs:
 v2-layout-issue:
   issues:
     comment: |
-      Hi there! 
+      Hi there!
 
       This is an automatic reply. `Share and enjoy`
 

.github/mergify.yml

@@ -8,56 +8,3 @@ pull_request_rules:
       close:
         message: Please do not open PR's on the `main` branch, but on the `develop`
           branch only. Thank you!
-  - name: No translations
-    conditions:
-      - -author~=^dependabot(|-preview)\[bot\]$
-      - base=develop
-      - or:
-          - files~=^resources/lang/bg_BG
-          - files~=^resources/lang/ca_ES
-          - files~=^resources/lang/cs_CZ
-          - files~=^resources/lang/da_DK
-          - files~=^resources/lang/de_DE
-          - files~=^resources/lang/el_GR
-          - files~=^resources/lang/en_GB
-          - files~=^resources/lang/es_ES
-          - files~=^resources/lang/et_EE
-          - files~=^resources/lang/fa_IR
-          - files~=^resources/lang/fi_FI
-          - files~=^resources/lang/fr_FR
-          - files~=^resources/lang/he_IL
-          - files~=^resources/lang/hu_HU
-          - files~=^resources/lang/id_ID
-          - files~=^resources/lang/is_IS
-          - files~=^resources/lang/it_IT
-          - files~=^resources/lang/ja_JP
-          - files~=^resources/lang/ko_KR
-          - files~=^resources/lang/lt_LT
-          - files~=^resources/lang/nb_NO
-          - files~=^resources/lang/nl_NL
-          - files~=^resources/lang/pl_PL
-          - files~=^resources/lang/pt_BR
-          - files~=^resources/lang/pt_PT
-          - files~=^resources/lang/ro_RO
-          - files~=^resources/lang/ru_RU
-          - files~=^resources/lang/si_LK
-          - files~=^resources/lang/sk_SK
-          - files~=^resources/lang/sl_SI
-          - files~=^resources/lang/sr_CS
-          - files~=^resources/lang/sv_SE
-          - files~=^resources/lang/th_TH
-          - files~=^resources/lang/tlh_AA
-          - files~=^resources/lang/tr_TR
-          - files~=^resources/lang/uk_UA
-          - files~=^resources/lang/vi_VN
-          - files~=^resources/lang/zh_CN
-          - files~=^resources/lang/zh_TW
-    actions:
-      comment:
-        message: >
-          Please do not submit translated strings in your PR. If you need new
-          sentences to be translated, add them to the `en_US` language strings.
-          New or changed translations for other languages can be submitted at
-          https://crowdin.com/project/firefly-iii
-
-          Thank you!

.github/pull_request_template.md

@@ -6,6 +6,7 @@ Thank you for submitting new code to Firefly III, or any of the related projects
 - Please do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I simply don't have time for that.
 - Pull requests for the MAIN branch will be closed.
 - DO NOT include translated strings in your PR.
+- PRs (or parts thereof) that only fix issues inside code comments will not be accepted.
 
 If it feels necessary to open an issue first, please do so, before you open a PR.
 

.github/workflows/close-duplicates.yml

@@ -13,7 +13,7 @@ jobs:
   close_duplicates:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/command@v1.2.0
+      - uses: github/command@v1.3.0
         id: command
         with:
           allowed_contexts: "issue"

.github/workflows/closed-issues.yml

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

.github/workflows/release.yml

@@ -4,11 +4,15 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Release "v1.2.3" or "develop"'
+        description: 'Release "v1.2.3" or "develop" or "branch-abc"'
         required: true
         default: 'develop'
+      phpversion:
+        description: 'PHP version'
+        required: true
+        default: '8.4'
   schedule:
-    - cron: '0 3 * * MON,THU'
+    - cron: '0 3 * * MON'
 
 jobs:
   build:
@@ -23,6 +27,11 @@ jobs:
           if [[ "develop" == "$version" ]]; then
             git checkout --track origin/develop
             git pull
+          elif [[ "$version" == branch* ]]; then
+            PULLBRANCH=${version:7}
+            echo "The branch is '$PULLBRANCH' ($version)"
+            git checkout --track origin/$PULLBRANCH
+            git pull
           else
             git config user.name github-actions
             git config user.email 41898282+github-actions[bot]@users.noreply.github.com
@@ -36,10 +45,10 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: ${{ github.event.inputs.phpversion }}
           extensions: mbstring, intl, zip, bcmath
       - name: crowdin action
-        uses: crowdin/github-action@v1
+        uses: crowdin/github-action@v2
         with:
           upload_sources: true
           download_translations: true
@@ -49,15 +58,6 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
           CROWDIN_PROJECT_NR: ${{ secrets.CROWDIN_PROJECT_NR }}
           CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
-      - name: Cleanup translations
-        id: cleanup-transactions
-        uses: JC5/firefly-iii-dev@main
-        with:
-          action: 'ff3:crowdin-warning'
-          output: ''
-        env:
-          FIREFLY_III_ROOT: /github/workspace
-          GH_TOKEN: ''
       - name: Cleanup changelog
         id: cleanup-changelog
         uses: JC5/firefly-iii-dev@main
@@ -125,15 +125,15 @@ jobs:
       - name: Build JS
         run: |
           npm install
-          npm update
           npm run prod  --workspace=v1
           npm run build --workspace=v2
+          npm update
       - name: Run CI
         run: |
           rm -rf vendor composer.lock
           composer update --no-dev --no-scripts --no-plugins -q
           sudo chown -R runner:docker resources/lang
-          .ci/phpcs.sh
+          .ci/phpcs.sh || true
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@v6
         with:
@@ -159,13 +159,23 @@ jobs:
 
           # if this is a develop build, slightly different variable names.
           if [[ "develop" == "$version" ]]; then
-            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            #[[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
             releaseName=$version-$(date +'%Y%m%d')
             originalName=$releaseName
             zipName=FireflyIII-develop.zip
             tarName=FireflyIII-develop.tar.gz
           fi
 
+          # if this is a branch build, also slightly different variable names.
+          if [[ "$version" == branch* ]]; then
+            #[[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            # branch builds overrule develop
+            releaseName=$version-$(date +'%Y%m%d')
+            originalName=$releaseName
+            zipName=FireflyIII-$version.zip
+            tarName=FireflyIII-$version.tar.gz
+          fi
+
           # in both cases, if the release or tag already exists, add ".1" until it no longer exists.
           tagFound=true
           tagCount=1
@@ -207,12 +217,13 @@ jobs:
           gpg --armor --detach-sign $zipName
           gpg --armor --detach-sign $tarName
 
-          # create a development (nightly) release:
+          # describe the development release.
           if [[ "develop" == "$version" ]]; then
             echo 'Develop release.'
-            # add text to output.txt (instructions)
-            rm output.txt
-            echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
+            rm -f output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
             echo "" >> output.txt
             echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
             echo "" >> output.txt
@@ -220,15 +231,100 @@ jobs:
             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
             echo "" >> output.txt
             echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe a branch release
+          if [[ "$version" == branch* ]]; then
+            echo 'Branch release.'
+            rm -f output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Irregular BRANCH release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
+            echo "" >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "" >> output.txt
+            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "" >> output.txt
+            echo ":warning: Please be careful with this branch pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe the main release
+          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]] && [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then
+            echo 'Main release.'
+            sudo chown -R runner:docker output.txt
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
 
+          fi
+
+          # describe alpha release
+          if [[ "$version" == *alpha* ]]; then
+            echo 'ALPHA release.'
+            rm -f output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Very early ALPHA release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
+            echo '' >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+
+          fi
+
+          # describe beta release
+          if [[ "$version" == *beta* ]]; then
+            echo 'BETA release.'
+            rm -f output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Very early BETA release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
+            echo '' >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+
+          fi
+
+          # create a development release:
+          if [[ "develop" == "$version" ]]; then
             # create the release:
-            echo "Create nightly release."
-            git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
+            echo "Create develop release."
+            git tag -a $releaseName -m "Development release '$version' on $(date +'%Y-%m-%d')"
+
             git push origin $releaseName
             gh release create $releaseName -p --verify-tag \
               -t "Development release for $(date +'%Y-%m-%d')" \
+              --latest=false \
               -F output.txt
+          fi
 
+          # create a branch release:
+          if [[ "$version" == branch* ]]; then
+
+            # create the release:
+            echo "Create branch release."
+            git tag -a $releaseName -m "Branch release '$version' on $(date +'%Y-%m-%d')"
+
+            git push origin $releaseName
+            gh release create $releaseName -p --verify-tag \
+              -t "Branch release for $(date +'%Y-%m-%d')" \
+              --latest=false \
+              -F output.txt
+          fi
+
+          # create a development (nightly) release:
+          if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then
             # add zip file to release.
             gh release upload $releaseName $zipName
             gh release upload $releaseName $tarName
@@ -247,19 +343,20 @@ jobs:
             gh release upload $releaseName HEAD.txt
           else
             echo 'MAIN (real) release'
-            sudo chown -R runner:docker output.txt
-            # add text to output.txt (more instructions)
-            echo '' >> output.txt
-            echo '### Instructions' >> output.txt
-            echo '' >> output.txt
-            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
-            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
-            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
-
-            echo "Create default release."
             git tag -a $releaseName -m "Here be changelog"
             git push origin $releaseName
-            gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
+
+            # do not tag as latest when alpha or beta.
+            if [[ "$version" == *alpha* ]] || [[ "$version" == *beta* ]]; then
+              echo 'Mark alpha or beta as NOT the latest.'
+              gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag --latest=false
+            fi
+
+            # tag as latest when NOT alpha or beta.
+            if [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then
+              echo 'Mark prod as the latest.'
+              gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
+            fi
 
             # add archive files to release
             gh release upload $releaseName $zipName
@@ -279,12 +376,12 @@ jobs:
             gh release upload $releaseName HEAD.txt
 
             # remove all temporary files
-            rm output.txt
-            rm HEAD.txt
-            rm $zipName
-            rm $zipName.sha256
-            rm $tarName
-            rm $tarName.sha256
+            rm -f output.txt
+            rm -f HEAD.txt
+            rm -f $zipName
+            rm -f $zipName.sha256
+            rm -f $tarName
+            rm -f $tarName.sha256
 
             # merge main back into develop
             git checkout develop

.github/workflows/sonarcloud.yml

@@ -8,7 +8,7 @@ on:
       - develop
 env:
   DB_CONNECTION: sqlite
-  APP_KEY: UfpBqqeXx7zpNodsC6yjYQcRfDdm4Bxh
+  APP_KEY: TestTestTestTestTestTestTestTest
 jobs:
   sonarcloud:
     name: SonarCloud
@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP with Xdebug
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: xdebug
           extensions: >-
             bcmath
@@ -46,7 +46,9 @@ jobs:
         run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
 
       - name: "Create database file"
-        run: touch storage/database/database.sqlite
+        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

.github/workflows/stale.yml

@@ -12,6 +12,7 @@ jobs:
     permissions:
       issues: write  # for actions/stale to close stale issues
       pull-requests: write  # for actions/stale to close stale PRs
+      actions: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/stale@v9
@@ -35,4 +36,5 @@ jobs:
             Thank you for your contributions.
           days-before-stale: 14
           days-before-close: 7
-          exempt-issue-labels: 'enhancement,feature,bug,announcement,epic,triage'
+          exempt-all-milestones: true
+          exempt-issue-labels: 'triage'

.gitignore

@@ -14,7 +14,16 @@ public/build
 # ignore v1 build files
 resources/assets/v1/node_modules
 resources/assets/v1/build
+public/v1/js/app.js*
+public/v1/js/app_vue.js*
+public/v1/js/create*
+public/v1/js/edit*
+public/v1/js/profile*
+public/v1/js/administrations
+public/v1/js/exchange-rates
+public/v1/js/webhooks
 
 # ignore v2 build files
 resources/assets/v2/node_modules
 resources/assets/v2/build
+public/v2/i18n

THANKS.md

@@ -3,7 +3,18 @@
 Over time, many people have contributed to Firefly III. Their efforts are not always visible, but always remembered and appreciated.
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
 
+## 2025
+- SoftBrix
+
 ## 2024
+- Sobuno
+- TasneemTantawy
+- Antônio Franco
+- yparitcher
+- Jhon Pedroza
+- mzhubail
+- tasnim
+- withbest
 - Steve Wasiura
 - imlonghao
 - Rahman Yusuf

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -25,13 +26,15 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class AccountController
@@ -39,6 +42,8 @@ use Illuminate\Http\JsonResponse;
 class AccountController extends Controller
 {
     use AccountFilter;
+    // this array only exists to test if the constructor will use it properly.
+    protected array $accepts = ['application/json', 'application/vnd.api+json'];
 
     /** @var array<int, string> */
     private array                      $balanceTypes;
@@ -60,7 +65,7 @@ class AccountController extends Controller
                 return $next($request);
             }
         );
-        $this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
+        $this->balanceTypes = [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
     }
 
     /**
@@ -72,40 +77,50 @@ class AccountController extends Controller
      */
     public function accounts(AutocompleteRequest $request): JsonResponse
     {
-        $data            = $request->getData();
-        $types           = $data['types'];
-        $query           = $data['query'];
-        $date            = $data['date'] ?? today(config('app.timezone'));
-        $return          = [];
-        $result          = $this->repository->searchAccount((string)$query, $types, $this->parameters->get('limit'));
+        $data   = $request->getData();
+        $types  = $data['types'];
+        $query  = $data['query'];
+        $date   = $data['date'] ?? today(config('app.timezone'));
+        $return = [];
+        $result = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));
 
-        // TODO this code is duplicated in the V2 Autocomplete controller, which means this code is due to be deprecated.
-        $defaultCurrency = app('amount')->getDefaultCurrency();
+        // set date to subday + end-of-day for account balance. so it is at $date 23:59:59
+        $date->subDay()->endOfDay();
 
         /** @var Account $account */
         foreach ($result as $account) {
             $nameWithBalance = $account->name;
-            $currency        = $this->repository->getAccountCurrency($account) ?? $defaultCurrency;
-
+            $currency        = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency;
+            $useCurrency     = $currency;
             if (in_array($account->accountType->type, $this->balanceTypes, true)) {
-                $balance         = app('steam')->balance($account, $date);
+                // this one is correct.
+                Log::debug(sprintf('accounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
+                $balance         = Steam::finalAccountBalance($account, $date);
+                $key             = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? 'native_balance' : 'balance';
+                $useCurrency     = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? $this->nativeCurrency : $currency;
+                $amount          = $balance[$key] ?? '0';
                 $nameWithBalance = sprintf(
                     '%s (%s)',
                     $account->name,
-                    app('amount')->formatAnything($currency, $balance, false)
+                    app('amount')->formatAnything($useCurrency, $amount, false)
                 );
             }
 
             $return[]        = [
-                'id'                      => (string)$account->id,
-                'name'                    => $account->name,
-                'name_with_balance'       => $nameWithBalance,
-                'type'                    => $account->accountType->type,
-                'currency_id'             => (string)$currency->id,
-                'currency_name'           => $currency->name,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
+                'id'                              => (string) $account->id,
+                'name'                            => $account->name,
+                'name_with_balance'               => $nameWithBalance,
+                'type'                            => $account->accountType->type,
+                'currency_id'                     => (string) $useCurrency->id,
+                'currency_name'                   => $useCurrency->name,
+                'currency_code'                   => $useCurrency->code,
+                'currency_symbol'                 => $useCurrency->symbol,
+                'currency_decimal_places'         => $useCurrency->decimal_places,
+                'account_currency_id'             => (string) $currency->id,
+                'account_currency_name'           => $currency->name,
+                'account_currency_code'           => $currency->code,
+                'account_currency_symbol'         => $currency->symbol,
+                'account_currency_decimal_places' => $currency->decimal_places,
             ];
         }
 
@@ -113,14 +128,14 @@ class AccountController extends Controller
         usort(
             $return,
             static function (array $left, array $right) {
-                $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
-                $posA  = (int)array_search($left['type'], $order, true);
-                $posB  = (int)array_search($right['type'], $order, true);
+                $order = [AccountTypeEnum::ASSET->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::EXPENSE->value];
+                $posA  = (int) array_search($left['type'], $order, true);
+                $posB  = (int) array_search($right['type'], $order, true);
 
                 return $posA - $posB;
             }
         );
 
-        return response()->json($return);
+        return response()->api($return);
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * BillController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -66,13 +67,13 @@ class BillController extends Controller
         $filtered = $result->map(
             static function (Bill $item) {
                 return [
-                    'id'     => (string)$item->id,
+                    'id'     => (string) $item->id,
                     'name'   => $item->name,
                     'active' => $item->active,
                 ];
             }
         );
 
-        return response()->json($filtered->toArray());
+        return response()->api($filtered->toArray());
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * BudgetController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -66,12 +67,12 @@ class BudgetController extends Controller
         $filtered = $result->map(
             static function (Budget $item) {
                 return [
-                    'id'   => (string)$item->id,
+                    'id'   => (string) $item->id,
                     'name' => $item->name,
                 ];
             }
         );
 
-        return response()->json($filtered);
+        return response()->api($filtered->toArray());
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CategoryController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -66,12 +67,12 @@ class CategoryController extends Controller
         $filtered = $result->map(
             static function (Category $item) {
                 return [
-                    'id'   => (string)$item->id,
+                    'id'   => (string) $item->id,
                     'name' => $item->name,
                 ];
             }
         );
 
-        return response()->json($filtered);
+        return response()->api($filtered->toArray());
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CurrencyController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -68,7 +69,7 @@ class CurrencyController extends Controller
         /** @var TransactionCurrency $currency */
         foreach ($collection as $currency) {
             $result[] = [
-                'id'             => (string)$currency->id,
+                'id'             => (string) $currency->id,
                 'name'           => $currency->name,
                 'code'           => $currency->code,
                 'symbol'         => $currency->symbol,
@@ -76,7 +77,7 @@ class CurrencyController extends Controller
             ];
         }
 
-        return response()->json($result);
+        return response()->api($result);
     }
 
     /**
@@ -94,7 +95,7 @@ class CurrencyController extends Controller
         /** @var TransactionCurrency $currency */
         foreach ($collection as $currency) {
             $result[] = [
-                'id'             => (string)$currency->id,
+                'id'             => (string) $currency->id,
                 'name'           => sprintf('%s (%s)', $currency->name, $currency->code),
                 'code'           => $currency->code,
                 'symbol'         => $currency->symbol,
@@ -102,6 +103,6 @@ class CurrencyController extends Controller
             ];
         }
 
-        return response()->json($result);
+        return response()->api($result);
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ObjectGroupController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -68,12 +69,12 @@ class ObjectGroupController extends Controller
         /** @var ObjectGroup $objectGroup */
         foreach ($result as $objectGroup) {
             $return[] = [
-                'id'    => (string)$objectGroup->id,
+                'id'    => (string) $objectGroup->id,
                 'name'  => $objectGroup->title,
                 'title' => $objectGroup->title,
             ];
         }
 
-        return response()->json($return);
+        return response()->api($return);
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * PiggyBankController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -65,29 +66,28 @@ class PiggyBankController extends Controller
      */
     public function piggyBanks(AutocompleteRequest $request): JsonResponse
     {
-        $data            = $request->getData();
-        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
-        $defaultCurrency = app('amount')->getDefaultCurrency();
-        $response        = [];
+        $data     = $request->getData();
+        $piggies  = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
+        $response = [];
 
         /** @var PiggyBank $piggy */
         foreach ($piggies as $piggy) {
-            $currency    = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $currency    = $piggy->transactionCurrency;
             $objectGroup = $piggy->objectGroups()->first();
             $response[]  = [
-                'id'                      => (string)$piggy->id,
+                'id'                      => (string) $piggy->id,
                 'name'                    => $piggy->name,
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
-                'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id,
+                'object_group_id'         => null === $objectGroup ? null : (string) $objectGroup->id,
                 'object_group_title'      => $objectGroup?->title,
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 
     /**
@@ -96,35 +96,34 @@ class PiggyBankController extends Controller
      */
     public function piggyBanksWithBalance(AutocompleteRequest $request): JsonResponse
     {
-        $data            = $request->getData();
-        $piggies         = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
-        $defaultCurrency = app('amount')->getDefaultCurrency();
-        $response        = [];
+        $data     = $request->getData();
+        $piggies  = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
+        $response = [];
 
         /** @var PiggyBank $piggy */
         foreach ($piggies as $piggy) {
-            $currency      = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
-            $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
+            $currency      = $piggy->transactionCurrency;
+            $currentAmount = $this->piggyRepository->getCurrentAmount($piggy);
             $objectGroup   = $piggy->objectGroups()->first();
             $response[]    = [
-                'id'                      => (string)$piggy->id,
+                'id'                      => (string) $piggy->id,
                 'name'                    => $piggy->name,
                 'name_with_balance'       => sprintf(
                     '%s (%s / %s)',
                     $piggy->name,
                     app('amount')->formatAnything($currency, $currentAmount, false),
-                    app('amount')->formatAnything($currency, $piggy->targetamount, false),
+                    app('amount')->formatAnything($currency, $piggy->target_amount, false),
                 ),
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
-                'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id,
+                'object_group_id'         => null === $objectGroup ? null : (string) $objectGroup->id,
                 'object_group_title'      => $objectGroup?->title,
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * RecurrenceController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -66,12 +67,12 @@ class RecurrenceController extends Controller
         /** @var Recurrence $recurrence */
         foreach ($recurrences as $recurrence) {
             $response[] = [
-                'id'          => (string)$recurrence->id,
+                'id'          => (string) $recurrence->id,
                 'name'        => $recurrence->title,
                 'description' => $recurrence->description,
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * RuleController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -65,12 +66,12 @@ class RuleController extends Controller
         /** @var Rule $rule */
         foreach ($rules as $rule) {
             $response[] = [
-                'id'          => (string)$rule->id,
+                'id'          => (string) $rule->id,
                 'name'        => $rule->title,
                 'description' => $rule->description,
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * RuleGroupController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -65,12 +66,12 @@ class RuleGroupController extends Controller
         /** @var RuleGroup $group */
         foreach ($groups as $group) {
             $response[] = [
-                'id'          => (string)$group->id,
+                'id'          => (string) $group->id,
                 'name'        => $group->title,
                 'description' => $group->description,
             ];
         }
 
-        return response()->json($response);
+        return response()->api($response);
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * TagController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -68,12 +69,12 @@ class TagController extends Controller
         /** @var Tag $tag */
         foreach ($result as $tag) {
             $array[] = [
-                'id'   => (string)$tag->id,
+                'id'   => (string) $tag->id,
                 'name' => $tag->tag,
                 'tag'  => $tag->tag,
             ];
         }
 
-        return response()->json($array);
+        return response()->api($array);
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * TransactionController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -25,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
@@ -40,6 +42,8 @@ class TransactionController extends Controller
     private TransactionGroupRepositoryInterface $groupRepository;
     private JournalRepositoryInterface          $repository;
 
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+
     /**
      * TransactionController constructor.
      */
@@ -50,10 +54,12 @@ class TransactionController extends Controller
             function ($request, $next) {
                 /** @var User $user */
                 $user                  = auth()->user();
+                $userGroup             = $this->validateUserGroup($request);
                 $this->repository      = app(JournalRepositoryInterface::class);
                 $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
                 $this->repository->setUser($user);
                 $this->groupRepository->setUser($user);
+                $this->groupRepository->setUserGroup($userGroup);
 
                 return $next($request);
             }
@@ -76,14 +82,14 @@ class TransactionController extends Controller
         /** @var TransactionJournal $journal */
         foreach ($filtered as $journal) {
             $array[] = [
-                'id'                   => (string)$journal->id,
-                'transaction_group_id' => (string)$journal->transaction_group_id,
+                'id'                   => (string) $journal->id,
+                'transaction_group_id' => (string) $journal->transaction_group_id,
                 'name'                 => $journal->description,
                 'description'          => $journal->description,
             ];
         }
 
-        return response()->json($array);
+        return response()->api($array);
     }
 
     /**
@@ -96,7 +102,7 @@ class TransactionController extends Controller
         $result = new Collection();
         if (is_numeric($data['query'])) {
             // search for group, not journal.
-            $firstResult = $this->groupRepository->find((int)$data['query']);
+            $firstResult = $this->groupRepository->find((int) $data['query']);
             if (null !== $firstResult) {
                 // group may contain multiple journals, each a result:
                 foreach ($firstResult->transactionJournals as $journal) {
@@ -114,13 +120,13 @@ class TransactionController extends Controller
         /** @var TransactionJournal $journal */
         foreach ($result as $journal) {
             $array[] = [
-                'id'                   => (string)$journal->id,
-                'transaction_group_id' => (string)$journal->transaction_group_id,
+                'id'                   => (string) $journal->id,
+                'transaction_group_id' => (string) $journal->transaction_group_id,
                 'name'                 => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
                 'description'          => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
             ];
         }
 
-        return response()->json($array);
+        return response()->api($array);
     }
 }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * TransactionTypeController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -65,12 +66,12 @@ class TransactionTypeController extends Controller
         foreach ($types as $type) {
             // different key for consistency.
             $array[] = [
-                'id'   => (string)$type->id,
+                'id'   => (string) $type->id,
                 'name' => $type->type,
                 'type' => $type->type,
             ];
         }
 
-        return response()->json($array);
+        return response()->api($array);
     }
 }

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

@@ -27,11 +27,12 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DateRequest;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\ApiSupport;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -80,12 +81,15 @@ class AccountController extends Controller
         /** @var Carbon $end */
         $end        = $dates['end'];
 
+        // set dates to end of day + start of day:
+        $start->startOfDay();
+        $end->endOfDay();
+
         // user's preferences
-        $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray();
+        $defaultSet = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray();
 
         /** @var Preference $frontpage */
         $frontpage  = app('preferences')->get('frontpageAccounts', $defaultSet);
-        $default    = app('amount')->getDefaultCurrency();
 
         if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) {
             $frontpage->data = $defaultSet;
@@ -98,13 +102,11 @@ class AccountController extends Controller
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            $currency     = $this->repository->getAccountCurrency($account);
-            if (null === $currency) {
-                $currency = $default;
-            }
+            $currency     = $this->repository->getAccountCurrency($account) ?? $this->nativeCurrency;
+            $field        = $this->convertToNative && $currency->id !== $this->nativeCurrency->id ? 'native_balance' : 'balance';
             $currentSet   = [
                 'label'                   => $account->name,
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
@@ -116,13 +118,12 @@ 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')->balanceInRange($account, $start, clone $end);
-            // 2022-10-11 this method no longer converts to float.
-            $previous     = array_values($range)[0];
+            $range        = Steam::finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
+            $previous     = array_values($range)[0][$field];
             while ($currentStart <= $end) {
                 $format                        = $currentStart->format('Y-m-d');
                 $label                         = $currentStart->toAtomString();
-                $balance                       = array_key_exists($format, $range) ? $range[$format] : $previous;
+                $balance                       = array_key_exists($format, $range) ? $range[$format][$field] : $previous;
                 $previous                      = $balance;
                 $currentStart->addDay();
                 $currentSet['entries'][$label] = $balance;

app/Api/V1/Controllers/Controller.php

@@ -25,15 +25,26 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use Carbon\Carbon;
-use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
+use FireflyIII\Exceptions\BadHttpHeaderException;
 use FireflyIII\Models\Preference;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Facades\Steam;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\AbstractTransformer;
 use FireflyIII\User;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Collection;
 use League\Fractal\Manager;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\ParameterBag;
@@ -41,20 +52,25 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 /**
  * Class Controller.
  *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
+ * @SuppressWarnings("PHPMD.NumberOfChildren")
  */
 abstract class Controller extends BaseController
 {
     use AuthorizesRequests;
     use DispatchesJobs;
     use ValidatesRequests;
+    use ValidatesUserGroupTrait;
 
-    protected const string CONTENT_TYPE = 'application/vnd.api+json';
+    protected const string CONTENT_TYPE      = 'application/vnd.api+json';
+    protected const string JSON_CONTENT_TYPE = 'application/json';
 
     /** @var array<int, string> */
     protected array        $allowedSort;
     protected ParameterBag $parameters;
+    protected bool        $convertToNative   = false;
+    protected array $accepts                 = ['application/json', 'application/vnd.api+json'];
+    protected TransactionCurrency $nativeCurrency;
 
     /**
      * Controller constructor.
@@ -67,10 +83,19 @@ abstract class Controller extends BaseController
             function ($request, $next) {
                 $this->parameters = $this->getParameters();
                 if (auth()->check()) {
-                    $language = app('steam')->getLanguage();
+                    $language              = Steam::getLanguage();
+                    $this->convertToNative = Amount::convertToNative();
+                    $this->nativeCurrency  = Amount::getNativeCurrency();
                     app()->setLocale($language);
                 }
 
+
+                // filter down what this endpoint accepts.
+                if (!$request->accepts($this->accepts)) {
+                    throw new BadHttpHeaderException(sprintf('Sorry, Accept header "%s" is not something this endpoint can provide.', $request->header('Accept')));
+                }
+
+
                 return $next($request);
             }
         );
@@ -82,7 +107,7 @@ abstract class Controller extends BaseController
     private function getParameters(): ParameterBag
     {
         $bag      = new ParameterBag();
-        $page     = (int)request()->get('page');
+        $page     = (int) request()->get('page');
         if ($page < 1) {
             $page = 1;
         }
@@ -107,13 +132,13 @@ abstract class Controller extends BaseController
             $obj  = null;
             if (null !== $date) {
                 try {
-                    $obj = Carbon::parse((string)$date);
-                } catch (InvalidDateException|InvalidFormatException $e) {
+                    $obj = Carbon::parse((string) $date);
+                } catch (InvalidFormatException $e) {
                     // don't care
                     app('log')->warning(
                         sprintf(
                             'Ignored invalid date "%s" in API controller parameter check: %s',
-                            substr((string)$date, 0, 20),
+                            substr((string) $date, 0, 20),
                             $e->getMessage()
                         )
                     );
@@ -134,7 +159,15 @@ abstract class Controller extends BaseController
                 $value = null;
             }
             if (null !== $value) {
-                $bag->set($integer, (int)$value);
+                $value = (int) $value;
+                if ($value < 1) {
+                    $value = 1;
+                }
+                if ($value > 2 ** 16) {
+                    $value = 2 ** 16;
+                }
+
+                $bag->set($integer, $value);
             }
             if (null === $value
                 && 'limit' === $integer // @phpstan-ignore-line
@@ -144,7 +177,7 @@ abstract class Controller extends BaseController
                 $user     = auth()->user();
 
                 /** @var Preference $pageSize */
-                $pageSize = (int)app('preferences')->getForUser($user, 'listPageSize', 50)->data;
+                $pageSize = (int) app('preferences')->getForUser($user, 'listPageSize', 50)->data;
                 $bag->set($integer, $pageSize);
             }
         }
@@ -158,7 +191,7 @@ abstract class Controller extends BaseController
         $sortParameters = [];
 
         try {
-            $param = (string)request()->query->get('sort');
+            $param = (string) request()->query->get('sort');
         } catch (BadRequestException $e) {
             app('log')->error('Request field "sort" contains a non-scalar value. Value set to NULL.');
             app('log')->error($e->getMessage());
@@ -216,4 +249,45 @@ abstract class Controller extends BaseController
 
         return $manager;
     }
+
+    final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array
+    {
+        $manager  = new Manager();
+        $baseUrl  = sprintf('%s/api/v1/', request()->getSchemeAndHttpHost());
+
+        // TODO add stuff to path?
+
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $objects  = $paginator->getCollection();
+
+        // the transformer, at this point, needs to collect information that ALL items in the collection
+        // require, like meta-data and stuff like that, and save it for later.
+        $objects  = $transformer->collectMetaData($objects);
+        $paginator->setCollection($objects);
+
+        $resource = new FractalCollection($objects, $transformer, $key);
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return $manager->createData($resource)->toArray();
+    }
+
+    /**
+     * Returns a JSON API object and returns it.
+     *
+     * @param array<int, mixed>|Model $object
+     */
+    final protected function jsonApiObject(string $key, array|Model $object, AbstractTransformer $transformer): array
+    {
+        // create some objects:
+        $manager  = new Manager();
+        $baseUrl  = sprintf('%s/api/v1', request()->getSchemeAndHttpHost());
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $transformer->collectMetaData(new Collection([$object]));
+
+        $resource = new Item($object, $transformer, $key);
+
+        return $manager->createData($resource)->toArray();
+    }
 }

app/Api/V1/Controllers/Data/Bulk/TransactionController.php

@@ -70,8 +70,8 @@ class TransactionController extends Controller
         // to respond to what is in the $query.
         // this is OK because only one thing can be in the query at the moment.
         if ($this->isUpdateTransactionAccount($params)) {
-            $original    = $this->repository->find((int)$params['where']['account_id']);
-            $destination = $this->repository->find((int)$params['update']['account_id']);
+            $original    = $this->repository->find((int) $params['where']['account_id']);
+            $destination = $this->repository->find((int) $params['update']['account_id']);
 
             /** @var AccountDestroyService $service */
             $service     = app(AccountDestroyService::class);

app/Api/V1/Controllers/Data/DestroyController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -25,11 +26,11 @@ namespace FireflyIII\Api\V1\Controllers\Data;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
+use FireflyIII\Enums\AccountTypeEnum;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
@@ -65,10 +66,10 @@ class DestroyController extends Controller
         $objects         = $request->getObjects();
         $this->unused    = $request->boolean('unused', false);
 
-        $allExceptAssets = [AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::RECONCILIATION, AccountType::REVENUE];
-        $all             = [AccountType::ASSET, AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEBT, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::RECONCILIATION];
-        $liabilities     = [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD];
-        $transactions    = [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::RECONCILIATION];
+        $allExceptAssets = [AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::CASH->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::RECONCILIATION->value, AccountTypeEnum::REVENUE->value];
+        $all             = [AccountTypeEnum::ASSET->value, AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::CASH->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::RECONCILIATION->value];
+        $liabilities     = [AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CREDITCARD->value];
+        $transactions    = [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value, TransactionTypeEnum::RECONCILIATION->value];
 
         match ($objects) {
             'budgets'                => $this->destroyBudgets(),
@@ -81,14 +82,14 @@ class DestroyController extends Controller
             'object_groups'          => $this->destroyObjectGroups(),
             'not_assets_liabilities' => $this->destroyAccounts($allExceptAssets),
             'accounts'               => $this->destroyAccounts($all),
-            'asset_accounts'         => $this->destroyAccounts([AccountType::ASSET, AccountType::DEFAULT]),
-            'expense_accounts'       => $this->destroyAccounts([AccountType::BENEFICIARY, AccountType::EXPENSE]),
-            'revenue_accounts'       => $this->destroyAccounts([AccountType::REVENUE]),
+            'asset_accounts'         => $this->destroyAccounts([AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value]),
+            'expense_accounts'       => $this->destroyAccounts([AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::EXPENSE->value]),
+            'revenue_accounts'       => $this->destroyAccounts([AccountTypeEnum::REVENUE->value]),
             'liabilities'            => $this->destroyAccounts($liabilities),
             'transactions'           => $this->destroyTransactions($transactions),
-            'withdrawals'            => $this->destroyTransactions([TransactionType::WITHDRAWAL]),
-            'deposits'               => $this->destroyTransactions([TransactionType::DEPOSIT]),
-            'transfers'              => $this->destroyTransactions([TransactionType::TRANSFER]),
+            'withdrawals'            => $this->destroyTransactions([TransactionTypeEnum::WITHDRAWAL->value]),
+            'deposits'               => $this->destroyTransactions([TransactionTypeEnum::DEPOSIT->value]),
+            'transfers'              => $this->destroyTransactions([TransactionTypeEnum::TRANSFER->value]),
             default                  => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects)),
         };
 

app/Api/V1/Controllers/Data/Export/ExportController.php

@@ -59,7 +59,7 @@ class ExportController extends Controller
      *
      * @throws FireflyException
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function accounts(ExportRequest $request): LaravelResponse
     {
@@ -88,7 +88,7 @@ class ExportController extends Controller
             ->header('Expires', '0')
             ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
             ->header('Pragma', 'public')
-            ->header('Content-Length', (string)strlen($data[$key]))
+            ->header('Content-Length', (string) strlen($data[$key]))
         ;
 
         return $response;
@@ -100,7 +100,7 @@ class ExportController extends Controller
      *
      * @throws FireflyException
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function bills(ExportRequest $request): LaravelResponse
     {
@@ -115,7 +115,7 @@ class ExportController extends Controller
      *
      * @throws FireflyException
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function budgets(ExportRequest $request): LaravelResponse
     {
@@ -130,7 +130,7 @@ class ExportController extends Controller
      *
      * @throws FireflyException
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function categories(ExportRequest $request): LaravelResponse
     {
@@ -145,7 +145,7 @@ class ExportController extends Controller
      *
      * @throws FireflyException
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function piggyBanks(ExportRequest $request): LaravelResponse
     {
@@ -160,7 +160,7 @@ class ExportController extends Controller
      *
      * @throws FireflyException
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function recurring(ExportRequest $request): LaravelResponse
     {
@@ -175,7 +175,7 @@ class ExportController extends Controller
      *
      * @throws FireflyException
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function rules(ExportRequest $request): LaravelResponse
     {
@@ -190,7 +190,7 @@ class ExportController extends Controller
      *
      * @throws FireflyException
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function tags(ExportRequest $request): LaravelResponse
     {

app/Api/V1/Controllers/Data/PurgeController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * PurgeController.php
  * Copyright (c) 2022 james@firefly-iii.org
@@ -28,13 +29,13 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
-use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -51,7 +52,7 @@ class PurgeController extends Controller
     public function purge(): JsonResponse
     {
         /** @var User $user */
-        $user = auth()->user();
+        $user       = auth()->user();
 
         // some manual code, too lazy to call all repositories.
 
@@ -62,14 +63,17 @@ class PurgeController extends Controller
         Bill::whereUserId($user->id)->onlyTrashed()->forceDelete();
 
         // piggies
-        $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
-            ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
-        ;
-
-        /** @var PiggyBank $piggy */
-        foreach ($set as $piggy) {
-            $piggy->forceDelete();
-        }
+        $repository = app(PiggyBankRepositoryInterface::class);
+        $repository->setUser($user);
+        $repository->purgeAll();
+        //        $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
+        //            ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
+        //        ;
+        //
+        //        /** @var PiggyBank $piggy */
+        //        foreach ($set as $piggy) {
+        //            $piggy->forceDelete();
+        //        }
 
         // rule group
         RuleGroup::whereUserId($user->id)->onlyTrashed()->forceDelete();

app/Api/V1/Controllers/Insight/Expense/AccountController.php

@@ -79,11 +79,11 @@ class AccountController extends Controller
         /** @var array $expense */
         foreach ($expenses as $expense) {
             $result[] = [
-                'id'               => (string)$expense['id'],
+                'id'               => (string) $expense['id'],
                 'name'             => $expense['name'],
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // intentional float
-                'currency_id'      => (string)$expense['currency_id'],
+                'difference_float' => (float) $expense['sum'], // intentional float
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }
@@ -107,11 +107,11 @@ class AccountController extends Controller
         /** @var array $expense */
         foreach ($expenses as $expense) {
             $result[] = [
-                'id'               => (string)$expense['id'],
+                'id'               => (string) $expense['id'],
                 'name'             => $expense['name'],
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // intentional float
-                'currency_id'      => (string)$expense['currency_id'],
+                'difference_float' => (float) $expense['sum'], // intentional float
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

app/Api/V1/Controllers/Insight/Expense/BillController.php

@@ -26,10 +26,12 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class BillController
@@ -63,11 +65,13 @@ class BillController extends Controller
      */
     public function bill(GenericRequest $request): JsonResponse
     {
-        $accounts   = $request->getAssetAccounts();
-        $bills      = $request->getBills();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $bills           = $request->getBills();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
+        $response        = [];
 
         // get all bills:
         if (0 === $bills->count()) {
@@ -75,39 +79,42 @@ class BillController extends Controller
         }
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
         $collector->setBills($bills);
 
-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $billId            = (int)$journal['bill_id'];
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
-            $key               = sprintf('%d-%d', $billId, $currencyId);
-            $foreignKey        = sprintf('%d-%d', $billId, $foreignCurrencyId);
+            $billId       = (int) $journal['bill_id'];
+            $currencyId   = (int) $journal['currency_id'];
+            $currencyCode = $journal['currency_code'];
+            $field        = 'amount';
+
+            // use the native amount if the user wants to convert to native currency
+            if ($convertToNative && $currencyId !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
+                $field        = 'native_amount';
+            }
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
+            }
+            Log::debug(sprintf('Journal #%d in bill #%d will use %s (%s %s)', $journal['transaction_group_id'], $billId, $field, $currencyCode, $journal[$field] ?? '0'));
+
+            $key          = sprintf('%d-%d', $billId, $currencyId);
 
             if (0 !== $currencyId) {
                 $response[$key] ??= [
-                    'id'               => (string)$billId,
+                    'id'               => (string) $billId,
                     'name'             => $journal['bill_name'],
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
-                    'currency_code'    => $journal['currency_code'],
+                    'currency_id'      => (string) $currencyId,
+                    'currency_code'    => $currencyCode,
                 ];
-                $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
-                $response[$key]['difference_float'] = (float)$response[$key]['difference']; // intentional float
-            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignKey] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
-                $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
+                $response[$key]['difference']       = bcadd($response[$key]['difference'], (string) ($journal[$field] ?? '0'));
+                $response[$key]['difference_float'] = (float) $response[$key]['difference']; // intentional float
             }
         }
 
@@ -122,41 +129,46 @@ class BillController extends Controller
      */
     public function noBill(GenericRequest $request): JsonResponse
     {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
+        $response        = [];
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
         $collector->withoutBill();
 
-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $currencyId   = (int) $journal['currency_id'];
+            $currencyCode = $journal['currency_code'];
+            $field        = 'amount';
+
+            // use the native amount if the user wants to convert to native currency
+            if ($convertToNative && $currencyId !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
+                $field        = 'native_amount';
+            }
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
+            }
+            Log::debug(sprintf('Journal #%d will use %s (%s %s)', $journal['transaction_group_id'], $field, $currencyCode, $journal[$field] ?? '0'));
 
             if (0 !== $currencyId) {
                 $response[$currencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
-                    'currency_code'    => $journal['currency_code'],
+                    'currency_id'      => (string) $currencyId,
+                    'currency_code'    => $currencyCode,
                 ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
-            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
+                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) ($journal[$field] ?? '0'));
+                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float
             }
         }
 

app/Api/V1/Controllers/Insight/Expense/BudgetController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * BudgetController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -84,11 +85,11 @@ class BudgetController extends Controller
             /** @var array $expense */
             foreach ($expenses as $expense) {
                 $result[] = [
-                    'id'               => (string)$budget->id,
+                    'id'               => (string) $budget->id,
                     'name'             => $budget->name,
                     'difference'       => $expense['sum'],
-                    'difference_float' => (float)$expense['sum'], // intentional float
-                    'currency_id'      => (string)$expense['currency_id'],
+                    'difference_float' => (float) $expense['sum'], // intentional float
+                    'currency_id'      => (string) $expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -113,8 +114,8 @@ class BudgetController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // intentional float
-                'currency_id'      => (string)$expense['currency_id'],
+                'difference_float' => (float) $expense['sum'], // intentional float
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

app/Api/V1/Controllers/Insight/Expense/CategoryController.php

@@ -85,11 +85,11 @@ class CategoryController extends Controller
             /** @var array $expense */
             foreach ($expenses as $expense) {
                 $result[] = [
-                    'id'               => (string)$category->id,
+                    'id'               => (string) $category->id,
                     'name'             => $category->name,
                     'difference'       => $expense['sum'],
-                    'difference_float' => (float)$expense['sum'], // intentional float
-                    'currency_id'      => (string)$expense['currency_id'],
+                    'difference_float' => (float) $expense['sum'], // intentional float
+                    'currency_id'      => (string) $expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -114,8 +114,8 @@ class CategoryController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // intentional float
-                'currency_id'      => (string)$expense['currency_id'],
+                'difference_float' => (float) $expense['sum'], // intentional float
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

app/Api/V1/Controllers/Insight/Expense/PeriodController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * PeriodController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -25,9 +26,11 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class PeriodController
@@ -40,39 +43,49 @@ class PeriodController extends Controller
      */
     public function total(GenericRequest $request): JsonResponse
     {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type)
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
-        $genericSet = $collector->getExtractedJournals();
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
+        $genericSet      = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            // same code as many other sumExpense methods. I think this needs some kind of generic method.
+            $amount                                    = '0';
+            $currencyId                                = (int) $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            if ($convertToNative) {
+                $amount = Amount::getAmountFromJournal($journal);
+                if ($default->id !== (int) $journal['currency_id'] && $default->id !== (int) $journal['foreign_currency_id']) {
+                    $currencyId   = $default->id;
+                    $currencyCode = $default->code;
+                }
+                if ($default->id !== (int) $journal['currency_id'] && $default->id === (int) $journal['foreign_currency_id']) {
+                    $currencyId   = $journal['foreign_currency_id'];
+                    $currencyCode = $journal['foreign_currency_code'];
+                }
+                Log::debug(sprintf('[a] Add amount %s %s', $currencyCode, $amount));
+            }
+            if (!$convertToNative) {
+                // ignore the amount in foreign currency.
+                Log::debug(sprintf('[b] Add amount %s %s', $currencyCode, $journal['amount']));
+                $amount = $journal['amount'];
+            }
 
-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
-            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
-            }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $amount);
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float
         }
 
         return response()->json(array_values($response));

app/Api/V1/Controllers/Insight/Expense/TagController.php

@@ -26,10 +26,12 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class TagController
@@ -62,42 +64,51 @@ class TagController extends Controller
      */
     public function noTag(GenericRequest $request): JsonResponse
     {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
         $collector->withoutTags();
 
-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            // same code as many other sumExpense methods. I think this needs some kind of generic method.
+            $amount                                    = '0';
+            $currencyId                                = (int) $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            if ($convertToNative) {
+                $amount = Amount::getAmountFromJournal($journal);
+                if ($default->id !== (int) $journal['currency_id'] && $default->id !== (int) $journal['foreign_currency_id']) {
+                    $currencyId   = $default->id;
+                    $currencyCode = $default->code;
+                }
+                if ($default->id !== (int) $journal['currency_id'] && $default->id === (int) $journal['foreign_currency_id']) {
+                    $currencyId   = $journal['foreign_currency_id'];
+                    $currencyCode = $journal['foreign_currency_code'];
+                }
+                Log::debug(sprintf('[a] Add amount %s %s', $currencyCode, $amount));
+            }
+            if (!$convertToNative) {
+                // ignore the amount in foreign currency.
+                Log::debug(sprintf('[b] Add amount %s %s', $currencyCode, $journal['amount']));
+                $amount = $journal['amount'];
+            }
 
-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
-            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
-            }
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $amount);
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
         }
 
         return response()->json(array_values($response));
@@ -124,14 +135,14 @@ class TagController extends Controller
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
         $collector->setTags($tags);
         $genericSet = $collector->getExtractedJournals();
 
         /** @var array $journal */
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             /** @var array $tag */
             foreach ($journal['tags'] as $tag) {
@@ -142,15 +153,15 @@ class TagController extends Controller
                 // on currency ID
                 if (0 !== $currencyId) {
                     $response[$key] ??= [
-                        'id'               => (string)$tagId,
+                        'id'               => (string) $tagId,
                         'name'             => $tag['name'],
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$currencyId,
+                        'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
                     $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
-                    $response[$key]['difference_float'] = (float)$response[$key]['difference']; // float but on purpose.
+                    $response[$key]['difference_float'] = (float) $response[$key]['difference']; // float but on purpose.
                 }
 
                 // on foreign ID
@@ -158,11 +169,11 @@ class TagController extends Controller
                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // float but on purpose.
+                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // float but on purpose.
                 }
             }
         }

app/Api/V1/Controllers/Insight/Income/AccountController.php

@@ -73,17 +73,18 @@ class AccountController extends Controller
         $start         = $request->getStart();
         $end           = $request->getEnd();
         $assetAccounts = $request->getAssetAccounts();
+
         $income        = $this->opsRepository->sumIncomeByDestination($start, $end, $assetAccounts);
         $result        = [];
 
         /** @var array $entry */
         foreach ($income as $entry) {
             $result[] = [
-                'id'               => (string)$entry['id'],
+                'id'               => (string) $entry['id'],
                 'name'             => $entry['name'],
                 'difference'       => $entry['sum'],
-                'difference_float' => (float)$entry['sum'], // float but on purpose.
-                'currency_id'      => (string)$entry['currency_id'],
+                'difference_float' => (float) $entry['sum'], // float but on purpose.
+                'currency_id'      => (string) $entry['currency_id'],
                 'currency_code'    => $entry['currency_code'],
             ];
         }
@@ -107,11 +108,11 @@ class AccountController extends Controller
         /** @var array $entry */
         foreach ($income as $entry) {
             $result[] = [
-                'id'               => (string)$entry['id'],
+                'id'               => (string) $entry['id'],
                 'name'             => $entry['name'],
                 'difference'       => $entry['sum'],
-                'difference_float' => (float)$entry['sum'], // float but on purpose.
-                'currency_id'      => (string)$entry['currency_id'],
+                'difference_float' => (float) $entry['sum'], // float but on purpose.
+                'currency_id'      => (string) $entry['currency_id'],
                 'currency_code'    => $entry['currency_code'],
             ];
         }

app/Api/V1/Controllers/Insight/Income/CategoryController.php

@@ -85,11 +85,11 @@ class CategoryController extends Controller
             /** @var array $expense */
             foreach ($expenses as $expense) {
                 $result[] = [
-                    'id'               => (string)$category->id,
+                    'id'               => (string) $category->id,
                     'name'             => $category->name,
                     'difference'       => $expense['sum'],
-                    'difference_float' => (float)$expense['sum'], // float but on purpose.
-                    'currency_id'      => (string)$expense['currency_id'],
+                    'difference_float' => (float) $expense['sum'], // float but on purpose.
+                    'currency_id'      => (string) $expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -114,8 +114,8 @@ class CategoryController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // float but on purpose.
-                'currency_id'      => (string)$expense['currency_id'],
+                'difference_float' => (float) $expense['sum'], // float but on purpose.
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

app/Api/V1/Controllers/Insight/Income/PeriodController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * PeriodController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -25,8 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Income;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -40,42 +42,41 @@ class PeriodController extends Controller
      */
     public function total(GenericRequest $request): JsonResponse
     {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type)
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
-        $genericSet = $collector->getExtractedJournals();
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $genericSet      = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            // currency
+            $currencyId                                = $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            $field                                     = $convertToNative && $currencyId !== $default->id ? 'native_amount' : 'amount';
 
-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
+            // perhaps use default currency instead?
+            if ($convertToNative && $journal['currency_id'] !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
             }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'],
-                    app('steam')->positive($journal['foreign_amount'])
-                );
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
             }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
         }
 
         return response()->json(array_values($response));

app/Api/V1/Controllers/Insight/Income/TagController.php

@@ -26,9 +26,10 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Income;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -63,45 +64,45 @@ class TagController extends Controller
      */
     public function noTag(GenericRequest $request): JsonResponse
     {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
         $collector->withoutTags();
 
-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            // currency
+            $currencyId                                = $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            $field                                     = $convertToNative && $currencyId !== $default->id ? 'native_amount' : 'amount';
 
-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            // perhaps use default currency instead?
+            if ($convertToNative && $journal['currency_id'] !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
             }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'],
-                    app('steam')->positive($journal['foreign_amount'])
-                );
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
             }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+
         }
 
         return response()->json(array_values($response));
@@ -128,14 +129,14 @@ class TagController extends Controller
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
         $collector->setTags($tags);
         $genericSet = $collector->getExtractedJournals();
 
         /** @var array $journal */
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             /** @var array $tag */
             foreach ($journal['tags'] as $tag) {
@@ -146,15 +147,15 @@ class TagController extends Controller
                 // on currency ID
                 if (0 !== $currencyId) {
                     $response[$key] ??= [
-                        'id'               => (string)$tagId,
+                        'id'               => (string) $tagId,
                         'name'             => $tag['name'],
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$currencyId,
+                        'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
                     $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
-                    $response[$key]['difference_float'] = (float)$response[$key]['difference'];
+                    $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
                 // on foreign ID
@@ -162,14 +163,14 @@ class TagController extends Controller
                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd(
                         $response[$foreignKey]['difference'],
                         app('steam')->positive($journal['foreign_amount'])
                     );
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
+                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
                 }
             }
         }

app/Api/V1/Controllers/Insight/Transfer/AccountController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * AccountController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Insight/Transfer/CategoryController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * CategoryController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -84,11 +85,11 @@ class CategoryController extends Controller
             /** @var array $expense */
             foreach ($expenses as $expense) {
                 $result[] = [
-                    'id'               => (string)$category->id,
+                    'id'               => (string) $category->id,
                     'name'             => $category->name,
                     'difference'       => $expense['sum'],
-                    'difference_float' => (float)$expense['sum'],
-                    'currency_id'      => (string)$expense['currency_id'],
+                    'difference_float' => (float) $expense['sum'],
+                    'currency_id'      => (string) $expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -113,8 +114,8 @@ class CategoryController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'],
-                'currency_id'      => (string)$expense['currency_id'],
+                'difference_float' => (float) $expense['sum'],
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

app/Api/V1/Controllers/Insight/Transfer/PeriodController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * PeriodController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -25,8 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -40,42 +42,42 @@ class PeriodController extends Controller
      */
     public function total(GenericRequest $request): JsonResponse
     {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
 
         // collect all expenses in this period (regardless of type)
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
-        $genericSet = $collector->getExtractedJournals();
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::TRANSFER->value])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $genericSet      = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            // currency
+            $currencyId                                = $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            $field                                     = $convertToNative && $currencyId !== $default->id ? 'native_amount' : 'amount';
 
-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            // perhaps use default currency instead?
+            if ($convertToNative && $journal['currency_id'] !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
             }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'],
-                    app('steam')->positive($journal['foreign_amount'])
-                );
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
             }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+
         }
 
         return response()->json(array_values($response));

app/Api/V1/Controllers/Insight/Transfer/TagController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * TagController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -25,9 +26,10 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -60,45 +62,46 @@ class TagController extends Controller
      */
     public function noTag(GenericRequest $request): JsonResponse
     {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
+
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::TRANSFER->value])->setRange($start, $end)->setDestinationAccounts($accounts);
         $collector->withoutTags();
 
-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            // currency
+            $currencyId                                = $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            $field                                     = $convertToNative && $currencyId !== $default->id ? 'native_amount' : 'amount';
 
-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+            // perhaps use default currency instead?
+            if ($convertToNative && $journal['currency_id'] !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
             }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'],
-                    app('steam')->positive($journal['foreign_amount'])
-                );
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
             }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+
         }
 
         return response()->json(array_values($response));
@@ -125,14 +128,14 @@ class TagController extends Controller
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::TRANSFER->value])->setRange($start, $end)->setDestinationAccounts($accounts);
         $collector->setTags($tags);
         $genericSet = $collector->getExtractedJournals();
 
         /** @var array $journal */
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             /** @var array $tag */
             foreach ($journal['tags'] as $tag) {
@@ -143,15 +146,15 @@ class TagController extends Controller
                 // on currency ID
                 if (0 !== $currencyId) {
                     $response[$key] ??= [
-                        'id'               => (string)$tagId,
+                        'id'               => (string) $tagId,
                         'name'             => $tag['name'],
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$currencyId,
+                        'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
                     $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
-                    $response[$key]['difference_float'] = (float)$response[$key]['difference'];
+                    $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
                 // on foreign ID
@@ -159,14 +162,14 @@ class TagController extends Controller
                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd(
                         $response[$foreignKey]['difference'],
                         app('steam')->positive($journal['foreign_amount'])
                     );
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
+                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
                 }
             }
         }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2019 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2019 james@firefly-iii.org
@@ -29,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\PiggyBankTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -110,7 +112,7 @@ class ListController extends Controller
         // types to get, page size:
         $pageSize    = $this->parameters->get('limit');
 
-        // get list of budgets. Count it and split it.
+        // get list of piggy banks. Count it and split it.
         $collection  = $this->repository->getPiggyBanks($account);
         $count       = $collection->count();
         $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -139,18 +141,18 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Account $account): JsonResponse
     {
-        $pageSize    = $this->parameters->get('limit');
-        $type        = $request->get('type') ?? 'default';
+        $pageSize     = $this->parameters->get('limit');
+        $type         = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
-        $types       = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager     = $this->getManager();
+        $types        = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager      = $this->getManager();
 
         /** @var User $admin */
-        $admin       = auth()->user();
+        $admin        = auth()->user();
 
         // use new group collector:
         /** @var GroupCollectorInterface $collector */
-        $collector   = app(GroupCollectorInterface::class);
+        $collector    = app(GroupCollectorInterface::class);
         $collector->setUser($admin)->setAccounts(new Collection([$account]))
             ->withAPIInformation()->setLimit($pageSize)->setPage($this->parameters->get('page'))->setTypes($types)
         ;
@@ -162,15 +164,19 @@ class ListController extends Controller
             $collector->setEnd($this->parameters->get('end'));
         }
 
-        $paginator   = $collector->getPaginatedGroups();
+        $paginator    = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());
-        $groups      = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
-        $transformer = app(TransactionGroupTransformer::class);
+        $transformer  = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource    = new FractalCollection($groups, $transformer, 'transactions');
+        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -28,7 +29,9 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -87,9 +90,17 @@ class ShowController extends Controller
         $count       = $collection->count();
 
         // continue sort:
-
         $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setConvertToNative($this->convertToNative);
+        $enrichment->setNative($this->nativeCurrency);
+        $accounts    = $enrichment->enrich($accounts);
+
         // make paginator:
         $paginator   = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.accounts.index').$this->buildParams());
@@ -117,6 +128,16 @@ class ShowController extends Controller
         $account->refresh();
         $manager     = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setConvertToNative($this->convertToNative);
+        $enrichment->setNative($this->nativeCurrency);
+        $account     = $enrichment->enrichSingle($account);
+
+
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2019 james@firefly-iii.org
@@ -26,7 +27,9 @@ namespace FireflyIII\Api\V1\Controllers\Models\Account;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Account\StoreRequest;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;
 
@@ -68,6 +71,15 @@ class StoreController extends Controller
         $account     = $this->repository->store($data);
         $manager     = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setConvertToNative($this->convertToNative);
+        $enrichment->setNative($this->nativeCurrency);
+        $account     = $enrichment->enrichSingle($account);
+
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2019 james@firefly-iii.org
@@ -27,7 +28,9 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Account\UpdateRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;
 
@@ -72,6 +75,15 @@ class UpdateController extends Controller
         $account->refresh();
         app('preferences')->mark();
 
+        // enrich
+        /** @var User $admin */
+        $admin        = auth()->user();
+        $enrichment   = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setConvertToNative($this->convertToNative);
+        $enrichment->setNative($this->nativeCurrency);
+        $account      = $enrichment->enrichSingle($account);
+
         /** @var AccountTransformer $transformer */
         $transformer  = app(AccountTransformer::class);
         $transformer->setParameters($this->parameters);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -104,7 +105,7 @@ class ShowController extends Controller
                 ->header('Expires', '0')
                 ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
                 ->header('Pragma', 'public')
-                ->header('Content-Length', (string)strlen($content))
+                ->header('Content-Length', (string) strlen($content))
             ;
 
             return $response;

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -112,7 +113,12 @@ class StoreController extends Controller
 
             return response()->json([], 422);
         }
-        $helper->saveAttachmentFromApi($attachment, $body);
+        $result = $helper->saveAttachmentFromApi($attachment, $body);
+        if (false === $result) {
+            app('log')->error('Could not save attachment from API.');
+
+            return response()->json([], 422);
+        }
 
         return response()->json([], 204);
     }

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -29,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -175,7 +177,11 @@ class ListController extends Controller
         // get paginator.
         $paginator    = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
         $transformer  = app(TransactionGroupTransformer::class);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -24,12 +25,14 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Models\Budget;
 
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
@@ -170,7 +173,11 @@ class ListController extends Controller
 
         $paginator    = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
         $transformer  = app(TransactionGroupTransformer::class);
@@ -207,6 +214,8 @@ class ListController extends Controller
         $collector    = app(GroupCollectorInterface::class);
         $collector
             ->setUser($admin)
+            // withdrawals only
+            ->setTypes([TransactionTypeEnum::WITHDRAWAL->value])
             // filter on budget.
             ->withoutBudget()
             // all info needed for the API:
@@ -228,7 +237,11 @@ class ListController extends Controller
 
         $paginator    = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.budgets.without-budget').$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
         $transformer  = app(TransactionGroupTransformer::class);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -29,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -83,7 +85,11 @@ class ListController extends Controller
         $collector->setTypes($types);
         $paginator    = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
         $transformer  = app(TransactionGroupTransformer::class);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -99,7 +100,7 @@ class ShowController extends Controller
      *
      * Display a listing of the budget limits for this budget.
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function indexAll(SameDateRequest $request): JsonResponse
     {

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -68,6 +69,7 @@ class StoreController extends Controller
         $data               = $request->getAll();
         $data['start_date'] = $data['start'];
         $data['end_date']   = $data['end'];
+        $data['notes']      = $data['notes'];
         $data['budget_id']  = $budget->id;
 
         $budgetLimit        = $this->blRepository->store($data);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -29,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
@@ -138,7 +140,11 @@ class ListController extends Controller
 
         $paginator    = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.categories.transactions', [$category->id]).$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
         $transformer  = app(TransactionGroupTransformer::class);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -0,0 +1,82 @@
+<?php
+
+/*
+ * DestroyController.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\DestroyRequest;
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Exceptions\ValidationException;
+use FireflyIII\Models\CurrencyExchangeRate;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class DestroyController extends Controller
+{
+    use ValidatesUserGroupTrait;
+
+    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
+
+    public const string RESOURCE_KEY = 'exchange-rates';
+
+    private ExchangeRateRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(ExchangeRateRepositoryInterface::class);
+                $this->repository->setUserGroup($this->validateUserGroup($request));
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function destroy(DestroyRequest $request, TransactionCurrency $from, TransactionCurrency $to): JsonResponse
+    {
+        $date = $request->getDate();
+        if (null === $date) {
+            throw new ValidationException('Date is required');
+        }
+        $rate = $this->repository->getSpecificRateOnDate($from, $to, $date);
+        if (null === $rate) {
+            throw new NotFoundHttpException();
+        }
+        $this->repository->deleteRate($rate);
+
+        return response()->json([], 204);
+    }
+
+    public function destroySingle(CurrencyExchangeRate $exchangeRate): JsonResponse
+    {
+        $this->repository->deleteRate($exchangeRate);
+
+        return response()->json([], 204);
+    }
+}

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

@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * IndexController.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\ExchangeRateTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+/**
+ * Class ShowController
+ */
+class IndexController extends Controller
+{
+    use ValidatesUserGroupTrait;
+
+    public const string RESOURCE_KEY = 'currency_exchange_rates';
+
+    private ExchangeRateRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(ExchangeRateRepositoryInterface::class);
+                $this->repository->setUserGroup($this->validateUserGroup($request));
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function index(): JsonResponse
+    {
+        $entries     = $this->repository->getAll();
+        $pageSize    = $this->parameters->get('limit');
+        $count       = $entries->count();
+        $entries     = $entries->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator   = new LengthAwarePaginator($entries, $count, $pageSize, $this->parameters->get('page'));
+        $transformer = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}

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

@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * ShowController.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Models\CurrencyExchangeRate;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\ExchangeRateTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    use ValidatesUserGroupTrait;
+
+    public const string RESOURCE_KEY = 'exchange-rates';
+
+    private ExchangeRateRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(ExchangeRateRepositoryInterface::class);
+                $this->repository->setUserGroup($this->validateUserGroup($request));
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function show(TransactionCurrency $from, TransactionCurrency $to): JsonResponse
+    {
+        $pageSize    = $this->parameters->get('limit');
+        $page        = $this->parameters->get('page');
+        $rates       = $this->repository->getRates($from, $to);
+        $count       = $rates->count();
+        $rates       = $rates->slice(($page - 1) * $pageSize, $pageSize);
+        $paginator   = new LengthAwarePaginator($rates, $count, $pageSize, $page);
+
+        $transformer = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+
+    public function showSingle(CurrencyExchangeRate $exchangeRate): JsonResponse
+    {
+        $transformer = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}

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

@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * StoreController.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
+
+use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreRequest;
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\ExchangeRateTransformer;
+use Illuminate\Http\JsonResponse;
+
+class StoreController extends Controller
+{
+    use ValidatesUserGroupTrait;
+
+    public const string RESOURCE_KEY = 'exchange-rates';
+
+    private ExchangeRateRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(ExchangeRateRepositoryInterface::class);
+                $this->repository->setUserGroup($this->validateUserGroup($request));
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function store(StoreRequest $request): JsonResponse
+    {
+        $date        = $request->getDate();
+        $rate        = $request->getRate();
+        $from        = $request->getFromCurrency();
+        $to          = $request->getToCurrency();
+
+        // already has rate?
+        $object      = $this->repository->getSpecificRateOnDate($from, $to, $date);
+        if (null !== $object) {
+            // just update it, no matter.
+            $rate = $this->repository->updateExchangeRate($object, $rate, $date);
+        }
+        if (null === $object) {
+            // store new
+            $rate = $this->repository->storeExchangeRate($from, $to, $rate, $date);
+        }
+
+        $transformer = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject(self::RESOURCE_KEY, $rate, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}

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

@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * UpdateController.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;
+
+use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\UpdateRequest;
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Models\CurrencyExchangeRate;
+use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\ExchangeRateTransformer;
+use Illuminate\Http\JsonResponse;
+
+class UpdateController extends Controller
+{
+    use ValidatesUserGroupTrait;
+
+    public const string RESOURCE_KEY = 'exchange-rates';
+
+    private ExchangeRateRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(ExchangeRateRepositoryInterface::class);
+                $this->repository->setUserGroup($this->validateUserGroup($request));
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function update(UpdateRequest $request, CurrencyExchangeRate $exchangeRate): JsonResponse
+    {
+        $date         = $request->getDate();
+        $rate         = $request->getRate();
+        $exchangeRate = $this->repository->updateExchangeRate($exchangeRate, $rate, $date);
+        $transformer  = new ExchangeRateTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject(self::RESOURCE_KEY, $exchangeRate, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -27,8 +28,11 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
+use FireflyIII\Transformers\AccountTransformer;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\PiggyBankEventTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -57,6 +61,47 @@ class ListController extends Controller
         );
     }
 
+    /**
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listAccountByPiggyBank
+     *
+     * List single resource.
+     *
+     * @throws FireflyException
+     */
+    public function accounts(PiggyBank $piggyBank): JsonResponse
+    {
+        // types to get, page size:
+        $pageSize    = $this->parameters->get('limit');
+        $manager     = $this->getManager();
+
+        $collection  = $piggyBank->accounts;
+        $count       = $collection->count();
+        $accounts    = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new AccountEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setConvertToNative($this->convertToNative);
+        $enrichment->setNative($this->nativeCurrency);
+        $accounts    = $enrichment->enrich($accounts);
+
+        // make paginator:
+        $paginator   = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.piggy-banks.accounts', [$piggyBank->id]).$this->buildParams());
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource    = new FractalCollection($accounts, $transformer, 'accounts');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listAttachmentByPiggyBank

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -71,7 +72,7 @@ class ShowController extends Controller
         // types to get, page size:
         $pageSize    = $this->parameters->get('limit');
 
-        // get list of budgets. Count it and split it.
+        // get list of piggy banks. Count it and split it.
         $collection  = $this->repository->getPiggyBanks();
         $count       = $collection->count();
         $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -29,6 +30,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -109,7 +111,11 @@ class ListController extends Controller
 
         $paginator    = $collector->getPaginatedGroups();
         $paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
-        $transactions = $paginator->getCollection();
+
+        // enrich
+        $enrichment   = new TransactionGroupEnrichment();
+        $enrichment->setUser($admin);
+        $transactions = $enrichment->enrich($paginator->getCollection());
 
         /** @var TransactionGroupTransformer $transformer */
         $transformer  = app(TransactionGroupTransformer::class);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Rule/ExpressionController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ExpressionController.php
  * Copyright (c) 2024 Michael Thomas
@@ -36,7 +37,7 @@ class ExpressionController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/validateExpression
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function validateExpression(ValidateExpressionRequest $request): JsonResponse
     {