Merge branch 'release/5.6.15'

# Conflicts:
#	yarn.lock

.env.example

@@ -37,9 +37,16 @@ TRUSTED_PROXIES=
 # Several other options exist. You can use 'single' for one big fat error log (not recommended).
 # Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
 # A rotating log option is 'daily', creates 5 files that (surprise) rotate.
+# A cool option is 'papertrail' for cloud logging
 # Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
 LOG_CHANNEL=stack
 
+#
+# Used when logging to papertrail:
+#
+PAPERTRAIL_HOST=
+PAPERTRAIL_PORT=
+
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
 # If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
@@ -62,6 +69,8 @@ DB_PORT=3306
 DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=secret_firefly_password
+# leave empty or omit when not using a socket connection
+DB_SOCKET=
 
 # MySQL supports SSL. You can configure it here.
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
@@ -82,6 +91,9 @@ PGSQL_SSL_CERT=null
 PGSQL_SSL_KEY=null
 PGSQL_SSL_CRL_FILE=null
 
+# more PostgreSQL settings
+PGSQL_SCHEMA=public
+
 # If you're looking for performance improvements, you could install memcached or redis
 CACHE_DRIVER=file
 SESSION_DRIVER=file
@@ -170,6 +182,12 @@ MAP_DEFAULT_ZOOM=6
 # https://docs.firefly-iii.org/advanced-installation/authentication
 AUTHENTICATION_GUARD=web
 
+#
+# Your LDAP server may speak a dialect. You can choose between 'OpenLDAP' and 'ActiveDirectory'
+# Anything else defaults to 'ActiveDirectory'
+#
+LDAP_DIALECT=OpenLDAP
+
 #
 # LDAP connection settings:
 #
@@ -185,6 +203,15 @@ LDAP_PASSWORD=super_secret
 
 LDAP_AUTH_FIELD=uid
 
+#
+# If you wish to only authenticate users from a specific group, use the base DN above.
+#
+# If you require extra/special filters please use the LDAP_EXTRA_FILTER with a valid DN.
+#
+# The extra filter will only be applied after the user is authenticated.
+#
+LDAP_EXTRA_FILTER=
+
 #
 # Remote user guard settings
 #
@@ -227,6 +254,8 @@ ALLOW_WEBHOOKS=false
 #
 # For more info: https://docs.firefly-iii.org/firefly-iii/advanced-installation/cron/
 #
+# You can set this variable from a file by appending it with _FILE
+#
 STATIC_CRON_TOKEN=
 
 # You can fine tune the start-up of a Docker container by editing these environment variables.
@@ -280,6 +309,8 @@ FIREFLY_III_LAYOUT=v1
 # It won't work. It doesn't do ANYTHING. Don't believe the lies you read online. I'm not joking.
 # This configuration value WILL NOT HELP.
 #
+# Notable exception to this rule is Synology, which, according to some users, will use APP_URL to rewrite stuff.
+#
 # This variable is ONLY used in some of the emails Firefly III sends around. Nowhere else.
 # So when configuring anything WEB related this variable doesn't do anything. Nothing
 #

.github/.mergify.yml

@@ -1,7 +0,0 @@
-pull_request_rules:
-  - name: PR on main is never approved.
-    conditions:
-      - base=main
-    actions:
-      close:
-        message: Please reopen this PR on the `develop` branch. Thank you.

.github/ISSUE_TEMPLATE/bug.yml

@@ -14,8 +14,9 @@ body:
       label: I've found a bug and checked that ...
       description: Make sure that your request fulfills all of the following requirements. If one requirement cannot be satisfied, explain in detail why.
       options:
-        - label: ... the documentation does not mention anything about my problem
+        - label: ... [the documentation](https://docs.firefly-iii.org/) does not mention anything about my problem
         - label: ... there are no open or closed issues that are related to my problem
+        - label: ... it's [definitely me, not you](https://github.com/firefly-iii/firefly-iii/blob/main/.github/its_you_not_me.md)
 
   - type: textarea
     attributes:

.github/dependabot.yml

@@ -19,11 +19,3 @@ updates:
     schedule:
       interval: "weekly"
 
-  # yarn / JS updates for new frontend
-  - package-ecosystem: "npm"
-    directory: "/frontend"
-    target-branch: develop
-    versioning-strategy: increase
-    labels: ["bug"]
-    schedule:
-      interval: "weekly"

.github/its_you_not_me.md

@@ -0,0 +1,15 @@
+# It's not you, it's me
+
+Sometimes bugs reported to Firefly III are configuration and system problems on the user side.
+
+If you run into one of the following problems, there's a good chance it's not a Firefly III issue, but a configuration issue.
+
+- ⚠️ Can't connect to the database when starting Firefly III
+- ⚠️ Errors with missing app keys or encryption problems
+- ⚠️ Can't login due to 419 errors
+- ⚠️ Any 500 error when starting Firefly III
+- ⚠️ Any white page when starting Firefly III
+- ⚠️ Time-out when starting Firefly III for the first time
+- ⚠️ Firefly III does not work behind your reverse proxy
+
+If you run into an issue like this, please start a [discussion](https://github.com/firefly-iii/firefly-iii/discussions) or chat on [Gitter.im](https://gitter.im/firefly-iii/firefly-iii). There's a good chance it's not a bug but something we can fix rather quickly :+1:

.github/mergify.yml

@@ -0,0 +1,8 @@
+pull_request_rules:
+  - name: Close all on main
+    conditions:
+      - base=main
+      - -author~=^dependabot(|-preview)\[bot\]$
+    actions:
+      close:
+        message: Please do not open PR's on the `main` branch, but on the `develop` branch only. Thank you!

.github/stale.yml

@@ -1,11 +1,11 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 7
+daysUntilStale: 14
 
 # Number of days of inactivity before a stale Issue or Pull Request is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 7
+daysUntilClose: 14
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 # - "[Status] Maybe Later"

.github/workflows/build.yml

@@ -0,0 +1,21 @@
+name: Sonarcloud CI
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

@@ -1,18 +1,8 @@
 /node_modules
 /frontend/node_modules
-/frontend/fonts
-/frontend/images
-/public/hot
-/public/storage
 /storage/*.key
 /vendor
 /.vagrant
-Homestead.json
-Homestead.yaml
 npm-debug.log
 yarn-error.log
 .env
-public/google*.html
-report.html
-composer.phar
-app.js.map

.scrutinizer.yml

@@ -1,58 +0,0 @@
---- 
-build: 
-  nodes: 
-    analysis: 
-      project_setup: 
-        override: true
-      tests: 
-        override: 
-          - php-scrutinizer-run
-checks: 
-  javascript: true
-  php: 
-    align_assignments: true
-    avoid_fixme_comments: true
-    avoid_multiple_statements_on_same_line: true
-    avoid_perl_style_comments: true
-    avoid_todo_comments: true
-    duplication: false
-    encourage_single_quotes: true
-    newline_at_end_of_file: true
-    no_goto: true
-    no_long_variable_names: 
-      maximum: "20"
-    no_short_method_names: 
-      minimum: "3"
-    no_short_variable_names: 
-      minimum: "3"
-    optional_parameters_at_the_end: true
-    parameter_doc_comments: true
-    remove_extra_empty_lines: true
-    return_doc_comment_if_not_inferrable: true
-    return_doc_comments: true
-    uppercase_constants: true
-    use_self_instead_of_fqcn: true
-coding_style: 
-  php: 
-    spaces: 
-      around_operators: 
-        concatenation: true
-      other: 
-        after_type_cast: false
-filter: 
-  excluded_paths: 
-    - database/migrations/*
-    - bootstrap/*
-    - config/*
-    - docker/*
-    - public/js/lib/*
-    - public/lib/adminlte/js/*
-    - public/lib/bootstrap/js/*
-    - resources/*
-    - routes/*
-    - storage/*
-  paths: 
-    - app/*
-    - public/js/ff/*
-tools: 
-  external_code_coverage: false

.travis.yml

@@ -1,20 +0,0 @@
-language: php
-php:
-- '7.4'
-dist: xenial
-os: linux
-cache:
-  directories:
-  - "/home/travis/.config"
-  - "/home/travis/build/firefly-iii/firefly-iii/vendor"
-
-branches:
-  only:
-  - develop
-
-before_script:
-- phpenv config-rm xdebug.ini || return 0
-
-script:
-- "./.ci/phpstan.sh"
-- "./.ci/phpunit.sh"

app/Api/V1/Controllers/Controller.php

@@ -94,7 +94,7 @@ abstract class Controller extends BaseController
                     $obj = Carbon::parse($date);
                 } catch (InvalidDateException | InvalidFormatException $e) {
                     // don't care
-                    Log::error(sprintf('Invalid date exception in API controller: %s', $e->getMessage()));
+                    Log::warn(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', (string) $date, $e->getMessage()));
                 }
             }
             $bag->set($field, $obj);

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

@@ -201,4 +201,70 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
+    /**
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/#/budgets/listTransactionWithoutBudget
+     *
+     * Show all transactions.
+     *
+     * @param Request $request
+     *
+     * @param Budget  $budget
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     * @codeCoverageIgnore
+     */
+    public function withoutBudget(Request $request): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // user can overrule page size with limit parameter.
+        $limit = $this->parameters->get('limit');
+        if (null !== $limit && $limit > 0) {
+            $pageSize = $limit;
+        }
+
+        $type = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = $this->getManager();
+
+        /** @var User $admin */
+        $admin = auth()->user();
+
+        // use new group collector:
+        /** @var GroupCollectorInterface $collector */
+        $collector = app(GroupCollectorInterface::class);
+        $collector
+            ->setUser($admin)
+            // filter on budget.
+            ->withoutBudget()
+            // all info needed for the API:
+            ->withAPIInformation()
+            // set page size:
+            ->setLimit($pageSize)
+            // set page to retrieve
+            ->setPage($this->parameters->get('page'))
+            // set types of transactions to return.
+            ->setTypes($types);
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+
+        $paginator = $collector->getPaginatedGroups();
+        $paginator->setPath(route('api.v1.budgets.without-budget') . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
 }

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

@@ -77,7 +77,7 @@ class ShowController extends Controller
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
-        $collection = $this->repository->getAll();
+        $collection = $this->repository->get();
         $count      = $collection->count();
         $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 

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

@@ -145,11 +145,11 @@ class TriggerController extends Controller
             // add a range:
             $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]);
         }
-        if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) {
+        if (array_key_exists('accounts', $parameters) && is_array($parameters['accounts']) && count($parameters['accounts']) > 0) {
             $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]);
         }
 
-        // file the rule(s)
+        // fire the rule(s)
         $ruleEngine->fire();
 
         return response()->json([], 204);

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

@@ -75,6 +75,7 @@ class DestroyController extends Controller
         $this->repository->destroyGroup($transactionGroup);
         // trigger just after destruction
         event(new DestroyedTransactionGroup($transactionGroup));
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -70,8 +70,8 @@ class AccountController extends Controller
     {
         Log::debug('Now in account search()');
         $manager = $this->getManager();
-        $query   = $request->get('query');
-        $field   = $request->get('field');
+        $query   = trim((string)$request->get('query'));
+        $field   = trim((string)$request->get('field'));
         $type    = $request->get('type') ?? 'all';
         if ('' === $query || !in_array($field, $this->validFields, true)) {
             return response(null, 422);

app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php

@@ -54,7 +54,7 @@ class AutocompleteRequest extends FormRequest
         return [
             'types' => $array,
             'query' => $this->string('query'),
-            'date'  => $this->date('date'),
+            'date'  => $this->getCarbonDate('date'),
             'limit' => $limit,
         ];
     }

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

@@ -45,8 +45,8 @@ class DateRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'start' => $this->date('start'),
-            'end'   => $this->date('end'),
+            'start' => $this->getCarbonDate('start'),
+            'end'   => $this->getCarbonDate('end'),
         ];
     }
 

app/Api/V1/Requests/Data/Export/ExportRequest.php

@@ -41,8 +41,8 @@ class ExportRequest extends FormRequest
     public function getAll(): array
     {
         $result     = [
-            'start' => $this->date('start') ?? Carbon::now()->subYear(),
-            'end'   => $this->date('end') ?? Carbon::now(),
+            'start' => $this->getCarbonDate('start') ?? Carbon::now()->subYear(),
+            'end'   => $this->getCarbonDate('end') ?? Carbon::now(),
             'type'  => $this->string('type'),
         ];
         $parts      = explode(',', $this->string('accounts'));

app/Api/V1/Requests/Insight/GenericRequest.php

@@ -58,8 +58,8 @@ class GenericRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'start' => $this->date('start'),
-            'end'   => $this->date('end'),
+            'start' => $this->getCarbonDate('start'),
+            'end'   => $this->getCarbonDate('end'),
         ];
     }
 
