Merge branch 'release/5.7.14'

5.7.13

.deploy/heroku/.locales

@@ -1,5 +1,6 @@
 bg_BG
 cs_CZ
+da_DK
 de_DE
 el_GR
 en_GB
@@ -8,7 +9,9 @@ es_ES
 fi_FI
 fr_FR
 hu_HU
+id_ID
 it_IT
+ja_JP
 nb_NO
 nl_NL
 pl_PL
@@ -17,7 +20,10 @@ pt_PT
 ro_RO
 ru_RU
 sk_SK
+sl_SI
 sv_SE
+tr_TR
+uk_UA
 vi_VN
 zh-hans_CN
 zh-hant_CN

.env.example

@@ -12,6 +12,9 @@ SITE_OWNER=mail@example.com
 # The encryption key for your sessions. Keep this very secure.
 # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
+#
+# Avoid the "#" character in your APP_KEY, it may break things.
+#
 APP_KEY=SomeRandomStringOf32CharsExactly
 
 # Firefly III will launch using this language (for new users and unauthenticated visitors)
@@ -111,7 +114,10 @@ REDIS_PATH=
 # use only when using 'tcp' or 'http' for REDIS_SCHEME. Leave empty otherwise.
 REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
-REDIS_PASSWORD=null
+
+# Use only with Redis 6+ with proper ACL set. Leave empty otherwise.
+REDIS_USERNAME=
+REDIS_PASSWORD=
 
 # always use quotes and make sure redis db "0" and "1" exists. Otherwise change accordingly.
 REDIS_DB="0"

.github/dependabot.yml

@@ -19,3 +19,10 @@ updates:
     schedule:
       interval: "weekly"
 
+  - package-ecosystem: "github-actions"
+    directory: "/" 
+    target-branch: develop
+    labels: ["bug"]
+    versioning-strategy: increase
+    schedule:
+      interval: "weekly"

.github/stale.yml

@@ -14,6 +14,7 @@ exemptLabels:
   - feature
   - bug
   - announcement
+  - "layout-v3"
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: false

.github/workflows/cleanup.yml

@@ -0,0 +1,99 @@
+# This workflow prunes old workflow runs for an entire repository.
+
+name: Prune old builds
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  workflow_dispatch:
+jobs:
+  prune:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Prune cancelled/skipped runs
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
+          script: |
+            const cancelled = await github.actions.listWorkflowRunsForRepo({
+              owner: context.repo.owner,
+              per_page: 100,
+              repo: context.repo.repo,
+              status: 'cancelled',
+            });
+            
+            const skipped = await github.actions.listWorkflowRunsForRepo({
+              owner: context.repo.owner,
+              per_page: 100,
+              repo: context.repo.repo,
+              status: 'skipped',
+            });
+            
+            for (const response of [cancelled, skipped]) {
+              for (const run of response.data.workflow_runs) {
+                console.log(`Run id ${run.id} of '${run.name}' is a cancelled/skipped run. Deleting...`);
+                await github.actions.deleteWorkflowRun({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  run_id: run.id
+                });
+              }
+            }
+
+      - name: Prune runs older than 3 days
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{ secrets.GH_ACTIONS_PERSONAL_ACCESS_TOKEN }}
+          script: |
+            const days_to_expiration = 3;
+            const ms_in_day = 86400000;
+            const now = Date.now();
+            const pages = 5;
+            
+            // we don't want to prune old runs from test.yml
+            // because we track the duration of runs over time
+            
+            const workflows = [
+              'build.yml',
+              'cleanup.yml',
+              'depsreview.yaml',
+              'laravel.yml',
+              'lock.yml',
+              'stale.yml'
+            ]
+            
+            let runs_to_delete = [];
+            
+            for (const workflow of workflows) {
+              for (let page = 0; page < pages; page += 1) {
+                let response = await github.actions.listWorkflowRuns({
+                  owner: context.repo.owner,
+                  page: page,
+                  per_page: 100,
+                  repo: context.repo.repo,
+                  workflow_id: workflow
+                });
+            
+                if (response.data.workflow_runs.length > 0) {
+                  for (const run of response.data.workflow_runs) {
+                    if (now - Date.parse(run.created_at) > ms_in_day * days_to_expiration) {
+                      runs_to_delete.push([run.id, run.name]);
+                    }
+                  }
+                }
+              }
+            }
+            
+            for (const run of runs_to_delete) {
+              console.log(`Run id ${run[0]} of '${run[1]}' is older than ${days_to_expiration} days. Deleting...`);
+              try {
+                await github.actions.deleteWorkflowRun({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  run_id: run[0]
+                });
+              } catch (error) {
+                // ignore errors
+              }
+            }

.github/workflows/closed-issues.yml

@@ -0,0 +1,22 @@
+name: "Reply to closed issue"
+on: 
+  issues: 
+    types: 
+      - closed
+jobs: 
+  auto_comment: 
+    runs-on: ubuntu-latest
+    steps: 
+      - 
+        uses: aws-actions/closed-issue-message@v1
+        with: 
+          message: |
+              Hi there! This is an automatic reply. `Share and enjoy`
+              
+              This issue is now closed. Please be aware that closed issues are not actively monitored. If you reply, you may get no response.
+                       
+              - If the original bug is not actually fixed, please feel free to open a new ticket. Please refer to this issue for clarity.
+              - Follow-up questions can also be posted in a new [discussion](https://github.com/firefly-iii/firefly-iii/discussions/)
+              
+              Thank you for your consideration.
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/depsreview.yaml

@@ -0,0 +1,14 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v1

.github/workflows/lock.yml

@@ -5,8 +5,14 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   lock:
+    permissions:
+      issues: write  # for dessant/lock-threads to lock issues
+      pull-requests: write  # for dessant/lock-threads to lock PRs
     runs-on: ubuntu-latest
     steps:
       - uses: dessant/lock-threads@v2

.github/workflows/stale.yml

@@ -3,8 +3,14 @@ on:
   schedule:
     - cron: "30 1 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   stale:
+    permissions:
+      issues: write  # for actions/stale to close stale issues
+      pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/stale@v3
@@ -20,4 +26,4 @@ jobs:
             for your contributions.
           days-before-stale: 14
           days-before-close: 7
-          exempt-issue-labels: 'enhancement,feature,bug,announcement'
+          exempt-issue-labels: 'enhancement,feature,bug,announcement,layout-v3'

app/Api/V1/Controllers/Controller.php

@@ -73,7 +73,7 @@ abstract class Controller extends BaseController
     }
 
     /**
-     * Method to grab all parameters from the URI.
+     * Method to grab all parameters from the URL.
      *
      * @return ParameterBag
      * @throws ContainerExceptionInterface
@@ -148,7 +148,7 @@ abstract class Controller extends BaseController
 
 
     /**
-     * Method to help build URI's.
+     * Method to help build URL's.
      *
      * @return string
      */

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

@@ -25,11 +25,16 @@ namespace FireflyIII\Api\V1\Controllers\Models\Transaction;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Events\DestroyedTransactionGroup;
+use FireflyIII\Events\UpdatedAccount;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepository;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Log;
 
 /**
  * Class DestroyController
@@ -37,6 +42,7 @@ use Illuminate\Http\JsonResponse;
 class DestroyController extends Controller
 {
     private JournalRepositoryInterface $repository;
+    private TransactionGroupRepository $groupRepository;
 
     /**
      * TransactionController constructor.
@@ -54,6 +60,9 @@ class DestroyController extends Controller
                 $this->repository = app(JournalRepositoryInterface::class);
                 $this->repository->setUser($admin);
 
+                $this->groupRepository = app(TransactionGroupRepository::class);
+                $this->groupRepository->setUser($admin);
+
                 return $next($request);
             }
         );
@@ -72,11 +81,32 @@ class DestroyController extends Controller
      */
     public function destroy(TransactionGroup $transactionGroup): JsonResponse
     {
-        $this->repository->destroyGroup($transactionGroup);
+        // grab asset account(s) from group:
+        $accounts = [];
+        /** @var TransactionJournal $journal */
+        foreach($transactionGroup->transactionJournals as $journal) {
+            /** @var Transaction $transaction */
+            foreach($journal->transactions as $transaction) {
+                $type = $transaction->account->accountType->type;
+                // if is valid liability, trigger event!
+                if(in_array($type, config('firefly.valid_liabilities'))) {
+                    $accounts[] = $transaction->account;
+                }
+            }
+        }
+
+        $this->groupRepository->destroy($transactionGroup);
+
         // trigger just after destruction
         event(new DestroyedTransactionGroup($transactionGroup));
         app('preferences')->mark();
 
+        /** @var Account $account */
+        foreach($accounts as $account) {
+            Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id));
+            event(new UpdatedAccount($account));
+        }
+
         return response()->json([], 204);
     }
 

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

@@ -125,7 +125,7 @@ class StoreController extends Controller
 
         $selectedGroup = $collector->getGroups()->first();
         if (null === $selectedGroup) {
-            throw new FireflyException('Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
+            throw new FireflyException('200032: Cannot find transaction. Possibly, a rule deleted this transaction after its creation.');
         }
         /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);

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

@@ -103,7 +103,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
 
-        // read type from URI
+        // read type from URL
         $type = $request->get('type') ?? 'all';
         $this->parameters->set('type', $type);
 

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

@@ -79,7 +79,7 @@ class ShowController extends Controller
     {
         // create some objects:
         $manager = $this->getManager();
-        // read type from URI
+        // read type from URL
         $name = $request->get('name');
 
         // types to get, page size:

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

@@ -40,12 +40,12 @@ class AutocompleteRequest extends FormRequest
      */
     public function getData(): array
     {
-        $types = $this->string('types');
+        $types = $this->convertString('types');
         $array = [];
         if ('' !== $types) {
             $array = explode(',', $types);
         }
-        $limit = $this->integer('limit');
+        $limit = $this->convertInteger('limit');
         $limit = 0 === $limit ? 10 : $limit;
 
         // remove 'initial balance' from allowed types. its internal
@@ -53,7 +53,7 @@ class AutocompleteRequest extends FormRequest
 
         return [
             'types' => $array,
-            'query' => $this->string('query'),
+            'query' => $this->convertString('query'),
             'date'  => $this->getCarbonDate('date'),
             'limit' => $limit,
         ];

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

@@ -43,8 +43,8 @@ class MoveTransactionsRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'original_account'    => $this->integer('original_account'),
-            'destination_account' => $this->integer('destination_account'),
+            'original_account'    => $this->convertInteger('original_account'),
+            'destination_account' => $this->convertInteger('destination_account'),
         ];
     }
 

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

