Merge branch 'release/v6.1.5'

Update outdated documentation URLs in .env.example

.ci/all.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+#
+# all.sh
+# Copyright (c) 2024 james@firefly-iii.org
+#
+# This file is part of Firefly III (https://github.com/firefly-iii).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+$SCRIPT_DIR/phpcs.sh
+$SCRIPT_DIR/phpstan.sh
+$SCRIPT_DIR/phpmd.sh

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

@@ -57,7 +57,14 @@ return $config->setRules([
                              'statement_indentation'         => true,
                              'type_declaration_spaces'       => false,
                              'cast_spaces'                   => false,
-                             'binary_operator_spaces'        => false,
+                             'binary_operator_spaces'        => [
+                                 'default' => 'at_least_single_space',
+                                 'operators' => [
+                                     '=>' => 'align_single_space_by_scope',
+                                     '='  => 'align_single_space_minimal_by_scope',
+                                     '??='  => 'align_single_space_minimal_by_scope',
+                                 ],
+                             ],
                              'void_return'                   => true,
                          ])
               ->setFinder($finder);

.ci/php-cs-fixer/composer.lock

@@ -226,21 +226,22 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.42.0",
+            "version": "v3.46.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "632ef1be3447a9b890bef06147475facee535d0f"
+                "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/632ef1be3447a9b890bef06147475facee535d0f",
-                "reference": "632ef1be3447a9b890bef06147475facee535d0f",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/be6831c9af1740470d2a773119b9273f8ac1c3d2",
+                "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2",
                 "shasum": ""
             },
             "require": {
                 "composer/semver": "^3.4",
                 "composer/xdebug-handler": "^3.0.3",
+                "ext-filter": "*",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
                 "php": "^7.4 || ^8.0",
@@ -265,7 +266,7 @@
                 "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
-                "phpunit/phpunit": "^9.6",
+                "phpunit/phpunit": "^9.6 || ^10.5.5",
                 "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
             },
             "suggest": {
@@ -304,7 +305,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.42.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.46.0"
             },
             "funding": [
                 {
@@ -312,7 +313,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-12-24T14:38:51+00:00"
+            "time": "2024-01-03T21:38:46+00:00"
         },
         {
             "name": "psr/container",
@@ -536,16 +537,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.0.1",
+            "version": "v7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "cdce5c684b2f920bb1343deecdfba356ffad83d5"
+                "reference": "f8587c4cdc5acad67af71c37db34ef03af91e59c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/cdce5c684b2f920bb1343deecdfba356ffad83d5",
-                "reference": "cdce5c684b2f920bb1343deecdfba356ffad83d5",
+                "url": "https://api.github.com/repos/symfony/console/zipball/f8587c4cdc5acad67af71c37db34ef03af91e59c",
+                "reference": "f8587c4cdc5acad67af71c37db34ef03af91e59c",
                 "shasum": ""
             },
             "require": {
@@ -609,7 +610,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.0.1"
+                "source": "https://github.com/symfony/console/tree/v7.0.2"
             },
             "funding": [
                 {
@@ -625,7 +626,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-01T15:10:06+00:00"
+            "time": "2023-12-10T16:54:46+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -696,16 +697,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v7.0.0",
+            "version": "v7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "c459b40ffe67c49af6fd392aac374c9edf8a027e"
+                "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c459b40ffe67c49af6fd392aac374c9edf8a027e",
-                "reference": "c459b40ffe67c49af6fd392aac374c9edf8a027e",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/098b62ae81fdd6cbf941f355059f617db28f4f9a",
+                "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a",
                 "shasum": ""
             },
             "require": {
@@ -756,7 +757,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.2"
             },
             "funding": [
                 {
@@ -772,7 +773,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-27T16:29:09+00:00"
+            "time": "2023-12-27T22:24:19+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -1538,16 +1539,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.0.0",
+            "version": "v7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "13bdb1670c7f510494e04fcb2bfa29af63db9c0d"
+                "reference": "acd3eb5cb02382c1cb0287ba29b2908cc6ffa83a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/13bdb1670c7f510494e04fcb2bfa29af63db9c0d",
-                "reference": "13bdb1670c7f510494e04fcb2bfa29af63db9c0d",
+                "url": "https://api.github.com/repos/symfony/process/zipball/acd3eb5cb02382c1cb0287ba29b2908cc6ffa83a",
+                "reference": "acd3eb5cb02382c1cb0287ba29b2908cc6ffa83a",
                 "shasum": ""
             },
             "require": {
@@ -1579,7 +1580,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.0.0"
+                "source": "https://github.com/symfony/process/tree/v7.0.2"
             },
             "funding": [
                 {
@@ -1595,25 +1596,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-20T16:43:42+00:00"
+            "time": "2023-12-24T09:15:37+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838"
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
-                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "psr/container": "^2.0"
+                "psr/container": "^1.1|^2.0"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -1661,7 +1662,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
             },
             "funding": [
                 {
@@ -1677,7 +1678,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-30T20:28:31+00:00"
+            "time": "2023-12-26T14:02:43+00:00"
         },
         {
             "name": "symfony/stopwatch",
@@ -1743,16 +1744,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.0.0",
+            "version": "v7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "92bd2bfbba476d4a1838e5e12168bef2fd1e6620"
+                "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/92bd2bfbba476d4a1838e5e12168bef2fd1e6620",
-                "reference": "92bd2bfbba476d4a1838e5e12168bef2fd1e6620",
+                "url": "https://api.github.com/repos/symfony/string/zipball/cc78f14f91f5e53b42044d0620961c48028ff9f5",
+                "reference": "cc78f14f91f5e53b42044d0620961c48028ff9f5",
                 "shasum": ""
             },
             "require": {
@@ -1809,7 +1810,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.0.0"
+                "source": "https://github.com/symfony/string/tree/v7.0.2"
             },
             "funding": [
                 {
@@ -1825,7 +1826,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-29T08:40:23+00:00"
+            "time": "2023-12-10T16:54:46+00:00"
         }
     ],
     "packages-dev": [],

.ci/phpmd/composer.lock

@@ -470,16 +470,16 @@
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v7.0.1",
+            "version": "v7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "f6667642954bce638733f254c39e5b5700b47ba4"
+                "reference": "bd25ef7c937b9da12510bdc4f1c66728f19620e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f6667642954bce638733f254c39e5b5700b47ba4",
-                "reference": "f6667642954bce638733f254c39e5b5700b47ba4",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bd25ef7c937b9da12510bdc4f1c66728f19620e3",
+                "reference": "bd25ef7c937b9da12510bdc4f1c66728f19620e3",
                 "shasum": ""
             },
             "require": {
@@ -530,7 +530,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v7.0.1"
+                "source": "https://github.com/symfony/dependency-injection/tree/v7.0.2"
             },
             "funding": [
                 {
@@ -546,7 +546,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-01T15:10:06+00:00"
+            "time": "2023-12-28T19:18:20+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -845,21 +845,21 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838"
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
-                "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "psr/container": "^2.0"
+                "psr/container": "^1.1|^2.0"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -907,7 +907,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
             },
             "funding": [
                 {
@@ -923,20 +923,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-30T20:28:31+00:00"
+            "time": "2023-12-26T14:02:43+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v7.0.1",
+            "version": "v7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3"
+                "reference": "345c62fefe92243c3a06fc0cc65f2ec1a47e0764"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3",
-                "reference": "a3d7c877414fcd59ab7075ecdc3b8f9c00f7bcc3",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/345c62fefe92243c3a06fc0cc65f2ec1a47e0764",
+                "reference": "345c62fefe92243c3a06fc0cc65f2ec1a47e0764",
                 "shasum": ""
             },
             "require": {
@@ -981,7 +981,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.0.1"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.0.2"
             },
             "funding": [
                 {
@@ -997,7 +997,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-30T11:38:21+00:00"
+            "time": "2023-12-27T08:42:13+00:00"
         }
     ],
     "aliases": [],

.env.example

@@ -78,7 +78,7 @@ PAPERTRAIL_HOST=
 PAPERTRAIL_PORT=
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# For other database types, please see the FAQ: https://docs.firefly-iii.org/firefly-iii/faq/self-hosted/#i-want-to-use-sqlite
+# For other database types, please see the FAQ: https://docs.firefly-iii.org/references/faq/install/#i-want-to-use-sqlite
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 # Use "pgsql" for PostgreSQL
 # Use "mysql" for MySQL and MariaDB.
@@ -150,7 +150,7 @@ COOKIE_SECURE=false
 COOKIE_SAMESITE=lax
 
 # If you want Firefly III to email you, update these settings
-# For instructions, see: https://docs.firefly-iii.org/firefly-iii/advanced-installation/email/#email
+# For instructions, see: https://docs.firefly-iii.org/how-to/firefly-iii/advanced/notifications/#email
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAIL_MAILER=log
 MAIL_HOST=null
@@ -214,7 +214,7 @@ VALID_URL_PROTOCOLS=
 # - 'web' (default, uses built in DB)
 # - 'remote_user_guard' for Authelia etc
 # Read more about these settings in the documentation.
-# https://docs.firefly-iii.org/firefly-iii/advanced-installation/authentication
+# https://docs.firefly-iii.org/how-to/firefly-iii/advanced/authentication/
 #
 # LDAP is no longer supported :(
 #
@@ -269,7 +269,7 @@ ALLOW_WEBHOOKS=false
 # 1. Set this token to any 32-character value (this is important!).
 # 2. Use this token in the cron URL instead of a user's command line token that you can find in /profile
 #
-# For more info: https://docs.firefly-iii.org/firefly-iii/advanced-installation/cron/
+# For more info: https://docs.firefly-iii.org/how-to/firefly-iii/advanced/cron/
 #
 # You can set this variable from a file by appending it with _FILE
 #

.github/ISSUE_TEMPLATE/fr.yml

@@ -8,7 +8,7 @@ body:
       options:
         - label: I've read the [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)
           required: true
-        - label: My request is not listed as [a very good idea, but unfortunately...](https://docs.firefly-iii.org/firefly-iii/more-information/what-its-not/)
+        - label: My request is not listed as [a very good idea, but unfortunately...](https://docs.firefly-iii.org/explanation/more-information/what-its-not/)
           required: true
         - label: I've used [the search](https://github.com/firefly-iii/firefly-iii/issues?q=is%3Aissue) and this has not been requested before.
           required: true

.github/contributing.md

@@ -1,3 +1,3 @@
-# [Contributing guidelines](https://docs.firefly-iii.org/firefly-iii/support/#contributing-code)
+# [Contributing guidelines](https://docs.firefly-iii.org/explanation/support/#contributing-code)
 
-[Contributing guidelines](https://docs.firefly-iii.org/firefly-iii/support/#contributing-code)
+[Contributing guidelines](https://docs.firefly-iii.org/explanation/support/#contributing-code)

.github/support.md

@@ -27,7 +27,7 @@ Only then [create a new issue](https://github.com/firefly-iii/firefly-iii/issues
 
 - Issues can be converted into discussions if it's not a bug or feature request.
 - Features that won't be implemented will be labelled "
-  wontfix". [This isn't personal](https://docs.firefly-iii.org/firefly-iii/about-firefly-iii/what-its-not/).
+  wontfix". [This isn't personal](https://docs.firefly-iii.org/explanation/more-information/what-its-not/).
 - Issues can be closed if they're duplicates of other issues.
 - Issues can be closed if the answer is in the FAQ.
 - Issues will be closed automatically after 14 days.

.gitignore

@@ -1,6 +1,7 @@
 /node_modules
 /storage/*.key
 /vendor
+public/hot
 npm-debug.log
 yarn-error.log
 .env

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

@@ -76,10 +76,9 @@ class AccountController extends Controller
         $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();
 

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

@@ -62,7 +62,6 @@ class TagController extends Controller
     public function tags(AutocompleteRequest $request): JsonResponse
     {
         $data   = $request->getData();
-
         $result = $this->repository->searchTags($data['query'], $this->parameters->get('limit'));
         $array  = [];
 

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

@@ -45,6 +45,7 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class DestroyController
@@ -175,12 +176,14 @@ class DestroyController extends Controller
             $count = $account->transactions()->count();
             if (true === $this->unused && 0 === $count) {
                 app('log')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
+                Log::channel('audit')->info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
                 $service->destroy($account, null);
 
                 continue;
             }
             if (false === $this->unused) {
                 app('log')->info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));
+                Log::channel('audit')->info(sprintf('Deleted account #%d "%s"', $account->id, $account->name));
                 $service->destroy($account, null);
             }
         }

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

@@ -75,28 +75,28 @@ class TagController extends Controller
         $genericSet = $collector->getExtractedJournals();
 
         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'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    '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.
+                $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_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[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose.
             }
         }
 
@@ -130,8 +130,8 @@ class TagController extends Controller
 
         /** @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 +142,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 +158,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/Models/Attachment/DestroyController.php

@@ -29,6 +29,8 @@ use FireflyIII\Models\Attachment;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class DestroyController
@@ -64,6 +66,12 @@ class DestroyController extends Controller
      */
     public function destroy(Attachment $attachment): JsonResponse
     {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+
         $this->repository->destroy($attachment);
         app('preferences')->mark();
 

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

@@ -33,9 +33,11 @@ use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response as LaravelResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class ShowController
@@ -73,6 +75,11 @@ class ShowController extends Controller
      */
     public function download(Attachment $attachment): LaravelResponse
     {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
         if (false === $attachment->uploaded) {
             throw new FireflyException('200000: File has not been uploaded (yet).');
         }
@@ -116,6 +123,12 @@ class ShowController extends Controller
      */
     public function index(): JsonResponse
     {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+
         $manager     = $this->getManager();
 
         // types to get, page size:
@@ -148,6 +161,11 @@ class ShowController extends Controller
      */
     public function show(Attachment $attachment): JsonResponse
     {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
         $manager     = $this->getManager();
 
         /** @var AttachmentTransformer $transformer */

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

@@ -34,7 +34,9 @@ use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class StoreController
@@ -72,6 +74,11 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
         app('log')->debug(sprintf('Now in %s', __METHOD__));
         $data        = $request->getAll();
         $attachment  = $this->repository->store($data);
@@ -91,6 +98,12 @@ class StoreController extends Controller
      */
     public function upload(Request $request, Attachment $attachment): JsonResponse
     {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
+
         /** @var AttachmentHelperInterface $helper */
         $helper = app(AttachmentHelperInterface::class);
         $body   = $request->getContent();

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

@@ -31,7 +31,9 @@ use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class UpdateController
@@ -67,6 +69,11 @@ class UpdateController extends Controller
      */
     public function update(UpdateRequest $request, Attachment $attachment): JsonResponse
     {
+        if(true === auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('Demo user tries to access attachment API in %s', __METHOD__));
+
+            throw new NotFoundHttpException();
+        }
         $data        = $request->getAll();
         $this->repository->update($attachment, $data);
         $manager     = $this->getManager();

app/Api/V1/Controllers/Webhook/AttemptController.php

@@ -32,9 +32,11 @@ use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
 use FireflyIII\Transformers\WebhookAttemptTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class AttemptController
@@ -68,6 +70,12 @@ class AttemptController extends Controller
         if ($message->webhook_id !== $webhook->id) {
             throw new FireflyException('200040: Webhook and webhook message are no match');
         }
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User lists webhook attempts of webhook #%d and message #%d, but webhooks are DISABLED.', $webhook->id, $message->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+        Log::channel('audit')->info(sprintf('User lists webhook attempts of webhook #%d and message #%d.', $webhook->id, $message->id));
 
         $manager     = $this->getManager();
         $pageSize    = $this->parameters->get('limit');
@@ -106,6 +114,14 @@ class AttemptController extends Controller
             throw new FireflyException('200041: Webhook message and webhook attempt are no match');
         }
 
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User views single webhook attempt #%d of webhook #%d and message #%d, but webhooks are DISABLED', $attempt->id, $webhook->id, $message->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
+        Log::channel('audit')->info(sprintf('User views single webhook attempt #%d of webhook #%d and message #%d.', $attempt->id, $webhook->id, $message->id));
+
         $manager     = $this->getManager();
 
         /** @var WebhookAttemptTransformer $transformer */

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

@@ -31,6 +31,8 @@ use FireflyIII\Models\WebhookAttempt;
 use FireflyIII\Models\WebhookMessage;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class DestroyController
@@ -60,6 +62,13 @@ class DestroyController extends Controller
      */
     public function destroy(Webhook $webhook): JsonResponse
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User tries to destroy webhook #%d. but webhooks are DISABLED.', $webhook->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
+        Log::channel('audit')->info(sprintf('User destroys webhook #%d.', $webhook->id));
         $this->repository->destroy($webhook);
         app('preferences')->mark();
 
@@ -83,6 +92,14 @@ class DestroyController extends Controller
             throw new FireflyException('200041: Webhook message and webhook attempt are no match');
         }
 
+        if (false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User tries to destroy webhook #%d, message #%d, attempt #%d, but webhooks are DISABLED.', $webhook->id, $message->id, $attempt->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
+        Log::channel('audit')->info(sprintf('User destroys webhook #%d, message #%d, attempt #%d.', $webhook->id, $message->id, $attempt->id));
+
         $this->repository->destroyAttempt($attempt);
         app('preferences')->mark();
 
@@ -102,6 +119,14 @@ class DestroyController extends Controller
         if ($message->webhook_id !== $webhook->id) {
             throw new FireflyException('200040: Webhook and webhook message are no match');
         }
+
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User tries to destroy webhook #%d, message #%d, but webhooks are DISABLED.', $webhook->id, $message->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+        Log::channel('audit')->info(sprintf('User destroys webhook #%d, message #%d.', $webhook->id, $message->id));
+
         $this->repository->destroyMessage($message);
         app('preferences')->mark();
 

app/Api/V1/Controllers/Webhook/MessageController.php

@@ -31,9 +31,11 @@ use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
 use FireflyIII\Transformers\WebhookMessageTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class MessageController
@@ -64,6 +66,12 @@ class MessageController extends Controller
      */
     public function index(Webhook $webhook): JsonResponse
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User tries to view messages of webhook #%d, but webhooks are DISABLED.', $webhook->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+        Log::channel('audit')->info(sprintf('User views messages of webhook #%d.', $webhook->id));
         $manager     = $this->getManager();
         $pageSize    = $this->parameters->get('limit');
         $collection  = $this->repository->getMessages($webhook);
@@ -98,6 +106,13 @@ class MessageController extends Controller
         if ($message->webhook_id !== $webhook->id) {
             throw new FireflyException('200040: Webhook and webhook message are no match');
         }
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User tries to view message #%d of webhook #%d, but webhooks are DISABLED.', $message->id, $webhook->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
+        Log::channel('audit')->info(sprintf('User views message #%d of webhook #%d.', $message->id, $webhook->id));
 
         $manager     = $this->getManager();
 

app/Api/V1/Controllers/Webhook/ShowController.php

@@ -34,9 +34,11 @@ use FireflyIII\Transformers\WebhookTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class ShowController
@@ -69,6 +71,13 @@ class ShowController extends Controller
      */
     public function index(): JsonResponse
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info('User tries to view all webhooks, but webhooks are DISABLED.');
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
+        Log::channel('audit')->info('User views all webhooks.');
         $manager     = $this->getManager();
         $collection  = $this->repository->all();
         $pageSize    = $this->parameters->get('limit');
@@ -97,6 +106,13 @@ class ShowController extends Controller
      */
     public function show(Webhook $webhook): JsonResponse
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User tries to view webhook #%d, but webhooks are DISABLED.', $webhook->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
+        Log::channel('audit')->info(sprintf('User views webhook #%d.', $webhook->id));
         $manager     = $this->getManager();
 
         /** @var WebhookTransformer $transformer */
@@ -115,7 +131,14 @@ class ShowController extends Controller
      */
     public function triggerTransaction(Webhook $webhook, TransactionGroup $group): JsonResponse
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User tries to trigger webhook #%d on transaction group #%d, but webhooks are DISABLED.', $webhook->id, $group->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
         app('log')->debug(sprintf('Now in triggerTransaction(%d, %d)', $webhook->id, $group->id));
+        Log::channel('audit')->info(sprintf('User triggers webhook #%d on transaction group #%d.', $webhook->id, $group->id));
 
         /** @var MessageGeneratorInterface $engine */
         $engine = app(MessageGeneratorInterface::class);

app/Api/V1/Controllers/Webhook/StoreController.php

@@ -28,7 +28,9 @@ use FireflyIII\Api\V1\Requests\Models\Webhook\CreateRequest;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
 use FireflyIII\Transformers\WebhookTransformer;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class StoreController
@@ -58,9 +60,17 @@ class StoreController extends Controller
     public function store(CreateRequest $request): JsonResponse
     {
         $data        = $request->getData();
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info('User tries to store new webhook, but webhooks are DISABLED.', $data);
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
         $webhook     = $this->repository->store($data);
         $manager     = $this->getManager();
 
+        Log::channel('audit')->info('User stores new webhook', $data);
+
         /** @var WebhookTransformer $transformer */
         $transformer = app(WebhookTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/Webhook/SubmitController.php

@@ -28,6 +28,8 @@ use FireflyIII\Jobs\SendWebhookMessage;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class SubmitController
@@ -55,6 +57,13 @@ class SubmitController extends Controller
      */
     public function submit(Webhook $webhook): JsonResponse
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User tries to submit webhook #%d, but webhooks are DISABLED.', $webhook->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
+        Log::channel('audit')->info(sprintf('User submits webhook #%d', $webhook->id));
         // count messages that can be sent.
         $messages = $this->repository->getReadyMessages($webhook);
         if (0 === $messages->count()) {

app/Api/V1/Controllers/Webhook/UpdateController.php

@@ -29,7 +29,9 @@ use FireflyIII\Models\Webhook;
 use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
 use FireflyIII\Transformers\WebhookTransformer;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 use League\Fractal\Resource\Item;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class UpdateController
@@ -58,9 +60,17 @@ class UpdateController extends Controller
     public function update(Webhook $webhook, UpdateRequest $request): JsonResponse
     {
         $data        = $request->getData();
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User tries to update webhook #%d, but webhooks are DISABLED.', $webhook->id), $data);
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+
         $webhook     = $this->repository->update($webhook, $data);
         $manager     = $this->getManager();
 
+        Log::channel('audit')->info(sprintf('User updates webhook #%d', $webhook->id), $data);
+
         /** @var WebhookTransformer $transformer */
         $transformer = app(WebhookTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php

@@ -59,9 +59,7 @@ class MoveTransactionsRequest extends FormRequest
 
     /**
      * Configure the validator instance with special rules for after the basic validation rules.
-     *
-     * @param validator $validator
-     *                             TODO this is duplicate
+     * TODO this is duplicate.
      */
     public function withValidator(Validator $validator): void
     {
@@ -81,12 +79,12 @@ class MoveTransactionsRequest extends FormRequest
         $data                = $validator->getData();
         $repository          = app(AccountRepositoryInterface::class);
         $repository->setUser(auth()->user());
-        $original    = $repository->find((int)$data['original_account']);
-        $destination = $repository->find((int)$data['destination_account']);
+        $original            = $repository->find((int) $data['original_account']);
+        $destination         = $repository->find((int) $data['destination_account']);
 
         // not the same type:
         if ($original->accountType->type !== $destination->accountType->type) {
-            $validator->errors()->add('title', (string)trans('validation.same_account_type'));
+            $validator->errors()->add('title', (string) trans('validation.same_account_type'));
 
             return;
         }
@@ -96,7 +94,7 @@ class MoveTransactionsRequest extends FormRequest
 
         // check different scenario's.
         if (null === $originalCurrency xor null === $destinationCurrency) {
-            $validator->errors()->add('title', (string)trans('validation.same_account_currency'));
+            $validator->errors()->add('title', (string) trans('validation.same_account_currency'));
 
             return;
         }
@@ -105,7 +103,7 @@ class MoveTransactionsRequest extends FormRequest
             return;
         }
         if ($originalCurrency->code !== $destinationCurrency->code) {
-            $validator->errors()->add('title', (string)trans('validation.same_account_currency'));
+            $validator->errors()->add('title', (string) trans('validation.same_account_currency'));
         }
     }
 }

app/Api/V1/Requests/Data/DateRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Data;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -43,9 +44,15 @@ class DateRequest extends FormRequest
      */
     public function getAll(): array
     {
+        $start = $this->getCarbonDate('start');
+        $end   = $this->getCarbonDate('end');
+        if($start->diffInYears($end) > 5) {
+            throw new FireflyException('Date range out of range.');
+        }
+
         return [
-            'start' => $this->getCarbonDate('start'),
-            'end'   => $this->getCarbonDate('end'),
+            'start' => $start,
+            'end'   => $end,
         ];
     }
 

app/Api/V1/Requests/Models/Account/StoreRequest.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Account;
 
 use FireflyIII\Models\Location;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Rules\UniqueAccountNumber;
 use FireflyIII\Rules\UniqueIban;
 use FireflyIII\Support\Request\AppendsLocationData;
@@ -100,7 +101,7 @@ class StoreRequest extends FormRequest
             'type'                 => 'required|max:1024|min:1|'.sprintf('in:%s', $types),
             'iban'                 => ['iban', 'nullable', new UniqueIban(null, $type)],
             'bic'                  => 'bic|nullable',
-            'account_number'       => ['between:1,255', 'nullable', new UniqueAccountNumber(null, $type)],
+            'account_number'       => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber(null, $type)],
             'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
             'opening_balance_date' => 'date|required_with:opening_balance|nullable',
             'virtual_balance'      => 'numeric|nullable',
@@ -113,10 +114,10 @@ class StoreRequest extends FormRequest
             'credit_card_type'     => sprintf('nullable|in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
             'monthly_payment_date' => 'nullable|date|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
             'liability_type'       => 'nullable|required_if:type,liability|required_if:type,liabilities|in:loan,debt,mortgage',
-            'liability_amount'     => 'required_with:liability_start_date|min:0|numeric|max:1000000000',
+            'liability_amount'     => ['required_with:liability_start_date', new IsValidPositiveAmount()],
             'liability_start_date' => 'required_with:liability_amount|date',
             'liability_direction'  => 'nullable|required_if:type,liability|required_if:type,liabilities|in:credit,debit',
-            'interest'             => 'between:0,100|numeric',
+            'interest'             => 'min:0|max:100|numeric',
             'interest_period'      => sprintf('nullable|in:%s', implode(',', config('firefly.interest_periods'))),
             'notes'                => 'min:0|max:65536',
         ];

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -91,7 +91,7 @@ class UpdateRequest extends FormRequest
             'type'                 => sprintf('in:%s', $types),
             'iban'                 => ['iban', 'nullable', new UniqueIban($account, $this->convertString('type'))],
             'bic'                  => 'bic|nullable',
-            'account_number'       => ['between:1,255', 'nullable', new UniqueAccountNumber($account, $this->convertString('type'))],
+            'account_number'       => ['min:1', 'max:255', 'nullable', new UniqueAccountNumber($account, $this->convertString('type'))],
             'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
             'opening_balance_date' => 'date|required_with:opening_balance|nullable',
             'virtual_balance'      => 'numeric|nullable',
@@ -105,7 +105,7 @@ class UpdateRequest extends FormRequest
             'monthly_payment_date' => 'date|nullable|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
             'liability_type'       => 'required_if:type,liability|in:loan,debt,mortgage',
             'liability_direction'  => 'required_if:type,liability|in:credit,debit',
-            'interest'             => 'required_if:type,liability|between:0,100|numeric',
+            'interest'             => 'required_if:type,liability|min:0|max:100|numeric',
             'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
             'notes'                => 'min:0|max:65536',
         ];

app/Api/V1/Requests/Models/Attachment/StoreRequest.php

@@ -66,9 +66,9 @@ class StoreRequest extends FormRequest
         $model  = $this->convertString('attachable_type');
 
         return [
-            'filename'        => 'required|between:1,255',
-            'title'           => 'between:1,255',
-            'notes'           => 'between:1,65000',
+            'filename'        => 'required|min:1|max:255',
+            'title'           => ['min:1', 'max:255'],
+            'notes'           => 'min:1|max:32768',
             'attachable_type' => sprintf('required|in:%s', $models),
             'attachable_id'   => ['required', 'numeric', new IsValidAttachmentModel($model)],
         ];

app/Api/V1/Requests/Models/Attachment/UpdateRequest.php

@@ -68,9 +68,9 @@ class UpdateRequest extends FormRequest
         $model  = $this->convertString('attachable_type');
 
         return [
-            'filename'        => 'between:1,255',
-            'title'           => 'between:1,255',
-            'notes'           => 'between:1,65000',
+            'filename'        => ['min:1', 'max:255'],
+            'title'           => ['min:1', 'max:255'],
+            'notes'           => 'min:1|max:32768',
             'attachable_type' => sprintf('in:%s', $models),
             'attachable_id'   => ['numeric', new IsValidAttachmentModel($model)],
         ];

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests\Models\AvailableBudget;
 
 use Carbon\Carbon;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -62,7 +63,7 @@ class Request extends FormRequest
         return [
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',
-            'amount'        => 'numeric|gt:0',
+            'amount'        => ['nullable', new IsValidPositiveAmount()],
             'start'         => 'date',
             'end'           => 'date',
         ];

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests\Models\Bill;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -71,18 +72,18 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name'           => 'between:1,255|uniqueObjectForUser:bills,name',
-            'amount_min'     => 'numeric|gt:0|required',
-            'amount_max'     => 'numeric|gt:0|required',
+            'name'           => 'min:1|max:255|uniqueObjectForUser:bills,name',
+            'amount_min'     => ['required', new IsValidPositiveAmount()],
+            'amount_max'     => ['required', new IsValidPositiveAmount()],
             'currency_id'    => 'numeric|exists:transaction_currencies,id',
             'currency_code'  => 'min:3|max:51|exists:transaction_currencies,code',
             'date'           => 'date|required',
             'end_date'       => 'date|after:date',
             'extension_date' => 'date|after:date',
             'repeat_freq'    => 'in:weekly,monthly,quarterly,half-year,yearly|required',
-            'skip'           => 'between:0,31',
+            'skip'           => 'min:0|max:31|numeric',
             'active'         => [new IsBoolean()],
-            'notes'          => 'between:1,65536',
+            'notes'          => 'min:1|max:32768',
         ];
     }
 

app/Api/V1/Requests/Models/Bill/UpdateRequest.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Bill;
 
 use FireflyIII\Models\Bill;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -74,18 +75,18 @@ class UpdateRequest extends FormRequest
         $bill = $this->route()->parameter('bill');
 
         return [
-            'name'           => sprintf('between:1,255|uniqueObjectForUser:bills,name,%d', $bill->id),
-            'amount_min'     => 'numeric|gt:0',
-            'amount_max'     => 'numeric|gt:0',
+            'name'           => sprintf('min:1|max:255|uniqueObjectForUser:bills,name,%d', $bill->id),
+            'amount_min'     => ['nullable', new IsValidPositiveAmount()],
+            'amount_max'     => ['nullable', new IsValidPositiveAmount()],
             'currency_id'    => 'numeric|exists:transaction_currencies,id',
             'currency_code'  => 'min:3|max:51|exists:transaction_currencies,code',
             'date'           => 'date',
             'end_date'       => 'date|after:date',
             'extension_date' => 'date|after:date',
             'repeat_freq'    => 'in:weekly,monthly,quarterly,half-year,yearly',
-            'skip'           => 'between:0,31',
+            'skip'           => 'min:0|max:31|numeric',
             'active'         => [new IsBoolean()],
-            'notes'          => 'between:1,65536',
+            'notes'          => 'min:1|max:32768',
         ];
     }
 

app/Api/V1/Requests/Models/Budget/StoreRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests\Models\Budget;
 
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
@@ -67,14 +68,14 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name'               => 'required|between:1,100|uniqueObjectForUser:budgets,name',
+            'name'               => 'required|min:1|max:255|uniqueObjectForUser:budgets,name',
             'active'             => [new IsBoolean()],
             'currency_id'        => 'exists:transaction_currencies,id',
             'currency_code'      => 'exists:transaction_currencies,code',
-            'notes'              => 'nullable|between:1,65536',
+            'notes'              => 'nullable|min:1|max:32768',
             // auto budget info
             'auto_budget_type'   => 'in:reset,rollover,adjusted,none',
-            'auto_budget_amount' => 'numeric|min:0|max:1000000000|required_if:auto_budget_type,reset|required_if:auto_budget_type,rollover|required_if:auto_budget_type,adjusted',
+            'auto_budget_amount' => ['required_if:auto_budget_type,reset', 'required_if:auto_budget_type,rollover', 'required_if:auto_budget_type,adjusted', new IsValidPositiveAmount()],
             'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly|required_if:auto_budget_type,reset|required_if:auto_budget_type,rollover|required_if:auto_budget_type,adjusted',
         ];
     }

app/Api/V1/Requests/Models/Budget/UpdateRequest.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Budget;
 
 use FireflyIII\Models\Budget;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest;
@@ -80,13 +81,13 @@ class UpdateRequest extends FormRequest
         $budget = $this->route()->parameter('budget');
 
         return [
-            'name'                      => sprintf('between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id),
+            'name'                      => sprintf('min:1|max:100|uniqueObjectForUser:budgets,name,%d', $budget->id),
             'active'                    => [new IsBoolean()],
-            'notes'                     => 'nullable|between:1,65536',
+            'notes'                     => 'nullable|min:1|max:32768',
             'auto_budget_type'          => 'in:reset,rollover,adjusted,none',
             'auto_budget_currency_id'   => 'exists:transaction_currencies,id',
             'auto_budget_currency_code' => 'exists:transaction_currencies,code',
-            'auto_budget_amount'        => 'min:0|max:1000000000',
+            'auto_budget_amount'        => ['nullable', new IsValidPositiveAmount()],
             'auto_budget_period'        => 'in:daily,weekly,monthly,quarterly,half_year,yearly',
         ];
     }

app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\BudgetLimit;
 
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -57,7 +58,7 @@ class StoreRequest extends FormRequest
         return [
             'start'         => 'required|before:end|date',
             'end'           => 'required|after:start|date',
-            'amount'        => 'required|gt:0',
+            'amount'        => ['required', new IsValidPositiveAmount()],
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',
         ];

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests\Models\BudgetLimit;
 
 use Carbon\Carbon;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -61,7 +62,7 @@ class UpdateRequest extends FormRequest
         return [
             'start'         => 'date',
             'end'           => 'date',
-            'amount'        => 'gt:0',
+            'amount'        => ['nullable', new IsValidPositiveAmount()],
             'currency_id'   => 'numeric|exists:transaction_currencies,id',
             'currency_code' => 'min:3|max:51|exists:transaction_currencies,code',
         ];
@@ -69,9 +70,7 @@ class UpdateRequest extends FormRequest
 
     /**
      * Configure the validator instance with special rules for after the basic validation rules.
-     *
-     * @param Validator $validator
-     *                             TODO duplicate code
+     * TODO duplicate code.
      */
     public function withValidator(Validator $validator): void
     {
@@ -83,7 +82,7 @@ class UpdateRequest extends FormRequest
                     $start = new Carbon($data['start']);
                     $end   = new Carbon($data['end']);
                     if ($end->isBefore($start)) {
-                        $validator->errors()->add('end', (string)trans('validation.date_after'));
+                        $validator->errors()->add('end', (string) trans('validation.date_after'));
                     }
                 }
             }

app/Api/V1/Requests/Models/Category/StoreRequest.php

@@ -52,7 +52,7 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name' => 'required|between:1,100|uniqueObjectForUser:categories,name',
+            'name' => 'required|min:1|max:100|uniqueObjectForUser:categories,name',
         ];
     }
 }

app/Api/V1/Requests/Models/Category/UpdateRequest.php

@@ -58,7 +58,7 @@ class UpdateRequest extends FormRequest
         $category = $this->route()->parameter('category');
 
         return [
-            'name' => sprintf('between:1,100|uniqueObjectForUser:categories,name,%d', $category->id),
+            'name' => sprintf('min:1|max:100|uniqueObjectForUser:categories,name,%d', $category->id),
         ];
     }
 }

app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\PiggyBank;
 
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -63,12 +64,12 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name'               => 'required|between:1,255|uniquePiggyBankForUser',
-            'current_amount'     => ['numeric', 'gte:0', 'lte:target_amount'],
+            'name'               => 'required|min:1|max:255|uniquePiggyBankForUser',
+            'current_amount'     => ['nullable', new IsValidPositiveAmount()],
             'account_id'         => 'required|numeric|belongsToUser:accounts,id',
             'object_group_id'    => 'numeric|belongsToUser:object_groups,id',
-            'object_group_title' => 'between:1,255',
-            'target_amount'      => ['numeric', 'gte:0', 'lte:target_amount', 'required'],
+            'object_group_title' => ['min:1', 'max:255'],
+            'target_amount'      => ['required', new IsValidPositiveAmount()],
             'start_date'         => 'date|nullable',
             'target_date'        => 'date|nullable|after:start_date',
             'notes'              => 'max:65000',

app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests\Models\PiggyBank;
 
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Rules\IsAssetAccountId;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Rules\LessThanPiggyTarget;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -68,9 +69,9 @@ class UpdateRequest extends FormRequest
         $piggyBank = $this->route()->parameter('piggyBank');
 
         return [
-            'name'           => 'between:1,255|uniquePiggyBankForUser:'.$piggyBank->id,
-            'current_amount' => ['numeric', 'gte:0', new LessThanPiggyTarget()],
-            'target_amount'  => 'numeric|gte:0',
+            'name'           => 'min:1|max:255|uniquePiggyBankForUser:'.$piggyBank->id,
+            'current_amount' => ['nullable', new LessThanPiggyTarget(), new IsValidPositiveAmount()],
+            'target_amount'  => ['nullable', new IsValidPositiveAmount()],
             'start_date'     => 'date|nullable',
             'target_date'    => 'date|nullable|after:start_date',
             'notes'          => 'max:65000',

app/Api/V1/Requests/Models/Recurrence/StoreRequest.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Recurrence;
 
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRecurrenceData;
@@ -78,39 +79,39 @@ class StoreRequest extends FormRequest
     {
         return [
             'type'                                 => 'required|in:withdrawal,transfer,deposit',
-            'title'             => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
-            'description'       => 'between:1,65000',
+            'title'                                => 'required|min:1|max:255|uniqueObjectForUser:recurrences,title',
+            'description'                          => 'min:1|max:32768',
             'first_date'                           => 'required|date',
             'apply_rules'                          => [new IsBoolean()],
             'active'                               => [new IsBoolean()],
             'repeat_until'                         => 'nullable|date',
-            'nr_of_repetitions' => 'nullable|numeric|between:1,31',
+            'nr_of_repetitions'                    => 'nullable|numeric|min:1|max:31',
 
             'repetitions.*.type'                   => 'required|in:daily,weekly,ndom,monthly,yearly',
-            'repetitions.*.moment'  => 'between:0,10',
-            'repetitions.*.skip'    => 'nullable|numeric|between:0,31',
+            'repetitions.*.moment'                 => 'min:0|max:10',
+            'repetitions.*.skip'                   => 'nullable|numeric|min:0|max:31',
             'repetitions.*.weekend'                => 'numeric|min:1|max:4',
 
-            'transactions.*.description'           => 'required|between:1,255',
-            'transactions.*.amount'                => 'required|numeric|gt:0',
-            'transactions.*.foreign_amount'        => 'nullable|numeric|gt:0',
+            'transactions.*.description'           => 'required|min:1|max:255',
+            'transactions.*.amount'                => ['required', new IsValidPositiveAmount()],
+            'transactions.*.foreign_amount'        => ['nullable', new IsValidPositiveAmount()],
             'transactions.*.currency_id'           => 'nullable|numeric|exists:transaction_currencies,id',
             'transactions.*.currency_code'         => 'nullable|min:3|max:51|exists:transaction_currencies,code',
             'transactions.*.foreign_currency_id'   => 'nullable|numeric|exists:transaction_currencies,id',
             'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code',
             'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.source_name'           => 'between:1,255|nullable',
+            'transactions.*.source_name'           => 'min:1|max:255|nullable',
             'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.destination_name'      => 'between:1,255|nullable',
+            'transactions.*.destination_name'      => 'min:1|max:255|nullable',
 
             // new and updated fields:
             'transactions.*.budget_id'             => ['nullable', 'mustExist:budgets,id', new BelongsUser()],
-            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser()],
+            'transactions.*.budget_name'           => ['min:1', 'max:255', 'nullable', new BelongsUser()],
             'transactions.*.category_id'           => ['nullable', 'mustExist:categories,id', new BelongsUser()],
-            'transactions.*.category_name'         => 'between:1,255|nullable',
+            'transactions.*.category_name'         => 'min:1|max:255|nullable',
             'transactions.*.piggy_bank_id'         => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser()],
-            'transactions.*.piggy_bank_name'       => ['between:1,255', 'nullable', new BelongsUser()],
-            'transactions.*.tags'                  => 'nullable|between:1,64000',
+            'transactions.*.piggy_bank_name'       => ['min:1', 'max:255', 'nullable', new BelongsUser()],
+            'transactions.*.tags'                  => 'nullable|min:1|max:255',
         ];
     }
 

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Requests\Models\Recurrence;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Support\Request\GetRecurrenceData;
@@ -85,39 +86,39 @@ class UpdateRequest extends FormRequest
         $recurrence = $this->route()->parameter('recurrence');
 
         return [
-            'title'             => sprintf('between:1,255|uniqueObjectForUser:recurrences,title,%d', $recurrence->id),
-            'description'       => 'between:1,65000',
+            'title'                                => sprintf('min:1|max:255|uniqueObjectForUser:recurrences,title,%d', $recurrence->id),
+            'description'                          => 'min:1|max:32768',
             'first_date'                           => 'date',
             'apply_rules'                          => [new IsBoolean()],
             'active'                               => [new IsBoolean()],
             'repeat_until'                         => 'nullable|date',
-            'nr_of_repetitions' => 'nullable|numeric|between:1,31',
+            'nr_of_repetitions'                    => 'nullable|numeric|min:1|max:31',
 
             'repetitions.*.type'                   => 'in:daily,weekly,ndom,monthly,yearly',
-            'repetitions.*.moment'  => 'between:0,10',
-            'repetitions.*.skip'    => 'nullable|numeric|between:0,31',
+            'repetitions.*.moment'                 => 'min:0|max:10|numeric',
+            'repetitions.*.skip'                   => 'nullable|numeric|min:0|max:31',
             'repetitions.*.weekend'                => 'nullable|numeric|min:1|max:4',
 
-            'transactions.*.description'           => 'between:1,255',
-            'transactions.*.amount'                => 'numeric|gt:0',
-            'transactions.*.foreign_amount'        => 'nullable|numeric|gt:0',
+            'transactions.*.description'           => ['min:1', 'max:255'],
+            'transactions.*.amount'                => [new IsValidPositiveAmount()],
+            'transactions.*.foreign_amount'        => ['nullable', new IsValidPositiveAmount()],
             'transactions.*.currency_id'           => 'nullable|numeric|exists:transaction_currencies,id',
             'transactions.*.currency_code'         => 'nullable|min:3|max:51|exists:transaction_currencies,code',
             'transactions.*.foreign_currency_id'   => 'nullable|numeric|exists:transaction_currencies,id',
             'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code',
             'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.source_name'           => 'between:1,255|nullable',
+            'transactions.*.source_name'           => 'min:1|max:255|nullable',
             'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.destination_name'      => 'between:1,255|nullable',
+            'transactions.*.destination_name'      => 'min:1|max:255|nullable',
 
             // new and updated fields:
             'transactions.*.budget_id'             => ['nullable', 'mustExist:budgets,id', new BelongsUser()],
-            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser()],
+            'transactions.*.budget_name'           => ['min:1', 'max:255', 'nullable', new BelongsUser()],
             'transactions.*.category_id'           => ['nullable', 'mustExist:categories,id', new BelongsUser()],
-            'transactions.*.category_name'         => 'between:1,255|nullable',
+            'transactions.*.category_name'         => 'min:1|max:255|nullable',
             'transactions.*.piggy_bank_id'         => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser()],
-            'transactions.*.piggy_bank_name'       => ['between:1,255', 'nullable', new BelongsUser()],
-            'transactions.*.tags'                  => 'nullable|between:1,64000',
+            'transactions.*.piggy_bank_name'       => ['min:1', 'max:255', 'nullable', new BelongsUser()],
+            'transactions.*.tags'                  => 'nullable|min:1|max:255',
         ];
     }
 
@@ -164,15 +165,15 @@ class UpdateRequest extends FormRequest
             }
 
             if (array_key_exists('moment', $repetition)) {
-                $current['moment'] = (string)$repetition['moment'];
+                $current['moment'] = (string) $repetition['moment'];
             }
 
             if (array_key_exists('skip', $repetition)) {
-                $current['skip'] = (int)$repetition['skip'];
+                $current['skip'] = (int) $repetition['skip'];
             }
 
             if (array_key_exists('weekend', $repetition)) {
-                $current['weekend'] = (int)$repetition['weekend'];
+                $current['weekend'] = (int) $repetition['weekend'];
             }
             $return[] = $current;
         }