@@ -204,7 +204,7 @@ class GenericRequest extends FormRequest
      */
     public function getEnd(): Carbon
     {
-        $date = $this->date('end');
+        $date = $this->getCarbonDate('end');
         $date->endOfDay();
 
         return $date;
@@ -251,7 +251,7 @@ class GenericRequest extends FormRequest
      */
     public function getStart(): Carbon
     {
-        $date = $this->date('start');
+        $date = $this->getCarbonDate('start');
         $date->startOfDay();
 
         return $date;

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

@@ -70,7 +70,7 @@ class StoreRequest extends FormRequest
             'account_number'          => $this->string('account_number'),
             'account_role'            => $this->string('account_role'),
             'opening_balance'         => $this->string('opening_balance'),
-            'opening_balance_date'    => $this->date('opening_balance_date'),
+            'opening_balance_date'    => $this->getCarbonDate('opening_balance_date'),
             'cc_type'                 => $this->string('credit_card_type'),
             'cc_monthly_payment_date' => $this->string('monthly_payment_date'),
             'notes'                   => $this->stringWithNewlines('notes'),
@@ -82,7 +82,7 @@ class StoreRequest extends FormRequest
 
         if ('liability' === $data['account_type_name'] || 'liabilities' === $data['account_type_name']) {
             $data['opening_balance']      = app('steam')->negative($this->string('liability_amount'));
-            $data['opening_balance_date'] = $this->date('liability_start_date');
+            $data['opening_balance_date'] = $this->getCarbonDate('liability_start_date');
             $data['account_type_name']    = $this->string('liability_type');
             $data['liability_direction']  = $this->string('liability_direction');
             $data['account_type_id']      = null;
@@ -116,15 +116,15 @@ class StoreRequest extends FormRequest
             'currency_code'        => 'min:3|max:3|exists:transaction_currencies,code',
             'active'               => [new IsBoolean],
             'include_net_worth'    => [new IsBoolean],
-            'account_role'         => sprintf('in:%s|required_if:type,asset', $accountRoles),
-            'credit_card_type'     => sprintf('in:%s|required_if:account_role,ccAsset', $ccPaymentTypes),
-            'monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
-            'liability_type'       => 'required_if:type,liability|required_if:type,liabilities|in:loan,debt,mortgage',
+            'account_role'         => sprintf('nullable|in:%s|required_if:type,asset', $accountRoles),
+            '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',
             'liability_start_date' => 'required_with:liability_amount|date',
-            'liability_direction'  => 'required_if:type,liability|required_if:type,liabilities|in:credit,debit',
+            'liability_direction'  => 'nullable|required_if:type,liability|required_if:type,liabilities|in:credit,debit',
             'interest'             => 'between:0,100|numeric',
-            'interest_period'      => sprintf('in:%s', join(',', config('firefly.interest_periods'))),
+            'interest_period'      => sprintf('nullable|in:%s', join(',', config('firefly.interest_periods'))),
             'notes'                => 'min:0|max:65536',
         ];
 

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

@@ -44,8 +44,8 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'start'         => $this->date('start'),
-            'end'           => $this->date('end'),
+            'start'         => $this->getCarbonDate('start'),
+            'end'           => $this->getCarbonDate('end'),
             'amount'        => $this->string('amount'),
             'currency_id'   => $this->integer('currency_id'),
             'currency_code' => $this->string('currency_code'),

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

@@ -51,8 +51,8 @@ class StoreRequest extends FormRequest
         $data['account_id']         = $this->integer('account_id');
         $data['targetamount']       = $this->string('target_amount');
         $data['current_amount']     = $this->string('current_amount');
-        $data['startdate']          = $this->date('start_date');
-        $data['targetdate']         = $this->date('target_date');
+        $data['startdate']          = $this->getCarbonDate('start_date');
+        $data['targetdate']         = $this->getCarbonDate('target_date');
         $data['notes']              = $this->stringWithNewlines('notes');
         $data['object_group_id']    = $this->integer('object_group_id');
         $data['object_group_title'] = $this->string('object_group_title');

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

@@ -141,32 +141,34 @@ class StoreRequest extends FormRequest
             'first_date'                           => 'required|date',
             'apply_rules'                          => [new IsBoolean],
             'active'                               => [new IsBoolean],
-            'repeat_until'                         => 'date',
-            'nr_of_repetitions'                    => 'numeric|between:1,31',
+            'repeat_until'                         => 'nullable|date',
+            'nr_of_repetitions'                    => 'nullable|numeric|between:1,31',
+
             'repetitions.*.type'                   => 'required|in:daily,weekly,ndom,monthly,yearly',
             'repetitions.*.moment'                 => 'between:0,10',
-            'repetitions.*.skip'                   => 'numeric|between:0,31',
+            'repetitions.*.skip'                   => 'nullable|numeric|between:0,31',
             'repetitions.*.weekend'                => 'numeric|min:1|max:4',
+
             'transactions.*.description'           => 'required|between:1,255',
             'transactions.*.amount'                => 'required|numeric|gt:0',
-            'transactions.*.foreign_amount'        => 'numeric|gt:0',
-            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
-            'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_amount'        => 'nullable|numeric|gt:0',
+            'transactions.*.currency_id'           => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.currency_code'         => 'nullable|min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_id'   => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
             'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
             'transactions.*.source_name'           => 'between:1,255|nullable',
             'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
             'transactions.*.destination_name'      => 'between:1,255|nullable',
 
             // new and updated fields:
-            'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
+            'transactions.*.budget_id'             => ['nullable','mustExist:budgets,id', new BelongsUser],
             'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
-            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
+            'transactions.*.category_id'           => ['nullable','mustExist:categories,id', new BelongsUser],
             'transactions.*.category_name'         => 'between:1,255|nullable',
-            'transactions.*.piggy_bank_id'         => ['numeric', 'mustExist:piggy_banks,id', new BelongsUser],
+            'transactions.*.piggy_bank_id'         => ['nullable','numeric', 'mustExist:piggy_banks,id', new BelongsUser],
             'transactions.*.piggy_bank_name'       => ['between:1,255', 'nullable', new BelongsUser],
-            'transactions.*.tags'                  => 'between:1,64000',
+            'transactions.*.tags'                  => 'nullable|between:1,64000',
         ];
     }
 

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

@@ -155,33 +155,34 @@ class UpdateRequest extends FormRequest
             'first_date'            => 'date',
             'apply_rules'           => [new IsBoolean],
             'active'                => [new IsBoolean],
-            'repeat_until'          => 'date',
-            'nr_of_repetitions'     => 'numeric|between:1,31',
+            'repeat_until'          => 'nullable|date',
+            'nr_of_repetitions'     => 'nullable|numeric|between:1,31',
+
             'repetitions.*.type'    => 'in:daily,weekly,ndom,monthly,yearly',
             'repetitions.*.moment'  => 'between:0,10',
-            'repetitions.*.skip'    => 'numeric|between:0,31',
-            'repetitions.*.weekend' => 'numeric|min:1|max:4',
+            'repetitions.*.skip'    => 'nullable|numeric|between:0,31',
+            'repetitions.*.weekend' => 'nullable|numeric|min:1|max:4',
 
             'transactions.*.description'           => 'between:1,255',
             'transactions.*.amount'                => 'numeric|gt:0',
-            'transactions.*.foreign_amount'        => 'numeric|gt:0',
-            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
-            'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_amount'        => 'nullable|numeric|gt:0',
+            'transactions.*.currency_id'           => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.currency_code'         => 'nullable|min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_id'   => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
             'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
             'transactions.*.source_name'           => 'between:1,255|nullable',
             'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
             'transactions.*.destination_name'      => 'between:1,255|nullable',
 
             // new and updated fields:
-            'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
+            'transactions.*.budget_id'             => ['nullable','mustExist:budgets,id', new BelongsUser],
             'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
-            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
+            'transactions.*.category_id'           => ['nullable','mustExist:categories,id', new BelongsUser],
             'transactions.*.category_name'         => 'between:1,255|nullable',
-            'transactions.*.piggy_bank_id'         => ['numeric', 'mustExist:piggy_banks,id', new BelongsUser],
+            'transactions.*.piggy_bank_id'         => ['nullable','numeric', 'mustExist:piggy_banks,id', new BelongsUser],
             'transactions.*.piggy_bank_name'       => ['between:1,255', 'nullable', new BelongsUser],
-            'transactions.*.tags'                  => 'between:1,64000',
+            'transactions.*.tags'                  => 'nullable|between:1,64000',
 
         ];
     }

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

@@ -153,12 +153,14 @@ class StoreRequest extends FormRequest
             function (Validator $validator) {
                 $this->atLeastOneTrigger($validator);
                 $this->atLeastOneAction($validator);
+                $this->atLeastOneActiveTrigger($validator);
+                $this->atLeastOneActiveAction($validator);
             }
         );
     }
 
     /**
-     * Adds an error to the validator when there are no repetitions in the array of data.
+     * Adds an error to the validator when there are no triggers in the array of data.
      *
      * @param Validator $validator
      */
@@ -172,6 +174,64 @@ class StoreRequest extends FormRequest
         }
     }
 
+    /**
+     * Adds an error to the validator when there are no ACTIVE triggers in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneActiveTrigger(Validator $validator): void
+    {
+        $data     = $validator->getData();
+        $triggers = $data['triggers'] ?? [];
+        // need at least one trigger
+        if (!is_countable($triggers) || empty($triggers)) {
+            return;
+        }
+        $allInactive   = true;
+        $inactiveIndex = 0;
+        foreach ($triggers as $index => $trigger) {
+            $active = array_key_exists('active', $trigger) ? $trigger['active'] : true; // assume true
+            if (true === $active) {
+                $allInactive = false;
+            }
+            if (false === $active) {
+                $inactiveIndex = $index;
+            }
+        }
+        if (true === $allInactive) {
+            $validator->errors()->add(sprintf('triggers.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_trigger'));
+        }
+    }
+
+    /**
+     * Adds an error to the validator when there are no ACTIVE actions in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneActiveAction(Validator $validator): void
+    {
+        $data    = $validator->getData();
+        $actions = $data['actions'] ?? [];
+        // need at least one trigger
+        if (!is_countable($actions) || empty($actions)) {
+            return;
+        }
+        $allInactive   = true;
+        $inactiveIndex = 0;
+        foreach ($actions as $index => $action) {
+            $active = array_key_exists('active', $action) ? $action['active'] : true; // assume true
+            if (true === $active) {
+                $allInactive = false;
+            }
+            if (false === $active) {
+                $inactiveIndex = $index;
+            }
+        }
+        if (true === $allInactive) {
+            $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_action'));
+        }
+    }
+
     /**
      * Adds an error to the validator when there are no repetitions in the array of data.
      *

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

@@ -55,7 +55,7 @@ class TriggerRequest extends FormRequest
      */
     private function getDate(string $field): ?Carbon
     {
-        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', $this->query($field));
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($this->query($field),0,10));
     }
 
     /**
@@ -63,7 +63,7 @@ class TriggerRequest extends FormRequest
      */
     private function getAccounts(): array
     {
-        return $this->get('accounts');
+        return $this->get('accounts') ?? [];
     }
 
     /**

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

@@ -53,6 +53,7 @@ class UpdateRequest extends FormRequest
             'strict'          => ['strict', 'boolean'],
             'stop_processing' => ['stop_processing', 'boolean'],
             'active'          => ['active', 'boolean'],
+            'order'           => ['order', 'integer'],
         ];
 
         $return   = $this->getAllData($fields);
@@ -150,6 +151,7 @@ class UpdateRequest extends FormRequest
             'strict'                     => [new IsBoolean],
             'stop_processing'            => [new IsBoolean],
             'active'                     => [new IsBoolean],
+            'order'                      => 'numeric|between:1,1337',
         ];
     }
 
@@ -165,7 +167,9 @@ class UpdateRequest extends FormRequest
         $validator->after(
             function (Validator $validator) {
                 $this->atLeastOneTrigger($validator);
+                $this->atLeastOneValidTrigger($validator);
                 $this->atLeastOneAction($validator);
+                $this->atLeastOneValidAction($validator);
             }
         );
     }
@@ -185,6 +189,35 @@ class UpdateRequest extends FormRequest
         }
     }
 
+    /**
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneValidTrigger(Validator $validator): void
+    {
+        $data          = $validator->getData();
+        $triggers      = $data['triggers'] ?? [];
+        $allInactive   = true;
+        $inactiveIndex = 0;
+        // need at least one trigger
+        if (is_array($triggers) && empty($triggers)) {
+            return;
+        }
+        foreach ($triggers as $index => $trigger) {
+            $active = array_key_exists('active', $trigger) ? $trigger['active'] : true; // assume true
+            if (true === $active) {
+                $allInactive = false;
+            }
+            if (false === $active) {
+                $inactiveIndex = $index;
+            }
+        }
+        if (true === $allInactive) {
+            $validator->errors()->add(sprintf('triggers.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_trigger'));
+        }
+    }
+
     /**
      * Adds an error to the validator when there are no repetitions in the array of data.
      *
@@ -199,4 +232,34 @@ class UpdateRequest extends FormRequest
             $validator->errors()->add('title', (string)trans('validation.at_least_one_action'));
         }
     }
+
+    /**
+     * Adds an error to the validator when there are no repetitions in the array of data.
+     *
+     * @param Validator $validator
+     */
+    protected function atLeastOneValidAction(Validator $validator): void
+    {
+        $data          = $validator->getData();
+        $actions       = $data['actions'] ?? [];
+        $allInactive   = true;
+        $inactiveIndex = 0;
+        // need at least one action
+        if (is_array($actions) && empty($actions)) {
+            return;
+        }
+
+        foreach ($actions as $index => $action) {
+            $active = array_key_exists('active', $action) ? $action['active'] : true; // assume true
+            if (true === $active) {
+                $allInactive = false;
+            }
+            if (false === $active) {
+                $inactiveIndex = $index;
+            }
+        }
+        if (true === $allInactive) {
+            $validator->errors()->add(sprintf('actions.%d.active', $inactiveIndex), (string)trans('validation.at_least_one_active_action'));
+        }
+    }
 }

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