@@ -43,9 +43,9 @@ class ExportRequest extends FormRequest
         $result     = [
             'start' => $this->getCarbonDate('start') ?? Carbon::now()->subYear(),
             'end'   => $this->getCarbonDate('end') ?? Carbon::now(),
-            'type'  => $this->string('type'),
+            'type'  => $this->convertString('type'),
         ];
-        $parts      = explode(',', $this->string('accounts'));
+        $parts      = explode(',', $this->convertString('accounts'));
         $repository = app(AccountRepositoryInterface::class);
         $repository->setUser(auth()->user());
 

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

@@ -56,35 +56,35 @@ class StoreRequest extends FormRequest
             $includeNetWorth = $this->boolean('include_net_worth');
         }
         $data = [
-            'name'                    => $this->string('name'),
+            'name'                    => $this->convertString('name'),
             'active'                  => $active,
             'include_net_worth'       => $includeNetWorth,
-            'account_type_name'       => $this->string('type'),
+            'account_type_name'       => $this->convertString('type'),
             'account_type_id'         => null,
-            'currency_id'             => $this->integer('currency_id'),
-            'order'                   => $this->integer('order'),
-            'currency_code'           => $this->string('currency_code'),
-            'virtual_balance'         => $this->string('virtual_balance'),
-            'iban'                    => $this->string('iban'),
-            'BIC'                     => $this->string('bic'),
-            'account_number'          => $this->string('account_number'),
-            'account_role'            => $this->string('account_role'),
-            'opening_balance'         => $this->string('opening_balance'),
+            'currency_id'             => $this->convertInteger('currency_id'),
+            'order'                   => $this->convertInteger('order'),
+            'currency_code'           => $this->convertString('currency_code'),
+            'virtual_balance'         => $this->convertString('virtual_balance'),
+            'iban'                    => $this->convertString('iban'),
+            'BIC'                     => $this->convertString('bic'),
+            'account_number'          => $this->convertString('account_number'),
+            'account_role'            => $this->convertString('account_role'),
+            'opening_balance'         => $this->convertString('opening_balance'),
             'opening_balance_date'    => $this->getCarbonDate('opening_balance_date'),
-            'cc_type'                 => $this->string('credit_card_type'),
-            'cc_monthly_payment_date' => $this->string('monthly_payment_date'),
+            'cc_type'                 => $this->convertString('credit_card_type'),
+            'cc_monthly_payment_date' => $this->convertString('monthly_payment_date'),
             'notes'                   => $this->stringWithNewlines('notes'),
-            'interest'                => $this->string('interest'),
-            'interest_period'         => $this->string('interest_period'),
+            'interest'                => $this->convertString('interest'),
+            'interest_period'         => $this->convertString('interest_period'),
         ];
         // append location information.
         $data = $this->appendLocationData($data, null);
 
         if ('liability' === $data['account_type_name'] || 'liabilities' === $data['account_type_name']) {
-            $data['opening_balance']      = app('steam')->negative($this->string('liability_amount'));
+            $data['opening_balance']      = app('steam')->negative($this->convertString('liability_amount'));
             $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_name']    = $this->convertString('liability_type');
+            $data['liability_direction']  = $this->convertString('liability_direction');
             $data['account_type_id']      = null;
         }
 
@@ -101,7 +101,7 @@ class StoreRequest extends FormRequest
         $accountRoles   = implode(',', config('firefly.accountRoles'));
         $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
         $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
-        $type           = $this->string('type');
+        $type           = $this->convertString('type');
         $rules          = [
             'name'                 => 'required|min:1|uniqueAccountForUser',
             'type'                 => 'required|' . sprintf('in:%s', $types),

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

@@ -50,28 +50,28 @@ class UpdateRequest extends FormRequest
     public function getUpdateData(): array
     {
         $fields = [
-            'name'                    => ['name', 'string'],
+            'name'                    => ['name', 'convertString'],
             'active'                  => ['active', 'boolean'],
             'include_net_worth'       => ['include_net_worth', 'boolean'],
-            'account_type_name'       => ['type', 'string'],
-            'virtual_balance'         => ['virtual_balance', 'string'],
-            'iban'                    => ['iban', 'string'],
-            'BIC'                     => ['bic', 'string'],
-            'account_number'          => ['account_number', 'string'],
-            'account_role'            => ['account_role', 'string'],
-            'liability_type'          => ['liability_type', 'string'],
-            'opening_balance'         => ['opening_balance', 'string'],
+            'account_type_name'       => ['type', 'convertString'],
+            'virtual_balance'         => ['virtual_balance', 'convertString'],
+            'iban'                    => ['iban', 'convertString'],
+            'BIC'                     => ['bic', 'convertString'],
+            'account_number'          => ['account_number', 'convertString'],
+            'account_role'            => ['account_role', 'convertString'],
+            'liability_type'          => ['liability_type', 'convertString'],
+            'opening_balance'         => ['opening_balance', 'convertString'],
             'opening_balance_date'    => ['opening_balance_date', 'date'],
-            'cc_type'                 => ['credit_card_type', 'string'],
-            'cc_monthly_payment_date' => ['monthly_payment_date', 'string'],
+            'cc_type'                 => ['credit_card_type', 'convertString'],
+            'cc_monthly_payment_date' => ['monthly_payment_date', 'convertString'],
             'notes'                   => ['notes', 'stringWithNewlines'],
-            'interest'                => ['interest', 'string'],
-            'interest_period'         => ['interest_period', 'string'],
-            'order'                   => ['order', 'integer'],
-            'currency_id'             => ['currency_id', 'integer'],
-            'currency_code'           => ['currency_code', 'string'],
-            'liability_direction'     => ['liability_direction', 'string'],
-            'liability_amount'        => ['liability_amount', 'string'],
+            'interest'                => ['interest', 'convertString'],
+            'interest_period'         => ['interest_period', 'convertString'],
+            'order'                   => ['order', 'convertInteger'],
+            'currency_id'             => ['currency_id', 'convertInteger'],
+            'currency_code'           => ['currency_code', 'convertString'],
+            'liability_direction'     => ['liability_direction', 'convertString'],
+            'liability_amount'        => ['liability_amount', 'convertString'],
             'liability_start_date'    => ['liability_start_date', 'date'],
         ];
         /** @var Account $account */
@@ -107,9 +107,9 @@ class UpdateRequest extends FormRequest
         $rules = [
             'name'                 => sprintf('min:1|uniqueAccountForUser:%d', $account->id),
             'type'                 => sprintf('in:%s', $types),
-            'iban'                 => ['iban', 'nullable', new UniqueIban($account, $this->string('type'))],
+            'iban'                 => ['iban', 'nullable', new UniqueIban($account, $this->convertString('type'))],
             'bic'                  => 'bic|nullable',
-            'account_number'       => ['between:1,255', 'nullable', new UniqueAccountNumber($account, $this->string('type'))],
+            'account_number'       => ['between:1,255', 'nullable', new UniqueAccountNumber($account, $this->convertString('type'))],
             'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
             'opening_balance_date' => 'date|required_with:opening_balance|nullable',
             'virtual_balance'      => 'numeric|nullable',

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

@@ -45,11 +45,11 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'filename'        => $this->string('filename'),
-            'title'           => $this->string('title'),
+            'filename'        => $this->convertString('filename'),
+            'title'           => $this->convertString('title'),
             'notes'           => $this->stringWithNewlines('notes'),
-            'attachable_type' => $this->string('attachable_type'),
-            'attachable_id'   => $this->integer('attachable_id'),
+            'attachable_type' => $this->convertString('attachable_type'),
+            'attachable_id'   => $this->convertInteger('attachable_id'),
         ];
     }
 
@@ -68,7 +68,7 @@ class StoreRequest extends FormRequest
             }, $models
         );
         $models = implode(',', $models);
-        $model  = $this->string('attachable_type');
+        $model  = $this->convertString('attachable_type');
 
         return [
             'filename'        => 'required|between:1,255',

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

@@ -45,11 +45,11 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'filename'        => ['filename', 'string'],
-            'title'           => ['title', 'string'],
+            'filename'        => ['filename', 'convertString'],
+            'title'           => ['title', 'convertString'],
             'notes'           => ['notes', 'stringWithNewlines'],
-            'attachable_type' => ['attachable_type', 'string'],
-            'attachable_id'   => ['attachable_id', 'integer'],
+            'attachable_type' => ['attachable_type', 'convertString'],
+            'attachable_id'   => ['attachable_id', 'convertInteger'],
         ];
 
         return $this->getAllData($fields);
@@ -70,7 +70,7 @@ class UpdateRequest extends FormRequest
             }, $models
         );
         $models = implode(',', $models);