app/Api/V1/Requests/Models/Rule/StoreRequest.php

@@ -76,10 +76,10 @@ class StoreRequest extends FormRequest
         $contextActions  = implode(',', config('firefly.context-rule-actions'));
 
         return [
-            'title'                      => 'required|between:1,100|uniqueObjectForUser:rules,title',
-            'description'                => 'between:1,5000|nullable',
+            'title'                      => 'required|min:1|max:100|uniqueObjectForUser:rules,title',
+            'description'                => 'min:1|max:32768|nullable',
             'rule_group_id'              => 'belongsToUser:rule_groups|required_without:rule_group_title',
-            'rule_group_title'           => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title',
+            'rule_group_title'           => 'nullable|min:1|max:255|required_without:rule_group_id|belongsToUser:rule_groups,title',
             'trigger'                    => 'required|in:store-journal,update-journal',
             'triggers.*.type'            => 'required|in:'.implode(',', $validTriggers),
             'triggers.*.value'           => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024',

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -85,10 +85,10 @@ class UpdateRequest extends FormRequest
         $contextActions  = implode(',', config('firefly.context-rule-actions'));
 
         return [
-            'title'                      => sprintf('between:1,100|uniqueObjectForUser:rules,title,%d', $rule->id),
-            'description'                => 'between:1,5000|nullable',
+            'title'                      => sprintf('min:1|max:100|uniqueObjectForUser:rules,title,%d', $rule->id),
+            'description'                => 'min:1|max:32768|nullable',
             'rule_group_id'              => 'belongsToUser:rule_groups',
-            'rule_group_title'           => 'nullable|between:1,255|belongsToUser:rule_groups,title',
+            'rule_group_title'           => 'nullable|min:1|max:255|belongsToUser:rule_groups,title',
             'trigger'                    => 'in:store-journal,update-journal',
             'triggers.*.type'            => 'required|in:'.implode(',', $validTriggers),
             'triggers.*.value'           => 'required_if:actions.*.type,'.$contextTriggers.'|min:1|ruleTriggerValue|max:1024',
@@ -101,7 +101,7 @@ class UpdateRequest extends FormRequest
             'strict'                     => [new IsBoolean()],
             'stop_processing'            => [new IsBoolean()],
             'active'                     => [new IsBoolean()],
-            'order'                      => 'numeric|between:1,1337',
+            'order'                      => 'numeric|min:1|max:2048',
         ];
     }
 