@@ -47,7 +47,7 @@ class StoreRequest extends FormRequest
     {
         $data = [
             'tag'          => $this->string('tag'),
-            'date'         => $this->date('date'),
+            'date'         => $this->getCarbonDate('date'),
             'description'  => $this->string('description'),
             'has_location' => true,
         ];

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

@@ -98,17 +98,17 @@ class StoreRequest extends FormRequest
 
                 // source of transaction. If everything is null, assume cash account.
                 'source_id'             => $this->integerFromValue((string)$object['source_id']),
-                'source_name'           => $this->clearString($object['source_name'], false),
-                'source_iban'           => $this->clearString($object['source_iban'], false),
-                'source_number'         => $this->clearString($object['source_number'], false),
-                'source_bic'            => $this->clearString($object['source_bic'], false),
+                'source_name'           => $this->clearString((string)$object['source_name'], false),
+                'source_iban'           => $this->clearString((string)$object['source_iban'], false),
+                'source_number'         => $this->clearString((string)$object['source_number'], false),
+                'source_bic'            => $this->clearString((string)$object['source_bic'], false),
 
                 // destination of transaction. If everything is null, assume cash account.
                 'destination_id'        => $this->integerFromValue((string)$object['destination_id']),
-                'destination_name'      => $this->clearString($object['destination_name'], false),
-                'destination_iban'      => $this->clearString($object['destination_iban'], false),
-                'destination_number'    => $this->clearString($object['destination_number'], false),
-                'destination_bic'       => $this->clearString($object['destination_bic'], false),
+                'destination_name'      => $this->clearString((string)$object['destination_name'], false),
+                'destination_iban'      => $this->clearString((string)$object['destination_iban'], false),
+                'destination_number'    => $this->clearString((string)$object['destination_number'], false),
+                'destination_bic'       => $this->clearString((string)$object['destination_bic'], false),
 
                 // budget info
                 'budget_id'             => $this->integerFromValue((string)$object['budget_id']),
@@ -137,7 +137,7 @@ class StoreRequest extends FormRequest
                 'original_source'       => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
                 'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
                 'bunq_payment_id'       => $this->clearString((string)$object['bunq_payment_id'], false),
-                'external_uri'          => $this->clearString((string)$object['external_uri'], false),
+                'external_url'          => $this->clearString((string)$object['external_url'], false),
 
                 'sepa_cc'       => $this->clearString((string)$object['sepa_cc'], false),
                 'sepa_ct_op'    => $this->clearString((string)$object['sepa_ct_op'], false),
@@ -211,7 +211,7 @@ class StoreRequest extends FormRequest
             // budget, category, bill and piggy
             'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
             'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
-            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
+            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser,'nullable'],
             'transactions.*.category_name'         => 'between:1,255|nullable',
             'transactions.*.bill_id'               => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
             'transactions.*.bill_name'             => ['between:1,255', 'nullable', new BelongsUser],
@@ -228,7 +228,7 @@ class StoreRequest extends FormRequest
             'transactions.*.external_id'           => 'min:1,max:255|nullable',
             'transactions.*.recurrence_id'         => 'min:1,max:255|nullable',
             'transactions.*.bunq_payment_id'       => 'min:1,max:255|nullable',
-            'transactions.*.external_uri'          => 'min:1,max:255|nullable|url',
+            'transactions.*.external_url'          => 'min:1,max:255|nullable|url',
 
             // SEPA fields:
             'transactions.*.sepa_cc'               => 'min:1,max:255|nullable',

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

@@ -113,7 +113,7 @@ class UpdateRequest extends FormRequest
             'sepa_ep',
             'sepa_ci',
             'sepa_batch_id',