-        $model  = $this->string('attachable_type');
+        $model  = $this->convertString('attachable_type');
 
         return [
             'filename'        => 'between:1,255',

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

@@ -47,9 +47,9 @@ class Request extends FormRequest
     {
         // this is the way:
         $fields = [
-            'currency_id'   => ['currency_id', 'integer'],
-            'currency_code' => ['currency_code', 'string'],
-            'amount'        => ['amount', 'string'],
+            'currency_id'   => ['currency_id', 'convertInteger'],
+            'currency_code' => ['currency_code', 'convertString'],
+            'amount'        => ['amount', 'convertString'],
             'start'         => ['start', 'date'],
             'end'           => ['end', 'date'],
         ];

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

@@ -49,21 +49,21 @@ class StoreRequest extends FormRequest
     {
         Log::debug('Raw fields in Bill StoreRequest', $this->all());
         $fields = [
-            'name'               => ['name', 'string'],
-            'amount_min'         => ['amount_min', 'string'],
-            'amount_max'         => ['amount_max', 'string'],
-            'currency_id'        => ['currency_id', 'integer'],
-            'currency_code'      => ['currency_code', 'string'],
+            'name'               => ['name', 'convertString'],
+            'amount_min'         => ['amount_min', 'convertString'],
+            'amount_max'         => ['amount_max', 'convertString'],
+            'currency_id'        => ['currency_id', 'convertInteger'],
+            'currency_code'      => ['currency_code', 'convertString'],
             'date'               => ['date', 'date'],
             'end_date'           => ['end_date', 'date'],
             'extension_date'     => ['extension_date', 'date'],
-            'repeat_freq'        => ['repeat_freq', 'string'],
-            'skip'               => ['skip', 'integer'],
+            'repeat_freq'        => ['repeat_freq', 'convertString'],
+            'skip'               => ['skip', 'convertInteger'],
             'active'             => ['active', 'boolean'],
-            'order'              => ['order', 'integer'],
+            'order'              => ['order', 'convertInteger'],
             'notes'              => ['notes', 'stringWithNewlines'],
-            'object_group_id'    => ['object_group_id', 'integer'],
-            'object_group_title' => ['object_group_title', 'string'],
+            'object_group_id'    => ['object_group_id', 'convertInteger'],
+            'object_group_title' => ['object_group_title', 'convertString'],
         ];
 
         return $this->getAllData($fields);

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

@@ -47,21 +47,21 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'name'               => ['name', 'string'],
-            'amount_min'         => ['amount_min', 'string'],
-            'amount_max'         => ['amount_max', 'string'],
-            'currency_id'        => ['currency_id', 'integer'],
-            'currency_code'      => ['currency_code', 'string'],
+            'name'               => ['name', 'convertString'],
+            'amount_min'         => ['amount_min', 'convertString'],
+            'amount_max'         => ['amount_max', 'convertString'],
+            'currency_id'        => ['currency_id', 'convertInteger'],
+            'currency_code'      => ['currency_code', 'convertString'],
             'date'               => ['date', 'date'],
             'end_date'           => ['end_date', 'date'],
             'extension_date'     => ['extension_date', 'date'],
-            'repeat_freq'        => ['repeat_freq', 'string'],
-            'skip'               => ['skip', 'integer'],
+            'repeat_freq'        => ['repeat_freq', 'convertString'],
+            'skip'               => ['skip', 'convertInteger'],
             'active'             => ['active', 'boolean'],
-            'order'              => ['order', 'integer'],
+            'order'              => ['order', 'convertInteger'],
             'notes'              => ['notes', 'stringWithNewlines'],
-            'object_group_id'    => ['object_group_id', 'integer'],
-            'object_group_title' => ['object_group_title', 'string'],
+            'object_group_id'    => ['object_group_id', 'convertInteger'],
+            'object_group_title' => ['object_group_title', 'convertString'],
         ];
 
         return $this->getAllData($fields);

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

@@ -47,17 +47,17 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'name'               => ['name', 'string'],
+            'name'               => ['name', 'convertString'],
             'active'             => ['active', 'boolean'],
-            'order'              => ['active', 'integer'],
-            'notes'              => ['notes', 'string'],
+            'order'              => ['active', 'convertInteger'],
+            'notes'              => ['notes', 'convertString'],
 
             // auto budget currency:
-            'currency_id'        => ['auto_budget_currency_id', 'integer'],
-            'currency_code'      => ['auto_budget_currency_code', 'string'],
-            'auto_budget_type'   => ['auto_budget_type', 'string'],
-            'auto_budget_amount' => ['auto_budget_amount', 'string'],
-            'auto_budget_period' => ['auto_budget_period', 'string'],
+            'currency_id'        => ['auto_budget_currency_id', 'convertInteger'],
+            'currency_code'      => ['auto_budget_currency_code', 'convertString'],
+            'auto_budget_type'   => ['auto_budget_type', 'convertString'],
+            'auto_budget_amount' => ['auto_budget_amount', 'convertString'],
+            'auto_budget_period' => ['auto_budget_period', 'convertString'],
         ];
 
         return $this->getAllData($fields);

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

@@ -48,15 +48,15 @@ class UpdateRequest extends FormRequest
     {
         // this is the way:
         $fields  = [
-            'name'               => ['name', 'string'],
+            'name'               => ['name', 'convertString'],
             'active'             => ['active', 'boolean'],
-            'order'              => ['order', 'integer'],
-            'notes'              => ['notes', 'string'],
-            'currency_id'        => ['auto_budget_currency_id', 'integer'],
-            'currency_code'      => ['auto_budget_currency_code', 'string'],
-            'auto_budget_type'   => ['auto_budget_type', 'string'],
-            'auto_budget_amount' => ['auto_budget_amount', 'string'],
-            'auto_budget_period' => ['auto_budget_period', 'string'],
+            'order'              => ['order', 'convertInteger'],
+            'notes'              => ['notes', 'convertString'],
+            'currency_id'        => ['auto_budget_currency_id', 'convertInteger'],
+            'currency_code'      => ['auto_budget_currency_code', 'convertString'],
+            'auto_budget_type'   => ['auto_budget_type', 'convertString'],
+            'auto_budget_amount' => ['auto_budget_amount', 'convertString'],
+            'auto_budget_period' => ['auto_budget_period', 'convertString'],
         ];
         $allData = $this->getAllData($fields);
         if (array_key_exists('auto_budget_type', $allData)) {

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

@@ -46,9 +46,9 @@ class StoreRequest extends FormRequest
         return [
             'start'         => $this->getCarbonDate('start'),
             'end'           => $this->getCarbonDate('end'),
-            'amount'        => $this->string('amount'),
-            'currency_id'   => $this->integer('currency_id'),
-            'currency_code' => $this->string('currency_code'),
+            'amount'        => $this->convertString('amount'),
+            'currency_id'   => $this->convertInteger('currency_id'),
+            'currency_code' => $this->convertString('currency_code'),
         ];
     }
 

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

@@ -48,9 +48,9 @@ class UpdateRequest extends FormRequest
         $fields = [
             'start'         => ['start', 'date'],
             'end'           => ['end', 'date'],
-            'amount'        => ['amount', 'string'],
-            'currency_id'   => ['currency_id', 'integer'],
-            'currency_code' => ['currency_code', 'string'],
+            'amount'        => ['amount', 'convertString'],
+            'currency_id'   => ['currency_id', 'convertInteger'],
+            'currency_code' => ['currency_code', 'convertString'],
         ];
 
         return $this->getAllData($fields);

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

@@ -45,7 +45,7 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'name'  => $this->string('name'),
+            'name'  => $this->convertString('name'),
             'notes' => $this->stringWithNewlines('notes'),
         ];
     }

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

@@ -44,7 +44,7 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'name'  => ['name', 'string'],
+            'name'  => ['name', 'convertString'],
             'notes' => ['notes', 'stringWithNewlines'],
         ];
 

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

@@ -43,8 +43,8 @@ class UpdateRequest extends FormRequest
     public function getUpdateData(): array
     {
         $fields = [
-            'title' => ['title', 'string'],
-            'order' => ['order', 'integer'],
+            'title' => ['title', 'convertString'],
+            'order' => ['order', 'convertInteger'],
         ];
 
         return $this->getAllData($fields);

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

@@ -44,18 +44,18 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         $fields                     = [
-            'order' => ['order', 'integer'],
+            'order' => ['order', 'convertInteger'],
         ];
         $data                       = $this->getAllData($fields);
-        $data['name']               = $this->string('name');
-        $data['account_id']         = $this->integer('account_id');
-        $data['targetamount']       = $this->string('target_amount');
-        $data['current_amount']     = $this->string('current_amount');
+        $data['name']               = $this->convertString('name');
+        $data['account_id']         = $this->convertInteger('account_id');
+        $data['targetamount']       = $this->convertString('target_amount');
+        $data['current_amount']     = $this->convertString('current_amount');
         $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');
+        $data['object_group_id']    = $this->convertInteger('object_group_id');
+        $data['object_group_title'] = $this->convertString('object_group_title');
 
         return $data;
 

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

@@ -46,16 +46,16 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'name'               => ['name', 'string'],
-            'account_id'         => ['account_id', 'integer'],
-            'targetamount'       => ['target_amount', 'string'],
-            'current_amount'     => ['current_amount', 'string'],
+            'name'               => ['name', 'convertString'],
+            'account_id'         => ['account_id', 'convertInteger'],
+            'targetamount'       => ['target_amount', 'convertString'],
+            'current_amount'     => ['current_amount', 'convertString'],
             'startdate'          => ['start_date', 'date'],
-            'targetdate'         => ['target_date', 'string'],
+            'targetdate'         => ['target_date', 'convertString'],
             'notes'              => ['notes', 'stringWithNewlines'],
-            'order'              => ['order', 'integer'],
-            'object_group_title' => ['object_group_title', 'string'],
-            'object_group_id'    => ['object_group_id', 'integer'],
+            'order'              => ['order', 'convertInteger'],
+            'object_group_title' => ['object_group_title', 'convertString'],
+            'object_group_id'    => ['object_group_id', 'convertInteger'],
         ];
 
         return $this->getAllData($fields);

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