app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php

@@ -64,8 +64,8 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'title'       => 'required|between:1,100|uniqueObjectForUser:rule_groups,title',
-            'description' => 'between:1,5000|nullable',
+            'title'       => 'required|min:1|max:100|uniqueObjectForUser:rule_groups,title',
+            'description' => 'min:1|max:32768|nullable',
             'active'      => [new IsBoolean()],
         ];
     }

app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php

@@ -62,8 +62,8 @@ class UpdateRequest extends FormRequest
         $ruleGroup = $this->route()->parameter('ruleGroup');
 
         return [
-            'title'       => 'between:1,100|uniqueObjectForUser:rule_groups,title,'.$ruleGroup->id,
-            'description' => 'between:1,5000|nullable',
+            'title'       => 'min:1|max:100|uniqueObjectForUser:rule_groups,title,'.$ruleGroup->id,
+            'description' => 'min:1|max:32768|nullable',
             'active'      => [new IsBoolean()],
         ];
     }

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -27,6 +27,8 @@ namespace FireflyIII\Api\V1\Requests\Models\Transaction;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsDateOrTime;
+use FireflyIII\Rules\IsValidPositiveAmount;
+use FireflyIII\Rules\IsValidZeroOrMoreAmount;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\Support\Request\AppendsLocationData;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -76,7 +78,7 @@ class StoreRequest extends FormRequest
 
         return [
             // basic fields for group:
-            'group_title'                          => 'between:1,1000|nullable',
+            'group_title'                            => 'min:1|max:1000|nullable',
             'error_if_duplicate_hash'                => [new IsBoolean()],
             'apply_rules'                            => [new IsBoolean()],
 
@@ -92,40 +94,41 @@ class StoreRequest extends FormRequest
             'transactions.*.foreign_currency_code'   => 'min:3|max:51|exists:transaction_currencies,code|nullable',
 
             // amount
-            'transactions.*.amount'                => 'required|numeric|gt:0',
-            'transactions.*.foreign_amount'        => 'numeric',
+            'transactions.*.amount'                  => ['required', new IsValidPositiveAmount()],
+            'transactions.*.foreign_amount'          => ['nullable', new IsValidZeroOrMoreAmount()],
 
             // description
-            'transactions.*.description'           => 'nullable|between:1,1000',
+            'transactions.*.description'             => 'nullable|min:1|max:1000',
 
             // source of transaction
             'transactions.*.source_id'               => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.source_name'           => 'between:1,255|nullable',
-            'transactions.*.source_iban'           => 'between:1,255|nullable|iban',
-            'transactions.*.source_number'         => 'between:1,255|nullable',
-            'transactions.*.source_bic'            => 'between:1,255|nullable|bic',
+            'transactions.*.source_name'             => 'min:1|max:255|nullable',
+            'transactions.*.source_iban'             => 'min:1|max:255|nullable|iban',
+            'transactions.*.source_number'           => 'min:1|max:255|nullable',
+            'transactions.*.source_bic'              => 'min:1|max:255|nullable|bic',
 
             // destination of transaction
             'transactions.*.destination_id'          => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.destination_name'      => 'between:1,255|nullable',
-            'transactions.*.destination_iban'      => 'between:1,255|nullable|iban',
-            'transactions.*.destination_number'    => 'between:1,255|nullable',
-            'transactions.*.destination_bic'       => 'between:1,255|nullable|bic',
+            'transactions.*.destination_name'        => 'min:1|max:255|nullable',
+            'transactions.*.destination_iban'        => 'min:1|max:255|nullable|iban',
+            'transactions.*.destination_number'      => 'min:1|max:255|nullable',
+            'transactions.*.destination_bic'         => 'min:1|max:255|nullable|bic',
 
             // budget, category, bill and piggy
             'transactions.*.budget_id'               => ['mustExist:budgets,id', new BelongsUser()],
-            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser()],
+            'transactions.*.budget_name'             => ['min:1', 'max:255', 'nullable', new BelongsUser()],
             'transactions.*.category_id'             => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