-            'external_uri',
+            'external_url',
         ];
         $this->booleanFields = [
             'reconciled',
@@ -181,7 +181,7 @@ class UpdateRequest extends FormRequest
     {
         foreach ($this->integerFields as $fieldName) {
             if (array_key_exists($fieldName, $transaction)) {
-                $current[$fieldName] = $this->integerFromValue((string)$transaction[$fieldName]);
+                $current[$fieldName] = $this->integerFromValue((string) $transaction[$fieldName]);
             }
         }
 
@@ -198,7 +198,7 @@ class UpdateRequest extends FormRequest
     {
         foreach ($this->stringFields as $fieldName) {
             if (array_key_exists($fieldName, $transaction)) {
-                $current[$fieldName] = $this->clearString((string)$transaction[$fieldName], false);
+                $current[$fieldName] = $this->clearString((string) $transaction[$fieldName], false);
             }
         }
 
@@ -215,7 +215,7 @@ class UpdateRequest extends FormRequest
     {
         foreach ($this->textareaFields as $fieldName) {
             if (array_key_exists($fieldName, $transaction)) {
-                $current[$fieldName] = $this->clearString((string)$transaction[$fieldName]);
+                $current[$fieldName] = $this->clearString((string) $transaction[$fieldName]);
             }
         }
 
@@ -233,8 +233,8 @@ class UpdateRequest extends FormRequest
         foreach ($this->dateFields as $fieldName) {
             Log::debug(sprintf('Now at date field %s', $fieldName));
             if (array_key_exists($fieldName, $transaction)) {
-                Log::debug(sprintf('New value: "%s"', (string)$transaction[$fieldName]));
-                $current[$fieldName] = $this->dateFromValue((string)$transaction[$fieldName]);
+                Log::debug(sprintf('New value: "%s"', (string) $transaction[$fieldName]));
+                $current[$fieldName] = $this->dateFromValue((string) $transaction[$fieldName]);
             }
         }
 
@@ -251,7 +251,7 @@ class UpdateRequest extends FormRequest
     {
         foreach ($this->booleanFields as $fieldName) {
             if (array_key_exists($fieldName, $transaction)) {
-                $current[$fieldName] = $this->convertBoolean((string)$transaction[$fieldName]);
+                $current[$fieldName] = $this->convertBoolean((string) $transaction[$fieldName]);
             }
         }
 
@@ -284,72 +284,76 @@ class UpdateRequest extends FormRequest
     {
         return [
             // basic fields for group:
-            'group_title'                          => 'between:1,1000',
-            'apply_rules'                          => [new IsBoolean],
+            'group_title'                           => 'between:1,1000',
+            'apply_rules'                           => [new IsBoolean],
 
             // transaction rules (in array for splits):
-            'transactions.*.type'                  => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
-            'transactions.*.date'                  => [new IsDateOrTime],
-            'transactions.*.order'                 => 'numeric|min:0',
+            'transactions.*.type'                   => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation',
+            'transactions.*.date'                   => [new IsDateOrTime],
+            'transactions.*.order'                  => 'numeric|min:0',
+
+            // group id:
+            'transactions.*.transaction_journal_id' => ['nullable', 'numeric', new BelongsUser],
+
 
             // currency info
-            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
-            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
-            'transactions.*.foreign_currency_id'   => 'nullable|numeric|exists:transaction_currencies,id',
-            'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.currency_id'            => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.currency_code'          => 'min:3|max:3|exists:transaction_currencies,code',
+            'transactions.*.foreign_currency_id'    => 'nullable|numeric|exists:transaction_currencies,id',
+            'transactions.*.foreign_currency_code'  => 'nullable|min:3|max:3|exists:transaction_currencies,code',
 
             // amount
-            'transactions.*.amount'                => 'numeric|gt:0|max:100000000000',
-            'transactions.*.foreign_amount'        => 'nullable|numeric|gte:0',
+            'transactions.*.amount'                 => 'numeric|gt:0|max:100000000000',
+            'transactions.*.foreign_amount'         => 'nullable|numeric|gte:0',
 
             // description
-            'transactions.*.description'           => 'nullable|between:1,1000',
+            'transactions.*.description'            => 'nullable|between:1,1000',
 
             // source of transaction
-            'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
-            'transactions.*.source_name'           => 'between:1,255|nullable',
+            'transactions.*.source_id'              => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.source_name'            => 'between:1,255|nullable',
 
             // destination of transaction
-            'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
-            'transactions.*.destination_name'      => 'between:1,255|nullable',
+            'transactions.*.destination_id'         => ['numeric', 'nullable', new BelongsUser],
+            'transactions.*.destination_name'       => 'between:1,255|nullable',
 
             // budget, category, bill and piggy
-            'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
-            'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
-            'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
-            'transactions.*.category_name'         => 'between:1,255|nullable',
-            'transactions.*.bill_id'               => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
-            'transactions.*.bill_name'             => ['between:1,255', 'nullable', new BelongsUser],
+            'transactions.*.budget_id'              => ['mustExist:budgets,id', new BelongsUser],
+            'transactions.*.budget_name'            => ['between:1,255', 'nullable', new BelongsUser],
+            'transactions.*.category_id'            => ['mustExist:categories,id', new BelongsUser],
+            'transactions.*.category_name'          => 'between:1,255|nullable',
+            'transactions.*.bill_id'                => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
+            'transactions.*.bill_name'              => ['between:1,255', 'nullable', new BelongsUser],
 
             // other interesting fields
-            'transactions.*.reconciled'            => [new IsBoolean],
-            'transactions.*.notes'                 => 'min:1,max:50000|nullable',
-            'transactions.*.tags'                  => 'between:0,255',
+            'transactions.*.reconciled'             => [new IsBoolean],
+            'transactions.*.notes'                  => 'min:1,max:50000|nullable',
+            'transactions.*.tags'                   => 'between:0,255',
 
             // meta info fields
-            'transactions.*.internal_reference'    => 'min:1,max:255|nullable',
-            'transactions.*.external_id'           => 'min:1,max:255|nullable',
-            'transactions.*.recurrence_id'         => 'min:1,max:255|nullable',
-            'transactions.*.bunq_payment_id'       => 'min:1,max:255|nullable',
-            'transactions.*.external_uri'          => 'min:1,max:255|nullable|url',
+            'transactions.*.internal_reference'     => 'min:1,max:255|nullable',
+            'transactions.*.external_id'            => 'min:1,max:255|nullable',
+            'transactions.*.recurrence_id'          => 'min:1,max:255|nullable',
+            'transactions.*.bunq_payment_id'        => 'min:1,max:255|nullable',
+            'transactions.*.external_url'           => 'min:1,max:255|nullable|url',
 
             // SEPA fields:
-            'transactions.*.sepa_cc'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ct_op'            => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ct_id'            => 'min:1,max:255|nullable',
-            'transactions.*.sepa_db'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_country'          => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ep'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_ci'               => 'min:1,max:255|nullable',
-            'transactions.*.sepa_batch_id'         => 'min:1,max:255|nullable',
+            'transactions.*.sepa_cc'                => 'min:1,max:255|nullable',
+            'transactions.*.sepa_ct_op'             => 'min:1,max:255|nullable',
+            'transactions.*.sepa_ct_id'             => 'min:1,max:255|nullable',
+            'transactions.*.sepa_db'                => 'min:1,max:255|nullable',
+            'transactions.*.sepa_country'           => 'min:1,max:255|nullable',
+            'transactions.*.sepa_ep'                => 'min:1,max:255|nullable',
+            'transactions.*.sepa_ci'                => 'min:1,max:255|nullable',
+            'transactions.*.sepa_batch_id'          => 'min:1,max:255|nullable',
 
             // dates
-            'transactions.*.interest_date'         => 'date|nullable',
-            'transactions.*.book_date'             => 'date|nullable',
-            'transactions.*.process_date'          => 'date|nullable',
-            'transactions.*.due_date'              => 'date|nullable',
-            'transactions.*.payment_date'          => 'date|nullable',
-            'transactions.*.invoice_date'          => 'date|nullable',
+            'transactions.*.interest_date'          => 'date|nullable',
+            'transactions.*.book_date'              => 'date|nullable',
+            'transactions.*.process_date'           => 'date|nullable',
+            'transactions.*.due_date'               => 'date|nullable',
+            'transactions.*.payment_date'           => 'date|nullable',
+            'transactions.*.invoice_date'           => 'date|nullable',
         ];
     }
 
@@ -375,6 +379,9 @@ class UpdateRequest extends FormRequest
                 // validate source/destination is equal, depending on the transaction journal type.
                 $this->validateEqualAccountsForUpdate($validator, $transactionGroup);
 
+                // a catch when users submit splits with no source or destination info at all.
+                $this->preventNoAccountInfo($validator,);
+
                 // validate that the currency fits the source and/or destination account.
                 // validate all account info
                 $this->validateAccountInformationUpdate($validator, $transactionGroup);

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

@@ -62,7 +62,7 @@ class CronRequest extends FormRequest
             $data['force'] = $this->boolean('force');
         }
         if ($this->has('date')) {
-            $data['date'] = $this->date('date');
+            $data['date'] = $this->getCarbonDate('date');
         }
 
         return $data;

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

@@ -28,6 +28,7 @@ use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Validator;
 
 /**
  * Class UserUpdateRequest
@@ -43,7 +44,7 @@ class UserUpdateRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return auth()->check() && auth()->user()->hasRole('owner');
+        return auth()->check();
     }
 
     /**
@@ -83,4 +84,25 @@ class UserUpdateRequest extends FormRequest
         ];
     }
 
+    /**
+     * Configure the validator instance.
+     *
+     * @param Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $current = $this->route()->parameter('user');
+        $validator->after(
+            static function (Validator $validator) use($current) {
+                $isAdmin = auth()->user()->hasRole('owner');
+                // not admin, and not own user?
+                if (auth()->check() && false === $isAdmin && $current?->id !== auth()->user()->id) {
+                    $validator->errors()->add('email', (string) trans('validation.invalid_selection'));
+                }
+            }
+        );
+    }
+
 }

app/Console/Commands/Correction/CorrectDatabase.php

@@ -69,6 +69,7 @@ class CorrectDatabase extends Command
             'firefly-iii:delete-empty-journals',
             'firefly-iii:delete-empty-groups',
             'firefly-iii:fix-account-types',
+            'firefly-iii:fix-ibans',
             'firefly-iii:fix-account-order',
             'firefly-iii:rename-meta-fields',
             'firefly-iii:fix-ob-currencies',

app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php

@@ -72,9 +72,7 @@ class CorrectOpeningBalanceCurrencies extends Command
         $count = 0;
         /** @var TransactionJournal $journal */
         foreach ($set as $journal) {
-            Log::debug(sprintf('Going to fix journal #%d', $journal->id));
             $count += $this->correctJournal($journal);
-            Log::debug(sprintf('Done, count is now %d', $count));
         }
 
         if ($count > 0) {
@@ -100,7 +98,6 @@ class CorrectOpeningBalanceCurrencies extends Command
      */
     private function correctJournal(TransactionJournal $journal): int
     {
-        Log::debug(sprintf('Going to correct journal #%d', $journal->id));
         // get the asset account for this opening balance:
         $account = $this->getAccount($journal);
         if (null === $account) {
@@ -110,9 +107,7 @@ class CorrectOpeningBalanceCurrencies extends Command
 
             return 0;
         }
-        Log::debug(sprintf('Found "%s" #%d "%s".', $account->accountType->type, $account->id, $account->name));
         $currency = $this->getCurrency($account);
-        Log::debug(sprintf('Found currency #%d (%s)', $currency->id, $currency->code));
 
         // update journal and all transactions:
         return $this->setCurrency($journal, $currency);
@@ -126,20 +121,14 @@ class CorrectOpeningBalanceCurrencies extends Command
     private function getAccount(TransactionJournal $journal): ?Account
     {
         $transactions = $journal->transactions()->get();
-        Log::debug(sprintf('Found %d transactions for journal #%d.', $transactions->count(), $journal->id));
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
-            Log::debug(sprintf('Testing transaction #%d', $transaction->id));
             /** @var Account $account */
             $account = $transaction->account()->first();
             if (null !== $account && AccountType::INITIAL_BALANCE !== $account->accountType()->first()->type) {
-                Log::debug(sprintf('Account of transaction #%d is opposite of IB account (%s).', $transaction->id, $account->accountType()->first()->type));
-
                 return $account;
             }
         }
-        Log::debug('Found no IB account in transactions of journal.');
-
         return null;
     }
 
@@ -165,10 +154,8 @@ class CorrectOpeningBalanceCurrencies extends Command
      */
     private function setCurrency(TransactionJournal $journal, TransactionCurrency $currency): int
     {
-        Log::debug('Now in setCurrency');
         $count = 0;
         if ((int)$journal->transaction_currency_id !== (int)$currency->id) {
-            Log::debug(sprintf('Currency ID of journal #%d was #%d, now set to #%d', $journal->id, $journal->transaction_currency_id, $currency->id));
             $journal->transaction_currency_id = $currency->id;
             $journal->save();
             $count = 1;
@@ -177,15 +164,11 @@ class CorrectOpeningBalanceCurrencies extends Command
         /** @var Transaction $transaction */
         foreach ($journal->transactions as $transaction) {
             if ((int)$transaction->transaction_currency_id !== (int)$currency->id) {
-                Log::debug(
-                    sprintf('Currency ID of transaction #%d was #%d, now set to #%d', $transaction->id, $transaction->transaction_currency_id, $currency->id)
-                );
                 $transaction->transaction_currency_id = $currency->id;
                 $transaction->save();
                 $count = 1;
             }
         }
-        Log::debug(sprintf('Return %d', $count));
 
         return $count;
     }

app/Console/Commands/Correction/CorrectionSkeleton.php.stub

@@ -6,6 +6,7 @@ use Illuminate\Console\Command;
 
 /**
  * Class CorrectionSkeleton
+ * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
  */
 class CorrectionSkeleton extends Command
 {

app/Console/Commands/Correction/FixIbans.php

@@ -0,0 +1,51 @@
+<?php
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\Correction;
+
+use FireflyIII\Models\Account;
+use Illuminate\Console\Command;
+
+/**
+ * Class FixIbans
+ */
+class FixIbans extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Removes spaces from IBANs';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:fix-ibans';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        $accounts = Account::whereNotNull('iban')->get();
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $iban = $account->iban;
+            if (str_contains($iban, ' ')) {
+
+                $iban = app('steam')->filterSpaces((string)$account->iban);
+                if ('' !== $iban) {
+                    $account->iban = $iban;
+                    $account->save();
+                    $this->line(sprintf('Removed spaces from IBAN of account #%d', $account->id));
+                }
+            }
+        }
+
+        return 0;
+    }
+}

app/Console/Commands/Correction/RenameMetaFields.php

@@ -68,6 +68,7 @@ class RenameMetaFields extends Command
             'sepa-ep'         => 'sepa_ep',
             'sepa-ci'         => 'sepa_ci',
             'sepa-batch-id'   => 'sepa_batch_id',
+            'external_uri'    => 'external_url',
         ];
         foreach ($changes as $original => $update) {
             $this->rename($original, $update);

app/Console/Commands/CreateDatabase.php

@@ -63,6 +63,12 @@ class CreateDatabase extends Command
         $exists  = false;
         $checked = false; // checked for existence of DB?
         $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST', 'localhost'), env('DB_PORT', '3306'));
+
+        if ('' !== env('DB_SOCKET', '')) {
+            $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', env('DB_SOCKET', ''));
+        }
+        $this->info(sprintf('DSN is %s', $dsn));
+
         $options = [
             PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
             PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,

app/Console/Commands/Export/ExportData.php

@@ -154,6 +154,7 @@ class ExportData extends Command
     /**
      * @return array
      * @throws FireflyException
+     * @throws Exception
      */
     private function parseOptions(): array
     {
@@ -201,12 +202,17 @@ class ExportData extends Command
                 $error = true;
             }
         }
+        if(null === $this->option($field)) {
+            Log::info(sprintf('No date given in field "%s"', $field));
+            $error = true;
+        }
 
         if (true === $error && 'start' === $field) {
             $journal = $this->journalRepository->firstNull();
             $date    = null === $journal ? Carbon::now()->subYear() : $journal->date;
             $date->startOfDay();
         }
+
         if (true === $error && 'end' === $field) {
             $date = today(config('app.timezone'));
             $date->endOfDay();

app/Console/Commands/Integrity/ReportSkeleton.php.stub

@@ -6,6 +6,7 @@ use Illuminate\Console\Command;
 
 /**
  * Class ReportSkeleton
+ * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
  */
 class ReportSkeleton extends Command
 {

app/Console/Commands/Integrity/RestoreOAuthKeys.php

@@ -74,8 +74,16 @@ class RestoreOAuthKeys extends Command
         }
         if ($this->keysInDatabase() && !$this->keysOnDrive()) {
             Log::debug('Keys are in DB and keys are not on the drive. Restore.');
-            $this->restoreKeysFromDB();
-            $this->line('Restored OAuth keys from database.');
+            $result = $this->restoreKeysFromDB();
+            if(true === $result) {
+                $this->line('Restored OAuth keys from database.');
+
+                return;
+            }
+            Log::warning('Could not restore keys. Will create new ones.');
+            $this->generateKeys();
+            $this->storeKeysInDB();
+            $this->line('Generated and stored new keys.');
 
             return;
         }
@@ -124,8 +132,8 @@ class RestoreOAuthKeys extends Command
     /**
      *
      */
-    private function restoreKeysFromDB(): void
+    private function restoreKeysFromDB(): bool
     {
-        OAuthKeys::restoreKeysFromDB();
+        return OAuthKeys::restoreKeysFromDB();
     }
 }

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -98,6 +98,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:unify-group-accounts',
             'firefly-iii:fix-transaction-types',
             'firefly-iii:fix-frontpage-accounts',
+            'firefly-iii:fix-ibans',
 
             // two report commands
             'firefly-iii:report-empty-objects',
@@ -143,11 +144,6 @@ class UpgradeDatabase extends Command
         $result = Artisan::output();
         echo $result;
 
-        $this->line('Now installing OAuth2 keys...');
-        Artisan::call('passport:install');
-        $result = Artisan::output();
-        echo $result;
-
         $this->line('Done!');
     }
 }

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

@@ -5,7 +5,8 @@ namespace FireflyIII\Console\Commands\Upgrade;
 use Illuminate\Console\Command;
 
 /**
- * Class UpgradeSkeleton
+ * Class UpgradeSkeleton.
+ * TODO DONT FORGET TO ADD THIS TO THE DOCKER BUILD
  */
 class UpgradeSkeleton extends Command
 {

app/Events/ActuallyLoggedIn.php

@@ -1,6 +1,8 @@
+<?php
+
 /*
- * index.js
- * Copyright (c) 2020 james@firefly-iii.org
+ * ActuallyLoggedIn.php
+ * Copyright (c) 2022 james@firefly-iii.org
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -18,23 +20,27 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
 
-require('../../bootstrap');
+namespace FireflyIII\Events;
 
-import Delete from "../../components/accounts/Delete";
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
 
-// i18n
-let i18n = require('../../i18n');
+/**
+ * Class ActuallyLoggedIn
+ */
+class ActuallyLoggedIn extends Event
+{
+    use SerializesModels;
 
-// get page name?
+    public User $user;
 
-
-let props = {
-
-};
-const app = new Vue({
-            i18n,
-            render(createElement) {
-                return createElement(Delete, {props: props});
-            }
-        }).$mount('#accounts_delete');
+    /**
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}

app/Exceptions/GracefulNotFoundHandler.php

@@ -91,6 +91,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
                 return redirect(route('currencies.index'));
             case 'budgets.show':
             case 'budgets.edit':
+            case 'budgets.show.limit':
                 $request->session()->reflash();
 
                 return redirect(route('budgets.index'));

app/Exceptions/Handler.php

@@ -29,8 +29,11 @@ namespace FireflyIII\Exceptions;
 use ErrorException;
 use FireflyIII\Jobs\MailError;
 use Illuminate\Auth\AuthenticationException;
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException as LaravelValidationException;
@@ -187,4 +190,43 @@ class Handler extends ExceptionHandler
             )
         );
     }
+
+    /**
+     * Convert a validation exception into a response.
+     *
+     * @param Request                    $request
+     * @param LaravelValidationException $exception
+     *
+     * @return Application|RedirectResponse|Redirector
+     */
+    protected function invalid($request, LaravelValidationException $exception): Application|RedirectResponse|Redirector
+    {
+        // protect against open redirect when submitting invalid forms.
+        $previous = app('steam')->getSafePreviousUrl();
+        $redirect = $this->getRedirectUrl($exception);
+
+        return redirect($redirect ?? $previous)
+            ->withInput(Arr::except($request->input(), $this->dontFlash))
+            ->withErrors($exception->errors(), $request->input('_error_bag', $exception->errorBag));
+    }
+
+    /**
+     * Only return the redirectTo property from the exception if it is a valid URL. Return NULL otherwise.
+     *
+     * @param LaravelValidationException $exception
+     *
+     * @return string|null
+     */
+    private function getRedirectUrl(LaravelValidationException $exception): ?string
+    {
+        if (null === $exception->redirectTo) {
+            return null;
+        }
+        $safe         = route('index');
+        $previous     = $exception->redirectTo;
+        $previousHost = parse_url($previous, PHP_URL_HOST);
+        $safeHost     = parse_url($safe, PHP_URL_HOST);
+
+        return null !== $previousHost && $previousHost === $safeHost ? $previous : $safe;
+    }
 }

app/Factory/TransactionJournalFactory.php

@@ -342,7 +342,13 @@ class TransactionJournalFactory
         }
         if (null !== $result) {
             Log::warning(sprintf('Found a duplicate in errorIfDuplicate because hash %s is not unique!', $hash));
-            throw new DuplicateTransactionException(sprintf('Duplicate of transaction #%d.', $result->transactionJournal->transaction_group_id));
+            $journal = $result->transactionJournal()->withTrashed()->first();
+            $group   = $journal?->transactionGroup()->withTrashed()->first();
+            $groupId = $group?->id;
+            if (null === $group) {
+                $groupId = 0;
+            }
+            throw new DuplicateTransactionException(sprintf('Duplicate of transaction #%d.', $groupId));
         }
     }
 
@@ -359,19 +365,29 @@ class TransactionJournalFactory
         $this->accountValidator->setTransactionType($transactionType);
 
         // validate source account.
-        $sourceId    = $data['source_id'] ? (int)$data['source_id'] : null;
-        $sourceName  = $data['source_name'] ? (string)$data['source_name'] : null;
-        $validSource = $this->accountValidator->validateSource($sourceId, $sourceName, null);
+        $array       = [
+            'id'     => $data['source_id'] ? (int)$data['source_id'] : null,
+            'name'   => $data['source_name'] ? (string)$data['source_name'] : null,
+            'iban'   => $data['source_iban'] ? (string)$data['source_iban'] : null,
+            'number' => $data['source_number'] ? (string)$data['source_number'] : null,
+        ];
+        $validSource = $this->accountValidator->validateSource($array);
 
         // do something with result:
         if (false === $validSource) {
             throw new FireflyException(sprintf('Source: %s', $this->accountValidator->sourceError));
         }
         Log::debug('Source seems valid.');
+
         // validate destination account
-        $destinationId    = $data['destination_id'] ? (int)$data['destination_id'] : null;
-        $destinationName  = $data['destination_name'] ? (string)$data['destination_name'] : null;
-        $validDestination = $this->accountValidator->validateDestination($destinationId, $destinationName, null);
+        $array = [
+            'id'     => $data['destination_id'] ? (int)$data['destination_id'] : null,
+            'name'   => $data['destination_name'] ? (string)$data['destination_name'] : null,
+            'iban'   => $data['destination_iban'] ? (string)$data['destination_iban'] : null,
+            'number' => $data['destination_number'] ? (string)$data['destination_number'] : null,
+        ];
+
+        $validDestination = $this->accountValidator->validateDestination($array);
         // do something with result:
         if (false === $validDestination) {
             throw new FireflyException(sprintf('Destination: %s', $this->accountValidator->destError));

app/Generator/Report/Account/MonthReportGenerator.php

@@ -52,7 +52,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $reportType      = 'account';
         $preferredPeriod = $this->preferredPeriod();
         try {
-            $result = prefixView('reports.double.report', compact('accountIds', 'reportType', 'doubleIds', 'preferredPeriod'))
+            $result = view('reports.double.report', compact('accountIds', 'reportType', 'doubleIds', 'preferredPeriod'))
                 ->with('start', $this->start)->with('end', $this->end)
                 ->with('doubles', $this->expense)
                 ->render();

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -78,7 +78,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
                         'due_date', 'payment_date', 'invoice_date',
         ];
         try {
-            $result = prefixView('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
+            $result = view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
                 ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
                 ->render();
         } catch (Throwable $e) { // @phpstan-ignore-line

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -64,7 +64,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $accountIds = implode(',', $this->accounts->pluck('id')->toArray());
         $budgetIds  = implode(',', $this->budgets->pluck('id')->toArray());
         try {
-            $result = prefixView(
+            $result = view(
                 'reports.budget.month',
                 compact('accountIds', 'budgetIds')
             )

app/Generator/Report/Category/MonthReportGenerator.php

@@ -76,7 +76,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         // render!
         try {
-            return prefixView('reports.category.month', compact('accountIds', 'categoryIds', 'reportType'))
+            return view('reports.category.month', compact('accountIds', 'categoryIds', 'reportType'))
                 ->with('start', $this->start)->with('end', $this->end)
                 ->with('categories', $this->categories)
                 ->with('accounts', $this->accounts)

app/Generator/Report/Standard/MonthReportGenerator.php

@@ -53,7 +53,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $reportType = 'default';
 
         try {
-            return prefixView('reports.default.month', compact('accountIds', 'reportType'))->with('start', $this->start)->with('end', $this->end)->render();
+            return view('reports.default.month', compact('accountIds', 'reportType'))->with('start', $this->start)->with('end', $this->end)->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render reports.default.month: %s', $e->getMessage()));
             $result = 'Could not render report view.';

app/Generator/Report/Standard/MultiYearReportGenerator.php

@@ -54,7 +54,7 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
         $reportType = 'default';
 
         try {
-            return prefixView(
+            return view(
                 'reports.default.multi-year',
                 compact('accountIds', 'reportType')
             )->with('start', $this->start)->with('end', $this->end)->render();

app/Generator/Report/Standard/YearReportGenerator.php

@@ -54,7 +54,7 @@ class YearReportGenerator implements ReportGeneratorInterface
         $reportType = 'default';
 
         try {
-            $result = prefixView(
+            $result = view(
                 'reports.default.year',
                 compact('accountIds', 'reportType')
             )->with('start', $this->start)->with('end', $this->end)->render();

app/Generator/Report/Tag/MonthReportGenerator.php

@@ -75,7 +75,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         // render!
         try {
-            $result = prefixView(
+            $result = view(
                 'reports.tag.month',
                 compact('accountIds', 'reportType', 'tagIds')
             )->with('start', $this->start)->with('end', $this->end)->with('tags', $this->tags)->with('accounts', $this->accounts)->render();

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -123,7 +123,6 @@ class UpdatedGroupEventHandler
         if (1 === $group->transactionJournals->count()) {
             return;
         }
-        Log::debug(sprintf('Correct inconsistent accounts in group #%d', $group->id));
         // first journal:
         /** @var TransactionJournal $first */
         $first = $group->transactionJournals()
@@ -132,6 +131,12 @@ class UpdatedGroupEventHandler
                        ->orderBy('transaction_journals.id', 'DESC')
                        ->orderBy('transaction_journals.description', 'DESC')
                        ->first();
+
+        if(null === $first) {
+            Log::warning(sprintf('Group #%d has no transaction journals.', $group->id));
+            return;
+        }
+
         $all   = $group->transactionJournals()->get()->pluck('id')->toArray();
         /** @var Account $sourceAccount */
         $sourceAccount = $first->transactions()->where('amount', '<', '0')->first()->account;

app/Handlers/Events/UserEventHandler.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Handlers\Events;
 
 use Carbon\Carbon;
 use Exception;
+use FireflyIII\Events\ActuallyLoggedIn;
 use FireflyIII\Events\DetectedNewIPAddress;
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
@@ -116,9 +117,24 @@ class UserEventHandler
      */
     public function createGroupMembership(RegisteredUser $event): bool
     {
-        $user = $event->user;
+        $user        = $event->user;
+        $groupExists = true;
+        $groupTitle  = $user->email;
+        $index       = 1;
+
         // create a new group.
-        $group = UserGroup::create(['title' => $user->email]);
+        while (true === $groupExists) {
+            $groupExists = UserGroup::where('title', $groupTitle)->count() > 0;
+            if(false === $groupExists) {
+                $group = UserGroup::create(['title' => $groupTitle]);
+                break;
+            }
+            $groupTitle = sprintf('%s-%d', $user->email, $index);
+            $index++;
+            if($index > 99) {
+                throw new FireflyException('Email address can no longer be used for registrations.');
+            }
+        }
         $role  = UserRole::where('title', UserRole::OWNER)->first();
         if (null === $role) {
             throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');
@@ -317,12 +333,11 @@ class UserEventHandler
     }
 
     /**
-     * @param Login $event
-     *
-     * @throws FireflyException
+     * @param ActuallyLoggedIn $event
      */
-    public function storeUserIPAddress(Login $event): void
+    public function storeUserIPAddress(ActuallyLoggedIn $event): void
     {
+        Log::debug('Now in storeUserIPAddress');
         /** @var User $user */
         $user = $event->user;
         /** @var array $preference */

app/Helpers/Attachments/AttachmentHelper.php

@@ -171,11 +171,14 @@ class AttachmentHelper implements AttachmentHelperInterface
         $allowedMime = config('firefly.allowedMimes');
         if (!in_array($mime, $allowedMime, true)) {
             Log::error(sprintf('Mime type %s is not allowed for API file upload.', $mime));
+            fclose($resource);
 
             return false;
         }
         // is allowed? Save the file, without encryption.
-        $this->uploadDisk->put($attachment->fileName(), $content);
+        $parts = explode('/', $attachment->fileName());
+        $file  = $parts[count($parts) - 1];
+        $this->uploadDisk->put($file, $content);
 
         // update attachment.
         $attachment->md5      = md5_file($path);

app/Helpers/Collector/Extensions/MetaCollection.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\Tag;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 
@@ -212,6 +213,40 @@ trait MetaCollection
         return $this;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function withoutExternalUrl(): GroupCollectorInterface
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $this->hasJoinedMetaTables = true;
+            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
+        }
+        $this->query->where(function (Builder $q1) {
+            $q1->where(function (Builder $q2) {
+                $q2->where('journal_meta.name', '=', 'external_url');
+                $q2->whereNull('journal_meta.data');
+            })->orWhereNull('journal_meta.name');
+        });
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function withExternalUrl(): GroupCollectorInterface
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $this->hasJoinedMetaTables = true;
+            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
+        }
+        $this->query->where('journal_meta.name', '=', 'external_url');
+        $this->query->whereNotNull('journal_meta.data');
+
+        return $this;
+    }
+
     /**
      * @inheritDoc
      */
@@ -453,7 +488,10 @@ trait MetaCollection
     public function withoutNotes(): GroupCollectorInterface
     {
         $this->withNotes();
-        $this->query->whereNull('notes.text');
+        $this->query->where(function (Builder $q) {
+            $q->whereNull('notes.text');
+            $q->orWhere('notes.text', '');
+        });
 
         return $this;
     }

app/Helpers/Collector/Extensions/TimeCollection.php

@@ -119,4 +119,61 @@ trait TimeCollection
 
         return $this;
     }
+
+    public function yearIs(string $year): GroupCollectorInterface
+    {
+        $this->query->whereYear('transaction_journals.date', '=', $year);
+        return $this;
+    }
+
+    public function monthIs(string $month): GroupCollectorInterface
+    {
+        $this->query->whereMonth('transaction_journals.date', '=', $month);
+        return $this;
+
+    }
+
+    public function dayIs(string $day): GroupCollectorInterface
+    {
+        $this->query->whereDay('transaction_journals.date', '=', $day);
+        return $this;
+    }
+
+    public function yearBefore(string $year): GroupCollectorInterface
+    {
+        $this->query->whereYear('transaction_journals.date', '<=', $year);
+        return $this;
+    }
+
+    public function monthBefore(string $month): GroupCollectorInterface
+    {
+        $this->query->whereMonth('transaction_journals.date', '<=', $month);
+        return $this;
+
+    }
+
+    public function dayBefore(string $day): GroupCollectorInterface
+    {
+        $this->query->whereDay('transaction_journals.date', '<=', $day);
+        return $this;
+    }
+
+    public function yearAfter(string $year): GroupCollectorInterface
+    {
+        $this->query->whereYear('transaction_journals.date', '>=', $year);
+        return $this;
+    }
+
+    public function monthAfter(string $month): GroupCollectorInterface
+    {
+        $this->query->whereMonth('transaction_journals.date', '>=', $month);
+        return $this;
+
+    }
+
+    public function dayAfter(string $day): GroupCollectorInterface
+    {
+        $this->query->whereDay('transaction_journals.date', '>=', $day);
+        return $this;
+    }
 }

app/Helpers/Collector/GroupCollector.php

@@ -481,6 +481,7 @@ class GroupCollector implements GroupCollectorInterface
     public function withAttachmentInformation(): GroupCollectorInterface
     {
         $this->fields[] = 'attachments.id as attachment_id';
+        $this->fields[] = 'attachments.uploaded as attachment_uploaded';
         $this->joinAttachmentTables();
 
         return $this;
@@ -498,7 +499,7 @@ class GroupCollector implements GroupCollectorInterface
                         ->where(
                             static function (EloquentBuilder $q1) {
                                 $q1->where('attachments.attachable_type', TransactionJournal::class);
-                                $q1->where('attachments.uploaded', true);
+                                //$q1->where('attachments.uploaded', true);
                                 $q1->orWhereNull('attachments.attachable_type');
                             }
                         );
@@ -559,6 +560,15 @@ class GroupCollector implements GroupCollectorInterface
         echo '</pre>';
     }
 
+    /**
+     *
+     */
+    public function dumpQueryInLogs(): void
+    {
+        Log::debug($this->query->select($this->fields)->toSql());
+        Log::debug('Bindings', $this->query->getBindings());
+    }
+
     /**
      * Convert a selected set of fields to arrays.
      *
@@ -569,7 +579,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;
@@ -585,7 +595,8 @@ class GroupCollector implements GroupCollectorInterface
     {
         $newArray = $newJournal->toArray();
         if (array_key_exists('attachment_id', $newArray)) {
-            $attachmentId                                  = (int)$newJournal['tag_id'];
+            $attachmentId = (int) $newJournal['attachment_id'];
+
             $existingJournal['attachments'][$attachmentId] = [
                 'id' => $attachmentId,
             ];
@@ -604,7 +615,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;
             try {
@@ -614,7 +625,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'],
@@ -640,21 +651,21 @@ class GroupCollector implements GroupCollectorInterface
                 // make new array
                 $parsedGroup                            = $this->parseAugmentedJournal($augumentedJournal);
                 $groupArray                             = [
-                    'id'               => (int)$augumentedJournal->transaction_group_id,
-                    'user_id'          => (int)$augumentedJournal->user_id,
+                    'id'               => (int) $augumentedJournal->transaction_group_id,
+                    'user_id'          => (int) $augumentedJournal->user_id,
                     'title'            => $augumentedJournal->transaction_group_title,
                     'transaction_type' => $parsedGroup['transaction_type_type'],
                     'count'            => 1,
                     'sums'             => [],
                     'transactions'     => [],
                 ];
-                $journalId                              = (int)$augumentedJournal->transaction_journal_id;
+                $journalId                              = (int) $augumentedJournal->transaction_journal_id;
                 $groupArray['transactions'][$journalId] = $parsedGroup;
                 $groups[$groupId]                       = $groupArray;
                 continue;
             }
             // or parse the rest.
-            $journalId = (int)$augumentedJournal->transaction_journal_id;
+            $journalId = (int) $augumentedJournal->transaction_journal_id;
             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);
@@ -699,9 +710,9 @@ class GroupCollector implements GroupCollectorInterface
         // convert values to integers:
         $result = $this->convertToInteger($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 {
                 $tagDate = Carbon::parse($augumentedJournal['tag_date']);
@@ -710,7 +721,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'],
@@ -719,8 +730,9 @@ class GroupCollector implements GroupCollectorInterface
 
         // also merge attachments:
         if (array_key_exists('attachment_id', $result)) {
-            $attachmentId = (int)$augumentedJournal['attachment_id'];
-            if (0 !== $attachmentId) {
+            $uploaded = 1 === (int)$result['attachment_uploaded'];
+            $attachmentId = (int) $augumentedJournal['attachment_id'];
+            if (0 !== $attachmentId && $uploaded) {
                 $result['attachments'][$attachmentId] = [
                     'id' => $attachmentId,
                 ];
@@ -744,7 +756,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'];
 
                 // set default:
                 if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) {
@@ -757,7 +769,7 @@ class GroupCollector implements GroupCollectorInterface
                 $groups[$groudId]['sums'][$currencyId]['amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $transaction['amount'] ?? '0');
 
                 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'])) {

app/Helpers/Collector/GroupCollectorInterface.php

@@ -305,6 +305,20 @@ interface GroupCollectorInterface
      */
     public function setExternalId(string $externalId): GroupCollectorInterface;
 
+    /**
+     * Transactions without an external URL
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withoutExternalUrl(): GroupCollectorInterface;
+
+    /**
+     * Transactions with an external URL
+     *
+     * @return GroupCollectorInterface
+     */
+    public function withExternalUrl(): GroupCollectorInterface;
+
     /**
      * Limit results to a specific foreign currency.
      *
@@ -565,4 +579,15 @@ interface GroupCollectorInterface
      */
     public function withoutTags(): GroupCollectorInterface;
 
+
+    public function yearIs(string $year): GroupCollectorInterface;
+    public function monthIs(string $month): GroupCollectorInterface;
+    public function dayIs(string $day): GroupCollectorInterface;
+    public function yearBefore(string $year): GroupCollectorInterface;
+    public function monthBefore(string $month): GroupCollectorInterface;
+    public function dayBefore(string $day): GroupCollectorInterface;
+    public function yearAfter(string $year): GroupCollectorInterface;
+    public function monthAfter(string $month): GroupCollectorInterface;
+    public function dayAfter(string $day): GroupCollectorInterface;
+
 }

app/Helpers/Help/Help.php

@@ -1,163 +0,0 @@
-<?php
-/**
- * Help.php
- * Copyright (c) 2019 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\Helpers\Help;
-
-use Cache;
-use Exception;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-use League\CommonMark\CommonMarkConverter;
-use Log;
-use Route;
-
-/**
- * Class Help.
- */
-class Help implements HelpInterface
-{
-    /** @var string The cache key */
-    public const CACHEKEY = 'help_%s_%s';
-    /** @var string The user agent. */
-    protected $userAgent = 'Firefly III v%s';
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this->userAgent = sprintf($this->userAgent, config('firefly.version'));
-    }
-
-    /**
-     * Get from cache.
-     *
-     * @codeCoverageIgnore
-     *
-     * @param string $route
-     * @param string $language
-     *
-     * @return string
-     */
-    public function getFromCache(string $route, string $language): string
-    {
-        $line = sprintf(self::CACHEKEY, $route, $language);
-
-        return Cache::get($line);
-    }
-
-    /**
-     * Get text from GitHub.
-     *
-     * @param string $route
-     * @param string $language
-     *
-     * @return string
-     * @throws GuzzleException
-     */
-    public function getFromGitHub(string $route, string $language): string
-    {
-        $uri = sprintf('https://raw.githubusercontent.com/firefly-iii/help/main/%s/%s.md', $language, $route);
-        Log::debug(sprintf('Trying to get %s...', $uri));
-        $opt        = ['headers' => ['User-Agent' => $this->userAgent]];
-        $content    = '';
-        $statusCode = 500;
-        $client     = app(Client::class);
-        try {
-            $res        = $client->request('GET', $uri, $opt);
-            $statusCode = $res->getStatusCode();
-            $content    = trim($res->getBody()->getContents());
-        } catch (Exception $e) { // @phpstan-ignore-line
-            Log::info($e->getMessage());
-            Log::info($e->getTraceAsString());
-        }
-
-        Log::debug(sprintf('Status code is %d', $statusCode));
-
-        if ('' !== $content) {
-            Log::debug('Content is longer than zero. Expect something.');
-            $converter = new CommonMarkConverter();
-            $content   = (string)$converter->convertToHtml($content);
-        }
-
-        return $content;
-    }
-
-    /**
-     * Do we have the route?
-     *
-     * @codeCoverageIgnore
-     *
-     * @param string $route
-     *
-     * @return bool
-     */
-    public function hasRoute(string $route): bool
-    {
-        return Route::has($route);
-    }
-
-    /**
-     * Is in cache?
-     *
-     * @codeCoverageIgnore
-     *
-     * @param string $route
-     * @param string $language
-     *
-     * @return bool
-     */
-    public function inCache(string $route, string $language): bool
-    {
-        $line   = sprintf(self::CACHEKEY, $route, $language);
-        $result = Cache::has($line);
-        if ($result) {
-            Log::debug(sprintf('Cache has this entry: %s', 'help.' . $route . '.' . $language));
-        }
-        if (!$result) {
-            Log::debug(sprintf('Cache does not have this entry: %s', 'help.' . $route . '.' . $language));
-        }
-
-        return $result;
-    }
-
-    /**
-     * Put help text in cache.
-     *
-     * @codeCoverageIgnore
-     *
-     * @param string $route
-     * @param string $language
-     * @param string $content
-     */
-    public function putInCache(string $route, string $language, string $content): void
-    {
-        $key = sprintf(self::CACHEKEY, $route, $language);
-        if ('' !== $content) {
-            Log::debug(sprintf('Will store entry in cache: %s', $key));
-            Cache::put($key, $content, 10080); // a week.
-
-            return;
-        }
-        Log::info(sprintf('Will not cache %s because content is empty.', $key));
-    }
-}

app/Helpers/Help/HelpInterface.php

@@ -1,77 +0,0 @@
-<?php
-/**
- * HelpInterface.php
- * Copyright (c) 2019 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\Helpers\Help;
-
-/**
- * Interface HelpInterface.
- */
-interface HelpInterface
-{
-    /**
-     * Get the help text from cache.
-     *
-     * @param string $route
-     * @param string $language
-     *
-     * @return string
-     */
-    public function getFromCache(string $route, string $language): string;
-
-    /**
-     * Get the help text from GitHub.
-     *
-     * @param string $route
-     * @param string $language
-     *
-     * @return string
-     */
-    public function getFromGitHub(string $route, string $language): string;
-
-    /**
-     * Is the route a known route?
-     *
-     * @param string $route
-     *
-     * @return bool
-     */
-    public function hasRoute(string $route): bool;
-
-    /**
-     * Is the help text in cache?
-     *
-     * @param string $route
-     * @param string $language
-     *
-     * @return bool
-     */
-    public function inCache(string $route, string $language): bool;
-
-    /**
-     * Put the result in cache.
-     *
-     * @param string $route
-     * @param string $language
-     * @param string $content
-     */
-    public function putInCache(string $route, string $language, string $content);
-}

app/Helpers/Report/NetWorth.php

@@ -79,7 +79,7 @@ class NetWorth implements NetWorthInterface
 
         $netWorth = [];
         $result   = [];
-        Log::debug(sprintf('Now in getNetWorthByCurrency(%s)', $date->format('Y-m-d')));
+        //Log::debug(sprintf('Now in getNetWorthByCurrency(%s)', $date->format('Y-m-d')));
 
         // get default currency
         $default = app('amount')->getDefaultCurrencyByUser($this->user);
@@ -90,16 +90,16 @@ class NetWorth implements NetWorthInterface
         // get the preferred currency for this account
         /** @var Account $account */
         foreach ($accounts as $account) {
-            Log::debug(sprintf('Now at account #%d: "%s"', $account->id, $account->name));
+            //Log::debug(sprintf('Now at account #%d: "%s"', $account->id, $account->name));
             $currencyId = (int)$this->accountRepository->getMetaValue($account, 'currency_id');
             $currencyId = 0 === $currencyId ? $default->id : $currencyId;
 
-            Log::debug(sprintf('Currency ID is #%d', $currencyId));
+            //Log::debug(sprintf('Currency ID is #%d', $currencyId));
 
             // balance in array:
             $balance = $balances[$account->id] ?? '0';
 
-            Log::debug(sprintf('Balance is %s', $balance));
+            //Log::debug(sprintf('Balance is %s', $balance));
 
             // always subtract virtual balance.
             $virtualBalance = (string)$account->virtual_balance;
@@ -107,14 +107,14 @@ class NetWorth implements NetWorthInterface
                 $balance = bcsub($balance, $virtualBalance);
             }
 
-            Log::debug(sprintf('Balance corrected to %s because of virtual balance (%s)', $balance, $virtualBalance));
+            //Log::debug(sprintf('Balance corrected to %s because of virtual balance (%s)', $balance, $virtualBalance));
 
             if (!array_key_exists($currencyId, $netWorth)) {
                 $netWorth[$currencyId] = '0';
             }
             $netWorth[$currencyId] = bcadd($balance, $netWorth[$currencyId]);
 
-            Log::debug(sprintf('Total net worth for currency #%d is %s', $currencyId, $netWorth[$currencyId]));
+            //Log::debug(sprintf('Total net worth for currency #%d is %s', $currencyId, $netWorth[$currencyId]));
         }
         ksort($netWorth);
 

app/Helpers/Report/PopupReport.php

@@ -209,10 +209,10 @@ class PopupReport implements PopupReportInterface
         $collector = app(GroupCollectorInterface::class);
 
         // set report accounts + the request accounts:
-        $set = $attributes['accounts'] ?? new Collection;
-        $set->push($account);
+        //$set = $attributes['accounts'] ?? new Collection;
+        //$set->push($account);
 
-        $collector->setBothAccounts($set)
+        $collector->setDestinationAccounts(new Collection([$account]))
                   ->setRange($attributes['startDate'], $attributes['endDate'])
                   ->withAccountInformation()
                   ->withBudgetInformation()
@@ -222,7 +222,6 @@ class PopupReport implements PopupReportInterface
         if (null !== $currency) {
             $collector->setCurrency($currency);
         }
-
         return $collector->getExtractedJournals();
     }
 

app/Helpers/Webhook/Sha3SignatureGenerator.php

@@ -38,9 +38,16 @@ class Sha3SignatureGenerator implements SignatureGeneratorInterface
 
     /**
      * @inheritDoc
+     * @throws FireflyException
      */
     public function generate(WebhookMessage $message): string
     {
+        // webhook is deleted
+        if (null === $message->webhook) {
+            throw new FireflyException('Part of a deleted webhook.');
+        }
+
+
         try {
             $json = json_encode($message->message, JSON_THROW_ON_ERROR);
         } catch (JsonException $e) {
@@ -48,7 +55,7 @@ class Sha3SignatureGenerator implements SignatureGeneratorInterface
             Log::error(sprintf('JSON value: %s', $message->message));
             Log::error($e->getMessage());
             Log::error($e->getTraceAsString());
-            throw new FireflyException('Could not generate JSON for SHA3 hash.', $e);
+            throw new FireflyException('Could not generate JSON for SHA3 hash.', 0, $e);
         }
 
         // signature v1 is generated using the following structure:

app/Http/Controllers/Account/CreateController.php

@@ -124,7 +124,7 @@ class CreateController extends Controller
         $request->session()->forget('accounts.create.fromStore');
         Log::channel('audit')->info('Creating new account.');
 
-        return prefixView(
+        return view(
             'accounts.create',
             compact('subTitleIcon', 'liabilityDirections', 'locations', 'objectType', 'interestPeriods', 'subTitle', 'roles', 'liabilityTypes')
         );

app/Http/Controllers/Account/DeleteController.php

@@ -84,7 +84,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('accounts.delete.uri');
 
-        return prefixView('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
+        return view('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
     }
 
     /**

app/Http/Controllers/Account/EditController.php

@@ -122,7 +122,7 @@ class EditController extends Controller
         }
         $request->session()->forget('accounts.edit.fromUpdate');
 
-        $openingBalanceAmount = app('steam')->positive((string)$repository->getOpeningBalanceAmount($account));
+        $openingBalanceAmount = (string)$repository->getOpeningBalanceAmount($account);
         if ('0' === $openingBalanceAmount) {
             $openingBalanceAmount = '';
         }
@@ -143,9 +143,9 @@ class EditController extends Controller
             'BIC'                     => $repository->getMetaValue($account, 'BIC'),
             'opening_balance_date'    => $openingBalanceDate,
             'liability_type_id'       => $account->account_type_id,
-            'opening_balance'         => $openingBalanceAmount,
+            'opening_balance'         => number_format((float)$openingBalanceAmount, $currency->decimal_places,'.',''),
             'liability_direction'     => $this->repository->getMetaValue($account, 'liability_direction'),
-            'virtual_balance'         => $account->virtual_balance,
+            'virtual_balance'         => number_format((float)$account->virtual_balance, $currency->decimal_places,'.',''),
             'currency_id'             => $currency->id,
             'include_net_worth'       => $includeNetWorth,
             'interest'                => $repository->getMetaValue($account, 'interest'),
@@ -153,10 +153,13 @@ class EditController extends Controller
             'notes'                   => $this->repository->getNoteText($account),
             'active'                  => $hasOldInput ? (bool)$request->old('active') : $account->active,
         ];
+        if('' === $openingBalanceAmount) {
+            $preFilled['opening_balance'] = '';
+        }
 
         $request->session()->flash('preFilled', $preFilled);
 
-        return prefixView(
+        return view(
             'accounts.edit',
             compact(
                 'account',

app/Http/Controllers/Account/IndexController.php

@@ -101,13 +101,15 @@ class IndexController extends Controller
 
         $accounts->each(
             function (Account $account) use ($activities, $startBalances, $endBalances) {
-                $account->lastActivityDate  = $this->isInArray($activities, $account->id);
+                $account->lastActivityDate  = $this->isInArrayDate($activities, $account->id);
                 $account->startBalance      = $this->isInArray($startBalances, $account->id);
                 $account->endBalance        = $this->isInArray($endBalances, $account->id);
                 $account->difference        = bcsub($account->endBalance, $account->startBalance);
                 $account->interest          = number_format((float)$this->repository->getMetaValue($account, 'interest'), 4, '.', '');
                 $account->interestPeriod    = (string)trans(sprintf('firefly.interest_calc_%s', $this->repository->getMetaValue($account, 'interest_period')));
                 $account->accountTypeString = (string)trans(sprintf('firefly.account_type_%s', $account->accountType->type));
+                $account->current_debt      = '0';
+                $account->iban              = implode(' ', str_split((string)$account->iban, 4));
             }
         );
 
@@ -115,7 +117,7 @@ class IndexController extends Controller
         $accounts = new LengthAwarePaginator($accounts, $total, $pageSize, $page);
         $accounts->setPath(route('accounts.inactive.index', [$objectType]));
 
-        return prefixView('accounts.index', compact('objectType', 'inactivePage', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
+        return view('accounts.index', compact('objectType', 'inactivePage', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
 
     }
 
@@ -162,7 +164,7 @@ class IndexController extends Controller
         $accounts->each(
             function (Account $account) use ($activities, $startBalances, $endBalances) {
                 // See reference nr. 68
-                $account->lastActivityDate    = $this->isInArray($activities, $account->id);
+                $account->lastActivityDate    = $this->isInArrayDate($activities, $account->id);
                 $account->startBalance        = $this->isInArray($startBalances, $account->id);
                 $account->endBalance          = $this->isInArray($endBalances, $account->id);
                 $account->difference          = bcsub($account->endBalance, $account->startBalance);
@@ -174,6 +176,7 @@ class IndexController extends Controller
                 $account->location            = $this->repository->getLocation($account);
                 $account->liability_direction = $this->repository->getMetaValue($account, 'liability_direction');
                 $account->current_debt        = $this->repository->getMetaValue($account, 'current_debt') ?? '-';
+                $account->iban              = implode(' ', str_split((string)$account->iban, 4));
             }
         );
         // make paginator:
@@ -185,6 +188,6 @@ class IndexController extends Controller
         Log::debug(sprintf('Count of accounts after LAP (1): %d', $accounts->count()));
         Log::debug(sprintf('Count of accounts after LAP (2): %d', $accounts->getCollection()->count()));
 
-        return prefixView('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
+        return view('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
     }
 }

app/Http/Controllers/Account/ReconcileController.php

@@ -136,7 +136,7 @@ class ReconcileController extends Controller
         $indexUri        = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
         $objectType      = 'asset';
 
-        return prefixView(
+        return view(
             'accounts.reconcile.index',
             compact(
                 'account',

app/Http/Controllers/Account/ShowController.php

@@ -135,7 +135,7 @@ class ShowController extends Controller
         $showAll = false;
         $balance = app('steam')->balance($account, $end);
 
-        return prefixView(
+        return view(
             'accounts.show',
             compact(
                 'account',
@@ -194,7 +194,7 @@ class ShowController extends Controller
         $showAll  = true;
         $balance  = app('steam')->balance($account, $end);
 
-        return prefixView(
+        return view(
             'accounts.show',
             compact(
                 'account',

app/Http/Controllers/Admin/ConfigurationController.php

@@ -75,7 +75,7 @@ class ConfigurationController extends Controller
         $isDemoSite     = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $siteOwner      = config('firefly.site_owner');
 
-        return prefixView(
+        return view(
             'admin.configuration.index',
             compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner')
         );

app/Http/Controllers/Admin/HomeController.php

@@ -68,7 +68,7 @@ class HomeController extends Controller
         }
         Log::debug('Email is ', [$email]);
 
-        return prefixView('admin.index', compact('title', 'mainTitleIcon', 'email'));
+        return view('admin.index', compact('title', 'mainTitleIcon', 'email'));
     }
 
     /**

app/Http/Controllers/Admin/LinkController.php

@@ -79,7 +79,7 @@ class LinkController extends Controller
             $this->rememberPreviousUri('link-types.create.uri');
         }
 
-        return prefixView('admin.link.create', compact('subTitle', 'subTitleIcon'));
+        return view('admin.link.create', compact('subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -115,7 +115,7 @@ class LinkController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('link-types.delete.uri');
 
-        return prefixView('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
+        return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
     }
 
     /**
@@ -165,7 +165,7 @@ class LinkController extends Controller
         }
         $request->session()->forget('link-types.edit.fromUpdate');
 
-        return prefixView('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
+        return view('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
     }
 
     /**
@@ -186,7 +186,7 @@ class LinkController extends Controller
             }
         );
 
-        return prefixView('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
+        return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
     }
 
     /**
@@ -204,7 +204,7 @@ class LinkController extends Controller
 
         Log::channel('audit')->info(sprintf('User viewing link type #%d', $linkType->id));
 
-        return prefixView('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
+        return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
     }
 
     /**

app/Http/Controllers/Admin/UpdateController.php

@@ -82,7 +82,7 @@ class UpdateController extends Controller
             'alpha'  => (string)trans('firefly.update_channel_alpha'),
         ];
 
-        return prefixView('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
+        return view('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
     }
 
     /**

app/Http/Controllers/Admin/UserController.php

@@ -79,7 +79,7 @@ class UserController extends Controller
 
         $subTitle = (string)trans('firefly.delete_user', ['email' => $user->email]);
 
-        return prefixView('admin.users.delete', compact('user', 'subTitle'));
+        return view('admin.users.delete', compact('user', 'subTitle'));
     }
 
     /**
@@ -132,7 +132,7 @@ class UserController extends Controller
             'email_changed' => (string)trans('firefly.block_code_email_changed'),
         ];
 
-        return prefixView('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
+        return view('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
     }
 
     /**
@@ -154,7 +154,7 @@ class UserController extends Controller
             }
         );
 
-        return prefixView('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
+        return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
     }
 
     /**
@@ -172,7 +172,7 @@ class UserController extends Controller
         $subTitleIcon  = 'fa-user';
         $information   = $this->repository->getUserData($user);
 
-        return prefixView(
+        return view(
             'admin.users.show',
             compact(
                 'title',

app/Http/Controllers/AttachmentController.php

@@ -79,7 +79,7 @@ class AttachmentController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('attachments.delete.uri');
 
-        return prefixView('attachments.delete', compact('attachment', 'subTitle'));
+        return view('attachments.delete', compact('attachment', 'subTitle'));
     }
 
     /**
@@ -158,7 +158,7 @@ class AttachmentController extends Controller
         ];
         $request->session()->flash('preFilled', $preFilled);
 
-        return prefixView('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
+        return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
     }
 
     /**
@@ -177,7 +177,7 @@ class AttachmentController extends Controller
             }
         );
 
-        return prefixView('attachments.index', compact('set'));
+        return view('attachments.index', compact('set'));
     }
 
     /**

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -75,7 +75,7 @@ class ForgotPasswordController extends Controller
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
             Log::error($message);
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
 
 
@@ -92,9 +92,12 @@ class ForgotPasswordController extends Controller
         // We will send the password reset link to this user. Once we have attempted
         // to send the link, we will examine the response then see the message we
         // need to show to the user. Finally, we'll send out a proper response.
-        $this->broker()->sendResetLink($request->only('email'));
+        $result = $this->broker()->sendResetLink($request->only('email'));
+        if('passwords.throttled' === $result) {
+            Log::error(sprintf('Cowardly refuse to send a password reset message to user #%d because the reset button has been throttled.', $user->id));
+        }
 
-        // always send the same response:
+        // always send the same response to the user:
         $response = trans('firefly.forgot_password_response');
 
         return back()->with('status', trans($response));
@@ -114,7 +117,7 @@ class ForgotPasswordController extends Controller
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
 
         // is allowed to?
@@ -126,6 +129,6 @@ class ForgotPasswordController extends Controller
             $allowRegistration = false;
         }
 
-        return prefixView('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
+        return view('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
     }
 }

app/Http/Controllers/Auth/LoginController.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Auth;
 use Adldap;
 use Cookie;
 use DB;
+use FireflyIII\Events\ActuallyLoggedIn;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Providers\RouteServiceProvider;
@@ -86,7 +87,7 @@ class LoginController extends Controller
      */
     public function login(Request $request)
     {
-        Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get('email')));
+        Log::channel('audit')->info(sprintf('User is trying to login using "%s"', $request->get($this->username())));
         Log::info('User is trying to login.');
 
         $guard = config('auth.defaults.guard');
@@ -119,6 +120,10 @@ class LoginController extends Controller
 
             // if you just logged in, it can't be that you have a valid 2FA cookie.
 
+            // send a custom login event because laravel will also fire a login event if a "remember me"-cookie
+            // restores the event.
+            event(new ActuallyLoggedIn($this->guard()->user()));
+
             return $this->sendLoginResponse($request);
         }
         Log::warning('Login attempt failed.');
@@ -246,7 +251,7 @@ class LoginController extends Controller
         }
         $usernameField = $this->username();
 
-        return prefixView('auth.login', compact('allowRegistration', 'email', 'remember', 'ldapWarning', 'allowReset', 'title', 'usernameField'));
+        return view('auth.login', compact('allowRegistration', 'email', 'remember', 'ldapWarning', 'allowReset', 'title', 'usernameField'));
     }
 
     /**

app/Http/Controllers/Auth/RegisterController.php

@@ -148,12 +148,12 @@ class RegisterController extends Controller
         if (false === $allowRegistration) {
             $message = 'Registration is currently not available.';
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
 
         $email = $request->old('email');
 
-        return prefixView('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
+        return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
     }
 
 }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -85,7 +85,7 @@ class ResetPasswordController extends Controller
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
         $rules = [
             'token'    => 'required',
@@ -130,7 +130,7 @@ class ResetPasswordController extends Controller
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
 
         // is allowed to register?
@@ -143,7 +143,7 @@ class ResetPasswordController extends Controller
         }
 
         /** @noinspection PhpUndefinedFieldInspection */
-        return prefixView('auth.passwords.reset')->with(
+        return view('auth.passwords.reset')->with(
             ['token' => $token, 'email' => $request->email, 'allowRegistration' => $allowRegistration, 'pageTitle' => $pageTitle]
         );
     }

app/Http/Controllers/Auth/TwoFactorController.php

@@ -49,7 +49,7 @@ class TwoFactorController extends Controller
         $siteOwner = config('firefly.site_owner');
         $title     = (string)trans('firefly.two_factor_forgot_title');
 
-        return prefixView('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
+        return view('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
     }
 
     /**

app/Http/Controllers/Bill/CreateController.php

@@ -88,7 +88,7 @@ class CreateController extends Controller
         }
         $request->session()->forget('bills.create.fromStore');
 
-        return prefixView('bills.create', compact('periods', 'subTitle', 'defaultCurrency'));
+        return view('bills.create', compact('periods', 'subTitle', 'defaultCurrency'));
     }
 
     /**

app/Http/Controllers/Bill/DeleteController.php

@@ -75,7 +75,7 @@ class DeleteController extends Controller
         $this->rememberPreviousUri('bills.delete.uri');
         $subTitle = (string)trans('firefly.delete_bill', ['name' => $bill->name]);
 
-        return prefixView('bills.delete', compact('bill', 'subTitle'));
+        return view('bills.delete', compact('bill', 'subTitle'));
     }
 
     /**

app/Http/Controllers/Bill/EditController.php

@@ -107,7 +107,7 @@ class EditController extends Controller
         $request->session()->flash('preFilled', $preFilled);
         $request->session()->forget('bills.edit.fromUpdate');
 
-        return prefixView('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled'));
+        return view('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled'));
     }
 
     /**

app/Http/Controllers/Bill/IndexController.php

@@ -137,7 +137,7 @@ class IndexController extends Controller
         $sums   = $this->getSums($bills);
         $totals = $this->getTotals($sums);
 
-        return prefixView('bills.index', compact('bills', 'sums', 'total', 'totals'));
+        return view('bills.index', compact('bills', 'sums', 'total', 'totals'));
     }
 
     /**
@@ -203,6 +203,7 @@ class IndexController extends Controller
             'quarterly' => '4',
             'monthly'   => '12',
             'weekly'    => '52.17',
+            'daily'    => '365.24',
         ];
         $yearAmount = bcmul($avg, bcdiv($multiplies[$bill['repeat_freq']], (string)($bill['skip'] + 1)));
         Log::debug(sprintf('Amount per year is %s (%s * %s / %s)', $yearAmount, $avg, $multiplies[$bill['repeat_freq']], (string)($bill['skip'] + 1)));

app/Http/Controllers/Bill/ShowController.php

@@ -179,7 +179,7 @@ class ShowController extends Controller
         }
 
 
-        return prefixView('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
+        return view('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
     }
 
 }

app/Http/Controllers/Budget/AvailableBudgetController.php

@@ -36,6 +36,7 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 use Log;
+use ValueError;
 
 /**
  *
@@ -97,7 +98,7 @@ class AvailableBudgetController extends Controller
         }
         $page = (int)($request->get('page') ?? 1);
 
-        return prefixView('budgets.available-budgets.create', compact('start', 'end', 'page', 'currency'));
+        return view('budgets.available-budgets.create', compact('start', 'end', 'page', 'currency'));
     }
 
     /**
@@ -129,7 +130,7 @@ class AvailableBudgetController extends Controller
         );
         $page       = (int)($request->get('page') ?? 1);
 
-        return prefixView('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies'));
+        return view('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies'));
     }
 
     /**
@@ -163,7 +164,7 @@ class AvailableBudgetController extends Controller
     {
         $availableBudget->amount = number_format((float)$availableBudget->amount, $availableBudget->transactionCurrency->decimal_places, '.', '');
 
-        return prefixView('budgets.available-budgets.edit', compact('availableBudget', 'start', 'end'));
+        return view('budgets.available-budgets.edit', compact('availableBudget', 'start', 'end'));
     }
 
     /**
@@ -244,7 +245,14 @@ class AvailableBudgetController extends Controller
 
             return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
         }
-        if (bccomp($amount, '0') <= 0) {
+        try {
+            if (bccomp($amount, '0') <= 0) {
+                session()->flash('error', trans('firefly.invalid_amount'));
+
+                return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
+            }
+        } catch (ValueError $e) {
+            Log::error(sprintf('Value "%s" is not a number: %s', $amount, $e->getMessage()));
             session()->flash('error', trans('firefly.invalid_amount'));
 
             return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -103,7 +103,7 @@ class BudgetLimitController extends Controller
             }
         );
 
-        return prefixView('budgets.budget-limits.create', compact('start', 'end', 'currencies', 'budget'));
+        return view('budgets.budget-limits.create', compact('start', 'end', 'currencies', 'budget'));
     }
 
     /**
@@ -181,7 +181,7 @@ class BudgetLimitController extends Controller
             return response()->json($array);
         }
 
-        return response()->json([]);
+        return redirect(route('budgets.index'));
     }
 
     /**

app/Http/Controllers/Budget/CreateController.php

@@ -103,7 +103,7 @@ class CreateController extends Controller
         $request->session()->forget('budgets.create.fromStore');
         $subTitle = (string)trans('firefly.create_new_budget');
 
-        return prefixView('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
+        return view('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
     }
 
     /**

app/Http/Controllers/Budget/DeleteController.php

@@ -75,7 +75,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('budgets.delete.uri');
 
-        return prefixView('budgets.delete', compact('budget', 'subTitle'));
+        return view('budgets.delete', compact('budget', 'subTitle'));
     }
 
     /**

app/Http/Controllers/Budget/EditController.php

@@ -102,7 +102,8 @@ class EditController extends Controller
             'auto_budget_currency_id' => $hasOldInput ? (int)$request->old('auto_budget_currency_id') : $currency->id,
         ];
         if ($autoBudget) {
-            $preFilled['auto_budget_amount'] = $hasOldInput ? $request->old('auto_budget_amount') : $autoBudget->amount;
+            $amount                          = $hasOldInput ? $request->old('auto_budget_amount') : $autoBudget->amount;
+            $preFilled['auto_budget_amount'] = number_format((float)$amount, $autoBudget->transactionCurrency->decimal_places, '.', '');
         }
 
         // put previous url in session if not redirect from store (not "return_to_edit").
@@ -112,7 +113,7 @@ class EditController extends Controller
         $request->session()->forget('budgets.edit.fromUpdate');
         $request->session()->flash('preFilled', $preFilled);
 
-        return prefixView('budgets.edit', compact('budget', 'subTitle', 'autoBudgetTypes', 'autoBudgetPeriods', 'autoBudget'));
+        return view('budgets.edit', compact('budget', 'subTitle', 'autoBudgetTypes', 'autoBudgetPeriods', 'autoBudget'));
     }
 
     /**

app/Http/Controllers/Budget/IndexController.php

@@ -136,7 +136,7 @@ class IndexController extends Controller
         // get all inactive budgets, and simply list them:
         $inactive = $this->repository->getInactiveBudgets();
 
-        return prefixView(
+        return view(
             'budgets.index', compact(
                                'availableBudgets', 'budgeted', 'spent', 'prevLoop', 'nextLoop', 'budgets', 'currencies', 'enableAddButton', 'periodTitle',
                                'defaultCurrency', 'activeDaysPassed', 'activeDaysLeft', 'inactive', 'budgets', 'start', 'end', 'sums'

app/Http/Controllers/Budget/ShowController.php

@@ -105,7 +105,7 @@ class ShowController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.no-budget'));
 
-        return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'periods', 'start', 'end'));
+        return view('budgets.no-budget', compact('groups', 'subTitle', 'periods', 'start', 'end'));
     }
 
     /**
@@ -131,9 +131,9 @@ class ShowController extends Controller
         $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page)
                   ->withoutBudget()->withAccountInformation()->withCategoryInformation();
         $groups = $collector->getPaginatedGroups();
-        $groups->setPath(route('budgets.no-budget'));
+        $groups->setPath(route('budgets.no-budget-all'));
 
-        return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end'));
+        return view('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end'));
     }
 
     /**
@@ -167,7 +167,7 @@ class ShowController extends Controller
 
         $subTitle = (string)trans('firefly.all_journals_for_budget', ['name' => $budget->name]);
 
-        return prefixView('budgets.show', compact('limits', 'attachments', 'budget', 'repetition', 'groups', 'subTitle'));
+        return view('budgets.show', compact('limits', 'attachments', 'budget', 'repetition', 'groups', 'subTitle'));
     }
 
     /**
@@ -212,6 +212,6 @@ class ShowController extends Controller
         $attachments = $this->repository->getAttachments($budget);
         $limits      = $this->getLimits($budget, $start, $end);
 
-        return prefixView('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
+        return view('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
     }
 }

app/Http/Controllers/Category/CreateController.php

@@ -78,7 +78,7 @@ class CreateController extends Controller
         $request->session()->forget('categories.create.fromStore');
         $subTitle = (string)trans('firefly.create_new_category');
 
-        return prefixView('categories.create', compact('subTitle'));
+        return view('categories.create', compact('subTitle'));
     }
 
     /**

app/Http/Controllers/Category/DeleteController.php

@@ -74,7 +74,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('categories.delete.uri');
 
-        return prefixView('categories.delete', compact('category', 'subTitle'));
+        return view('categories.delete', compact('category', 'subTitle'));
     }
 
     /**