@@ -49,12 +49,12 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         $fields     = [
-            'type'              => ['type', 'string'],
-            'title'             => ['title', 'string'],
-            'description'       => ['description', 'string'],
+            'type'              => ['type', 'convertString'],
+            'title'             => ['title', 'convertString'],
+            'description'       => ['description', 'convertString'],
             'first_date'        => ['first_date', 'date'],
             'repeat_until'      => ['repeat_until', 'date'],
-            'nr_of_repetitions' => ['nr_of_repetitions', 'integer'],
+            'nr_of_repetitions' => ['nr_of_repetitions', 'convertInteger'],
             'apply_rules'       => ['apply_rules', 'boolean'],
             'active'            => ['active', 'boolean'],
             'notes'             => ['notes', 'stringWithNewlines'],

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

@@ -51,14 +51,14 @@ class UpdateRequest extends FormRequest
     {
         // this is the way:
         $fields       = [
-            'title'             => ['title', 'string'],
-            'description'       => ['description', 'string'],
+            'title'             => ['title', 'convertString'],
+            'description'       => ['description', 'convertString'],
             'first_date'        => ['first_date', 'date'],
             'repeat_until'      => ['repeat_until', 'date'],
-            'nr_of_repetitions' => ['nr_of_repetitions', 'integer'],
+            'nr_of_repetitions' => ['nr_of_repetitions', 'convertInteger'],
             'apply_rules'       => ['apply_rules', 'boolean'],
             'active'            => ['active', 'boolean'],
-            'notes'             => ['notes', 'string'],
+            'notes'             => ['notes', 'convertString'],
         ];
         $reps         = $this->getRepetitionData();
         $transactions = $this->getTransactionData();

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

@@ -46,12 +46,12 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'title'            => ['title', 'string'],
-            'description'      => ['description', 'string'],
-            'rule_group_id'    => ['rule_group_id', 'integer'],
-            'order'            => ['order', 'integer'],
-            'rule_group_title' => ['rule_group_title', 'string'],
-            'trigger'          => ['trigger', 'string'],
+            'title'            => ['title', 'convertString'],
+            'description'      => ['description', 'convertString'],
+            'rule_group_id'    => ['rule_group_id', 'convertInteger'],
+            'order'            => ['order', 'convertInteger'],
+            'rule_group_title' => ['rule_group_title', 'convertString'],
+            'trigger'          => ['trigger', 'convertString'],
             'strict'           => ['strict', 'boolean'],
             'stop_processing'  => ['stop_processing', 'boolean'],
             'active'           => ['active', 'boolean'],

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

@@ -46,14 +46,14 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         $fields = [
-            'title'           => ['title', 'string'],
+            'title'           => ['title', 'convertString'],
             'description'     => ['description', 'stringWithNewlines'],
-            'rule_group_id'   => ['rule_group_id', 'integer'],
-            'trigger'         => ['trigger', 'string'],
+            'rule_group_id'   => ['rule_group_id', 'convertInteger'],
+            'trigger'         => ['trigger', 'convertString'],
             'strict'          => ['strict', 'boolean'],
             'stop_processing' => ['stop_processing', 'boolean'],
             'active'          => ['active', 'boolean'],
-            'order'           => ['order', 'integer'],
+            'order'           => ['order', 'convertInteger'],
         ];
 
         $return   = $this->getAllData($fields);

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

@@ -49,12 +49,12 @@ class StoreRequest extends FormRequest
             $active = $this->boolean('active');
         }
         if (null !== $this->get('order')) {
-            $order = $this->integer('order');
+            $order = $this->convertInteger('order');
         }
 
         return [
-            'title'       => $this->string('title'),
-            'description' => $this->string('description'),
+            'title'       => $this->convertString('title'),
+            'description' => $this->convertString('description'),
             'active'      => $active,
             'order'       => $order,
         ];

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

@@ -45,10 +45,10 @@ class UpdateRequest extends FormRequest
     {
         // This is the way.
         $fields = [
-            'title'       => ['title', 'string'],
+            'title'       => ['title', 'convertString'],
             'description' => ['description', 'stringWithNewlines'],
             'active'      => ['active', 'boolean'],
-            'order'       => ['order', 'integer'],
+            'order'       => ['order', 'convertInteger'],
         ];
 
         return $this->getAllData($fields);

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

@@ -46,9 +46,9 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         $data = [
-            'tag'          => $this->string('tag'),
+            'tag'          => $this->convertString('tag'),
             'date'         => $this->getCarbonDate('date'),
-            'description'  => $this->string('description'),
+            'description'  => $this->convertString('description'),
             'has_location' => true,
         ];
 

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

@@ -48,9 +48,9 @@ class UpdateRequest extends FormRequest
     {
         // This is the way.
         $fields = [
-            'tag'         => ['tag', 'string'],
+            'tag'         => ['tag', 'convertString'],
             'date'        => ['date', 'date'],
-            'description' => ['description', 'string'],
+            'description' => ['description', 'convertString'],
         ];
         $data   = $this->getAllData($fields);
 

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

@@ -55,7 +55,7 @@ class StoreRequest extends FormRequest
         Log::debug('get all data in TransactionStoreRequest');
 
         return [
-            'group_title'             => $this->string('group_title'),
+            'group_title'             => $this->convertString('group_title'),
             'error_if_duplicate_hash' => $this->boolean('error_if_duplicate_hash'),
             'apply_rules'             => $this->boolean('apply_rules', true),
             'fire_webhooks'           => $this->boolean('fire_webhooks', true),

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

@@ -48,6 +48,7 @@ class UpdateRequest extends FormRequest
     private array $dateFields;
     private array $integerFields;
     private array $stringFields;
+    private array $floatFields;
     private array $textareaFields;
 
     /**
@@ -84,12 +85,15 @@ class UpdateRequest extends FormRequest
             'notes',
         ];
 
+        $this->floatFields = [
+            'amount',
+            'foreign_amount',
+        ];
+
         $this->stringFields  = [
             'type',
             'currency_code',
             'foreign_currency_code',
-            'amount',
-            'foreign_amount',
             'description',
             'source_name',
             'source_iban',
@@ -133,7 +137,7 @@ class UpdateRequest extends FormRequest
             $data['fire_webhooks'] = $this->boolean('fire_webhooks', true);
         }
         if ($this->has('group_title')) {
-            $data['group_title'] = $this->string('group_title');
+            $data['group_title'] = $this->convertString('group_title');
         }
 
         return $data;
@@ -163,6 +167,7 @@ class UpdateRequest extends FormRequest
             $current  = $this->getDateData($current, $transaction);
             $current  = $this->getBooleanData($current, $transaction);
             $current  = $this->getArrayData($current, $transaction);
+            $current  = $this->getFloatData($current, $transaction);
             $return[] = $current;
         }
 
@@ -389,4 +394,27 @@ class UpdateRequest extends FormRequest
             }
         );
     }
+
+    /**
+     * @param array $current
+     * @param array $transaction
+     * @return array
+     */
+    private function getFloatData(array $current, array $transaction): array
+    {
+        foreach ($this->floatFields as $fieldName) {
+            if (array_key_exists($fieldName, $transaction)) {
+                $value = $transaction[$fieldName];
+                if (is_float($value)) {
+                    // TODO this effectively limits the max number of decimals in currencies to 14.
+                    $current[$fieldName] = sprintf('%.14f', $value);
+                }
+                if (!is_float($value)) {
+                    $current[$fieldName] = (string) $value;
+                }
+            }
+        }
+
+        return $current;
+    }
 }

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

@@ -54,10 +54,10 @@ class StoreRequest extends FormRequest
         }
 
         return [
-            'name'           => $this->string('name'),
-            'code'           => $this->string('code'),
-            'symbol'         => $this->string('symbol'),
-            'decimal_places' => $this->integer('decimal_places'),
+            'name'           => $this->convertString('name'),
+            'code'           => $this->convertString('code'),
+            'symbol'         => $this->convertString('symbol'),
+            'decimal_places' => $this->convertInteger('decimal_places'),
             'default'        => $default,
             'enabled'        => $enabled,
         ];

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

@@ -46,10 +46,10 @@ class UpdateRequest extends FormRequest
     {
         // return nothing that isn't explicitely in the array:
         $fields = [
-            'name'           => ['name', 'string'],
-            'code'           => ['code', 'string'],
-            'symbol'         => ['symbol', 'string'],
-            'decimal_places' => ['decimal_places', 'integer'],
+            'name'           => ['name', 'convertString'],
+            'code'           => ['code', 'convertString'],
+            'symbol'         => ['symbol', 'convertString'],
+            'decimal_places' => ['decimal_places', 'convertInteger'],
             'default'        => ['default', 'boolean'],
             'enabled'        => ['enabled', 'boolean'],
         ];

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

@@ -46,10 +46,10 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'link_type_id'   => $this->integer('link_type_id'),
-            'link_type_name' => $this->string('link_type_name'),
-            'inward_id'      => $this->integer('inward_id'),
-            'outward_id'     => $this->integer('outward_id'),
+            'link_type_id'   => $this->convertInteger('link_type_id'),
+            'link_type_name' => $this->convertString('link_type_name'),
+            'inward_id'      => $this->convertInteger('inward_id'),
+            'outward_id'     => $this->convertInteger('outward_id'),
             'notes'          => $this->stringWithNewlines('notes'),
         ];
     }

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

@@ -46,10 +46,10 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'link_type_id'   => $this->integer('link_type_id'),
-            'link_type_name' => $this->string('link_type_name'),
-            'inward_id'      => $this->integer('inward_id'),
-            'outward_id'     => $this->integer('outward_id'),
+            'link_type_id'   => $this->convertInteger('link_type_id'),
+            'link_type_name' => $this->convertString('link_type_name'),
+            'inward_id'      => $this->convertInteger('inward_id'),
+            'outward_id'     => $this->convertInteger('outward_id'),
             'notes'          => $this->stringWithNewlines('notes'),
         ];
     }

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

@@ -44,9 +44,9 @@ class StoreRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'name'    => $this->string('name'),
-            'outward' => $this->string('outward'),
-            'inward'  => $this->string('inward'),
+            'name'    => $this->convertString('name'),
+            'outward' => $this->convertString('outward'),
+            'inward'  => $this->convertString('inward'),
         ];
     }
 

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

@@ -45,9 +45,9 @@ class UpdateRequest extends FormRequest
     public function getAll(): array
     {
         return [
-            'name'    => $this->string('name'),
-            'outward' => $this->string('outward'),
-            'inward'  => $this->string('inward'),
+            'name'    => $this->convertString('name'),
+            'outward' => $this->convertString('outward'),
+            'inward'  => $this->convertString('inward'),
         ];
     }
 

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

@@ -45,12 +45,12 @@ class CreateRequest extends FormRequest
         $deliveries = array_flip(config('firefly.webhooks.deliveries'));
 
         $fields = [
-            'title'    => ['title', 'string'],
+            'title'    => ['title', 'convertString'],
             'active'   => ['active', 'boolean'],
-            'trigger'  => ['trigger', 'string'],
-            'response' => ['response', 'string'],
-            'delivery' => ['delivery', 'string'],
-            'url'      => ['url', 'string'],
+            'trigger'  => ['trigger', 'convertString'],
+            'response' => ['response', 'convertString'],
+            'delivery' => ['delivery', 'convertString'],
+            'url'      => ['url', 'convertString'],
         ];
 
         // this is the way.

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

@@ -45,12 +45,12 @@ class UpdateRequest extends FormRequest
         $deliveries = array_flip(config('firefly.webhooks.deliveries'));
 
         $fields = [
-            'title'    => ['title', 'string'],
+            'title'    => ['title', 'convertString'],
             'active'   => ['active', 'boolean'],
-            'trigger'  => ['trigger', 'string'],
-            'response' => ['response', 'string'],
-            'delivery' => ['delivery', 'string'],
-            'url'      => ['url', 'string'],
+            'trigger'  => ['trigger', 'convertString'],
+            'response' => ['response', 'convertString'],
+            'delivery' => ['delivery', 'convertString'],
+            'url'      => ['url', 'convertString'],
         ];
 
         // this is the way.
@@ -66,7 +66,7 @@ class UpdateRequest extends FormRequest
         }
         $return['secret'] = null !== $this->get('secret');
         if (null !== $this->get('title')) {
-            $return['title'] = $this->string('title');
+            $return['title'] = $this->convertString('title');
         }
 
         return $return;

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

@@ -54,10 +54,10 @@ class UpdateRequest extends FormRequest
                 return ['value' => $this->boolean('value')];
             case 'configuration.permission_update_check':
             case 'configuration.last_update_check':
-                return ['value' => $this->integer('value')];
+                return ['value' => $this->convertInteger('value')];
         }
 