-            'transactions.*.category_name'         => 'between:1,255|nullable',
+            'transactions.*.category_name'           => 'min:1|max:255|nullable',
             'transactions.*.bill_id'                 => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
-            'transactions.*.bill_name'             => ['between:1,255', 'nullable', new BelongsUser()],
+            'transactions.*.bill_name'               => ['min:1', 'max:255', 'nullable', new BelongsUser()],
             'transactions.*.piggy_bank_id'           => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUser()],
-            'transactions.*.piggy_bank_name'       => ['between:1,255', 'nullable', new BelongsUser()],
+            'transactions.*.piggy_bank_name'         => ['min:1', 'max:255', 'nullable', new BelongsUser()],
 
             // other interesting fields
             'transactions.*.reconciled'              => [new IsBoolean()],
-            'transactions.*.notes'                 => 'min:1|max:50000|nullable',
-            'transactions.*.tags'                  => 'between:0,255',
+            'transactions.*.notes'                   => 'min:1|max:32768|nullable',
+            'transactions.*.tags'                    => 'min:0|max:255',
+            'transactions.*.tags.*'                  => 'min:0|max:255',
 
             // meta info fields
             'transactions.*.internal_reference'      => 'min:1|max:255|nullable',

app/Api/V1/Requests/Models/Transaction/UpdateRequest.php

@@ -29,6 +29,8 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Rules\BelongsUser;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsDateOrTime;
+use FireflyIII\Rules\IsValidPositiveAmount;
+use FireflyIII\Rules\IsValidZeroOrMoreAmount;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use FireflyIII\Validation\GroupValidation;
@@ -97,7 +99,7 @@ class UpdateRequest extends FormRequest
 
         return [
             // basic fields for group:
-            'group_title'                           => 'between:1,1000|nullable',
+            'group_title'                            => 'min:1|max:1000|nullable',
             'apply_rules'                            => [new IsBoolean()],
 
             // transaction rules (in array for splits):
@@ -115,32 +117,33 @@ class UpdateRequest extends FormRequest
             'transactions.*.foreign_currency_code'   => 'nullable|min:3|max:51|exists:transaction_currencies,code',
 
             // amount
-            'transactions.*.amount'                 => 'numeric|gt:0|max:100000000000',
-            'transactions.*.foreign_amount'         => 'nullable|numeric|gte:0',
+            'transactions.*.amount'                  => ['nullable', new IsValidPositiveAmount()],
+            'transactions.*.foreign_amount'          => ['nullable', new IsValidZeroOrMoreAmount()],
 
             // description
-            'transactions.*.description'            => 'nullable|between:1,1000',
+            'transactions.*.description'             => 'nullable|min:1|max:1000',
 
             // source of transaction
             'transactions.*.source_id'               => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.source_name'            => 'between:1,255|nullable',
+            'transactions.*.source_name'             => 'min:1|max:255|nullable',
 
             // destination of transaction
             'transactions.*.destination_id'          => ['numeric', 'nullable', new BelongsUser()],
-            'transactions.*.destination_name'       => 'between:1,255|nullable',
+            'transactions.*.destination_name'        => 'min:1|max:255|nullable',
 
             // budget, category, bill and piggy
             'transactions.*.budget_id'               => ['mustExist:budgets,id', new BelongsUser(), 'nullable'],
-            'transactions.*.budget_name'            => ['between:1,255', 'nullable', new BelongsUser()],
+            'transactions.*.budget_name'             => ['min:1', 'max:255', 'nullable', new BelongsUser()],
             'transactions.*.category_id'             => ['mustExist:categories,id', new BelongsUser(), 'nullable'],
-            'transactions.*.category_name'          => 'between:1,255|nullable',
+            'transactions.*.category_name'           => 'min:1|max:255|nullable',
             'transactions.*.bill_id'                 => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()],
-            'transactions.*.bill_name'              => ['between:1,255', 'nullable', new BelongsUser()],
+            'transactions.*.bill_name'               => ['min:1', 'max:255', 'nullable', new BelongsUser()],
 
             // other interesting fields
             'transactions.*.reconciled'              => [new IsBoolean()],
-            'transactions.*.notes'                  => 'min:1|max:50000|nullable',
-            'transactions.*.tags'                   => 'between:0,255|nullable',
+            'transactions.*.notes'                   => 'min:1|max:32768|nullable',
+            'transactions.*.tags'                    => 'min:0|max:255|nullable',
+            'transactions.*.tags.*'                  => 'min:0|max:255',
 
             // meta info fields
             'transactions.*.internal_reference'      => 'min:1|max:255|nullable',

app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php

@@ -66,10 +66,10 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name'           => 'required|between:1,255|unique:transaction_currencies,name',
-            'code'           => 'required|between:3,51|unique:transaction_currencies,code',
-            'symbol'         => 'required|between:1,51|unique:transaction_currencies,symbol',
-            'decimal_places' => 'between:0,20|numeric|min:0|max:12',
+            'name'           => 'required|min:1|max:255|unique:transaction_currencies,name',
+            'code'           => 'required|min:3|max:32|unique:transaction_currencies,code',
+            'symbol'         => 'required|min:1|max:32|unique:transaction_currencies,symbol',
+            'decimal_places' => 'numeric|min:0|max:12',
             'enabled'        => [new IsBoolean()],
             'default'        => [new IsBoolean()],
         ];

app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php

@@ -64,10 +64,10 @@ class UpdateRequest extends FormRequest
         $currency = $this->route()->parameter('currency_code');
 
         return [
-            'name'           => sprintf('between:1,255|unique:transaction_currencies,name,%d', $currency->id),
-            'code'           => sprintf('between:3,51|unique:transaction_currencies,code,%d', $currency->id),
-            'symbol'         => sprintf('between:1,51|unique:transaction_currencies,symbol,%d', $currency->id),
-            'decimal_places' => 'between:0,20|numeric|min:0|max:12',
+            'name'           => sprintf('min:1|max:255|unique:transaction_currencies,name,%d', $currency->id),
+            'code'           => sprintf('min:3|max:32|unique:transaction_currencies,code,%d', $currency->id),
+            'symbol'         => sprintf('min:1|max:32|unique:transaction_currencies,symbol,%d', $currency->id),
+            'decimal_places' => 'numeric|min:0|max:12',
             'enabled'        => [new IsBoolean()],
             'default'        => [new IsBoolean()],
         ];

app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php

@@ -63,7 +63,7 @@ class StoreRequest extends FormRequest
             'link_type_name' => 'exists:link_types,name|required_without:link_type_id',
             'inward_id'      => 'required|belongsToUser:transaction_journals,id|different:outward_id',
             'outward_id'     => 'required|belongsToUser:transaction_journals,id|different:inward_id',
-            'notes'          => 'between:0,65000',
+            'notes'          => 'min:1|max:32768|nullable',
         ];
     }
 

app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php

@@ -63,7 +63,7 @@ class UpdateRequest extends FormRequest
             'link_type_name' => 'exists:link_types,name',
             'inward_id'      => 'belongsToUser:transaction_journals,id|different:outward_id',
             'outward_id'     => 'belongsToUser:transaction_journals,id|different:inward_id',
-            'notes'          => 'between:0,65000',
+            'notes'          => 'min:1|max:32768|nullable',
         ];
     }
 

app/Api/V1/Requests/Models/Webhook/CreateRequest.php