-        return ['value' => $this->string('value')];
+        return ['value' => $this->convertString('value')];
     }
 
     /**

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

@@ -59,10 +59,10 @@ class UserStoreRequest extends FormRequest
         }
 
         return [
-            'email'        => $this->string('email'),
+            'email'        => $this->convertString('email'),
             'blocked'      => $blocked,
-            'blocked_code' => $this->string('blocked_code'),
-            'role'         => $this->string('role'),
+            'blocked_code' => $this->convertString('blocked_code'),
+            'role'         => $this->convertString('role'),
         ];
     }
 

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

@@ -60,10 +60,10 @@ class UserUpdateRequest extends FormRequest
         }
 
         return [
-            'email'        => $this->string('email'),
+            'email'        => $this->convertString('email'),
             'blocked'      => $blocked,
-            'blocked_code' => $this->string('blocked_code'),
-            'role'         => $this->string('role'),
+            'blocked_code' => $this->convertString('blocked_code'),
+            'role'         => $this->convertString('role'),
         ];
     }
 

app/Api/V1/Requests/User/PreferenceStoreRequest.php

@@ -37,7 +37,7 @@ class PreferenceStoreRequest extends FormRequest
     public function getAll(): array
     {
         $array = [
-            'name' => $this->string('name'),
+            'name' => $this->convertString('name'),
             'data' => $this->get('data'),
         ];
         if ('true' === $array['data']) {

app/Api/V1/Requests/User/PreferenceUpdateRequest.php

@@ -38,7 +38,7 @@ class PreferenceUpdateRequest extends FormRequest
     public function getAll(): array
     {
         $array = [
-            'name' => $this->string('name'),
+            'name' => $this->convertString('name'),
             'data' => $this->get('data'),
         ];
         if ('true' === $array['data']) {

app/Console/Commands/Correction/CorrectDatabase.php

@@ -61,6 +61,7 @@ class CorrectDatabase extends Command
             'firefly-iii:create-link-types',
             'firefly-iii:create-access-tokens',
             'firefly-iii:remove-bills',
+            'firefly-iii:fix-negative-limits',
             'firefly-iii:enable-currencies',
             'firefly-iii:fix-transfer-budgets',
             'firefly-iii:fix-uneven-amount',

app/Console/Commands/Correction/FixBudgetLimits.php

@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * FixBudgetLimits.php
+ * Copyright (c) 2022 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\Console\Commands\Correction;
+
+use DB;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Console\Command;
+
+/**
+ * Class CorrectionSkeleton
+ */
+class FixBudgetLimits extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fixes negative budget limits';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly-iii:fix-negative-limits';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        $set = BudgetLimit::where('amount', '<', '0')->get();
+        if (0 === $set->count()) {
+            $this->info('All budget limits are OK.');
+            return 0;
+        }
+        $count = BudgetLimit::where('amount', '<', '0')->update(['amount' => DB::raw('amount * -1')]);
+
+        $this->info(sprintf('Fixed %d budget limit(s)', $count));
+
+        return 0;
+    }
+}

app/Console/Commands/Correction/FixTransactionTypes.php

@@ -108,7 +108,11 @@ class FixTransactionTypes extends Command
         }
         $expectedType = (string) config(sprintf('firefly.account_to_transaction.%s.%s', $source->accountType->type, $destination->accountType->type));
         if ($expectedType !== $type) {
-            $this->line(sprintf('Transaction journal #%d was of type "%s" but is corrected to "%s"', $journal->id, $type, $expectedType));
+            $this->line(
+                sprintf('Transaction journal #%d was of type "%s" but is corrected to "%s" (%s -> %s)',
+                        $journal->id, $type, $expectedType,
+                        $source->accountType->type, $destination->accountType->type,
+                        ));
             $this->changeJournal($journal, $expectedType);
 
             return true;

app/Console/Commands/Upgrade/UpgradeDatabase.php

@@ -82,6 +82,7 @@ class UpgradeDatabase extends Command
             'firefly-iii:create-link-types',
             'firefly-iii:create-access-tokens',
             'firefly-iii:remove-bills',
+            'firefly-iii:fix-negative-limits',
             'firefly-iii:enable-currencies',
             'firefly-iii:fix-transfer-budgets',
             'firefly-iii:fix-uneven-amount',

app/Exceptions/Handler.php

@@ -39,6 +39,7 @@ use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException as LaravelValidationException;
 use Laravel\Passport\Exceptions\OAuthServerException as LaravelOAuthException;
 use League\OAuth2\Server\Exception\OAuthServerException;
+use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
@@ -62,6 +63,7 @@ class Handler extends ExceptionHandler
             LaravelOAuthException::class,
             TokenMismatchException::class,
             HttpException::class,
+            SuspiciousOperationException::class
         ];
 
     /**

app/Factory/TransactionGroupFactory.php

@@ -36,10 +36,8 @@ use Log;
  */
 class TransactionGroupFactory
 {
-    /** @var TransactionJournalFactory */
-    private $journalFactory;
-    /** @var User The user */
-    private $user;
+    private TransactionJournalFactory $journalFactory;
+    private User $user;
 
     /**
      * TransactionGroupFactory constructor.

app/Handlers/Events/UserEventHandler.php

@@ -230,9 +230,9 @@ class UserEventHandler
         $oldEmail = $event->oldEmail;
         $user     = $event->user;
         $token    = app('preferences')->getForUser($user, 'email_change_confirm_token', 'invalid');
-        $uri      = route('profile.confirm-email-change', [$token->data]);
+        $url      = route('profile.confirm-email-change', [$token->data]);
         try {
-            Mail::to($newEmail)->send(new ConfirmEmailChangeMail($newEmail, $oldEmail, $uri));
+            Mail::to($newEmail)->send(new ConfirmEmailChangeMail($newEmail, $oldEmail, $url));
 
         } catch (Exception $e) { // @phpstan-ignore-line
             Log::error($e->getMessage());
@@ -256,9 +256,9 @@ class UserEventHandler
         $user     = $event->user;
         $token    = app('preferences')->getForUser($user, 'email_change_undo_token', 'invalid');
         $hashed   = hash('sha256', sprintf('%s%s', (string) config('app.key'), $oldEmail));
-        $uri      = route('profile.undo-email-change', [$token->data, $hashed]);
+        $url      = route('profile.undo-email-change', [$token->data, $hashed]);
         try {
-            Mail::to($oldEmail)->send(new UndoEmailChangeMail($newEmail, $oldEmail, $uri));
+            Mail::to($oldEmail)->send(new UndoEmailChangeMail($newEmail, $oldEmail, $url));
 
         } catch (Exception $e) { // @phpstan-ignore-line
             Log::error($e->getMessage());
@@ -308,7 +308,7 @@ class UserEventHandler
         if ($sendMail) {
             // get the email address
             $email     = $event->user->email;
-            $uri       = route('index');
+            $url       = route('index');
 
             // see if user has alternative email address:
             $pref = app('preferences')->getForUser($event->user, 'remote_guard_alt_email');
@@ -318,7 +318,7 @@ class UserEventHandler
 
             // send email.
             try {
-                Mail::to($email)->send(new RegisteredUserMail($uri));
+                Mail::to($email)->send(new RegisteredUserMail($url));
 
             } catch (Exception $e) { // @phpstan-ignore-line
                 Log::error($e->getMessage());
@@ -338,6 +338,12 @@ class UserEventHandler
         Log::debug('Now in storeUserIPAddress');
         $user = $event->user;
         /** @var array $preference */
+
+        if($user->hasRole('demo')) {
+            Log::debug('Do not log demo user logins');
+            return;
+        }
+
         try {
             $preference = app('preferences')->getForUser($user, 'login_ip_history', [])->data;
         } catch (FireflyException $e) {

app/Helpers/Collector/Extensions/AttachmentCollection.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Helpers\Collector\Extensions;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Models\TransactionJournal;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Log;
 
@@ -299,7 +300,19 @@ trait AttachmentCollection
     {
         Log::debug('Add filter on no attachments.');
         $this->joinAttachmentTables();
-        $this->query->whereNull('attachments.attachable_id');
+
+        $this->query->where(function (Builder $q1) {
+            $q1
+                ->whereNull('attachments.attachable_id')
+                ->orWhere(function (Builder $q2) {
+                    $q2
+                        ->whereNotNull('attachments.attachable_id')
+                        ->whereNotNull('attachments.deleted_at');
+                    // id is not null
+                    // deleted at is not null.
+                });
+        });
+
 
         return $this;
     }

app/Helpers/Collector/Extensions/CollectorProperties.php

@@ -33,6 +33,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 trait CollectorProperties
 {
     private array   $fields;
+    private array   $stringFields;
     private bool    $hasAccountInfo;
     private bool    $hasBillInformation;
     private bool    $hasBudgetInformation;

app/Helpers/Collector/Extensions/TimeCollection.php

@@ -555,7 +555,9 @@ trait TimeCollection
      */
     public function setObjectBefore(Carbon $date, string $field): GroupCollectorInterface
     {
-        die('a');
+        $afterStr = $date->format('Y-m-d 00:00:00');
+        $this->query->where(sprintf('transaction_journals.%s', $field), '<=', $afterStr);
+        return $this;
     }
 
     /**

app/Helpers/Collector/GroupCollector.php

@@ -87,6 +87,7 @@ class GroupCollector implements GroupCollectorInterface
             'category_id',
             'budget_id',
         ];
+        $this->stringFields         = ['amount', 'foreign_amount'];
         $this->total                = 0;
         $this->fields               = [
             # group
@@ -375,6 +376,9 @@ class GroupCollector implements GroupCollectorInterface
         // convert values to integers:
         $result = $this->convertToInteger($result);
 
+        // convert back to strings because SQLite is dumb like that.
+        $result = $this->convertToStrings($result);
+
         $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'];
@@ -506,7 +510,7 @@ class GroupCollector implements GroupCollectorInterface
                     $groups[$groudId]['sums'][$currencyId]['currency_decimal_places'] = $transaction['currency_decimal_places'];
                     $groups[$groudId]['sums'][$currencyId]['amount']                  = '0';
                 }
-                $groups[$groudId]['sums'][$currencyId]['amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $transaction['amount'] ?? '0');
+                $groups[$groudId]['sums'][$currencyId]['amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $transaction['amount']);
 
                 if (null !== $transaction['foreign_amount'] && null !== $transaction['foreign_currency_id']) {
                     $currencyId = (int) $transaction['foreign_currency_id'];
@@ -815,4 +819,17 @@ class GroupCollector implements GroupCollectorInterface
 
         return $this;
     }
+
+    /**
+     * @param array $array
+     * @return array
+     */
+    private function convertToStrings(array $array): array
+    {
+        foreach ($this->stringFields as $field) {
+            $array[$field] = array_key_exists($field, $array) && null !== $array[$field] ? (string) $array[$field] : null;
+        }
+
+        return $array;
+    }
 }

app/Http/Controllers/Account/CreateController.php

@@ -119,7 +119,7 @@ class CreateController extends Controller
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('accounts.create.fromStore')) {
-            $this->rememberPreviousUri('accounts.create.uri');
+            $this->rememberPreviousUrl('accounts.create.url');
         }
         $request->session()->forget('accounts.create.fromStore');
         Log::channel('audit')->info('Creating new account.');
@@ -171,7 +171,7 @@ class CreateController extends Controller
         }
 
         // redirect to previous URL.
-        $redirect = redirect($this->getPreviousUri('accounts.create.uri'));
+        $redirect = redirect($this->getPreviousUrl('accounts.create.url'));
         if (1 === (int) $request->get('create_another')) {
             // set value so create routine will not overwrite URL:
             $request->session()->put('accounts.create.fromStore', true);

app/Http/Controllers/Account/DeleteController.php

@@ -82,7 +82,7 @@ class DeleteController extends Controller
         unset($accountList[$account->id]);
 
         // put previous url in session
-        $this->rememberPreviousUri('accounts.delete.uri');
+        $this->rememberPreviousUrl('accounts.delete.url');
 
         return view('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
     }
@@ -111,7 +111,7 @@ class DeleteController extends Controller
         $request->session()->flash('success', (string) trans(sprintf('firefly.%s_deleted', $typeName), ['name' => $name]));
         app('preferences')->mark();
 
-        return redirect($this->getPreviousUri('accounts.delete.uri'));
+        return redirect($this->getPreviousUrl('accounts.delete.url'));
     }
 
 }

app/Http/Controllers/Account/EditController.php

@@ -118,7 +118,7 @@ class EditController extends Controller
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('accounts.edit.fromUpdate')) {
-            $this->rememberPreviousUri('accounts.edit.uri');
+            $this->rememberPreviousUrl('accounts.edit.url');
         }
         $request->session()->forget('accounts.edit.fromUpdate');
 
@@ -211,7 +211,7 @@ class EditController extends Controller
         }
 
         // redirect
-        $redirect = redirect($this->getPreviousUri('accounts.edit.uri'));
+        $redirect = redirect($this->getPreviousUrl('accounts.edit.url'));
         if (1 === (int) $request->get('return_to_edit')) {
             // set value so edit routine will not overwrite URL:
             $request->session()->put('accounts.edit.fromUpdate', true);

app/Http/Controllers/Account/ReconcileController.php

@@ -134,9 +134,9 @@ class ReconcileController extends Controller
         $subTitle     = (string) trans('firefly.reconcile_account', ['account' => $account->name]);
 
         // various links
-        $transactionsUri = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
-        $overviewUri     = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
-        $indexUri        = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
+        $transactionsUrl = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
+        $overviewUrl     = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
+        $indexUrl        = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
         $objectType      = 'asset';
 
         return view(
@@ -151,9 +151,9 @@ class ReconcileController extends Controller
                 'subTitle',
                 'startBalance',
                 'endBalance',
-                'transactionsUri',
-                'overviewUri',
-                'indexUri'
+                'transactionsUrl',
+                'overviewUrl',
+                'indexUrl'
             )
         );
     }

app/Http/Controllers/Account/ShowController.php

@@ -114,7 +114,7 @@ class ShowController extends Controller
         $fStart           = $start->isoFormat($this->monthAndDayFormat);
         $fEnd             = $end->isoFormat($this->monthAndDayFormat);
         $subTitle         = (string) trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
-        $chartUri         = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
+        $chartUrl         = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $firstTransaction = $this->repository->oldestJournalDate($account) ?? $start;
         $periods          = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
 
@@ -152,7 +152,7 @@ class ShowController extends Controller
                 'subTitle',
                 'start',
                 'end',
-                'chartUri',
+                'chartUrl',
                 'location',
                 'balance'
             )
@@ -194,7 +194,7 @@ class ShowController extends Controller
         $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page)->withAccountInformation()->withCategoryInformation();
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('accounts.show.all', [$account->id]));
-        $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
+        $chartUrl = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
         $showAll  = true;
         $balance  = app('steam')->balance($account, $end);
 
@@ -209,7 +209,7 @@ class ShowController extends Controller
                 'attachments',
                 'currency',
                 'today',
-                'chartUri',
+                'chartUrl',
                 'periods',
                 'subTitleIcon',
                 'groups',

app/Http/Controllers/Admin/LinkController.php

@@ -76,7 +76,7 @@ class LinkController extends Controller
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('link-types.create.fromStore')) {
-            $this->rememberPreviousUri('link-types.create.uri');
+            $this->rememberPreviousUrl('link-types.create.url');
         }
 
         return view('admin.link.create', compact('subTitle', 'subTitleIcon'));
@@ -113,7 +113,7 @@ class LinkController extends Controller
         }
 
         // put previous url in session
-        $this->rememberPreviousUri('link-types.delete.uri');
+        $this->rememberPreviousUrl('link-types.delete.url');
 
         return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
     }
@@ -136,7 +136,7 @@ class LinkController extends Controller
         $request->session()->flash('success', (string) trans('firefly.deleted_link_type', ['name' => $name]));
         app('preferences')->mark();
 