@@ -72,7 +72,7 @@ class CreateRequest extends FormRequest
         $validProtocols = config('firefly.valid_url_protocols');
 
         return [
-            'title'    => 'required|between:1,512|uniqueObjectForUser:webhooks,title',
+            'title'    => 'required|min:1|max:255|uniqueObjectForUser:webhooks,title',
             'active'   => [new IsBoolean()],
             'trigger'  => sprintf('required|in:%s', $triggers),
             'response' => sprintf('required|in:%s', $responses),

app/Api/V1/Requests/Models/Webhook/UpdateRequest.php

@@ -85,7 +85,7 @@ class UpdateRequest extends FormRequest
         $webhook        = $this->route()->parameter('webhook');
 
         return [
-            'title'    => sprintf('between:1,512|uniqueObjectForUser:webhooks,title,%d', $webhook->id),
+            'title'    => sprintf('min:1|max:255|uniqueObjectForUser:webhooks,title,%d', $webhook->id),
             'active'   => [new IsBoolean()],
             'trigger'  => sprintf('in:%s', $triggers),
             'response' => sprintf('in:%s', $responses),

app/Api/V1/Requests/System/UpdateRequest.php

@@ -65,7 +65,7 @@ class UpdateRequest extends FormRequest
             return ['value' => ['required', new IsBoolean()]];
         }
         if ('configuration.permission_update_check' === $name) {
-            return ['value' => 'required|numeric|between:-1,1'];
+            return ['value' => 'required|numeric|min:-1|max:1'];
         }
         if ('configuration.last_update_check' === $name) {
             return ['value' => 'required|numeric|min:464272080'];

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

@@ -0,0 +1,83 @@
+<?php
+/*
+ * CategoryController.php
+ * Copyright (c) 2024 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V2\Controllers\Autocomplete;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Category;
+use FireflyIII\Repositories\UserGroups\Category\CategoryRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class CategoryController
+ */
+class CategoryController extends Controller
+{
+    private CategoryRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(CategoryRepositoryInterface::class);
+
+                $userGroup        = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     *  Documentation for this endpoint:
+     *  TODO list of checks
+     *  1. use dates from ParameterBag
+     *  2. Request validates dates
+     *  3. Request includes user_group_id
+     *  4. Endpoint is documented.
+     *  5. Collector uses user_group_id
+     */
+    public function categories(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $result   = $this->repository->searchCategory($data['query'], $this->parameters->get('limit'));
+        $filtered = $result->map(
+            static function (Category $item) {
+                return [
+                    'id'   => (string) $item->id,
+                    'name' => $item->name,
+                ];
+            }
+        );
+
+        return response()->json($filtered);
+    }
+}

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

@@ -0,0 +1,85 @@
+<?php
+/*
+ * CategoryController.php
+ * Copyright (c) 2024 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V2\Controllers\Autocomplete;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Api\V2\Request\Autocomplete\AutocompleteRequest;
+use FireflyIII\Models\Tag;
+use FireflyIII\Repositories\UserGroups\Tag\TagRepositoryInterface;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class TagController
+ */
+class TagController extends Controller
+{
+    private TagRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(TagRepositoryInterface::class);
+
+                $userGroup        = $this->validateUserGroup($request);
+                if (null !== $userGroup) {
+                    $this->repository->setUserGroup($userGroup);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     *  Documentation for this endpoint:
+     *  TODO list of checks
+     *  1. use dates from ParameterBag
+     *  2. Request validates dates
+     *  3. Request includes user_group_id
+     *  4. Endpoint is documented.
+     *  5. Collector uses user_group_id
+     */
+    public function tags(AutocompleteRequest $request): JsonResponse
+    {
+        $data     = $request->getData();
+        $result   = $this->repository->searchTag($data['query'], $data['limit']);
+        $filtered = $result->map(
+            static function (Tag $item) {
+                return [
+                    'id'      => (string) $item->id,
+                    'name'    => $item->tag,
+                    'value'   => (string) $item->id,
+                    'label'   => $item->tag,
+                ];
+            }
+        );
+
+        return response()->json($filtered);
+    }
+}

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

@@ -134,10 +134,10 @@ class AccountController extends Controller
                 'currency_decimal_places'          => $currency->decimal_places,
 
                 // the default currency of the user (could be the same!)
-                'native_id'               => (string)$default->id,
-                'native_code'             => $default->code,
-                'native_symbol'           => $default->symbol,
-                'native_decimal_places'   => $default->decimal_places,
+                'native_currency_id'               => (string)$default->id,
+                'native_currency_code'             => $default->code,
+                'native_currency_symbol'           => $default->symbol,
+                'native_currency_decimal_places'   => $default->decimal_places,
                 'start'                            => $start->toAtomString(),
                 'end'                              => $end->toAtomString(),
                 'period'                           => '1D',

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

@@ -39,6 +39,7 @@ use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class BudgetController
@@ -76,11 +77,7 @@ class BudgetController extends Controller
     }
 
     /**
-     * @param DateRequest $request
-     *
      * TODO see autocomplete/accountcontroller
-     *
-     * @throws FireflyException
      */
     public function dashboard(DateRequest $request): JsonResponse
     {
@@ -127,14 +124,14 @@ class BudgetController extends Controller
         foreach ($rows as $row) {
             $current  = [
                 'label'                          => $budget->name,
-                'currency_id'             => (string)$row['currency_id'],
+                'currency_id'                    => (string) $row['currency_id'],
                 'currency_code'                  => $row['currency_code'],
                 'currency_name'                  => $row['currency_name'],
                 'currency_decimal_places'        => $row['currency_decimal_places'],
-                'native_id'               => (string)$row['native_id'],
-                'native_code'             => $row['native_code'],
-                'native_name'             => $row['native_name'],
-                'native_decimal_places'   => $row['native_decimal_places'],
+                'native_currency_id'             => (string) $row['native_currency_id'],
+                'native_currency_code'           => $row['native_currency_code'],
+                'native_currency_name'           => $row['native_currency_name'],
+                'native_currency_decimal_places' => $row['native_currency_decimal_places'],
                 'period'                         => null,
                 'start'                          => $row['start'],
                 'end'                            => $row['end'],
@@ -169,7 +166,8 @@ class BudgetController extends Controller
     }
 
     /**
-     * Shared between the "noBudgetLimits" function and "processLimit". Will take a single set of expenses and return its info.
+     * Shared between the "noBudgetLimits" function and "processLimit". Will take a single set of expenses and return
+     * its info.
      *
      * @param array<int, array<int, string>> $array
      *
@@ -177,6 +175,7 @@ class BudgetController extends Controller
      */
     private function processExpenses(int $budgetId, array $array, Carbon $start, Carbon $end): array
     {
+        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
         $converter = new ExchangeRateConverter();
         $return    = [];
 
@@ -190,16 +189,16 @@ class BudgetController extends Controller
         foreach ($array as $currencyId => $block) {
             $this->currencies[$currencyId] ??= TransactionCurrency::find($currencyId);
             $return[$currencyId]           ??= [
-                'currency_id'             => (string)$currencyId,
+                'currency_id'                    => (string) $currencyId,
                 'currency_code'                  => $block['currency_code'],
                 'currency_name'                  => $block['currency_name'],
                 'currency_symbol'                => $block['currency_symbol'],
-                'currency_decimal_places' => (int)$block['currency_decimal_places'],
-                'native_id'               => (string)$this->currency->id,
-                'native_code'             => $this->currency->code,
-                'native_name'             => $this->currency->name,
-                'native_symbol'           => $this->currency->symbol,
-                'native_decimal_places'   => $this->currency->decimal_places,
+                'currency_decimal_places'        => (int) $block['currency_decimal_places'],
+                'native_currency_id'             => (string) $this->currency->id,
+                'native_currency_code'           => $this->currency->code,
+                'native_currency_name'           => $this->currency->name,
+                'native_currency_symbol'         => $this->currency->symbol,
+                'native_currency_decimal_places' => $this->currency->decimal_places,
                 'start'                          => $start->toAtomString(),
                 'end'                            => $end->toAtomString(),
                 'spent'                          => '0',
@@ -258,6 +257,7 @@ class BudgetController extends Controller
      */
     private function processLimit(Budget $budget, BudgetLimit $limit): array
     {
+        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
         $end                  = clone $limit->end_date;
         $end->endOfDay();
         $spent                = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection([$budget]));

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

@@ -37,6 +37,7 @@ use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class BudgetController
@@ -76,6 +77,8 @@ class CategoryController extends Controller
      */
     public function dashboard(DateRequest $request): JsonResponse
     {
+        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
+
         /** @var Carbon $start */
         $start      = $this->parameters->get('start');
 
@@ -115,11 +118,11 @@ class CategoryController extends Controller
                 'currency_name'                    => $currency->name,
                 'currency_symbol'                  => $currency->symbol,
                 'currency_decimal_places'          => $currency->decimal_places,
-                'native_id'               => (string)$default->id,
-                'native_code'             => $default->code,
-                'native_name'             => $default->name,
-                'native_symbol'           => $default->symbol,
-                'native_decimal_places'   => $default->decimal_places,
+                'native_currency_id'               => (string)$default->id,
+                'native_currency_code'             => $default->code,
+                'native_currency_name'             => $default->name,
+                'native_currency_symbol'           => $default->symbol,
+                'native_currency_decimal_places'   => $default->decimal_places,
                 'period'                           => null,
                 'start'                            => $start->toAtomString(),
                 'end'                              => $end->toAtomString(),

app/Api/V2/Controllers/Model/Budget/ShowController.php

@@ -28,6 +28,7 @@ use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Transformers\V2\BudgetTransformer;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -50,6 +51,20 @@ class ShowController extends Controller
         );
     }
 
+    /**
+     * Show a budget.
+     */
+    public function show(Budget $budget): JsonResponse
+    {
+        $transformer = new BudgetTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject('budgets', $budget, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+
     /**
      * 2023-10-29 removed the cerSum reference, not sure where this is used atm
      * so removed from api.php. Also applies to "spent" method.

app/Api/V2/Controllers/Model/BudgetLimit/IndexController.php

@@ -0,0 +1,65 @@
+<?php
+/*
+ * IndexController.php
+ * Copyright (c) 2023 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\V2\Controllers\Model\BudgetLimit;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Models\Budget;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Transformers\V2\BudgetLimitTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+class IndexController extends Controller
+{
+    private BudgetLimitRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(BudgetLimitRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * This endpoint is documented at:
+     * TODO add URL
+     */
+    public function index(Budget $budget): JsonResponse
+    {
+        $pageSize    = $this->parameters->get('limit');
+        $collection  = $this->repository->getBudgetLimits($budget);
+        $total       = $collection->count();
+        $collection->slice($pageSize * $this->parameters->get('page'), $pageSize);
+
+        $paginator   = new LengthAwarePaginator($collection, $total, $pageSize, $this->parameters->get('page'));
+        $transformer = new BudgetLimitTransformer();
+
+        return response()->api($this->jsonApiList('budget-limits', $paginator, $transformer))->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V2/Controllers/Model/Transaction/ShowController.php

@@ -0,0 +1,43 @@
+<?php
+/*
+ * ShowController.php
+ * Copyright (c) 2024 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V2\Controllers\Model\Transaction;
+
+use FireflyIII\Api\V2\Controllers\Controller;
+use FireflyIII\Models\TransactionGroup;
+use FireflyIII\Transformers\V2\TransactionGroupTransformer;
+use Illuminate\Http\JsonResponse;
+
+class ShowController extends Controller
+{
+    /**
+     * TODO this endpoint is not yet reachable.
+     */
+    public function show(TransactionGroup $transactionGroup): JsonResponse
+    {
+        $transformer = new TransactionGroupTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()->api($this->jsonApiObject('transactions', $transactionGroup, $transformer))->header('Content-Type', self::CONTENT_TYPE);
+    }
+}

app/Api/V2/Controllers/Summary/BasicController.php

@@ -45,6 +45,7 @@ use FireflyIII\Support\Http\Api\SummaryBalanceGrouped;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class BasicController
@@ -205,10 +206,10 @@ class BasicController extends Controller
             $return[]     = [
                 'key'                     => 'bills-paid-in-native',
                 'value'                   => $nativeAmount,
-                'currency_id'             => (string)$info['native_id'],
-                'currency_code'           => $info['native_code'],
-                'currency_symbol'         => $info['native_symbol'],
-                'currency_decimal_places' => $info['native_decimal_places'],
+                'currency_id'             => (string)$info['native_currency_id'],
+                'currency_code'           => $info['native_currency_code'],
+                'currency_symbol'         => $info['native_currency_symbol'],
+                'currency_decimal_places' => $info['native_currency_decimal_places'],
             ];
         }
 
@@ -229,10 +230,10 @@ class BasicController extends Controller
             $return[]     = [
                 'key'                     => 'bills-unpaid-in-native',
                 'value'                   => $nativeAmount,
-                'currency_id'             => (string)$info['native_id'],
-                'currency_code'           => $info['native_code'],
-                'currency_symbol'         => $info['native_symbol'],
-                'currency_decimal_places' => $info['native_decimal_places'],
+                'currency_id'             => (string)$info['native_currency_id'],
+                'currency_code'           => $info['native_currency_code'],
+                'currency_symbol'         => $info['native_currency_symbol'],
+                'currency_decimal_places' => $info['native_currency_decimal_places'],
             ];
         }
 
@@ -244,6 +245,7 @@ class BasicController extends Controller
      */
     private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
     {
+        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
         app('log')->debug('Now in getLeftToSpendInfo');
         $return       = [];
         $today        = today(config('app.timezone'));

app/Api/V2/Request/Model/Transaction/StoreRequest.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\UserGroup;
 use FireflyIII\Rules\BelongsUserGroup;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Rules\IsDateOrTime;
+use FireflyIII\Rules\IsValidPositiveAmount;
 use FireflyIII\Support\NullArrayObject;
 use FireflyIII\Support\Request\AppendsLocationData;
 use FireflyIII\Support\Request\ChecksLogin;
@@ -74,7 +75,6 @@ class StoreRequest extends FormRequest
             'fire_webhooks'           => $this->boolean('fire_webhooks', true),
             'transactions'            => $this->getTransactionData(),
         ];
-        // TODO include location and ability to process it.
     }
 
     /**
@@ -91,7 +91,7 @@ class StoreRequest extends FormRequest
 
         return [
             // basic fields for group:
-            'group_title'                          => 'between:1,1000|nullable',
+            'group_title'                            => 'min:1|max:1000|nullable',
             'error_if_duplicate_hash'                => [new IsBoolean()],
             'apply_rules'                            => [new IsBoolean()],
 
@@ -107,40 +107,41 @@ class StoreRequest extends FormRequest
             'transactions.*.foreign_currency_code'   => 'min:3|max:51|exists:transaction_currencies,code|nullable',
 
             // amount
-            'transactions.*.amount'                => 'required|numeric|gt:0',
-            'transactions.*.foreign_amount'        => 'numeric',
+            'transactions.*.amount'                  => ['required', new IsValidPositiveAmount()],
+            'transactions.*.foreign_amount'          => ['nullable', new IsValidPositiveAmount()],
 
             // description
-            'transactions.*.description'           => 'nullable|between:1,1000',
+            'transactions.*.description'             => 'nullable|min:1|max:1000',
 
             // source of transaction
             'transactions.*.source_id'               => ['numeric', 'nullable', new BelongsUserGroup($userGroup)],
-            'transactions.*.source_name'           => 'between:1,255|nullable',
-            'transactions.*.source_iban'           => 'between:1,255|nullable|iban',
-            'transactions.*.source_number'         => 'between:1,255|nullable',
-            'transactions.*.source_bic'            => 'between:1,255|nullable|bic',
+            'transactions.*.source_name'             => 'min:1|max:255|nullable',
+            'transactions.*.source_iban'             => 'min:1|max:255|nullable|iban',
+            'transactions.*.source_number'           => 'min:1|max:255|nullable',
+            'transactions.*.source_bic'              => 'min:1|max:255|nullable|bic',
 
             // destination of transaction
             'transactions.*.destination_id'          => ['numeric', 'nullable', new BelongsUserGroup($userGroup)],
-            'transactions.*.destination_name'      => 'between:1,255|nullable',
-            'transactions.*.destination_iban'      => 'between:1,255|nullable|iban',
-            'transactions.*.destination_number'    => 'between:1,255|nullable',
-            'transactions.*.destination_bic'       => 'between:1,255|nullable|bic',
+            'transactions.*.destination_name'        => 'min:1|max:255|nullable',
+            'transactions.*.destination_iban'        => 'min:1|max:255|nullable|iban',
+            'transactions.*.destination_number'      => 'min:1|max:255|nullable',
+            'transactions.*.destination_bic'         => 'min:1|max:255|nullable|bic',
 
             // budget, category, bill and piggy
             'transactions.*.budget_id'               => ['mustExist:budgets,id', new BelongsUserGroup($userGroup)],
-            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUserGroup($userGroup)],
+            'transactions.*.budget_name'             => ['min:1', 'max:255', 'nullable', new BelongsUserGroup($userGroup)],
             'transactions.*.category_id'             => ['mustExist:categories,id', new BelongsUserGroup($userGroup), 'nullable'],
-            'transactions.*.category_name'         => 'between:1,255|nullable',
+            'transactions.*.category_name'           => 'min:1|max:255|nullable',
             'transactions.*.bill_id'                 => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUserGroup($userGroup)],
-            'transactions.*.bill_name'             => ['between:1,255', 'nullable', new BelongsUserGroup($userGroup)],
+            'transactions.*.bill_name'               => ['min:1', 'max:255', 'nullable', new BelongsUserGroup($userGroup)],
             'transactions.*.piggy_bank_id'           => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUserGroup($userGroup)],
-            'transactions.*.piggy_bank_name'       => ['between:1,255', 'nullable', new BelongsUserGroup($userGroup)],
+            'transactions.*.piggy_bank_name'         => ['min:1', 'max:255', 'nullable', new BelongsUserGroup($userGroup)],
 
             // other interesting fields
             'transactions.*.reconciled'              => [new IsBoolean()],
-            'transactions.*.notes'                 => 'min:1|max:50000|nullable',
-            'transactions.*.tags'                  => 'between:0,255',
+            'transactions.*.notes'                   => 'min:1|max:32768|nullable',
+            'transactions.*.tags'                    => 'min:0|max:255',
+            'transactions.*.tags.*'                  => 'min:0|max:255',
 
             // meta info fields
             'transactions.*.internal_reference'      => 'min:1|max:255|nullable',
@@ -166,6 +167,8 @@ class StoreRequest extends FormRequest
             'transactions.*.due_date'                => 'date|nullable',
             'transactions.*.payment_date'            => 'date|nullable',
             'transactions.*.invoice_date'            => 'date|nullable',
+
+            // TODO include location and ability to process it.
         ];
     }
 
@@ -222,7 +225,7 @@ class StoreRequest extends FormRequest
          */
         foreach ($this->get('transactions') as $transaction) {
             $object   = new NullArrayObject($transaction);
-            $return[] = [
+            $result   = [
                 'type'                  => $this->clearString($object['type']),
                 'date'                  => $this->dateFromValue($object['date']),
                 'order'                 => $this->integerFromValue((string)$object['order']),
@@ -300,6 +303,8 @@ class StoreRequest extends FormRequest
                 'payment_date'          => $this->dateFromValue($object['payment_date']),
                 'invoice_date'          => $this->dateFromValue($object['invoice_date']),
             ];
+            $result   = $this->addFromromTransactionStore($transaction, $result);
+            $return[] = $result;
         }
 
         return $return;

app/Api/V2/Request/UserGroup/StoreRequest.php

@@ -49,7 +49,7 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'title' => 'unique:user_groups,title|required|min:2|max:255',
+            'title' => 'unique:user_groups,title|required|min:1|max:255',
         ];
     }
 }

app/Api/V2/Request/UserGroup/UpdateRequest.php

@@ -53,7 +53,7 @@ class UpdateRequest extends FormRequest
         $userGroup = $this->route()->parameter('userGroup');
 
         return [
-            'title' => sprintf('required|min:2|max:255|unique:user_groups,title,%d', $userGroup->id),
+            'title' => sprintf('required|min:1|max:255|unique:user_groups,title,%d', $userGroup->id),
         ];
     }
 }

app/Console/Commands/Tools/Cron.php

@@ -32,6 +32,7 @@ use FireflyIII\Support\Cronjobs\BillWarningCronjob;
 use FireflyIII\Support\Cronjobs\ExchangeRatesCronjob;
 use FireflyIII\Support\Cronjobs\RecurringCronjob;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class Cron
@@ -103,6 +104,7 @@ class Cron extends Command
 
     private function exchangeRatesCronJob(bool $force, ?Carbon $date): void
     {
+        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
         $exchangeRates = new ExchangeRatesCronjob();
         $exchangeRates->setForce($force);
         // set date in cron job:

app/Console/Commands/Upgrade/MigrateRecurrenceType.php

@@ -25,9 +25,6 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Models\Recurrence;
-use FireflyIII\Models\RecurrenceTransaction;
-use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
 
 /**
@@ -53,8 +50,7 @@ class MigrateRecurrenceType extends Command
 
             return 0;
         }
-
-        $this->migrateTypes();
+        $this->friendlyWarning('This command has been disabled.');
         $this->markAsExecuted();
 
         return 0;
@@ -67,38 +63,6 @@ class MigrateRecurrenceType extends Command
         return (bool)$configVar?->data;
     }
 
-    private function migrateTypes(): void
-    {
-        $set = Recurrence::get();
-
-        /** @var Recurrence $recurrence */
-        foreach ($set as $recurrence) {
-            if (TransactionType::INVALID !== $recurrence->transactionType->type) {
-                $this->migrateRecurrence($recurrence);
-            }
-        }
-    }
-
-    private function migrateRecurrence(Recurrence $recurrence): void
-    {
-        $originalType                    = $recurrence->transaction_type_id;
-        $newType                         = $this->getInvalidType();
-        $recurrence->transaction_type_id = $newType->id;
-        $recurrence->save();
-
-        /** @var RecurrenceTransaction $transaction */
-        foreach ($recurrence->recurrenceTransactions as $transaction) {
-            $transaction->transaction_type_id = $originalType;
-            $transaction->save();
-        }
-        $this->friendlyInfo(sprintf('Updated recurrence #%d to new transaction type model.', $recurrence->id));
-    }
-
-    private function getInvalidType(): TransactionType
-    {
-        return TransactionType::whereType(TransactionType::INVALID)->firstOrCreate(['type' => TransactionType::INVALID]);
-    }
-
     private function markAsExecuted(): void
     {
         app('fireflyconfig')->set(self::CONFIG_NAME, true);

app/Exceptions/Handler.php

@@ -216,6 +216,7 @@ class Handler extends ExceptionHandler
             'json'         => request()->acceptsJson(),
             'method'       => request()->method(),
             'headers'      => $headers,
+            'post'         => 'POST' === request()->method() ? json_encode(request()->all()) : '',
         ];
 
         // create job that will mail.

app/Factory/TransactionJournalFactory.php

@@ -28,6 +28,7 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\DuplicateTransactionException;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\Location;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
@@ -49,6 +50,8 @@ use Illuminate\Support\Collection;
 
 /**
  * Class TransactionJournalFactory
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TransactionJournalFactory
 {
@@ -318,10 +321,23 @@ class TransactionJournalFactory
         $this->storePiggyEvent($journal, $row);
         $this->storeTags($journal, $row['tags']);
         $this->storeMetaFields($journal, $row);
+        $this->storeLocation($journal, $row);
 
         return $journal;
     }
 
+    private function storeLocation(TransactionJournal $journal, NullArrayObject $data): void
+    {
+        if (true === $data['store_location']) {
+            $location             = new Location();
+            $location->longitude  = $data['longitude'];
+            $location->latitude   = $data['latitude'];
+            $location->zoom_level = $data['zoom_level'];
+            $location->locatable()->associate($journal);
+            $location->save();
+        }
+    }
+
     private function hashArray(NullArrayObject $row): string
     {
         $dataRow = $row->getArrayCopy();
@@ -355,18 +371,18 @@ class TransactionJournalFactory
 
         /** @var null|TransactionJournalMeta $result */
         $result = TransactionJournalMeta::withTrashed()
+            ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
+            ->whereNotNull('transaction_journals.id')
+            ->where('transaction_journals.user_id', $this->user->id)
             ->where('data', json_encode($hash, JSON_THROW_ON_ERROR))
             ->with(['transactionJournal', 'transactionJournal.transactionGroup'])
-            ->first()
+            ->first(['journal_meta.*'])
         ;
         if (null !== $result) {
             app('log')->warning(sprintf('Found a duplicate in errorIfDuplicate because hash %s is not unique!', $hash));
             $journal = $result->transactionJournal()->withTrashed()->first();
             $group   = $journal?->transactionGroup()->withTrashed()->first();
-            $groupId = $group?->id;
-            if (null === $group) {
-                $groupId = 0;
-            }
+            $groupId = (int) $group?->id;
 
             throw new DuplicateTransactionException(sprintf('Duplicate of transaction #%d.', $groupId));
         }

app/Handlers/Events/UserEventHandler.php

@@ -220,7 +220,7 @@ class UserEventHandler
 
     public function sendAdminRegistrationNotification(RegisteredUser $event): void
     {
-        $sendMail = (bool)app('fireflyconfig')->get('notification_admin_new_reg', true)->data;
+        $sendMail = (bool) app('fireflyconfig')->get('notification_admin_new_reg', true)->data;
         if ($sendMail) {
             /** @var UserRepositoryInterface $repository */
             $repository = app(UserRepositoryInterface::class);
@@ -285,7 +285,7 @@ class UserEventHandler
         $oldEmail = $event->oldEmail;
         $user     = $event->user;
         $token    = app('preferences')->getForUser($user, 'email_change_undo_token', 'invalid');
-        $hashed   = hash('sha256', sprintf('%s%s', (string)config('app.key'), $oldEmail));
+        $hashed   = hash('sha256', sprintf('%s%s', (string) config('app.key'), $oldEmail));
         $url      = route('profile.undo-email-change', [$token->data, $hashed]);
 
         try {
@@ -347,7 +347,7 @@ class UserEventHandler
      */
     public function sendRegistrationMail(RegisteredUser $event): void
     {
-        $sendMail = (bool)app('fireflyconfig')->get('notification_user_new_reg', true)->data;
+        $sendMail = (bool) app('fireflyconfig')->get('notification_user_new_reg', true)->data;
         if ($sendMail) {
             try {
                 Notification::send($event->user, new UserRegistrationNotification());

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -670,7 +670,58 @@ trait MetaCollection
     }
 
     /**
-     * Limit results to a specific set of tags.
+     * Limit results to a SPECIFIC set of tags.
+     */
+    public function setAllTags(Collection $tags): GroupCollectorInterface
+    {
+        Log::debug(sprintf('Now in setAllTags(%d tag(s))', $tags->count()));
+        $this->withTagInformation();
+        $this->query->whereNotNull('tag_transaction_journal.tag_id');
+
+        // this method adds a "postFilter" to the collector.
+        $list                = $tags->pluck('tag')->toArray();
+        $list                = array_map('strtolower', $list);
+        $filter              = static function (array $object) use ($list): bool|array {
+            $return                 = $object;
+            unset($return['transactions']);
+            $return['transactions'] = [];
+            Log::debug(sprintf('Now in setAllTags(%s) filter', implode(', ', $list)));
+            $expectedTagCount       = count($list);
+            $foundTagCount          = 0;
+            foreach ($object['transactions'] as $transaction) {
+                $transactionTagCount = count($transaction['tags']);
+                app('log')->debug(sprintf('Transaction #%d has %d tag(s)', $transaction['transaction_journal_id'], $transactionTagCount));
+                if ($transactionTagCount < $expectedTagCount) {
+                    app('log')->debug(sprintf('Transaction has %d tag(s), we expect %d tag(s), return false.', $transactionTagCount, $expectedTagCount));
+
+                    return false;
+                }
+                foreach ($transaction['tags'] as $tag) {
+                    Log::debug(sprintf('"%s" versus', strtolower($tag['name'])), $list);
+                    if (in_array(strtolower($tag['name']), $list, true)) {
+                        app('log')->debug(sprintf('Transaction has tag "%s" so count++.', $tag['name']));
+                        ++$foundTagCount;
+                        $return['transactions'][] = $transaction;
+                    }
+                }
+            }
+            Log::debug(sprintf('Found %d tags, need at least %d.', $foundTagCount, $expectedTagCount));
+
+            // found at least the expected tags.
+            $result                 = $foundTagCount >= $expectedTagCount;
+            if (true === $result) {
+                return $return;
+            }
+
+            return false;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * Limit results to any of the tags in the list.
      */
     public function setTags(Collection $tags): GroupCollectorInterface
     {
@@ -683,28 +734,19 @@ trait MetaCollection
         $list                = array_map('strtolower', $list);
         $filter              = static function (array $object) use ($list): bool {
             Log::debug(sprintf('Now in setTags(%s) filter', implode(', ', $list)));
-            $expectedTagCount = count($list);
-            $foundTagCount    = 0;
             foreach ($object['transactions'] as $transaction) {
-                $transactionTagCount = count($transaction['tags']);
-                app('log')->debug(sprintf('Transaction has %d tag(s)', $transactionTagCount));
-                if ($transactionTagCount < $expectedTagCount) {
-                    app('log')->debug(sprintf('Transaction has %d tag(s), we expect %d tag(s), return false.', $transactionTagCount, $expectedTagCount));
-
-                    return false;
-                }
                 foreach ($transaction['tags'] as $tag) {
                     Log::debug(sprintf('"%s" versus', strtolower($tag['name'])), $list);
                     if (in_array(strtolower($tag['name']), $list, true)) {
-                        app('log')->debug(sprintf('Transaction has tag "%s" so count++.', $tag['name']));
-                        ++$foundTagCount;
-                    }
-                }
-            }
-            Log::debug(sprintf('Found %d tags, need at least %d.', $foundTagCount, $expectedTagCount));
+                        app('log')->debug(sprintf('Transaction has tag "%s" so return true.', $tag['name']));
 
-            // found at least the expected tags.
-            return $foundTagCount >= $expectedTagCount;
+                        return true;
+                    }
+                }
+            }
+            app('log')->debug('Transaction has no tags from the list, so return false.');
+
+            return false;
         };
         $this->postFilters[] = $filter;
 

app/Helpers/Collector/Extensions/TimeCollection.php

@@ -462,7 +462,7 @@ trait TimeCollection
      */
     public function setBefore(Carbon $date): GroupCollectorInterface
     {
-        $beforeStr = $date->format('Y-m-d 00:00:00');
+        $beforeStr = $date->format('Y-m-d 23:59:59');
         $this->query->where('transaction_journals.date', '<=', $beforeStr);
 
         return $this;

app/Helpers/Collector/GroupCollector.php

@@ -25,7 +25,6 @@ namespace FireflyIII\Helpers\Collector;
 
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
-use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\Extensions\AccountCollection;
 use FireflyIII\Helpers\Collector\Extensions\AmountCollection;
@@ -43,6 +42,7 @@ use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class GroupCollector
@@ -105,6 +105,8 @@ class GroupCollector implements GroupCollectorInterface
             'transaction_groups.created_at as created_at',
             'transaction_groups.updated_at as updated_at',
             'transaction_groups.title as transaction_group_title',
+            'transaction_groups.created_at as group_created_at',
+            'transaction_groups.updated_at as group_updated_at',
 
             // journal
             'transaction_journals.id as transaction_journal_id',
@@ -284,7 +286,7 @@ class GroupCollector implements GroupCollectorInterface
         foreach ($params as $param) {
             $replace = sprintf('"%s"', $param);
             if (is_int($param)) {
-                $replace = (string)$param;
+                $replace = (string) $param;
             }
             $pos     = strpos($query, '?');
             if (false !== $pos) {
@@ -560,6 +562,7 @@ class GroupCollector implements GroupCollectorInterface
         if (0 !== count($journalIds)) {
             // make all integers.
             $integerIDs = array_map('intval', $journalIds);
+            Log::debug(sprintf('GroupCollector: setJournalIds: %s', implode(', ', $integerIDs)));
 
             $this->query->whereIn('transaction_journals.id', $integerIDs);
         }
@@ -689,24 +692,26 @@ class GroupCollector implements GroupCollectorInterface
 
         /** @var TransactionJournal $augumentedJournal */
         foreach ($collection as $augumentedJournal) {
-            $groupId = (int)$augumentedJournal->transaction_group_id;
+            $groupId   = (int) $augumentedJournal->transaction_group_id;
 
             if (!array_key_exists($groupId, $groups)) {
                 // make new array
                 $parsedGroup                            = $this->parseAugmentedJournal($augumentedJournal);
                 $groupArray                             = [
-                    'id'               => (int)$augumentedJournal->transaction_group_id,
+                    'id'               => (int) $augumentedJournal->transaction_group_id,
                     'user_id'          => $augumentedJournal->user_id,
                     'user_group_id'    => $augumentedJournal->user_group_id,
                     // Field transaction_group_title was added by the query.
                     'title'            => $augumentedJournal->transaction_group_title, // @phpstan-ignore-line
+                    'created_at'       => new Carbon($augumentedJournal->group_created_at, config('app.timezone')),
+                    'updated_at'       => new Carbon($augumentedJournal->group_updated_at, config('app.timezone')),
                     'transaction_type' => $parsedGroup['transaction_type_type'],
                     'count'            => 1,
                     'sums'             => [],
                     'transactions'     => [],
                 ];
                 // Field transaction_journal_id was added by the query.
-                $journalId                              = (int)$augumentedJournal->transaction_journal_id; // @phpstan-ignore-line
+                $journalId                              = (int) $augumentedJournal->transaction_journal_id; // @phpstan-ignore-line
                 $groupArray['transactions'][$journalId] = $parsedGroup;
                 $groups[$groupId]                       = $groupArray;
 
@@ -714,7 +719,7 @@ class GroupCollector implements GroupCollectorInterface
             }
             // or parse the rest.
             // Field transaction_journal_id was added by the query.
-            $journalId = (int)$augumentedJournal->transaction_journal_id; // @phpstan-ignore-line
+            $journalId = (int) $augumentedJournal->transaction_journal_id; // @phpstan-ignore-line
             if (array_key_exists($journalId, $groups[$groupId]['transactions'])) {
                 // append data to existing group + journal (for multiple tags or multiple attachments)
                 $groups[$groupId]['transactions'][$journalId] = $this->mergeTags($groups[$groupId]['transactions'][$journalId], $augumentedJournal);
@@ -767,7 +772,7 @@ class GroupCollector implements GroupCollectorInterface
         $dates                   = ['interest_date', 'payment_date', 'invoice_date', 'book_date', 'due_date', 'process_date'];
         if (array_key_exists('meta_name', $result) && in_array($result['meta_name'], $dates, true)) {
             $name = $result['meta_name'];
-            if (array_key_exists('meta_data', $result) && '' !== (string)$result['meta_data']) {
+            if (array_key_exists('meta_data', $result) && '' !== (string) $result['meta_data']) {
                 $result[$name] = Carbon::createFromFormat('!Y-m-d', substr(json_decode($result['meta_data']), 0, 10));
             }
         }
@@ -778,9 +783,9 @@ class GroupCollector implements GroupCollectorInterface
         // convert back to strings because SQLite is dumb like that.
         $result                  = $this->convertToStrings($result);
 
-        $result['reconciled'] = 1 === (int)$result['reconciled'];
+        $result['reconciled']    = 1 === (int) $result['reconciled'];
         if (array_key_exists('tag_id', $result) && null !== $result['tag_id']) { // assume the other fields are present as well.
-            $tagId   = (int)$augumentedJournal['tag_id'];
+            $tagId                  = (int) $augumentedJournal['tag_id'];
             $tagDate                = null;
 
             try {
@@ -790,7 +795,7 @@ class GroupCollector implements GroupCollectorInterface
             }
 
             $result['tags'][$tagId] = [
-                'id'          => (int)$result['tag_id'],
+                'id'          => (int) $result['tag_id'],
                 'name'        => $result['tag_name'],
                 'date'        => $tagDate,
                 'description' => $result['tag_description'],
@@ -799,8 +804,8 @@ class GroupCollector implements GroupCollectorInterface
 
         // also merge attachments:
         if (array_key_exists('attachment_id', $result)) {
-            $uploaded     = 1 === (int)$result['attachment_uploaded'];
-            $attachmentId = (int)$augumentedJournal['attachment_id'];
+            $uploaded     = 1 === (int) $result['attachment_uploaded'];
+            $attachmentId = (int) $augumentedJournal['attachment_id'];
             if (0 !== $attachmentId && $uploaded) {
                 $result['attachments'][$attachmentId] = [
                     'id'       => $attachmentId,
@@ -826,7 +831,7 @@ class GroupCollector implements GroupCollectorInterface
     private function convertToInteger(array $array): array
     {
         foreach ($this->integerFields as $field) {
-            $array[$field] = array_key_exists($field, $array) ? (int)$array[$field] : null;
+            $array[$field] = array_key_exists($field, $array) ? (int) $array[$field] : null;
         }
 
         return $array;
@@ -835,7 +840,7 @@ class GroupCollector implements GroupCollectorInterface
     private function convertToStrings(array $array): array
     {
         foreach ($this->stringFields as $field) {
-            $array[$field] = array_key_exists($field, $array) && null !== $array[$field] ? (string)$array[$field] : null;
+            $array[$field] = array_key_exists($field, $array) && null !== $array[$field] ? (string) $array[$field] : null;
         }
 
         return $array;
@@ -845,7 +850,7 @@ class GroupCollector implements GroupCollectorInterface
     {
         $newArray = $newJournal->toArray();
         if (array_key_exists('tag_id', $newArray)) { // assume the other fields are present as well.
-            $tagId = (int)$newJournal['tag_id'];
+            $tagId                           = (int) $newJournal['tag_id'];
 
             $tagDate                         = null;
 
@@ -856,7 +861,7 @@ class GroupCollector implements GroupCollectorInterface
             }
 
             $existingJournal['tags'][$tagId] = [
-                'id'          => (int)$newArray['tag_id'],
+                'id'          => (int) $newArray['tag_id'],
                 'name'        => $newArray['tag_name'],
                 'date'        => $tagDate,
                 'description' => $newArray['tag_description'],
@@ -870,7 +875,7 @@ class GroupCollector implements GroupCollectorInterface
     {
         $newArray = $newJournal->toArray();
         if (array_key_exists('attachment_id', $newArray)) {
-            $attachmentId = (int)$newJournal['attachment_id'];
+            $attachmentId                                  = (int) $newJournal['attachment_id'];
 
             $existingJournal['attachments'][$attachmentId] = [
                 'id' => $attachmentId,
@@ -889,7 +894,7 @@ class GroupCollector implements GroupCollectorInterface
         foreach ($groups as $groudId => $group) {
             /** @var array $transaction */
             foreach ($group['transactions'] as $transaction) {
-                $currencyId = (int)$transaction['currency_id'];
+                $currencyId                                      = (int) $transaction['currency_id'];
                 if (null === $transaction['amount']) {
                     throw new FireflyException(sprintf('Amount is NULL for a transaction in group #%d, please investigate.', $groudId));
                 }
@@ -905,7 +910,7 @@ class GroupCollector implements GroupCollectorInterface
                 $groups[$groudId]['sums'][$currencyId]['amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $transaction['amount']);
 
                 if (null !== $transaction['foreign_amount'] && null !== $transaction['foreign_currency_id']) {
-                    $currencyId = (int)$transaction['foreign_currency_id'];
+                    $currencyId                                      = (int) $transaction['foreign_currency_id'];
 
                     // set default:
                     if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) {
@@ -948,8 +953,15 @@ class GroupCollector implements GroupCollectorInterface
                     // skip other filters, continue to next item.
                     continue;
                 }
+                // if the result is a bool, use the unedited results.
+                if (true === $result) {
                     $nextCollection->push($item);
                 }
+                // if the result is an array, the filter has changed what's being returned.
+                if (is_array($result)) {
+                    $nextCollection->push($result);
+                }
+            }
             $currentCollection = $nextCollection;
             app('log')->debug(sprintf('GroupCollector: postFilterCollection has %d transaction(s) left.', count($currentCollection)));
         }

app/Helpers/Collector/GroupCollectorInterface.php

@@ -559,10 +559,15 @@ interface GroupCollectorInterface
     public function setTag(Tag $tag): self;
 
     /**
-     * Limit results to a specific set of tags.
+     * Limit results to any of the specified tags.
      */
     public function setTags(Collection $tags): self;
 
+    /**
+     * Limit results to a SPECIFIC set of tags.
+     */
+    public function setAllTags(Collection $tags): self;
+
     /**
      * Limit the search to one specific transaction group.
      */

app/Helpers/Report/NetWorth.php

@@ -36,6 +36,7 @@ use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use FireflyIII\User;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * This class can handle both request with and without a user group and will return the appropriate repository when
@@ -72,7 +73,7 @@ class NetWorth implements NetWorthInterface
             return $cache->get();
         }
         app('log')->debug(sprintf('Now in byAccounts("%s", "%s")', $ids, $date->format('Y-m-d')));
-
+        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
         $default   = app('amount')->getDefaultCurrency();
         $converter = new ExchangeRateConverter();
 
@@ -86,11 +87,11 @@ class NetWorth implements NetWorthInterface
                 'currency_name'                  => $default->name,
                 'currency_symbol'                => $default->symbol,
                 'currency_decimal_places'        => $default->decimal_places,
-                'native_id'               => $default->id,
-                'native_code'             => $default->code,
-                'native_name'             => $default->name,
-                'native_symbol'           => $default->symbol,
-                'native_decimal_places'   => $default->decimal_places,
+                'native_currency_id'             => $default->id,
+                'native_currency_code'           => $default->code,
+                'native_currency_name'           => $default->name,
+                'native_currency_symbol'         => $default->symbol,
+                'native_currency_decimal_places' => $default->decimal_places,
             ],
         ];
         $balances  = app('steam')->balancesByAccountsConverted($accounts, $date);
@@ -102,7 +103,7 @@ class NetWorth implements NetWorthInterface
             if (null === $currency) {
                 $currency = app('amount')->getDefaultCurrency();
             }
-            $currencyId    = $currency->id;
+            $currencyCode                              = $currency->code;
             $balance                                   = '0';
             $nativeBalance                             = '0';
             if (array_key_exists($account->id, $balances)) {
@@ -117,23 +118,23 @@ class NetWorth implements NetWorthInterface
                 $nativeVirtualBalance = $converter->convert($default, $currency, $account->created_at, $virtualBalance);
                 $nativeBalance        = bcsub($nativeBalance, $nativeVirtualBalance);
             }
-            $netWorth[$currencyId] ??= [
+            $netWorth[$currencyCode] ??= [
                 'balance'                        => '0',
                 'native_balance'                 => '0',
-                'currency_id'             => $currencyId,
+                'currency_id'                    => (string) $currency->id,
                 'currency_code'                  => $currency->code,
                 'currency_name'                  => $currency->name,
                 'currency_symbol'                => $currency->symbol,
                 'currency_decimal_places'        => $currency->decimal_places,
-                'native_id'               => $default->id,
-                'native_code'             => $default->code,
-                'native_name'             => $default->name,
-                'native_symbol'           => $default->symbol,
-                'native_decimal_places'   => $default->decimal_places,
+                'native_currency_id'             => (string) $default->id,
+                'native_currency_code'           => $default->code,
+                'native_currency_name'           => $default->name,
+                'native_currency_symbol'         => $default->symbol,
+                'native_currency_decimal_places' => $default->decimal_places,
             ];
 
-            $netWorth[$currencyId]['balance']        = bcadd($balance, $netWorth[$currencyId]['balance']);
-            $netWorth[$currencyId]['native_balance'] = bcadd($nativeBalance, $netWorth[$currencyId]['native_balance']);
+            $netWorth[$currencyCode]['balance']        = bcadd($balance, $netWorth[$currencyCode]['balance']);
+            $netWorth[$currencyCode]['native_balance'] = bcadd($nativeBalance, $netWorth[$currencyCode]['native_balance']);
             $netWorth['native']['balance']             = bcadd($nativeBalance, $netWorth['native']['balance']);
             $netWorth['native']['native_balance']      = bcadd($nativeBalance, $netWorth['native']['native_balance']);
         }
@@ -188,7 +189,7 @@ class NetWorth implements NetWorthInterface
             }
 
             $return[$currency->id] ??= [
-                'id'             => (string)$currency->id,
+                'id'             => (string) $currency->id,
                 'name'           => $currency->name,
                 'symbol'         => $currency->symbol,
                 'code'           => $currency->code,
@@ -219,7 +220,7 @@ class NetWorth implements NetWorthInterface
 
         /** @var Account $account */
         foreach ($accounts as $account) {
-            if (1 === (int)$this->getRepository()->getMetaValue($account, 'include_net_worth')) {
+            if (1 === (int) $this->getRepository()->getMetaValue($account, 'include_net_worth')) {
                 $filtered->push($account);
             }
         }

app/Http/Controllers/Account/CreateController.php

@@ -58,7 +58,7 @@ class CreateController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('mainTitleIcon', 'fa-credit-card');
-                app('view')->share('title', (string)trans('firefly.accounts'));
+                app('view')->share('title', (string) trans('firefly.accounts'));
 
                 $this->repository  = app(AccountRepositoryInterface::class);
                 $this->attachments = app(AttachmentHelperInterface::class);
@@ -77,7 +77,7 @@ class CreateController extends Controller
     {
         $defaultCurrency     = app('amount')->getDefaultCurrency();
         $subTitleIcon        = config(sprintf('firefly.subIconsByIdentifier.%s', $objectType));
-        $subTitle            = (string)trans(sprintf('firefly.make_new_%s_account', $objectType));
+        $subTitle            = (string) trans(sprintf('firefly.make_new_%s_account', $objectType));
         $roles               = $this->getRoles();
         $liabilityTypes      = $this->getLiabilityTypes();
         $hasOldInput         = null !== $request->old('_token');
@@ -96,9 +96,9 @@ class CreateController extends Controller
 
         // interest calculation periods:
         $interestPeriods     = [
-            'daily'   => (string)trans('firefly.interest_calc_daily'),
-            'monthly' => (string)trans('firefly.interest_calc_monthly'),
-            'yearly'  => (string)trans('firefly.interest_calc_yearly'),
+            'daily'   => (string) trans('firefly.interest_calc_daily'),
+            'monthly' => (string) trans('firefly.interest_calc_monthly'),
+            'yearly'  => (string) trans('firefly.interest_calc_yearly'),
         ];
 
         // pre fill some data
@@ -106,9 +106,14 @@ class CreateController extends Controller
             'preFilled',
             [
                 'currency_id'       => $defaultCurrency->id,
-                'include_net_worth' => $hasOldInput ? (bool)$request->old('include_net_worth') : true,
+                'include_net_worth' => $hasOldInput ? (bool) $request->old('include_net_worth') : true,
             ]
         );
+        // issue #8321
+        $showNetWorth        = true;
+        if ('liabilities' !== $objectType && 'asset' !== $objectType) {
+            $showNetWorth = false;
+        }
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('accounts.create.fromStore')) {
@@ -119,7 +124,7 @@ class CreateController extends Controller
 
         return view(
             'accounts.create',
-            compact('subTitleIcon', 'liabilityDirections', 'locations', 'objectType', 'interestPeriods', 'subTitle', 'roles', 'liabilityTypes')
+            compact('subTitleIcon', 'liabilityDirections', 'showNetWorth', 'locations', 'objectType', 'interestPeriods', 'subTitle', 'roles', 'liabilityTypes')
         );
     }
 
@@ -134,7 +139,7 @@ class CreateController extends Controller
     {
         $data      = $request->getAccountData();
         $account   = $this->repository->store($data);
-        $request->session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name]));
+        $request->session()->flash('success', (string) trans('firefly.stored_new_account', ['name' => $account->name]));
         app('preferences')->mark();
 
         Log::channel('audit')->info('Stored new account.', $data);
@@ -156,7 +161,8 @@ class CreateController extends Controller
             $this->attachments->saveAttachmentsForModel($account, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
-            session()->flash('info', (string)trans('firefly.no_att_demo_user'));
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
+            session()->flash('info', (string) trans('firefly.no_att_demo_user'));
         }
 
         if (count($this->attachments->getMessages()->get('attachments')) > 0) {
@@ -165,7 +171,7 @@ class CreateController extends Controller
 
         // redirect to previous URL.
         $redirect  = redirect($this->getPreviousUrl('accounts.create.url'));
-        if (1 === (int)$request->get('create_another')) {
+        if (1 === (int) $request->get('create_another')) {
             // set value so create routine will not overwrite URL:
             $request->session()->put('accounts.create.fromStore', true);
 

app/Http/Controllers/Account/EditController.php

@@ -33,6 +33,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -127,6 +128,12 @@ class EditController extends Controller
         $includeNetWorth      = $repository->getMetaValue($account, 'include_net_worth');
         $includeNetWorth      = null === $includeNetWorth ? true : '1' === $includeNetWorth;
 
+        // issue #8321
+        $showNetWorth         = true;
+        if ('liabilities' !== $objectType && 'asset' !== $objectType) {
+            $showNetWorth = false;
+        }
+
         // code to handle active-checkboxes
         $hasOldInput          = null !== $request->old('_token');
         $virtualBalance       = null === $account->virtual_balance ? '0' : $account->virtual_balance;
@@ -154,7 +161,7 @@ class EditController extends Controller
 
         $request->session()->flash('preFilled', $preFilled);
 
-        return view('accounts.edit', compact('account', 'currency', 'subTitle', 'subTitleIcon', 'locations', 'liabilityDirections', 'objectType', 'roles', 'preFilled', 'liabilityTypes', 'interestPeriods'));
+        return view('accounts.edit', compact('account', 'currency', 'showNetWorth', 'subTitle', 'subTitleIcon', 'locations', 'liabilityDirections', 'objectType', 'roles', 'preFilled', 'liabilityTypes', 'interestPeriods'));
     }
 
     /**
@@ -170,7 +177,7 @@ class EditController extends Controller
 
         $data     = $request->getAccountData();
         $this->repository->update($account, $data);
-
+        Log::channel('audit')->info(sprintf('Updated account #%d.', $account->id), $data);
         $request->session()->flash('success', (string) trans('firefly.updated_account', ['name' => $account->name]));
 
         // store new attachment(s):
@@ -180,6 +187,7 @@ class EditController extends Controller
             $this->attachments->saveAttachmentsForModel($account, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string) trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Bill/CreateController.php

@@ -33,6 +33,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class CreateController
@@ -104,6 +105,8 @@ class CreateController extends Controller
 
             return redirect(route('bills.create'))->withInput();
         }
+
+        Log::channel('audit')->info('Stored new bill.', $billData);
         $request->session()->flash('success', (string)trans('firefly.stored_new_bill', ['name' => $bill->name]));
         app('preferences')->mark();
 
@@ -113,6 +116,7 @@ class CreateController extends Controller
             $this->attachments->saveAttachmentsForModel($bill, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Bill/EditController.php

@@ -33,6 +33,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class EditController
@@ -51,7 +52,7 @@ class EditController extends Controller
 
         $this->middleware(
             function ($request, $next) {
-                app('view')->share('title', (string)trans('firefly.bills'));
+                app('view')->share('title', (string) trans('firefly.bills'));
                 app('view')->share('mainTitleIcon', 'fa-calendar-o');
                 $this->attachments = app(AttachmentHelperInterface::class);
                 $this->repository  = app(BillRepositoryInterface::class);
@@ -74,10 +75,10 @@ class EditController extends Controller
         $billPeriods      = config('firefly.bill_periods');
 
         foreach ($billPeriods as $current) {
-            $periods[$current] = (string)trans('firefly.'.$current);
+            $periods[$current] = (string) trans('firefly.'.$current);
         }
 
-        $subTitle = (string)trans('firefly.edit_bill', ['name' => $bill->name]);
+        $subTitle         = (string) trans('firefly.edit_bill', ['name' => $bill->name]);
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('bills.edit.fromUpdate')) {
@@ -98,7 +99,7 @@ class EditController extends Controller
             'extension_date'          => $bill->extension_date,
             'notes'                   => $this->repository->getNoteText($bill),
             'transaction_currency_id' => $bill->transaction_currency_id,
-            'active'                  => $hasOldInput ? (bool)$request->old('active') : $bill->active,
+            'active'                  => $hasOldInput ? (bool) $request->old('active') : $bill->active,
             'object_group'            => null !== $bill->objectGroups->first() ? $bill->objectGroups->first()->title : '',
         ];
 
@@ -116,7 +117,9 @@ class EditController extends Controller
         $billData = $request->getBillData();
         $bill     = $this->repository->update($bill, $billData);
 
-        $request->session()->flash('success', (string)trans('firefly.updated_bill', ['name' => $bill->name]));
+        Log::channel('audit')->info(sprintf('Updated bill #%d.', $bill->id), $billData);
+
+        $request->session()->flash('success', (string) trans('firefly.updated_bill', ['name' => $bill->name]));
         app('preferences')->mark();
 
         /** @var null|array $files */
@@ -125,7 +128,8 @@ class EditController extends Controller
             $this->attachments->saveAttachmentsForModel($bill, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
-            session()->flash('info', (string)trans('firefly.no_att_demo_user'));
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
+            session()->flash('info', (string) trans('firefly.no_att_demo_user'));
         }
 
         // flash messages
@@ -134,7 +138,7 @@ class EditController extends Controller
         }
         $redirect = redirect($this->getPreviousUrl('bills.edit.url'));
 
-        if (1 === (int)$request->get('return_to_edit')) {
+        if (1 === (int) $request->get('return_to_edit')) {
             $request->session()->put('bills.edit.fromUpdate', true);
 
             $redirect = redirect(route('bills.edit', [$bill->id]))->withInput(['return_to_edit' => 1]);

app/Http/Controllers/Budget/CreateController.php

@@ -32,6 +32,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -117,6 +118,8 @@ class CreateController extends Controller
         $request->session()->flash('success', (string)trans('firefly.stored_new_budget', ['name' => $budget->name]));
         app('preferences')->mark();
 
+        Log::channel('audit')->info('Stored new budget.', $data);
+
         // store attachment(s):
         /** @var null|array $files */
         $files    = $request->hasFile('attachments') ? $request->file('attachments') : null;
@@ -124,6 +127,7 @@ class CreateController extends Controller
             $this->attachments->saveAttachmentsForModel($budget, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Budget/EditController.php

@@ -32,6 +32,7 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -125,6 +126,8 @@ class EditController extends Controller
         $this->repository->cleanupBudgets();
         app('preferences')->mark();
 
+        Log::channel('audit')->info(sprintf('Updated budget #%d.', $budget->id), $data);
+
         $redirect = redirect($this->getPreviousUrl('budgets.edit.url'));
 
         // store new attachment(s):
@@ -134,6 +137,7 @@ class EditController extends Controller
             $this->attachments->saveAttachmentsForModel($budget, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Category/CreateController.php

@@ -32,6 +32,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -99,6 +100,7 @@ class CreateController extends Controller
             $this->attachments->saveAttachmentsForModel($category, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Category/EditController.php

@@ -32,6 +32,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -103,6 +104,7 @@ class EditController extends Controller
             $this->attachments->saveAttachmentsForModel($category, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Json/RecurrenceController.php

@@ -60,6 +60,7 @@ class RecurrenceController extends Controller
      * Shows all events for a repetition. Used in calendar.
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      *
      * @throws FireflyException
      */
@@ -70,11 +71,15 @@ class RecurrenceController extends Controller
         $start                         = Carbon::createFromFormat('Y-m-d', $request->get('start'));
         $end                           = Carbon::createFromFormat('Y-m-d', $request->get('end'));
         $firstDate                     = Carbon::createFromFormat('Y-m-d', $request->get('first_date'));
-        $endDate          = '' !== (string)$request->get('end_date') ? Carbon::createFromFormat('Y-m-d', $request->get('end_date')) : null;
-        $endsAt           = (string)$request->get('ends');
+        $endDate                       = '' !== (string) $request->get('end_date') ? Carbon::createFromFormat('Y-m-d', $request->get('end_date')) : null;
+        $endsAt                        = (string) $request->get('ends');
         $repetitionType                = explode(',', $request->get('type'))[0];
-        $repetitions      = (int)$request->get('reps');
+        $repetitions                   = (int) $request->get('reps');
+        $weekend                       = (int) $request->get('weekend');
         $repetitionMoment              = '';
+        $skip                          = (int) $request->get('skip');
+        $skip                          = $skip < 1 || $skip > 31 ? 1 : $skip;
+        $weekend                       = $weekend < 1 || $weekend > 4 ? 1 : $weekend;
 
         if (false === $start || false === $end || false === $firstDate || false === $endDate) {
             return response()->json();
@@ -102,8 +107,8 @@ class RecurrenceController extends Controller
         $repetition                    = new RecurrenceRepetition();
         $repetition->repetition_type   = $repetitionType;
         $repetition->repetition_moment = $repetitionMoment;
-        $repetition->repetition_skip   = (int)$request->get('skip');
-        $repetition->weekend           = (int)$request->get('weekend');
+        $repetition->repetition_skip   = $skip;
+        $repetition->weekend           = $weekend;
         $actualEnd                     = clone $end;
 
         if ('until_date' === $endsAt) {
@@ -142,7 +147,7 @@ class RecurrenceController extends Controller
      */
     public function suggest(Request $request): JsonResponse
     {
-        $string = '' === (string)$request->get('date') ? date('Y-m-d') : (string)$request->get('date');
+        $string      = '' === (string) $request->get('date') ? date('Y-m-d') : (string) $request->get('date');
         $today       = today(config('app.timezone'))->startOfDay();
 
         try {
@@ -154,37 +159,37 @@ class RecurrenceController extends Controller
             return response()->json();
         }
         $date->startOfDay();
-        $preSelected = (string)$request->get('pre_select');
+        $preSelected = (string) $request->get('pre_select');
         $locale      = app('steam')->getLocale();
 
         app('log')->debug(sprintf('date = %s, today = %s. date > today? %s', $date->toAtomString(), $today->toAtomString(), var_export($date > $today, true)));
-        app('log')->debug(sprintf('past = true? %s', var_export('true' === (string)$request->get('past'), true)));
+        app('log')->debug(sprintf('past = true? %s', var_export('true' === (string) $request->get('past'), true)));
 
         $result      = [];
-        if ($date > $today || 'true' === (string)$request->get('past')) {
+        if ($date > $today || 'true' === (string) $request->get('past')) {
             app('log')->debug('Will fill dropdown.');
             $weekly     = sprintf('weekly,%s', $date->dayOfWeekIso);
             $monthly    = sprintf('monthly,%s', $date->day);
-            $dayOfWeek  = (string)trans(sprintf('config.dow_%s', $date->dayOfWeekIso));
+            $dayOfWeek  = (string) trans(sprintf('config.dow_%s', $date->dayOfWeekIso));
             $ndom       = sprintf('ndom,%s,%s', $date->weekOfMonth, $date->dayOfWeekIso);
             $yearly     = sprintf('yearly,%s', $date->format('Y-m-d'));
-            $yearlyDate = $date->isoFormat((string)trans('config.month_and_day_no_year_js', [], $locale));
+            $yearlyDate = $date->isoFormat((string) trans('config.month_and_day_no_year_js', [], $locale));
             $result     = [
-                'daily'  => ['label' => (string)trans('firefly.recurring_daily'), 'selected' => str_starts_with($preSelected, 'daily')],
+                'daily'  => ['label' => (string) trans('firefly.recurring_daily'), 'selected' => str_starts_with($preSelected, 'daily')],
                 $weekly  => [
-                    'label'    => (string)trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]),
+                    'label'    => (string) trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]),
                     'selected' => str_starts_with($preSelected, 'weekly'),
                 ],
                 $monthly => [
-                    'label'    => (string)trans('firefly.recurring_monthly', ['dayOfMonth' => $date->day]),
+                    'label'    => (string) trans('firefly.recurring_monthly', ['dayOfMonth' => $date->day]),
                     'selected' => str_starts_with($preSelected, 'monthly'),
                 ],
                 $ndom    => [
-                    'label'    => (string)trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]),
+                    'label'    => (string) trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]),
                     'selected' => str_starts_with($preSelected, 'ndom'),
                 ],
                 $yearly  => [
-                    'label'    => (string)trans('firefly.recurring_yearly', ['date' => $yearlyDate]),
+                    'label'    => (string) trans('firefly.recurring_yearly', ['date' => $yearlyDate]),
                     'selected' => str_starts_with($preSelected, 'yearly'),
                 ],
             ];

app/Http/Controllers/PiggyBank/CreateController.php

@@ -32,6 +32,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -106,6 +107,7 @@ class CreateController extends Controller
             $this->attachments->saveAttachmentsForModel($piggyBank, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/PiggyBank/EditController.php

@@ -33,6 +33,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -126,6 +127,7 @@ class EditController extends Controller
             $this->attachments->saveAttachmentsForModel($piggyBank, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Recurring/CreateController.php

@@ -37,6 +37,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -230,6 +231,7 @@ class CreateController extends Controller
 
             return redirect(route('recurring.create'))->withInput();
         }
+        Log::channel('audit')->info('Stored new recurrence.', $data);
 
         $request->session()->flash('success', (string)trans('firefly.stored_new_recurrence', ['title' => $recurrence->title]));
         app('preferences')->mark();
@@ -241,6 +243,7 @@ class CreateController extends Controller
             $this->attachments->saveAttachmentsForModel($recurrence, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Recurring/EditController.php

@@ -37,6 +37,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
@@ -171,6 +172,7 @@ class EditController extends Controller
         $this->recurring->update($recurrence, $data);
 
         $request->session()->flash('success', (string)trans('firefly.updated_recurrence', ['title' => $recurrence->title]));
+        Log::channel('audit')->info(sprintf('Updated recurrence #%d.', $recurrence->id), $data);
 
         // store new attachment(s):
         /** @var null|array $files */
@@ -179,6 +181,7 @@ class EditController extends Controller
             $this->attachments->saveAttachmentsForModel($recurrence, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Report/TagController.php

@@ -57,6 +57,8 @@ class TagController extends Controller
 
     /**
      * @return Factory|View
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function accountPerTag(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
     {
@@ -81,6 +83,7 @@ class TagController extends Controller
 
             /** @var array $tag */
             foreach ($currency['tags'] as $tag) {
+                $tagId = $tag['id'];
                 foreach ($tag['transaction_journals'] as $journal) {
                     $sourceAccountId                                                              = $journal['source_account_id'];
                     $report[$sourceAccountId]['currencies'][$currencyId]                          ??= [
@@ -91,18 +94,18 @@ class TagController extends Controller
                         'tags'                    => [],
                     ];
 
-                    $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tag['id']]
+                    $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tagId]
                                                                                                   ??= [
                                                                                                       'spent'  => '0',
                                                                                                       'earned' => '0',
                                                                                                       'sum'    => '0',
                                                                                                   ];
-                    $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tag['id']]['spent'] = bcadd(
-                        $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tag['id']]['spent'],
+                    $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tagId]['spent'] = bcadd(
+                        $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tagId]['spent'],
                         $journal['amount']
                     );
-                    $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tag['id']]['sum']   = bcadd(
-                        $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tag['id']]['sum'],
+                    $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tagId]['sum']   = bcadd(
+                        $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tagId]['sum'],
                         $journal['amount']
                     );
                 }
@@ -114,6 +117,7 @@ class TagController extends Controller
 
             /** @var array $tag */
             foreach ($currency['tags'] as $tag) {
+                $tagId = $tag['id'];
                 foreach ($tag['transaction_journals'] as $journal) {
                     $destinationId                                                               = $journal['destination_account_id'];
                     $report[$destinationId]['currencies'][$currencyId]
@@ -124,18 +128,18 @@ class TagController extends Controller
                                                                                                      'currency_decimal_places' => $currency['currency_decimal_places'],
                                                                                                      'tags'                    => [],
                                                                                                  ];
-                    $report[$destinationId]['currencies'][$currencyId]['tags'][$tag['id']]
+                    $report[$destinationId]['currencies'][$currencyId]['tags'][$tagId]
                                                                                                  ??= [
                                                                                                      'spent'  => '0',
                                                                                                      'earned' => '0',
                                                                                                      'sum'    => '0',
                                                                                                  ];
-                    $report[$destinationId]['currencies'][$currencyId]['tags'][$tag['id']]['earned'] = bcadd(
-                        $report[$destinationId]['currencies'][$currencyId]['tags'][$tag['id']]['earned'],
+                    $report[$destinationId]['currencies'][$currencyId]['tags'][$tagId]['earned'] = bcadd(
+                        $report[$destinationId]['currencies'][$currencyId]['tags'][$tagId]['earned'],
                         $journal['amount']
                     );
-                    $report[$destinationId]['currencies'][$currencyId]['tags'][$tag['id']]['sum']    = bcadd(
-                        $report[$destinationId]['currencies'][$currencyId]['tags'][$tag['id']]['sum'],
+                    $report[$destinationId]['currencies'][$currencyId]['tags'][$tagId]['sum']    = bcadd(
+                        $report[$destinationId]['currencies'][$currencyId]['tags'][$tagId]['sum'],
                         $journal['amount']
                     );
                 }
@@ -383,27 +387,23 @@ class TagController extends Controller
             /** @var array $tag */
             foreach ($currency['tags'] as $tag) {
                 $tagId = $tag['id'];
-
+                if(!array_key_exists($tagId, $report)) {
+                    continue;
+                }
                 foreach ($tag['transaction_journals'] as $journal) {
                     // add currency info to report array:
                     $report[$tagId]['currencies'][$currencyId] ??= [
                         'spent'                   => '0',
                         'earned'                  => '0',
+                        $tagId                    => $tagId,
                         'sum'                     => '0',
                         'currency_id'             => $currency['currency_id'],
                         'currency_symbol'         => $currency['currency_symbol'],
                         'currency_name'           => $currency['currency_name'],
                         'currency_decimal_places' => $currency['currency_decimal_places'],
                     ];
-                    $report[$tagId]['currencies'][$currencyId]['spent'] = bcadd(
-                        $report[$tagId]['currencies'][$currencyId]['spent'],
-                        $journal['amount']
-                    );
-                    $report[$tagId]['currencies'][$currencyId]['sum']   = bcadd(
-                        $report[$tagId]['currencies'][$currencyId]['sum'],
-                        $journal['amount']
-                    );
-
+                    $report[$tagId]['currencies'][$currencyId]['spent'] = bcadd($report[$tagId]['currencies'][$currencyId]['spent'], $journal['amount']);
+                    $report[$tagId]['currencies'][$currencyId]['sum']   = bcadd($report[$tagId]['currencies'][$currencyId]['sum'], $journal['amount']);
                     $sums[$currencyId]['spent_sum']                     = bcadd($sums[$currencyId]['spent_sum'], $journal['amount']);
                     $sums[$currencyId]['total_sum']                     = bcadd($sums[$currencyId]['total_sum'], $journal['amount']);
                 }
@@ -425,27 +425,23 @@ class TagController extends Controller
             /** @var array $tag */
             foreach ($currency['tags'] as $tag) {
                 $tagId = $tag['id'];
-
+                if(!array_key_exists($tagId, $report)) {
+                    continue;
+                }
                 foreach ($tag['transaction_journals'] as $journal) {
                     // add currency info to report array:
                     $report[$tagId]['currencies'][$currencyId] ??= [
                         'spent'                   => '0',
                         'earned'                  => '0',
                         'sum'                     => '0',
+                        $tagId                    => $tagId,
                         'currency_id'             => $currency['currency_id'],
                         'currency_symbol'         => $currency['currency_symbol'],
                         'currency_name'           => $currency['currency_name'],
                         'currency_decimal_places' => $currency['currency_decimal_places'],
                     ];
-                    $report[$tagId]['currencies'][$currencyId]['earned'] = bcadd(
-                        $report[$tagId]['currencies'][$currencyId]['earned'],
-                        $journal['amount']
-                    );
-                    $report[$tagId]['currencies'][$currencyId]['sum']    = bcadd(
-                        $report[$tagId]['currencies'][$currencyId]['sum'],
-                        $journal['amount']
-                    );
-
+                    $report[$tagId]['currencies'][$currencyId]['earned'] = bcadd($report[$tagId]['currencies'][$currencyId]['earned'], $journal['amount']);
+                    $report[$tagId]['currencies'][$currencyId]['sum']    = bcadd($report[$tagId]['currencies'][$currencyId]['sum'], $journal['amount']);
                     $sums[$currencyId]['earned_sum']                     = bcadd($sums[$currencyId]['earned_sum'], $journal['amount']);
                     $sums[$currencyId]['total_sum']                      = bcadd($sums[$currencyId]['total_sum'], $journal['amount']);
                 }

app/Http/Controllers/TagController.php

@@ -34,6 +34,7 @@ use FireflyIII\Support\Http\Controllers\PeriodOverview;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
 
 /**
@@ -304,6 +305,7 @@ class TagController extends Controller
             $this->attachmentsHelper->saveAttachmentsForModel($result, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 
@@ -338,6 +340,7 @@ class TagController extends Controller
             $this->attachmentsHelper->saveAttachmentsForModel($tag, $files);
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
+            Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 

app/Http/Controllers/Transaction/CreateController.php

@@ -50,7 +50,7 @@ class CreateController extends Controller
 
         $this->middleware(
             function ($request, $next) {
-                app('view')->share('title', (string)trans('firefly.transactions'));
+                app('view')->share('title', (string) trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
                 $this->repository = app(TransactionGroupRepositoryInterface::class);
 
@@ -61,7 +61,7 @@ class CreateController extends Controller
 
     public function cloneGroup(Request $request): JsonResponse
     {
-        $groupId = (int)$request->get('id');
+        $groupId = (int) $request->get('id');
         if (0 !== $groupId) {
             $group = $this->repository->find($groupId);
             if (null !== $group) {
@@ -101,14 +101,14 @@ class CreateController extends Controller
     {
         app('preferences')->mark();
 
-        $sourceId      = (int)request()->get('source');
-        $destinationId = (int)request()->get('destination');
+        $sourceId                   = (int) request()->get('source');
+        $destinationId              = (int) request()->get('destination');
 
         /** @var AccountRepositoryInterface $accountRepository */
         $accountRepository          = app(AccountRepositoryInterface::class);
         $cash                       = $accountRepository->getCashAccount();
         $preFilled                  = session()->has('preFilled') ? session('preFilled') : [];
-        $subTitle             = (string)trans(sprintf('breadcrumbs.create_%s', strtolower((string)$objectType)));
+        $subTitle                   = (string) trans(sprintf('breadcrumbs.create_%s', strtolower((string) $objectType)));
         $subTitleIcon               = 'fa-plus';
         $optionalFields             = app('preferences')->get('transaction_journal_optional_fields', [])->data;
         $allowedOpposingTypes       = config('firefly.allowed_opposing_types');
@@ -118,6 +118,26 @@ class CreateController extends Controller
         $parts                      = parse_url($previousUrl);
         $search                     = sprintf('?%s', $parts['query'] ?? '');
         $previousUrl                = str_replace($search, '', $previousUrl);
+        if (!is_array($optionalFields)) {
+            $optionalFields = [];
+        }
+        // not really a fan of this, but meh.
+        $optionalDateFields         = [
+            'interest_date' => $optionalFields['interest_date'] ?? false,
+            'book_date'     => $optionalFields['book_date'] ?? false,
+            'process_date'  => $optionalFields['process_date'] ?? false,
+            'due_date'      => $optionalFields['due_date'] ?? false,
+            'payment_date'  => $optionalFields['payment_date'] ?? false,
+            'invoice_date'  => $optionalFields['invoice_date'] ?? false,
+        ];
+        $optionalFields['external_url'] ??= false;
+        $optionalFields['location']     ??= false;
+        $optionalFields['location'] = $optionalFields['location'] && true === config('firefly.enable_external_map');
+
+        // map info:
+        $longitude                  = config('firefly.default_location.longitude');
+        $latitude                   = config('firefly.default_location.latitude');
+        $zoomLevel                  = config('firefly.default_location.zoom_level');
 
         session()->put('preFilled', $preFilled);
 
@@ -126,7 +146,11 @@ class CreateController extends Controller
             compact(
                 'subTitleIcon',
                 'cash',
+                'longitude',
+                'latitude',
+                'zoomLevel',
                 'objectType',
+                'optionalDateFields',
                 'subTitle',
                 'defaultCurrency',
                 'previousUrl',

app/Http/Controllers/Transaction/EditController.php

@@ -51,7 +51,7 @@ class EditController extends Controller
         // translations:
         $this->middleware(
             function ($request, $next) {
-                app('view')->share('title', (string)trans('firefly.transactions'));
+                app('view')->share('title', (string) trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
 
                 $this->repository = app(JournalRepositoryInterface::class);
@@ -78,7 +78,9 @@ class EditController extends Controller
         $accountToTypes             = config('firefly.account_to_transaction');
         $expectedSourceTypes        = config('firefly.expected_source_types');
         $allowedSourceDests         = config('firefly.source_dests');
-
+        $title                      = $transactionGroup->transactionJournals()->count() > 1 ? $transactionGroup->title : $transactionGroup->transactionJournals()->first()->description;
+        $subTitle                   = (string) trans('firefly.edit_transaction_title', ['description' => $title]);
+        $subTitleIcon               = 'fa-plus';
         $defaultCurrency            = app('amount')->getDefaultCurrency();
         $cash                       = $repository->getCashAccount();
         $previousUrl                = $this->rememberPreviousUrl('transactions.edit.url');
@@ -86,12 +88,42 @@ class EditController extends Controller
         $search                     = sprintf('?%s', $parts['query'] ?? '');
         $previousUrl                = str_replace($search, '', $previousUrl);
 
+        // settings necessary for v2
+        $optionalFields             = app('preferences')->get('transaction_journal_optional_fields', [])->data;
+        if (!is_array($optionalFields)) {
+            $optionalFields = [];
+        }
+        // not really a fan of this, but meh.
+        $optionalDateFields         = [
+            'interest_date' => $optionalFields['interest_date'] ?? false,
+            'book_date'     => $optionalFields['book_date'] ?? false,
+            'process_date'  => $optionalFields['process_date'] ?? false,
+            'due_date'      => $optionalFields['due_date'] ?? false,
+            'payment_date'  => $optionalFields['payment_date'] ?? false,
+            'invoice_date'  => $optionalFields['invoice_date'] ?? false,
+        ];
+        $optionalFields['external_url'] ??= false;
+        $optionalFields['location']     ??= false;
+        $optionalFields['location'] = $optionalFields['location'] && true === config('firefly.enable_external_map');
+
+        // map info:
+        $longitude                  = config('firefly.default_location.longitude');
+        $latitude                   = config('firefly.default_location.latitude');
+        $zoomLevel                  = config('firefly.default_location.zoom_level');
+
         return view(
             'transactions.edit',
             compact(
                 'cash',
                 'allowedSourceDests',
                 'expectedSourceTypes',
+                'optionalDateFields',
+                'longitude',
+                'latitude',
+                'zoomLevel',
+                'optionalFields',
+                'subTitle',
+                'subTitleIcon',
                 'transactionGroup',
                 'allowedOpposingTypes',
                 'accountToTypes',

app/Http/Controllers/Webhooks/CreateController.php

@@ -26,7 +26,9 @@ namespace FireflyIII\Http\Controllers\Webhooks;
 
 use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class CreateController
@@ -57,6 +59,12 @@ class CreateController extends Controller
      */
     public function index()
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info('User visits webhook create page, but webhooks are DISABLED.');
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+        Log::channel('audit')->info('User visits webhook create page.');
         $previousUrl = $this->rememberPreviousUrl('webhooks.create.url');
 
         return view('webhooks.create', compact('previousUrl'));

app/Http/Controllers/Webhooks/DeleteController.php

@@ -28,6 +28,8 @@ use FireflyIII\Models\Webhook;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class DeleteController
@@ -61,6 +63,12 @@ class DeleteController extends Controller
      */
     public function index(Webhook $webhook)
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info('User visits webhook delete page, but webhooks are DISABLED.');
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+        Log::channel('audit')->info('User visits webhook delete page.');
         $subTitle = (string)trans('firefly.delete_webhook', ['title' => $webhook->title]);
         $this->rememberPreviousUrl('webhooks.delete.url');
 

app/Http/Controllers/Webhooks/EditController.php

@@ -28,6 +28,8 @@ use FireflyIII\Models\Webhook;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class EditController
@@ -60,8 +62,14 @@ class EditController extends Controller
      */
     public function index(Webhook $webhook)
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info('User visits webhook edit page, but webhooks are DISABLED.');
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+        Log::channel('audit')->info('User visits webhook edit page.');
         $subTitle = (string)trans('firefly.edit_webhook', ['title' => $webhook->title]);
-        $this->rememberPreviousUrl('webhooks.delete.url');
+        $this->rememberPreviousUrl('webhooks.edit.url');
 
         return view('webhooks.edit', compact('webhook', 'subTitle'));
     }

app/Http/Controllers/Webhooks/IndexController.php

@@ -26,7 +26,9 @@ namespace FireflyIII\Http\Controllers\Webhooks;
 
 use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class IndexController
@@ -53,6 +55,13 @@ class IndexController extends Controller
      */
     public function index()
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info('User visits webhook index page, but webhooks are DISABLED.');
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+        Log::channel('audit')->info('User visits webhook index page.');
+
         return view('webhooks.index');
     }
 }

app/Http/Controllers/Webhooks/ShowController.php

@@ -28,6 +28,8 @@ use FireflyIII\Models\Webhook;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Class ShowController
@@ -60,6 +62,12 @@ class ShowController extends Controller
      */
     public function index(Webhook $webhook)
     {
+        if(false === config('firefly.allow_webhooks')) {
+            Log::channel('audit')->info(sprintf('User visits webhook #%d page, but webhooks are DISABLED.', $webhook->id));
+
+            throw new NotFoundHttpException('Webhooks are not enabled.');
+        }
+        Log::channel('audit')->info(sprintf('User visits webhook #%d page.', $webhook->id));
         $subTitle = (string)trans('firefly.show_webhook', ['title' => $webhook->title]);
 
         return view('webhooks.show', compact('webhook', 'subTitle'));