-        return redirect($this->getPreviousUri('link-types.delete.uri'));
+        return redirect($this->getPreviousUrl('link-types.delete.url'));
     }
 
     /**
@@ -161,7 +161,7 @@ class LinkController extends Controller
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('link-types.edit.fromUpdate')) {
-            $this->rememberPreviousUri('link-types.edit.uri');
+            $this->rememberPreviousUrl('link-types.edit.url');
         }
         $request->session()->forget('link-types.edit.fromUpdate');
 
@@ -217,16 +217,16 @@ class LinkController extends Controller
     public function store(LinkTypeFormRequest $request)
     {
         $data     = [
-            'name'    => $request->string('name'),
-            'inward'  => $request->string('inward'),
-            'outward' => $request->string('outward'),
+            'name'    => $request->convertString('name'),
+            'inward'  => $request->convertString('inward'),
+            'outward' => $request->convertString('outward'),
         ];
         $linkType = $this->repository->store($data);
 
         Log::channel('audit')->info('User stored new link type.', $linkType->toArray());
 
         $request->session()->flash('success', (string) trans('firefly.stored_new_link_type', ['name' => $linkType->name]));
-        $redirect = redirect($this->getPreviousUri('link-types.create.uri'));
+        $redirect = redirect($this->getPreviousUrl('link-types.create.url'));
         if (1 === (int) $request->get('create_another')) {
             // set value so create routine will not overwrite URL:
             $request->session()->put('link-types.create.fromStore', true);
@@ -255,9 +255,9 @@ class LinkController extends Controller
         }
 
         $data = [
-            'name'    => $request->string('name'),
-            'inward'  => $request->string('inward'),
-            'outward' => $request->string('outward'),
+            'name'    => $request->convertString('name'),
+            'inward'  => $request->convertString('inward'),
+            'outward' => $request->convertString('outward'),
         ];
         $this->repository->update($linkType, $data);
 
@@ -265,7 +265,7 @@ class LinkController extends Controller
 
         $request->session()->flash('success', (string) trans('firefly.updated_link_type', ['name' => $linkType->name]));
         app('preferences')->mark();
-        $redirect = redirect($this->getPreviousUri('link-types.edit.uri'));
+        $redirect = redirect($this->getPreviousUrl('link-types.edit.url'));
         if (1 === (int) $request->get('return_to_edit')) {
             // set value so edit routine will not overwrite URL:
             $request->session()->put('link-types.edit.fromUpdate', true);

app/Http/Controllers/Admin/UserController.php

@@ -117,7 +117,7 @@ class UserController extends Controller
         }
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('users.edit.fromUpdate')) {
-            $this->rememberPreviousUri('users.edit.uri');
+            $this->rememberPreviousUrl('users.edit.url');
         }
         session()->forget('users.edit.fromUpdate');
 
@@ -217,7 +217,7 @@ class UserController extends Controller
 
         session()->flash('success', (string) trans('firefly.updated_user', ['email' => $user->email]));
         app('preferences')->mark();
-        $redirect = redirect($this->getPreviousUri('users.edit.uri'));
+        $redirect = redirect($this->getPreviousUrl('users.edit.url'));
         if (1 === (int) $request->get('return_to_edit')) {
 
             session()->put('users.edit.fromUpdate', true);

app/Http/Controllers/AttachmentController.php

@@ -77,7 +77,7 @@ class AttachmentController extends Controller
         $subTitle = (string) trans('firefly.delete_attachment', ['name' => $attachment->filename]);
 
         // put previous url in session
-        $this->rememberPreviousUri('attachments.delete.uri');
+        $this->rememberPreviousUrl('attachments.delete.url');
 
         return view('attachments.delete', compact('attachment', 'subTitle'));
     }
@@ -99,7 +99,7 @@ class AttachmentController extends Controller
         $request->session()->flash('success', (string) trans('firefly.attachment_deleted', ['name' => $name]));
         app('preferences')->mark();
 
-        return redirect($this->getPreviousUri('attachments.delete.uri'));
+        return redirect($this->getPreviousUrl('attachments.delete.url'));
     }
 
     /**
@@ -150,7 +150,7 @@ class AttachmentController extends Controller
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('attachments.edit.fromUpdate')) {
-            $this->rememberPreviousUri('attachments.edit.uri');
+            $this->rememberPreviousUrl('attachments.edit.url');
         }
         $request->session()->forget('attachments.edit.fromUpdate');
         $preFilled = [
@@ -196,7 +196,7 @@ class AttachmentController extends Controller
         $request->session()->flash('success', (string) trans('firefly.attachment_updated', ['name' => $attachment->filename]));
         app('preferences')->mark();
 
-        $redirect = redirect($this->getPreviousUri('attachments.edit.uri'));
+        $redirect = redirect($this->getPreviousUrl('attachments.edit.url'));
         if (1 === (int) $request->get('return_to_edit')) {
 
             $request->session()->put('attachments.edit.fromUpdate', true);

app/Http/Controllers/Auth/LoginController.php

@@ -169,11 +169,11 @@ class LoginController extends Controller
     public function logout(Request $request)
     {
         $authGuard = config('firefly.authentication_guard');
-        $logoutUri = config('firefly.custom_logout_url');
-        if ('remote_user_guard' === $authGuard && '' !== $logoutUri) {
-            return redirect($logoutUri);
+        $logoutUrl = config('firefly.custom_logout_url');
+        if ('remote_user_guard' === $authGuard && '' !== $logoutUrl) {
+            return redirect($logoutUrl);
         }
-        if ('remote_user_guard' === $authGuard && '' === $logoutUri) {
+        if ('remote_user_guard' === $authGuard && '' === $logoutUrl) {
             session()->flash('error', trans('firefly.cant_logout_guard'));
         }
 

app/Http/Controllers/Bill/CreateController.php

@@ -84,7 +84,7 @@ class CreateController extends Controller
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('bills.create.fromStore')) {
-            $this->rememberPreviousUri('bills.create.uri');
+            $this->rememberPreviousUrl('bills.create.url');
         }
         $request->session()->forget('bills.create.fromStore');
 

app/Http/Controllers/Bill/DeleteController.php

@@ -72,7 +72,7 @@ class DeleteController extends Controller
     public function delete(Bill $bill)
     {
         // put previous url in session
-        $this->rememberPreviousUri('bills.delete.uri');
+        $this->rememberPreviousUrl('bills.delete.url');
         $subTitle = (string) trans('firefly.delete_bill', ['name' => $bill->name]);
 
         return view('bills.delete', compact('bill', 'subTitle'));
@@ -94,6 +94,6 @@ class DeleteController extends Controller
         $request->session()->flash('success', (string) trans('firefly.deleted_bill', ['name' => $name]));
         app('preferences')->mark();
 
-        return redirect($this->getPreviousUri('bills.delete.uri'));
+        return redirect($this->getPreviousUrl('bills.delete.url'));
     }
 }

app/Http/Controllers/Bill/EditController.php

@@ -85,7 +85,7 @@ class EditController extends Controller
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('bills.edit.fromUpdate')) {
-            $this->rememberPreviousUri('bills.edit.uri');
+            $this->rememberPreviousUrl('bills.edit.url');
         }
 
         $currency         = app('amount')->getDefaultCurrency();
@@ -141,7 +141,7 @@ class EditController extends Controller
         if (count($this->attachments->getMessages()->get('attachments')) > 0) {
             $request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
         }
-        $redirect = redirect($this->getPreviousUri('bills.edit.uri'));
+        $redirect = redirect($this->getPreviousUrl('bills.edit.url'));
 
         if (1 === (int) $request->get('return_to_edit')) {
 

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -148,6 +148,22 @@ class BudgetLimitController extends Controller
         Log::debug(sprintf('Start: %s, end: %s', $start->format('Y-m-d'), $end->format('Y-m-d')));
 
         $limit = $this->blRepository->find($budget, $currency, $start, $end);
+
+        // sanity check on amount:
+        if ((float) $amount === 0.0) {
+            if (null !== $limit) {
+                $this->blRepository->destroyBudgetLimit($limit);
+            }
+            // return empty=ish array:
+            return response()->json([]);
+        }
+        if ((int) $amount > 268435456) {
+            $amount = '268435456';
+        }
+        if((float) $amount < 0.0) {
+            $amount = bcmul($amount, '-1');
+        }
+
         if (null !== $limit) {
             $limit->amount = $amount;
             $limit->save();
@@ -166,7 +182,7 @@ class BudgetLimitController extends Controller
 
         if ($request->expectsJson()) {
             $array = $limit->toArray();
-            // add some extra meta data:
+            // add some extra metadata:
             $spentArr                  = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection([$budget]), $currency);
             $array['spent']            = $spentArr[$currency->id]['sum'] ?? '0';
             $array['left_formatted']   = app('amount')->formatAnything($limit->transactionCurrency, bcadd($array['spent'], $array['amount']));
@@ -197,6 +213,26 @@ class BudgetLimitController extends Controller
             $amount = '0';
         }
 
+        // sanity check on amount:
+        if ((float) $amount === 0.0) {
+            $budgetId = $budgetLimit->budget_id;
+            $currency = $budgetLimit->transactionCurrency;
+            $this->blRepository->destroyBudgetLimit($budgetLimit);
+            $array = [
+                'budget_id'               => $budgetId,
+                'left_formatted'          => app('amount')->formatAnything($currency, '0'),
+                'left_per_day_formatted'  => app('amount')->formatAnything($currency, '0'),
+                'transaction_currency_id' => $currency->id,
+            ];
+            return response()->json($array);
+        }
+        if ((int) $amount > 268435456) { // 268 million
+            $amount = '268435456';
+        }
+        if((float) $amount < 0.0) {
+            $amount = bcmul($amount, '-1');
+        }
+
         $limit = $this->blRepository->update($budgetLimit, ['amount' => $amount]);
         $array = $limit->toArray();
 

app/Http/Controllers/Budget/CreateController.php

@@ -98,7 +98,7 @@ class CreateController extends Controller
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('budgets.create.fromStore')) {
-            $this->rememberPreviousUri('budgets.create.uri');
+            $this->rememberPreviousUrl('budgets.create.url');
         }
         $request->session()->forget('budgets.create.fromStore');
         $subTitle = (string) trans('firefly.create_new_budget');
@@ -136,7 +136,7 @@ class CreateController extends Controller
             $request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
         }
 
-        $redirect = redirect($this->getPreviousUri('budgets.create.uri'));
+        $redirect = redirect($this->getPreviousUrl('budgets.create.url'));
 
         if (1 === (int) $request->get('create_another')) {
 

app/Http/Controllers/Budget/DeleteController.php

@@ -73,7 +73,7 @@ class DeleteController extends Controller
         $subTitle = (string) trans('firefly.delete_budget', ['name' => $budget->name]);
 
         // put previous url in session
-        $this->rememberPreviousUri('budgets.delete.uri');
+        $this->rememberPreviousUrl('budgets.delete.url');
 
         return view('budgets.delete', compact('budget', 'subTitle'));
     }
@@ -93,7 +93,7 @@ class DeleteController extends Controller
         $request->session()->flash('success', (string) trans('firefly.deleted_budget', ['name' => $name]));
         app('preferences')->mark();
 
-        return redirect($this->getPreviousUri('budgets.delete.uri'));
+        return redirect($this->getPreviousUrl('budgets.delete.url'));
     }
 
 }

app/Http/Controllers/Budget/EditController.php

@@ -108,7 +108,7 @@ class EditController extends Controller
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('budgets.edit.fromUpdate')) {
-            $this->rememberPreviousUri('budgets.edit.uri');
+            $this->rememberPreviousUrl('budgets.edit.url');
         }
         $request->session()->forget('budgets.edit.fromUpdate');
         $request->session()->flash('preFilled', $preFilled);
@@ -133,7 +133,7 @@ class EditController extends Controller
         $this->repository->cleanupBudgets();
         app('preferences')->mark();
 
-        $redirect = redirect($this->getPreviousUri('budgets.edit.uri'));
+        $redirect = redirect($this->getPreviousUrl('budgets.edit.url'));
 
         // store new attachment(s):
         $files = $request->hasFile('attachments') ? $request->file('attachments') : null;

app/Http/Controllers/Category/CreateController.php

@@ -73,7 +73,7 @@ class CreateController extends Controller
     public function create(Request $request)
     {
         if (true !== session('categories.create.fromStore')) {
-            $this->rememberPreviousUri('categories.create.uri');
+            $this->rememberPreviousUrl('categories.create.url');
         }
         $request->session()->forget('categories.create.fromStore');
         $subTitle = (string) trans('firefly.create_new_category');

app/Http/Controllers/Category/DeleteController.php

@@ -72,7 +72,7 @@ class DeleteController extends Controller
         $subTitle = (string) trans('firefly.delete_category', ['name' => $category->name]);
 
         // put previous url in session
-        $this->rememberPreviousUri('categories.delete.uri');
+        $this->rememberPreviousUrl('categories.delete.url');
 
         return view('categories.delete', compact('category', 'subTitle'));
     }
@@ -93,6 +93,6 @@ class DeleteController extends Controller
         $request->session()->flash('success', (string) trans('firefly.deleted_category', ['name' => $name]));
         app('preferences')->mark();
 
-        return redirect($this->getPreviousUri('categories.delete.uri'));
+        return redirect($this->getPreviousUrl('categories.delete.url'));
     }
 }

app/Http/Controllers/Category/EditController.php

@@ -78,7 +78,7 @@ class EditController extends Controller
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('categories.edit.fromUpdate')) {
-            $this->rememberPreviousUri('categories.edit.uri');
+            $this->rememberPreviousUrl('categories.edit.url');
         }
         $request->session()->forget('categories.edit.fromUpdate');
 
@@ -117,7 +117,7 @@ class EditController extends Controller
         if (count($this->attachments->getMessages()->get('attachments')) > 0) {
             $request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
         }
-        $redirect = redirect($this->getPreviousUri('categories.edit.uri'));
+        $redirect = redirect($this->getPreviousUrl('categories.edit.url'));
 
         if (1 === (int) $request->get('return_to_edit')) {
 

app/Http/Controllers/Category/NoCategoryController.php

@@ -105,7 +105,7 @@ class NoCategoryController extends Controller
                   ->withAccountInformation()->withBudgetInformation()
                   ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]);
         $groups = $collector->getPaginatedGroups();
-        $groups->setPath(route('categories.no-category'));
+        $groups->setPath(route('categories.no-category', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
 
         return view('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
     }

app/Http/Controllers/Chart/AccountController.php

@@ -119,8 +119,8 @@ class AccountController extends Controller
 
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.
-                $startAmount             = $startBalances[$accountId][$currencyId] ?? '0';
-                $diff                    = bcsub($endAmount, $startAmount);
+                $startAmount             = (string) ($startBalances[$accountId][$currencyId] ?? '0');
+                $diff                    = bcsub((string)$endAmount, $startAmount);
                 $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->find($currencyId);
                 if (0 !== bccomp($diff, '0')) {
                     // store the values in a temporary array.
@@ -438,7 +438,7 @@ class AccountController extends Controller
         $cache->addProperty($end);
         $cache->addProperty($account->id);
         if ($cache->has()) {
-            //return response()->json($cache->get());
+            return response()->json($cache->get());
         }
         $currencies = $this->accountRepository->getUsedCurrencies($account);
 
@@ -578,8 +578,8 @@ class AccountController extends Controller
 
                 // see if there is an accompanying start amount.
                 // grab the difference and find the currency.
-                $startAmount             = $startBalances[$accountId][$currencyId] ?? '0';
-                $diff                    = bcsub($endAmount, $startAmount);
+                $startAmount             = (string)($startBalances[$accountId][$currencyId] ?? '0');
+                $diff                    = bcsub((string) $endAmount, $startAmount);
                 $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->find($currencyId);
                 if (0 !== bccomp($diff, '0')) {
                     // store the values in a temporary array.

app/Http/Controllers/Chart/BudgetController.php

@@ -99,7 +99,7 @@ class BudgetController extends Controller
         $cache->addProperty($budget->id);
 
         if ($cache->has()) {
-            //return response()->json($cache->get()); 
+            return response()->json($cache->get());
         }
         $step           = $this->calculateStep($start, $end); // depending on diff, do something with range of chart.
         $collection     = new Collection([$budget]);

app/Http/Controllers/Chart/ReportController.php

@@ -181,28 +181,31 @@ class ReportController extends Controller
             $period                     = $journal['date']->format($format);
             $currencyId                 = (int) $journal['currency_id'];
             $data[$currencyId]          = $data[$currencyId] ?? [
-                    'currency_id'             => $currencyId,
-                    'currency_symbol'         => $journal['currency_symbol'],
-                    'currency_code'           => $journal['currency_code'],
-                    'currency_name'           => $journal['currency_name'],
-                    'currency_decimal_places' => (int) $journal['currency_decimal_places'],
-                ];
+                'currency_id'             => $currencyId,
+                'currency_symbol'         => $journal['currency_symbol'],
+                'currency_code'           => $journal['currency_code'],
+                'currency_name'           => $journal['currency_name'],
+                'currency_decimal_places' => (int) $journal['currency_decimal_places'],
+            ];
             $data[$currencyId][$period] = $data[$currencyId][$period] ?? [
-                    'period' => $period,
-                    'spent'  => '0',
-                    'earned' => '0',
-                ];
+                'period' => $period,
+                'spent'  => '0',
+                'earned' => '0',
+            ];
             // in our outgoing?
             $key    = 'spent';
             $amount = app('steam')->positive($journal['amount']);
 
+            // deposit = incoming
+            // transfer or reconcile or opening balance, and these accounts are the destination.
             if (
                 TransactionType::DEPOSIT === $journal['transaction_type_type']
-                || // deposit = incoming
-                // transfer or opening balance, and these accounts are the destination.
+                ||
+
                 (
                     (
                         TransactionType::TRANSFER === $journal['transaction_type_type']
+                        || TransactionType::RECONCILIATION === $journal['transaction_type_type']
                         || TransactionType::OPENING_BALANCE === $journal['transaction_type_type']
                     )
                     && in_array($journal['destination_account_id'], $ids, true)

app/Http/Controllers/Controller.php

@@ -41,7 +41,7 @@ abstract class Controller extends BaseController
     protected string $dateTimeFormat;
     protected string $monthAndDayFormat;
     protected string $monthFormat;
-    protected string $redirectUri = '/';
+    protected string $redirectUrl = '/';
 
     /**
      * Controller constructor.
@@ -63,10 +63,10 @@ abstract class Controller extends BaseController
 
         // share custom auth guard info.
         $authGuard = config('firefly.authentication_guard');
-        $logoutUri = config('firefly.custom_logout_url');
+        $logoutUrl = config('firefly.custom_logout_url');
 
         app('view')->share('authGuard', $authGuard);
-        app('view')->share('logoutUri', $logoutUri);
+        app('view')->share('logoutUrl', $logoutUrl);
 
         // upload size
         $maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));

app/Http/Controllers/CurrencyController.php

@@ -88,7 +88,7 @@ class CurrencyController extends Controller
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('currencies.create.fromStore')) {
-            $this->rememberPreviousUri('currencies.create.uri');
+            $this->rememberPreviousUrl('currencies.create.url');
         }
         $request->session()->forget('currencies.create.fromStore');
 
@@ -157,7 +157,7 @@ class CurrencyController extends Controller
         }
 
         // put previous url in session
-        $this->rememberPreviousUri('currencies.delete.uri');
+        $this->rememberPreviousUrl('currencies.delete.url');
         $subTitle = (string) trans('form.delete_currency', ['name' => $currency->name]);
         Log::channel('audit')->info(sprintf('Visit page to delete currency %s.', $currency->code));
 
@@ -204,7 +204,7 @@ class CurrencyController extends Controller
 
         $request->session()->flash('success', (string) trans('firefly.deleted_currency', ['name' => $currency->name]));
 
-        return redirect($this->getPreviousUri('currencies.delete.uri'));
+        return redirect($this->getPreviousUrl('currencies.delete.url'));
     }
 
     /**
@@ -258,7 +258,7 @@ class CurrencyController extends Controller
         }
 
         session()->flash('success', (string) trans('firefly.currency_is_now_disabled', ['name' => $currency->name]));
-
+        return response()->json([]);
     }
 
     /**
@@ -297,7 +297,7 @@ class CurrencyController extends Controller
 
         // put previous url in session if not redirect from store (not "return_to_edit").
         if (true !== session('currencies.edit.fromUpdate')) {
-            $this->rememberPreviousUri('currencies.edit.uri');
+            $this->rememberPreviousUrl('currencies.edit.url');
         }
         $request->session()->forget('currencies.edit.fromUpdate');
 
@@ -308,7 +308,7 @@ class CurrencyController extends Controller
      * @param Request $request
      * @return RedirectResponse|Redirector
      */
-    public function enableCurrency(Request $request)
+    public function enableCurrency(Request $request): JsonResponse
     {
         $currencyId = (int) $request->get('id');
         if ($currencyId > 0) {
@@ -323,7 +323,7 @@ class CurrencyController extends Controller
             }
         }
 
-        return redirect(route('currencies.index'));
+        return response()->json([]);
     }
 
     /**
@@ -375,7 +375,7 @@ class CurrencyController extends Controller
             Log::error('User ' . auth()->user()->id . ' is not admin, but tried to store a currency.');
             Log::channel('audit')->info('Tried to create (POST) currency without admin rights.', $data);
 
-            return redirect($this->getPreviousUri('currencies.create.uri'));
+            return redirect($this->getPreviousUrl('currencies.create.url'));
 
         }
 
@@ -388,7 +388,7 @@ class CurrencyController extends Controller
             $request->session()->flash('error', (string) trans('firefly.could_not_store_currency'));
             $currency = null;
         }
-        $redirect = redirect($this->getPreviousUri('currencies.create.uri'));
+        $redirect = redirect($this->getPreviousUrl('currencies.create.url'));
 
         if (null !== $currency) {
             $request->session()->flash('success', (string) trans('firefly.created_currency', ['name' => $currency->name]));
@@ -443,6 +443,6 @@ class CurrencyController extends Controller
 
         }
 
-        return redirect($this->getPreviousUri('currencies.edit.uri'));
+        return redirect($this->getPreviousUrl('currencies.edit.url'));
     }
 }

app/Http/Controllers/DebugController.php

@@ -88,7 +88,7 @@ class DebugController extends Controller
     public function flush(Request $request)
     {
         app('preferences')->mark();
-        $request->session()->forget(['start', 'end', '_previous', 'viewRange', 'range', 'is_custom_range']);
+        $request->session()->forget(['start', 'end', '_previous', 'viewRange', 'range', 'is_custom_range','temp-mfa-secret','temp-mfa-codes']);
         Log::debug('Call cache:clear...');
         Artisan::call('cache:clear');
         Log::debug('Call config:clear...');

app/Http/Controllers/Json/BoxController.php

@@ -73,7 +73,7 @@ class BoxController extends Controller
         $cache->addProperty($today);
         $cache->addProperty('box-available');
         if ($cache->has()) {
-            //return response()->json($cache->get());
+            return response()->json($cache->get());
         }
         $leftPerDayAmount  = '0';
         $leftToSpendAmount = '0';

app/Http/Controllers/Json/ReconcileController.php

@@ -168,7 +168,7 @@ class ReconcileController extends Controller
         }
 
         $return = [
-            'post_uri' => $route,
+            'post_url' => $route,
             'html'     => $view,
         ];
 

app/Http/Controllers/NewUserController.php

@@ -92,7 +92,7 @@ class NewUserController extends Controller
      */
     public function submit(NewUserFormRequest $request, CurrencyRepositoryInterface $currencyRepository)
     {
-        $language = $request->string('language');
+        $language = $request->convertString('language');
         if (!array_key_exists($language, config('firefly.languages'))) {
             $language = 'en_US';
 

app/Http/Controllers/ObjectGroup/DeleteController.php

@@ -72,7 +72,7 @@ class DeleteController extends Controller
         $piggyBanks = $objectGroup->piggyBanks()->count();
 
         // put previous url in session
-        $this->rememberPreviousUri('object-groups.delete.uri');
+        $this->rememberPreviousUrl('object-groups.delete.url');
 
         return view('object-groups.delete', compact('objectGroup', 'subTitle', 'piggyBanks'));
     }
@@ -90,7 +90,7 @@ class DeleteController extends Controller
         app('preferences')->mark();
         $this->repository->destroy($objectGroup);
 
-        return redirect($this->getPreviousUri('object-groups.delete.uri'));
+        return redirect($this->getPreviousUrl('object-groups.delete.url'));
     }
 
 }

app/Http/Controllers/ObjectGroup/EditController.php

@@ -75,7 +75,7 @@ class EditController extends Controller
         $subTitleIcon = 'fa-pencil';
 
         if (true !== session('object-groups.edit.fromUpdate')) {
-            $this->rememberPreviousUri('object-groups.edit.uri');
+            $this->rememberPreviousUrl('object-groups.edit.url');
         }
         session()->forget('object-groups.edit.fromUpdate');
 
@@ -98,7 +98,7 @@ class EditController extends Controller
         session()->flash('success', (string) trans('firefly.updated_object_group', ['title' => $objectGroup->title]));
         app('preferences')->mark();
 
-        $redirect = redirect($this->getPreviousUri('object-groups.edit.uri'));
+        $redirect = redirect($this->getPreviousUrl('object-groups.edit.url'));
 
         if (1 === (int) $request->get('return_to_edit')) {
 

app/Http/Controllers/PiggyBank/CreateController.php

@@ -76,7 +76,7 @@ class CreateController extends Controller
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('piggy-banks.create.fromStore')) {
-            $this->rememberPreviousUri('piggy-banks.create.uri');
+            $this->rememberPreviousUrl('piggy-banks.create.url');
         }
         session()->forget('piggy-banks.create.fromStore');
 
@@ -115,7 +115,7 @@ class CreateController extends Controller
         if (count($this->attachments->getMessages()->get('attachments')) > 0) {
             $request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
         }
-        $redirect = redirect($this->getPreviousUri('piggy-banks.create.uri'));
+        $redirect = redirect($this->getPreviousUrl('piggy-banks.create.url'));
 
         if (1 === (int) $request->get('create_another')) {
 

app/Http/Controllers/PiggyBank/DeleteController.php

@@ -72,7 +72,7 @@ class DeleteController extends Controller
         $subTitle = (string) trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]);
 
         // put previous url in session
-        $this->rememberPreviousUri('piggy-banks.delete.uri');
+        $this->rememberPreviousUrl('piggy-banks.delete.url');
 
         return view('piggy-banks.delete', compact('piggyBank', 'subTitle'));
     }
@@ -90,6 +90,6 @@ class DeleteController extends Controller
         app('preferences')->mark();
         $this->piggyRepos->destroy($piggyBank);
 
-        return redirect($this->getPreviousUri('piggy-banks.delete.uri'));
+        return redirect($this->getPreviousUrl('piggy-banks.delete.url'));
     }
 }