Merge branch 'hotfix/4.7.12.1'

4.7.11

.codeclimate.yml

@@ -1,12 +0,0 @@
---- 
-exclude_patterns: 
-  - public/lib/
-  - public/js/lib/
-  - public/fonts/
-  - public/css/jquery-ui/
-  - public/css/bootstrap-multiselect.css
-  - public/css/bootstrap-sortable.css
-  - public/css/bootstrap-tagsinput.css
-  - public/css/daterangepicker.css
-  - public/css/google-fonts.css
-  - .sandstorm/

.deploy/docker/apache2.conf

@@ -1,73 +1,3 @@
-# This is the main Apache server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.4/ for detailed information about
-# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
-# hints.
-#
-#
-# Summary of how the Apache 2 configuration works in Debian:
-# The Apache 2 web server configuration in Debian is quite different to
-# upstream's suggested way to configure the web server. This is because Debian's
-# default Apache2 installation attempts to make adding and removing modules,
-# virtual hosts, and extra configuration directives as flexible as possible, in
-# order to make automating the changes and administering the server as easy as
-# possible.
-
-# It is split into several files forming the configuration hierarchy outlined
-# below, all located in the /etc/apache2/ directory:
-#
-#	/etc/apache2/
-#	|-- apache2.conf
-#	|	`--  ports.conf
-#	|-- mods-enabled
-#	|	|-- *.load
-#	|	`-- *.conf
-#	|-- conf-enabled
-#	|	`-- *.conf
-# 	`-- sites-enabled
-#	 	`-- *.conf
-#
-#
-# * apache2.conf is the main configuration file (this file). It puts the pieces
-#   together by including all remaining configuration files when starting up the
-#   web server.
-#
-# * ports.conf is always included from the main configuration file. It is
-#   supposed to determine listening ports for incoming connections which can be
-#   customized anytime.
-#
-# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
-#   directories contain particular configuration snippets which manage modules,
-#   global configuration fragments, or virtual host configurations,
-#   respectively.
-#
-#   They are activated by symlinking available configuration files from their
-#   respective *-available/ counterparts. These should be managed by using our
-#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
-#   their respective man pages for detailed information.
-#
-# * The binary is called apache2. Due to the use of environment variables, in
-#   the default configuration, apache2 needs to be started/stopped with
-#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
-#   work with the default configuration.
-
-
-# Global configuration
-#
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE!  If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the Mutex documentation (available
-# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-#ServerRoot "/etc/apache2"
-
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #

.deploy/docker/build-amd64.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# build image
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+
+
+
+if [ "$TRAVIS_BRANCH" == "develop" ]; then
+    echo "Build develop amd64"
+    docker build -t jc5x/firefly-iii:develop-amd64 -f Dockerfile.amd64 .
+    docker tag jc5x/firefly-iii:develop-amd64 jc5x/firefly-iii:develop-$VERSION-amd64
+    docker push jc5x/firefly-iii:develop-amd64
+    docker push jc5x/firefly-iii:develop-$VERSION-amd64
+fi
+
+if [ "$TRAVIS_BRANCH" == "master" ]; then
+    echo "Build master amd64"
+    docker build -t jc5x/firefly-iii:latest-amd64 -f Dockerfile.amd64 .
+    docker tag jc5x/firefly-iii:latest-amd64 jc5x/firefly-iii:release-$VERSION-amd64
+    docker push jc5x/firefly-iii:latest-amd64
+    docker push jc5x/firefly-iii:release-$VERSION-amd64
+fi

.deploy/docker/build-arm.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
+
+
+# get qemu-arm-static binary
+mkdir tmp
+pushd tmp && \
+curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v2.6.0/qemu-arm-static.tar.gz && \
+tar xzf qemu-arm-static.tar.gz && \
+popd
+
+# build image
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+
+if [ "$TRAVIS_BRANCH" == "develop" ]; then
+    echo "Build develop arm"
+    docker build --tag jc5x/firefly-iii:develop-arm --file Dockerfile.arm .
+    docker tag jc5x/firefly-iii:develop-arm jc5x/firefly-iii:develop-$VERSION-arm
+    docker push jc5x/firefly-iii:develop-arm
+    docker push jc5x/firefly-iii:develop-$VERSION-arm
+fi
+
+if [ "$TRAVIS_BRANCH" == "master" ]; then
+    echo "Build master arm"
+    docker build --tag jc5x/firefly-iii:latest-arm --file Dockerfile.arm .
+    docker tag jc5x/firefly-iii:latest-arm jc5x/firefly-iii:release-$VERSION-arm
+    docker push jc5x/firefly-iii:latest-arm
+    docker push jc5x/firefly-iii:release-$VERSION-arm
+fi

.deploy/docker/docker.env

@@ -1,6 +0,0 @@
-FF_APP_ENV=local
-FF_APP_KEY=S0m3R@nd0mString0f32Ch@rsEx@ct1y
-FF_DB_HOST=
-FF_DB_NAME=
-FF_DB_USER=
-FF_DB_PASSWORD=

.deploy/docker/entrypoint.sh

@@ -1,29 +1,64 @@
 #!/bin/bash
 
+echo "Now in entrypoint.sh for Firefly III"
+
+lscpu
+
 # make sure the correct directories exists (suggested by @chrif):
-mkdir -p $FIREFLY_PATH/storage/app
+echo "Making directories..."
 mkdir -p $FIREFLY_PATH/storage/app/public
 mkdir -p $FIREFLY_PATH/storage/build
 mkdir -p $FIREFLY_PATH/storage/database
 mkdir -p $FIREFLY_PATH/storage/debugbar
 mkdir -p $FIREFLY_PATH/storage/export
-mkdir -p $FIREFLY_PATH/storage/framework/cache
+mkdir -p $FIREFLY_PATH/storage/framework/cache/data
 mkdir -p $FIREFLY_PATH/storage/framework/sessions
 mkdir -p $FIREFLY_PATH/storage/framework/testing
-mkdir -p $FIREFLY_PATH/storage/framework/views
+mkdir -p $FIREFLY_PATH/storage/framework/views/v1
+mkdir -p $FIREFLY_PATH/storage/framework/views/v2
 mkdir -p $FIREFLY_PATH/storage/logs
 mkdir -p $FIREFLY_PATH/storage/upload
 
 
+echo "Touch DB file (if SQLlite)..."
+if [[ $DB_CONNECTION == "sqlite" ]]
+then
+    touch $FIREFLY_PATH/storage/database/database.sqlite
+    echo "Touched!"
+fi
+
+if [[ $FF_DB_CONNECTION == "sqlite" ]]
+then
+    touch $FIREFLY_PATH/storage/database/database.sqlite
+    echo "Touched!"
+fi
+
 # make sure we own the volumes:
+echo "Run chown on ${FIREFLY_PATH}/storage..."
 chown -R www-data:www-data -R $FIREFLY_PATH/storage
+echo "Run chmod on ${FIREFLY_PATH}/storage..."
 chmod -R 775 $FIREFLY_PATH/storage
 
 # remove any lingering files that may break upgrades:
+echo "Remove log file..."
 rm -f $FIREFLY_PATH/storage/logs/laravel.log
 
-cat .env.docker | envsubst > .env && cat .env
+echo "Map environment variables on .env file..."
+cat .env.docker | envsubst > .env
+echo "Dump auto load..."
 composer dump-autoload
+echo "Discover packages..."
 php artisan package:discover
+
+echo "Run various artisan commands..."
+php artisan migrate --seed
+php artisan firefly:decrypt-all
+php artisan firefly:upgrade-database
+php artisan firefly:verify
+php artisan passport:install
+php artisan cache:clear
+
 php artisan firefly:instructions install
-exec apache2-foreground
+
+echo "Go!"
+exec apache2-foreground

.deploy/docker/manifest.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+if [ "$TRAVIS_BRANCH" == "develop" ]; then
+    TARGET=jc5x/firefly-iii:develop
+    ARM=jc5x/firefly-iii:develop-arm
+    AMD=jc5x/firefly-iii:develop-amd64
+
+    docker manifest create $TARGET $AMD $ARM
+    docker manifest annotate $TARGET $ARM --arch arm   --os linux
+    docker manifest annotate $TARGET $AMD --arch amd64 --os linux
+    docker manifest push $TARGET
+fi
+
+echo "The version is $VERSION"
+
+if [ "$TRAVIS_BRANCH" == "master" ]; then
+    TARGET=jc5x/firefly-iii:latest
+    ARM=jc5x/firefly-iii:latest-arm
+    AMD=jc5x/firefly-iii:latest-amd64
+
+    docker manifest create $TARGET $AMD $ARM
+    docker manifest annotate $TARGET $ARM --arch arm   --os linux
+    docker manifest annotate $TARGET $AMD --arch amd64 --os linux
+    docker manifest push $TARGET
+
+    # and another one for version specific:
+    TARGET=jc5x/firefly-iii:release-$VERSION
+    ARM=jc5x/firefly-iii:release-$VERSION-arm
+    AMD=jc5x/firefly-iii:release-$VERSION-amd64
+
+    docker manifest create $TARGET $AMD $ARM
+    docker manifest annotate $TARGET $ARM --arch arm   --os linux
+    docker manifest annotate $TARGET $AMD --arch amd64 --os linux
+    docker manifest push $TARGET
+fi

.deploy/docker/vhost.conf

@@ -0,0 +1,26 @@
+server {
+    listen 80 default_server;
+
+    server_name  _ *.vm docker;
+
+    root "/app/public";
+    index index.php;
+
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
+}
+
+##############
+# SSL
+##############
+
+server {
+    listen 443 default_server;
+
+    server_name  _ *.vm docker;
+
+    root "/app/public";
+    index index.php;
+
+    include /opt/docker/etc/nginx/vhost.common.d/*.conf;
+    include /opt/docker/etc/nginx/vhost.ssl.conf;
+}

.env.docker

@@ -13,37 +13,55 @@ SITE_OWNER=${SITE_OWNER}
 # Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
 APP_KEY=${FF_APP_KEY}
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# Change this value to your preferred time zone.
+# Example: Europe/Amsterdam
+TZ=${TZ}
+
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=${APP_URL}
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 TRUSTED_PROXIES=${TRUSTED_PROXIES}
 
 # The log channel defines where your log entries go to.
-LOG_CHANNEL=${LOG_CHANNEL}
-
-# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
-DB_CONNECTION=${FF_DB_CONNECTION}
-DB_HOST=${FF_DB_HOST}
-DB_PORT=${FF_DB_PORT}
-DB_DATABASE=${FF_DB_NAME}
-DB_USERNAME=${FF_DB_USER}
-DB_PASSWORD=${FF_DB_PASSWORD}
-
 # 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
 # Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=syslog
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=stdout
 
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
 # If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
 # nothing will get logged, ever.
-APP_LOG_LEVEL=info
+APP_LOG_LEVEL=${APP_LOG_LEVEL}
+
+# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
+# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
+DB_CONNECTION=${FF_DB_CONNECTION}
+DB_HOST=${FF_DB_HOST}
+DB_PORT=${FF_DB_PORT}
+DB_DATABASE=${FF_DB_NAME}
+DB_USERNAME=${FF_DB_USER}
+DB_PASSWORD="${FF_DB_PASSWORD}"
 
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 
+# You can configure another file storage backend if you cannot use the local storage option.
+# To set this up, fill in the following variables. The upload path is used to store uploaded
+# files and the export path is to store exported data (before download).
+SFTP_HOST=${SFTP_HOST}
+SFTP_PORT=${SFTP_PORT}
+SFTP_UPLOAD_PATH=${SFTP_UPLOAD_PATH}
+SFTP_EXPORT_PATH=${SFTP_EXPORT_PATH}
+
+# SFTP uses either the username/password combination or the private key to authenticate.
+SFTP_USERNAME=${SFTP_USERNAME}
+SFTP_PASSWORD="${SFTP_PASSWORD}"
+SFTP_PRIV_KEY=${SFTP_PRIV_KEY}
+
 # Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
@@ -56,7 +74,7 @@ MAIL_HOST=${MAIL_HOST}
 MAIL_PORT=${MAIL_PORT}
 MAIL_FROM=${MAIL_FROM}
 MAIL_USERNAME=${MAIL_USERNAME}
-MAIL_PASSWORD=${MAIL_PASSWORD}
+MAIL_PASSWORD="${MAIL_PASSWORD}"
 MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
 
 # Other mail drivers:
@@ -69,11 +87,20 @@ SPARKPOST_SECRET=${SPARKPOST_SECRET}
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=false
 
+# These messages contain (sensitive) transaction information:
+SEND_REPORT_JOURNALS=${SEND_REPORT_JOURNALS}
+
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 MAPBOX_API_KEY=${MAPBOX_API_KEY}
 
-# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this will only work for paid fixer.io accounts because they severly limited
+# Firefly III currently supports two provider for live Currency Exchange Rates:
+# "fixer" is the default (for backward compatibility), and "ratesapi" is the new one.
+# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
+# built compatible with Fixer.IO, based on data published by European Central Bank, and don't require API key.
+CER_PROVIDER=${CER_PROVIDER}
+# If you have select "fixer" as default currency exchange rates,
+# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
 # the free API up to the point where you might as well offer nothing.
 FIXER_API_KEY=${FIXER_API_KEY}
 
@@ -84,9 +111,53 @@ ANALYTICS_ID=${ANALYTICS_ID}
 # This makes it easier to migrate your database. Not that some fields will never be decrypted.
 USE_ENCRYPTION=true
 
+# Firefly III has two options for user authentication. "eloquent" is the default,
+# and "ldap" for LDAP servers.
+# For full instructions on these settings please visit:
+# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
+LOGIN_PROVIDER=${LOGIN_PROVIDER}
+
+# LDAP connection configuration
+ADLDAP_CONNECTION_SCHEME=${ADLDAP_CONNECTION_SCHEME}
+ADLDAP_AUTO_CONNECT=${ADLDAP_AUTO_CONNECT}
+
+# LDAP connection settings
+ADLDAP_CONTROLLERS=${ADLDAP_CONTROLLERS}
+ADLDAP_PORT=${ADLDAP_PORT}
+ADLDAP_TIMEOUT=${ADLDAP_TIMEOUT}
+ADLDAP_BASEDN="${ADLDAP_BASEDN}"
+ADLDAP_FOLLOW_REFFERALS=${ADLDAP_FOLLOW_REFFERALS}
+ADLDAP_USE_SSL=${ADLDAP_USE_SSL}
+ADLDAP_USE_TLS=${ADLDAP_USE_TLS}
+
+ADLDAP_ADMIN_USERNAME=${ADLDAP_ADMIN_USERNAME}
+ADLDAP_ADMIN_PASSWORD="${ADLDAP_ADMIN_PASSWORD}"
+
+ADLDAP_ACCOUNT_PREFIX="${ADLDAP_ACCOUNT_PREFIX}"
+ADLDAP_ACCOUNT_SUFFIX="${ADLDAP_ACCOUNT_SUFFIX}"
+
+# LDAP authentication settings.
+ADLDAP_PASSWORD_SYNC=${ADLDAP_PASSWORD_SYNC}
+ADLDAP_LOGIN_FALLBACK=${ADLDAP_LOGIN_FALLBACK}
+
+ADLDAP_DISCOVER_FIELD=${ADLDAP_DISCOVER_FIELD}
+ADLDAP_AUTH_FIELD=${ADLDAP_AUTH_FIELD}
+
+# Will allow SSO if your server provides an AUTH_USER field.
+WINDOWS_SSO_DISCOVER=${WINDOWS_SSO_DISCOVER}
+WINDOWS_SSO_KEY=${WINDOWS_SSO_KEY}
+
+# field to sync as local username.
+ADLDAP_SYNC_FIELD=${ADLDAP_SYNC_FIELD}
+
+# You can disable the X-Frame-Options header if it interfears with tools like
+# Organizr. This is at your own risk.
+DISABLE_FRAME_HEADER=${DISABLE_FRAME_HEADER}
+
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
 APP_NAME=FireflyIII
+ADLDAP_CONNECTION=default
 BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 REDIS_HOST=127.0.0.1
@@ -103,4 +174,4 @@ IS_DOCKER=true
 IS_SANDSTORM=false
 IS_HEROKU=false
 BUNQ_USE_SANDBOX=false
-TZ=${TZ}
+FFIII_LAYOUT=v1

.env.example

@@ -15,15 +15,27 @@ APP_KEY=SomeRandomStringOf32CharsExactly
 
 # Change this value to your preferred time zone.
 # Example: Europe/Amsterdam
-TZ=UTC
+TZ=Europe/Amsterdam
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 TRUSTED_PROXIES=
 
 # The log channel defines where your log entries go to.
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
 LOG_CHANNEL=daily
 
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=notice
+
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
 DB_CONNECTION=mysql
@@ -33,21 +45,23 @@ DB_DATABASE=homestead
 DB_USERNAME=homestead
 DB_PASSWORD=secret
 
-# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
-# Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=daily
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=notice
-
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 
+# You can configure another file storage backend if you cannot use the local storage option.
+# To set this up, fill in the following variables. The upload path is used to store uploaded
+# files and the export path is to store exported data (before download).
+SFTP_HOST=
+SFTP_PORT=
+SFTP_UPLOAD_PATH=
+SFTP_EXPORT_PATH=
+
+# SFTP uses either the username/password combination or the private key to authenticate.
+SFTP_USERNAME=
+SFTP_PASSWORD=
+SFTP_PRIV_KEY=
+
 # Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
@@ -73,11 +87,20 @@ SPARKPOST_SECRET=
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
 
+# These messages contain (sensitive) transaction information:
+SEND_REPORT_JOURNALS=true
+
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 MAPBOX_API_KEY=
 
-# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this will only work for paid fixer.io accounts because they severly limited
+# Firefly III currently supports two provider for live Currency Exchange Rates:
+# "fixer" is the default (for backward compatibility), and "ratesapi" is the new one.
+# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
+# built compatible with Fixer.IO, based on data published by European Central Bank, and don't require API key.
+CER_PROVIDER=fixer
+# If you have select "fixer" as default currency exchange rates,
+# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
 # the free API up to the point where you might as well offer nothing.
 FIXER_API_KEY=
 
@@ -88,9 +111,54 @@ ANALYTICS_ID=
 # This makes it easier to migrate your database. Not that some fields will never be decrypted.
 USE_ENCRYPTION=true
 
+# Firefly III has two options for user authentication. "eloquent" is the default,
+# and "ldap" for LDAP servers.
+# For full instructions on these settings please visit:
+# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
+LOGIN_PROVIDER=eloquent
+
+# LDAP connection configuration
+# OpenLDAP, FreeIPA or ActiveDirectory
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
+ADLDAP_AUTO_CONNECT=true
+
+# LDAP connection settings
+ADLDAP_CONTROLLERS=
+ADLDAP_PORT=389
+ADLDAP_TIMEOUT=5
+ADLDAP_BASEDN=""
+ADLDAP_FOLLOW_REFFERALS=false
+ADLDAP_USE_SSL=false
+ADLDAP_USE_TLS=false
+
+ADLDAP_ADMIN_USERNAME=
+ADLDAP_ADMIN_PASSWORD=
+
+ADLDAP_ACCOUNT_PREFIX=
+ADLDAP_ACCOUNT_SUFFIX=
+
+# LDAP authentication settings.
+ADLDAP_PASSWORD_SYNC=false
+ADLDAP_LOGIN_FALLBACK=false
+
+ADLDAP_DISCOVER_FIELD=distinguishedname
+ADLDAP_AUTH_FIELD=distinguishedname
+
+# Will allow SSO if your server provides an AUTH_USER field.
+WINDOWS_SSO_DISCOVER=samaccountname
+WINDOWS_SSO_KEY=AUTH_USER
+
+# field to sync as local username.
+ADLDAP_SYNC_FIELD=userprincipalname
+
+# You can disable the X-Frame-Options header if it interfears with tools like
+# Organizr. This is at your own risk.
+DISABLE_FRAME_HEADER=false
+
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
 APP_NAME=FireflyIII
+ADLDAP_CONNECTION=default
 BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 REDIS_HOST=127.0.0.1
@@ -105,7 +173,6 @@ DEMO_USERNAME=
 DEMO_PASSWORD=
 IS_DOCKER=false
 IS_SANDSTORM=false
-BUNQ_USE_SANDBOX=false
 IS_HEROKU=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
+BUNQ_USE_SANDBOX=false
+FFIII_LAYOUT=v1

.env.heroku

@@ -17,12 +17,24 @@ APP_KEY=7ahyYVPVsmxjdhsweWCauGeJfwc92NP2
 # Example: Europe/Amsterdam
 TZ=UTC
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
-TRUSTED_PROXIES=
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
+TRUSTED_PROXIES=**
 
 # The log channel defines where your log entries go to.
-LOG_CHANNEL=syslog
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=stdout
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=debug
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
@@ -33,21 +45,23 @@ DB_CONNECTION=pgsql
 
 
 
-# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
-# Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=errorlog
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=debug
-
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 
+# You can configure another file storage backend if you cannot use the local storage option.
+# To set this up, fill in the following variables. The upload path is used to store uploaded
+# files and the export path is to store exported data (before download).
+SFTP_HOST=
+SFTP_PORT=
+SFTP_UPLOAD_PATH=
+SFTP_EXPORT_PATH=
+
+# SFTP uses either the username/password combination or the private key to authenticate.
+SFTP_USERNAME=
+SFTP_PASSWORD=
+SFTP_PRIV_KEY=
+
 # Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
@@ -73,11 +87,20 @@ SPARKPOST_SECRET=
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
 
+# These messages contain (sensitive) transaction information:
+SEND_REPORT_JOURNALS=true
+
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 MAPBOX_API_KEY=
 
-# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this will only work for paid fixer.io accounts because they severly limited
+# Firefly III currently supports two provider for live Currency Exchange Rates:
+# "fixer" is the default (for backward compatibility), and "ratesapi" is the new one.
+# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
+# built compatible with Fixer.IO, based on data published by European Central Bank, and don't require API key.
+CER_PROVIDER=fixer
+# If you have select "fixer" as default currency exchange rates,
+# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
 # the free API up to the point where you might as well offer nothing.
 FIXER_API_KEY=
 
@@ -88,9 +111,54 @@ ANALYTICS_ID=
 # This makes it easier to migrate your database. Not that some fields will never be decrypted.
 USE_ENCRYPTION=true
 
+# Firefly III has two options for user authentication. "eloquent" is the default,
+# and "ldap" for LDAP servers.
+# For full instructions on these settings please visit:
+# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
+LOGIN_PROVIDER=eloquent
+
+# LDAP connection configuration
+# OpenLDAP, FreeIPA or ActiveDirectory
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
+ADLDAP_AUTO_CONNECT=true
+
+# LDAP connection settings
+ADLDAP_CONTROLLERS=
+ADLDAP_PORT=389
+ADLDAP_TIMEOUT=5
+ADLDAP_BASEDN=""
+ADLDAP_FOLLOW_REFFERALS=false
+ADLDAP_USE_SSL=false
+ADLDAP_USE_TLS=false
+
+ADLDAP_ADMIN_USERNAME=
+ADLDAP_ADMIN_PASSWORD=
+
+ADLDAP_ACCOUNT_PREFIX=
+ADLDAP_ACCOUNT_SUFFIX=
+
+# LDAP authentication settings.
+ADLDAP_PASSWORD_SYNC=false
+ADLDAP_LOGIN_FALLBACK=false
+
+ADLDAP_DISCOVER_FIELD=distinguishedname
+ADLDAP_AUTH_FIELD=distinguishedname
+
+# Will allow SSO if your server provides an AUTH_USER field.
+WINDOWS_SSO_DISCOVER=samaccountname
+WINDOWS_SSO_KEY=AUTH_USER
+
+# field to sync as local username.
+ADLDAP_SYNC_FIELD=userprincipalname
+
+# You can disable the X-Frame-Options header if it interfears with tools like
+# Organizr. This is at your own risk.
+DISABLE_FRAME_HEADER=false
+
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
 APP_NAME=FireflyIII
+ADLDAP_CONNECTION=default
 BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 REDIS_HOST=127.0.0.1
@@ -105,7 +173,6 @@ DEMO_USERNAME=
 DEMO_PASSWORD=
 IS_DOCKER=false
 IS_SANDSTORM=false
-BUNQ_USE_SANDBOX=false
 IS_HEROKU=true
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
+BUNQ_USE_SANDBOX=false
+FFIII_LAYOUT=v1

.env.sandstorm

@@ -3,7 +3,7 @@
 APP_ENV=local
 
 # Set to true if you want to see debug information in error screens.
-APP_DEBUG=false
+APP_DEBUG=true
 
 # This should be your email address
 SITE_OWNER=sandstorm@example.com
@@ -17,12 +17,24 @@ APP_KEY=SomeRandomStringOf32CharsExactly
 # Example: Europe/Amsterdam
 TZ=UTC
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 TRUSTED_PROXIES=
 
 # The log channel defines where your log entries go to.
-LOG_CHANNEL=syslog
+# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
+# Several other options exist. You can use 'single' for one big fat error log (not recommended).
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=stdout
+
+# Log level. You can set this from least severe to most severe:
+# debug, info, notice, warning, error, critical, alert, emergency
+# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
+# nothing will get logged, ever.
+APP_LOG_LEVEL=debug
 
 # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
 # If you use SQLite, set connection to `sqlite` and remove the database, username and password settings.
@@ -33,21 +45,23 @@ DB_DATABASE=firefly
 DB_USERNAME=firefly
 DB_PASSWORD=firefly
 
-# 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
-# Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=syslog
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=info
-
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 
+# You can configure another file storage backend if you cannot use the local storage option.
+# To set this up, fill in the following variables. The upload path is used to store uploaded
+# files and the export path is to store exported data (before download).
+SFTP_HOST=
+SFTP_PORT=
+SFTP_UPLOAD_PATH=
+SFTP_EXPORT_PATH=
+
+# SFTP uses either the username/password combination or the private key to authenticate.
+SFTP_USERNAME=
+SFTP_PASSWORD=
+SFTP_PRIV_KEY=
+
 # Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
@@ -73,11 +87,20 @@ SPARKPOST_SECRET=
 SEND_REGISTRATION_MAIL=true
 SEND_ERROR_MESSAGE=true
 
+# These messages contain (sensitive) transaction information:
+SEND_REPORT_JOURNALS=true
+
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 MAPBOX_API_KEY=
 
-# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this will only work for paid fixer.io accounts because they severly limited
+# Firefly III currently supports two provider for live Currency Exchange Rates:
+# "fixer" is the default (for backward compatibility), and "ratesapi" is the new one.
+# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
+# built compatible with Fixer.IO, based on data published by European Central Bank, and don't require API key.
+CER_PROVIDER=fixer
+# If you have select "fixer" as default currency exchange rates,
+# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
 # the free API up to the point where you might as well offer nothing.
 FIXER_API_KEY=
 
@@ -88,9 +111,54 @@ ANALYTICS_ID=
 # This makes it easier to migrate your database. Not that some fields will never be decrypted.
 USE_ENCRYPTION=true
 
+# Firefly III has two options for user authentication. "eloquent" is the default,
+# and "ldap" for LDAP servers.
+# For full instructions on these settings please visit:
+# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
+LOGIN_PROVIDER=eloquent
+
+# LDAP connection configuration
+ # or FreeIPA or ActiveDirectory
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
+ADLDAP_AUTO_CONNECT=true
+
+# LDAP connection settings
+ADLDAP_CONTROLLERS=
+ADLDAP_PORT=389
+ADLDAP_TIMEOUT=5
+ADLDAP_BASEDN=""
+ADLDAP_FOLLOW_REFFERALS=false
+ADLDAP_USE_SSL=false
+ADLDAP_USE_TLS=false
+
+ADLDAP_ADMIN_USERNAME=
+ADLDAP_ADMIN_PASSWORD=
+
+ADLDAP_ACCOUNT_PREFIX=
+ADLDAP_ACCOUNT_SUFFIX=
+
+# LDAP authentication settings.
+ADLDAP_PASSWORD_SYNC=false
+ADLDAP_LOGIN_FALLBACK=false
+
+ADLDAP_DISCOVER_FIELD=distinguishedname
+ADLDAP_AUTH_FIELD=distinguishedname
+
+# Will allow SSO if your server provides an AUTH_USER field.
+WINDOWS_SSO_DISCOVER=samaccountname
+WINDOWS_SSO_KEY=AUTH_USER
+
+# field to sync as local username.
+ADLDAP_SYNC_FIELD=userprincipalname
+
+# You can disable the X-Frame-Options header if it interfears with tools like
+# Organizr. This is at your own risk.
+DISABLE_FRAME_HEADER=true
+
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
 APP_NAME=FireflyIII
+ADLDAP_CONNECTION=default
 BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 REDIS_HOST=127.0.0.1
@@ -105,7 +173,6 @@ DEMO_USERNAME=
 DEMO_PASSWORD=
 IS_DOCKER=false
 IS_SANDSTORM=true
-BUNQ_USE_SANDBOX=false
 IS_HEROKU=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
+BUNQ_USE_SANDBOX=false
+FFIII_LAYOUT=v1

.env.testing

@@ -17,32 +17,51 @@ APP_KEY=TestTestTestTestTestTestTestTest
 # Example: Europe/Amsterdam
 TZ=Europe/Amsterdam
 
-# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy.
+# This variable must match your installation's external address but keep in mind that
+# it's only used on the command line as a fallback value.
 APP_URL=http://localhost
+
+# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy.
 TRUSTED_PROXIES=
 
 # The log channel defines where your log entries go to.
-LOG_CHANNEL=dailytest
-
-# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
-# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
-DB_CONNECTION=sqlite
-
 # 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
 # Several other options exist. You can use 'single' for one big fat error log (not recommended).
-# Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=daily
+# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
+LOG_CHANNEL=dailytest
 
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
 # If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
 # nothing will get logged, ever.
-APP_LOG_LEVEL=debug
+APP_LOG_LEVEL=info
+
+# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
+# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html
+DB_CONNECTION=sqlite
+
+
+
+
+
 
 # If you're looking for performance improvements, you could install memcached.
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 
+# You can configure another file storage backend if you cannot use the local storage option.
+# To set this up, fill in the following variables. The upload path is used to store uploaded
+# files and the export path is to store exported data (before download).
+SFTP_HOST=
+SFTP_PORT=
+SFTP_UPLOAD_PATH=
+SFTP_EXPORT_PATH=
+
+# SFTP uses either the username/password combination or the private key to authenticate.
+SFTP_USERNAME=
+SFTP_PASSWORD=
+SFTP_PRIV_KEY=
+
 # Cookie settings. Should not be necessary to change these.
 COOKIE_PATH="/"
 COOKIE_DOMAIN=
@@ -64,12 +83,24 @@ MAILGUN_SECRET=
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
 
+# Firefly III can send you the following messages
+SEND_REGISTRATION_MAIL=true
+SEND_ERROR_MESSAGE=false
+
+# These messages contain (sensitive) transaction information:
+SEND_REPORT_JOURNALS=true
 
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 MAPBOX_API_KEY=
 
-# Set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this will only work for paid fixer.io accounts because they severly limited
+# Firefly III currently supports two provider for live Currency Exchange Rates:
+# "fixer" is the default (for backward compatibility), and "ratesapi" is the new one.
+# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
+# built compatible with Fixer.IO, based on data published by European Central Bank, and don't require API key.
+CER_PROVIDER=fixer
+# If you have select "fixer" as default currency exchange rates,
+# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
+# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
 # the free API up to the point where you might as well offer nothing.
 FIXER_API_KEY=
 
@@ -80,9 +111,54 @@ ANALYTICS_ID=
 # This makes it easier to migrate your database. Not that some fields will never be decrypted.
 USE_ENCRYPTION=false
 
+# Firefly III has two options for user authentication. "eloquent" is the default,
+# and "ldap" for LDAP servers.
+# For full instructions on these settings please visit:
+# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html
+LOGIN_PROVIDER=eloquent
+
+# LDAP connection configuration
+ # or FreeIPA or ActiveDirectory
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
+ADLDAP_AUTO_CONNECT=true
+
+# LDAP connection settings
+ADLDAP_CONTROLLERS=
+ADLDAP_PORT=389
+ADLDAP_TIMEOUT=5
+ADLDAP_BASEDN=""
+ADLDAP_FOLLOW_REFFERALS=false
+ADLDAP_USE_SSL=false
+ADLDAP_USE_TLS=false
+
+ADLDAP_ADMIN_USERNAME=
+ADLDAP_ADMIN_PASSWORD=
+
+ADLDAP_ACCOUNT_PREFIX=
+ADLDAP_ACCOUNT_SUFFIX=
+
+# LDAP authentication settings.
+ADLDAP_PASSWORD_SYNC=false
+ADLDAP_LOGIN_FALLBACK=false
+
+ADLDAP_DISCOVER_FIELD=distinguishedname
+ADLDAP_AUTH_FIELD=distinguishedname
+
+# Will allow SSO if your server provides an AUTH_USER field.
+WINDOWS_SSO_DISCOVER=samaccountname
+WINDOWS_SSO_KEY=AUTH_USER
+
+# field to sync as local username.
+ADLDAP_SYNC_FIELD=userprincipalname
+
+# You can disable the X-Frame-Options header if it interfears with tools like
+# Organizr. This is at your own risk.
+DISABLE_FRAME_HEADER=false
+
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
 APP_NAME=FireflyIII
+ADLDAP_CONNECTION=default
 BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 REDIS_HOST=127.0.0.1
@@ -97,7 +173,6 @@ DEMO_USERNAME=
 DEMO_PASSWORD=
 IS_DOCKER=false
 IS_SANDSTORM=false
-BUNQ_USE_SANDBOX=true
 IS_HEROKU=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
+BUNQ_USE_SANDBOX=true
+FFIII_LAYOUT=v1

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -5,18 +5,23 @@ about: Create a report to help Firefly III improve
 ---
 
 **Bug description**
-I am running Firefly III version x.x.x
+I am running Firefly III version x.x.x, and my problem is:
 
-(please give a clear and concise description of what the bug is)
+<!-- Replace the version and describe your problem or your issue will be closed. -->
 
 **Steps to reproduce**
-What do you need to do to trigger this bug?
+<!-- What do you need to do to trigger this bug? -->
+
+**Expected behavior**
+<!-- What do you expect to see after those steps? -->
 
 **Extra info**
-Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom).
+<!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). -->
 
 **Bonus points**
-Earn bonus points by:
+<!-- Earn bonus points by:
 
 - Post a stacktrace from your log files
-- Add a screenshot
+- Add a screenshot
+- Remember the human
+-->

.github/ISSUE_TEMPLATE/Custom.md

@@ -7,21 +7,19 @@ about: Ask away!
 I am running Firefly III version x.x.x
 
 **Description**
-
-
-
-**Steps to reproduce** 
-(if relevant of course)
-
-
+<!-- (if relevant of course) -->
 
 **Extra info**
-Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). 
+<!-- Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). --> 
 
 
 
 **Bonus points**
-Earn bonus points by:
+<!-- Earn bonus points by:
 
 - Add a screenshot
-- Replicate the problem on the demo site https://demo.firefly-iii.org/
+- Make a drawing
+- Donate money (just kidding ;)
+- Replicate the problem on the demo site https://demo.firefly-iii.org/
+- Remember the human
+-->

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -5,17 +5,28 @@ about: Suggest an idea or feature for Firefly III
 ---
 
 **Description**
+<!--
 Please describe your feature request:
 
-- I would like Firefly III to do X.
-- What if you would add feature Y?
-- Firefly III doesn't do Z.
+- I would like Firefly III to do ABC.
+- What if you would add feature XYZ?
+- Firefly III doesn't do DEF.
+
+-->
 
 **Solution**
-Describe what your feature would add to Firefly III.
+<!-- Describe what your feature would add to Firefly III. -->
 
 **What are alternatives?**
-Please describe what alternatives currently exist.
+<!-- Please describe what alternatives currently exist. -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->
+
+**Bonus points**
+<!-- Earn bonus points by:
+
+- Make a drawing
+- Donate money (just kidding ;)
+- Remember the human
+-->

.github/pull_request_template.md

@@ -1,4 +1,11 @@
-Fixes # (if relevant)
+<!--
+Please read me:
+
+1) DO NOT create a pull request for the MASTER branch.
+2) DO NOT create pull requests to add new CURRENCIES.
+-->
+
+Fixes issue # (if relevant)
 
 Changes in this pull request:
 

.github/stale.yml

@@ -1,7 +1,7 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 14
+daysUntilStale: 7
 
 # Number of days of inactivity before a stale Issue or Pull Request is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
@@ -13,6 +13,8 @@ exemptLabels:
   - enhancement
   - feature
   - bug
+  - possible-bug
+  - announcement
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: false
@@ -53,4 +55,4 @@ limitPerRun: 30
 
 # issues:
 #   exemptLabels:
-#     - confirmed
+#     - confirmed

.locales

@@ -0,0 +1,9 @@
+en_US
+de_DE
+fr_FR
+it_IT
+nl_NL
+pl_PL
+pt_BR
+ru_RU
+tr_TR

.sandstorm/Vagrantfile

@@ -9,9 +9,16 @@ VM_NAME = File.basename(File.dirname(File.dirname(__FILE__))) + "_sandstorm_#{Ti
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
+# ugly hack to prevent hashicorp's bitrot. See https://github.com/hashicorp/vagrant/issues/9442
+# this setting is required for pre-2.0 vagrant, but causes an error as of 2.0.3,
+# remove entirely when confident nobody uses vagrant 1.x for anything.
+unless Vagrant::DEFAULT_SERVER_URL.frozen?
+  Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com')
+end
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Base on the Sandstorm snapshots of the official Debian 8 (jessie) box.
-  config.vm.box = "sandstorm/debian-jessie64"
+  config.vm.box = "debian/contrib-jessie64"
 
   if Vagrant.has_plugin?("vagrant-vbguest") then
     # vagrant-vbguest is a Vagrant plugin that upgrades

.sandstorm/changelog.md

@@ -1,3 +1,251 @@
+# 4.7.12
+- 4.7.12 was released to fix several shortcomings in v4.7.11's Docker image. Those in turn were caused by me. My apologies.
+- [Issue 2085](https://github.com/firefly-iii/firefly-iii/issues/2085) Upgraded the LDAP code. To keep using LDAP, set the `LOGIN_PROVIDER` to `ldap`.
+- [Issue 2061](https://github.com/firefly-iii/firefly-iii/issues/2061) Some users reported empty update popups. 
+- [Issue 2070](https://github.com/firefly-iii/firefly-iii/issues/2070) A cache issue prevented rules from being applied correctly.
+- [Issue 2071](https://github.com/firefly-iii/firefly-iii/issues/2071) Several issues with Postgres and date values with time zone information in them.
+- [Issue 2081](https://github.com/firefly-iii/firefly-iii/issues/2081) Rules were not being applied when importing using FinTS.
+- [Issue 2082](https://github.com/firefly-iii/firefly-iii/issues/2082) The mass-editor changed all dates to today.
+
+# 4.7.11
+- Experimental audit logging channel to track important events (separate from debug logging).
+- [Issue 2003](https://github.com/firefly-iii/firefly-iii/issues/2003), [issue 2006](https://github.com/firefly-iii/firefly-iii/issues/2006) Transactions can be stored with a timestamp. The user-interface does not support this yet. But the API does.
+- Docker image tags a new manifest for arm and amd64.
+- [skuzzle](https://github.com/skuzzle) removed an annoying console.log statement.
+- [Issue 2048](https://github.com/firefly-iii/firefly-iii/issues/2048) Fix "Are you sure?" popup, thanks to @nescafe2002!
+- [Issue 2049](https://github.com/firefly-iii/firefly-iii/issues/2049) Empty preferences would crash Firefly III.
+- [Issue 2052](https://github.com/firefly-iii/firefly-iii/issues/2052) Rules could not auto-covert to liabilities.
+- Webbased upgrade routine will also decrypt the database.
+- Last use date for categories was off.
+- The `date`-field in any transaction object now returns a ISO 8601 timestamp instead of a date.
+
+# 4.7.10
+- [Issue 2037](https://github.com/firefly-iii/firefly-iii/issues/2037) Added some new magic keywords to reports.
+- Added a new currency exchange rate service, [ratesapi.io](https://ratesapi.io/), that does not require expensive API keys. Built by [@BoGnY](https://github.com/BoGnY).
+- Added Chinese Traditional translations. Thanks!
+- [Issue 1977](https://github.com/firefly-iii/firefly-iii/issues/1977) Docker image now includes memcached support
+- [Issue 2031](https://github.com/firefly-iii/firefly-iii/issues/2031) A new generic debit/credit indicator for imports.
+- The new Docker image no longer has the capability to run cron jobs, and will no longer generate your recurring transactions for you. This has been done to simplify the build and make sure your Docker container runs one service, as it should. To set up a cron job for your new Docker container, [check out the documentation](https://docs.firefly-iii.org/en/latest/installation/cronjob.html).
+- Due to a change in the database structure, this upgrade will reset your preferences. Sorry about that.
+- I will no longer accept PR's that introduce new currencies.
+- Firefly III no longer encrypts the database and will [decrypt the database]() on its first run.
+- [Issue 1923](https://github.com/firefly-iii/firefly-iii/issues/1923) Broken window position for date picker.
+- [Issue 1967](https://github.com/firefly-iii/firefly-iii/issues/1967) Attachments were hidden in bill view.
+- [Issue 1927](https://github.com/firefly-iii/firefly-iii/issues/1927) It was impossible to make recurring transactions skip.
+- [Issue 1929](https://github.com/firefly-iii/firefly-iii/issues/1929) Fix the recurring transactions calendar overview.
+- [Issue 1933](https://github.com/firefly-iii/firefly-iii/issues/1933) Fixed a bug that made it impossible to authenticate to FreeIPA servers.
+- [Issue 1938](https://github.com/firefly-iii/firefly-iii/issues/1938) The importer can now handle the insane way Postbank (DE) formats its numbers.
+- [Issue 1942](https://github.com/firefly-iii/firefly-iii/issues/1942) Favicons are relative so Scriptaculous installations work better.
+- [Issue 1944](https://github.com/firefly-iii/firefly-iii/issues/1944) Make sure that the search allows you to mass-select transactions.
+- [Issue 1945](https://github.com/firefly-iii/firefly-iii/issues/1945) Slight UI change so the drop-down menu renders better.
+- [Issue 1955](https://github.com/firefly-iii/firefly-iii/issues/1955) Fixed a bug in the category report.
+- [Issue 1968](https://github.com/firefly-iii/firefly-iii/issues/1968) The yearly range would jump to 1-Jan / 1-Jan instead of 1-Jan / 31-Dec
+- [Issue 1975](https://github.com/firefly-iii/firefly-iii/issues/1975) Fixed explanation for missing credit card liabilities.
+- [Issue 1979](https://github.com/firefly-iii/firefly-iii/issues/1979) Make sure tags are trimmed.
+- [Issue 1983](https://github.com/firefly-iii/firefly-iii/issues/1983) Could not use your favorite decimal separator.
+- [Issue 1989](https://github.com/firefly-iii/firefly-iii/issues/1989) Bug in YNAB importer forced you to select all accounts.
+- [Issue 1990](https://github.com/firefly-iii/firefly-iii/issues/1990) Rule description was invisible in edit screen.
+- [Issue 1996](https://github.com/firefly-iii/firefly-iii/issues/1996) Deleted budget would inadvertently also hide transactions.
+- [Issue 2001](https://github.com/firefly-iii/firefly-iii/issues/2001) Various issues with tag chart view.
+- [Issue 2009](https://github.com/firefly-iii/firefly-iii/issues/2009) Could not change recurrence back to "forever".
+- [Issue 2033](https://github.com/firefly-iii/firefly-iii/issues/2033) Longitude can go from -180 to 180.
+- [Issue 2034](https://github.com/firefly-iii/firefly-iii/issues/2034) Rules were not being triggered in mass-edit.
+- #2043 In rare instances the repetition of a recurring transaction was displayed incorrectly.
+- Fixed broken translations in the recurring transactions overview.
+- When you create a recurring transfer you make make it fill (or empty) a piggy bank. This was not working, despite a fix in 4.7.8.
+- Fixed a bug where the importer would not be capable of creating new currencies.
+- Rule trigger tester would skip the amount.
+- OAuth2 form can now submit back to original requester.
+- Submitting transactions with a disabled currency will auto-enable the currency.
+- The documentation now states that "Deposit" is a possible return when you get a transaction.
+- "savingAsset" was incorrectly documented as "savingsAsset".
+- Account endpoint can now return type "reconciliation" and "initial-balance" correctly.
+- New API endpoint under `/summary/basic` that gives you a basic overview of the user's finances.
+- New API endpoints under `/chart/*` to allow you to render charts.
+- `/accounts/x/transactions` now supports the limit query parameter.
+- `/budgets/x/transactions` now supports the limit query parameter.
+- `/available_budgets` now supports custom start and end date parameters.
+- New endpoint `/preferences/prefName` to retrieve a single preference.
+- Added field `account_name` to all piggy banks.
+- New tag cloud in API.
+
+# 4.7.9
+- [Issue 1622](https://github.com/firefly-iii/firefly-iii/issues/1622) Can now unlink a transaction from a bill.
+- [Issue 1848](https://github.com/firefly-iii/firefly-iii/issues/1848) Added support for the Swiss Franc.
+- [Issue 1828](https://github.com/firefly-iii/firefly-iii/issues/1828) Focus on fields for easy access.
+- [Issue 1859](https://github.com/firefly-iii/firefly-iii/issues/1859) Warning when seeding database.
+- Completely rewritten API. Check out the documentation [here](https://api-docs.firefly-iii.org/).
+- Currencies can now be enabled and disabled, making for cleaner views.
+- You can disable the `X-Frame-Options` header if this is necessary.
+- New fancy favicons.
+- Updated and improved docker build.
+- Docker build no longer builds its own cURL.
+- [Issue 1607](https://github.com/firefly-iii/firefly-iii/issues/1607) [issue 1857](https://github.com/firefly-iii/firefly-iii/issues/1857) [issue 1895](https://github.com/firefly-iii/firefly-iii/issues/1895) Improved bunq import and added support for auto-savings.
+- [Issue 1766](https://github.com/firefly-iii/firefly-iii/issues/1766) Extra commands so cache dir is owned by www user.
+- [Issue 1811](https://github.com/firefly-iii/firefly-iii/issues/1811) 404 when generating report without options.
+- [Issue 1835](https://github.com/firefly-iii/firefly-iii/issues/1835) Strange debug popup removed.
+- [Issue 1840](https://github.com/firefly-iii/firefly-iii/issues/1840) Error when exporting data.
+- [Issue 1857](https://github.com/firefly-iii/firefly-iii/issues/1857) Bunq import words again (see above).
+- [Issue 1858](https://github.com/firefly-iii/firefly-iii/issues/1858) SQL errors when importing CSV.
+- [Issue 1861](https://github.com/firefly-iii/firefly-iii/issues/1861) Period navigator was broken.
+- [Issue 1864](https://github.com/firefly-iii/firefly-iii/issues/1864) First description was empty on split transactions.
+- [Issue 1865](https://github.com/firefly-iii/firefly-iii/issues/1865) Bad math when showing categories.
+- [Issue 1868](https://github.com/firefly-iii/firefly-iii/issues/1868) Fixes to FinTS import.
+- [Issue 1872](https://github.com/firefly-iii/firefly-iii/issues/1872) Some images had 404's.
+- [Issue 1877](https://github.com/firefly-iii/firefly-iii/issues/1877) Several encryption / decryption issues.
+- [Issue 1878](https://github.com/firefly-iii/firefly-iii/issues/1878) Wrong nav links
+- [Issue 1884](https://github.com/firefly-iii/firefly-iii/issues/1884) Budget API improvements (see above)
+- [Issue 1888](https://github.com/firefly-iii/firefly-iii/issues/1888) Transaction API improvements (see above)
+- [Issue 1890](https://github.com/firefly-iii/firefly-iii/issues/1890) Fixes in Bills API
+- [Issue 1891](https://github.com/firefly-iii/firefly-iii/issues/1891) Typo fixed.
+- [Issue 1893](https://github.com/firefly-iii/firefly-iii/issues/1893) Update piggies from recurring transactions.
+- [Issue 1898](https://github.com/firefly-iii/firefly-iii/issues/1898) Bug in tag report.
+- [Issue 1901](https://github.com/firefly-iii/firefly-iii/issues/1901) Redirect when cloning transactions.
+- [Issue 1909](https://github.com/firefly-iii/firefly-iii/issues/1909) Date range fixes.
+- [Issue 1916](https://github.com/firefly-iii/firefly-iii/issues/1916) Date range fixes.
+
+# 4.7.8
+
+- [Issue 1005](https://github.com/firefly-iii/firefly-iii/issues/1005) You can now configure Firefly III to use LDAP. 
+- [Issue 1071](https://github.com/firefly-iii/firefly-iii/issues/1071) You can execute transaction rules using the command line (so you can cronjob it)
+- [Issue 1108](https://github.com/firefly-iii/firefly-iii/issues/1108) You can now reorder budgets.
+- [Issue 1159](https://github.com/firefly-iii/firefly-iii/issues/1159) The ability to import transactions from FinTS-enabled banks.
+- [Issue 1727](https://github.com/firefly-iii/firefly-iii/issues/1727) You can now use SFTP as storage for uploads and exports.
+- [Issue 1733](https://github.com/firefly-iii/firefly-iii/issues/1733) You can configure Firefly III not to send emails with transaction information in them.
+- [Issue 1040](https://github.com/firefly-iii/firefly-iii/issues/1040) Fixed various things that would not scale properly in the past.
+- [Issue 1771](https://github.com/firefly-iii/firefly-iii/issues/1771) A link to the transaction that fits the bill.
+- [Issue 1800](https://github.com/firefly-iii/firefly-iii/issues/1800) Icon updated to match others.
+- MySQL database connection now forces the InnoDB to be used.
+- [Issue 1583](https://github.com/firefly-iii/firefly-iii/issues/1583) Some times recurring transactions would not fire.
+- [Issue 1607](https://github.com/firefly-iii/firefly-iii/issues/1607) Problems with the bunq API, finally solved?! (I feel like a clickbait YouTube video now)
+- [Issue 1698](https://github.com/firefly-iii/firefly-iii/issues/1698) Certificate problems in the Docker container
+- [Issue 1751](https://github.com/firefly-iii/firefly-iii/issues/1751) Bug in autocomplete
+- [Issue 1760](https://github.com/firefly-iii/firefly-iii/issues/1760) Tag report bad math
+- [Issue 1765](https://github.com/firefly-iii/firefly-iii/issues/1765) API inconsistencies for piggy banks.
+- [Issue 1774](https://github.com/firefly-iii/firefly-iii/issues/1774) Integer exception in SQLite databases
+- [Issue 1775](https://github.com/firefly-iii/firefly-iii/issues/1775) Heroku now supports all locales
+- [Issue 1778](https://github.com/firefly-iii/firefly-iii/issues/1778) More autocomplete problems fixed
+- [Issue 1747](https://github.com/firefly-iii/firefly-iii/issues/1747) Rules now stop at the right moment.
+- [Issue 1781](https://github.com/firefly-iii/firefly-iii/issues/1781) Problems when creating new rules.
+- [Issue 1784](https://github.com/firefly-iii/firefly-iii/issues/1784) Can now create a liability with an empty balance.
+- [Issue 1785](https://github.com/firefly-iii/firefly-iii/issues/1785) Redirect error
+- [Issue 1790](https://github.com/firefly-iii/firefly-iii/issues/1790) Show attachments for bills.
+- [Issue 1792](https://github.com/firefly-iii/firefly-iii/issues/1792) Mention excluded accounts.
+- [Issue 1798](https://github.com/firefly-iii/firefly-iii/issues/1798) Could not recreate deleted piggy banks
+- [Issue 1805](https://github.com/firefly-iii/firefly-iii/issues/1805) Fixes when handling foreign currencies
+- [Issue 1807](https://github.com/firefly-iii/firefly-iii/issues/1807) Also decrypt deleted records.
+- [Issue 1812](https://github.com/firefly-iii/firefly-iii/issues/1812) Fix in transactions API
+- [Issue 1815](https://github.com/firefly-iii/firefly-iii/issues/1815) Opening balance account name can now be translated.
+- [Issue 1830](https://github.com/firefly-iii/firefly-iii/issues/1830) Multi-user in a single browser could leak autocomplete data.
+
+# 4.7.7
+- [Issue 954](https://github.com/firefly-iii/firefly-iii/issues/954) Some additional view chart ranges
+- [Issue 1710](https://github.com/firefly-iii/firefly-iii/issues/1710) Added a new currency ([hamuz](https://github.com/hamuz)) 
+- Transactions will now store (in the database) how they were created.
+- [Issue 907](https://github.com/firefly-iii/firefly-iii/issues/907) Better and more options on the transaction list.
+- [Issue 1450](https://github.com/firefly-iii/firefly-iii/issues/1450) Add a rule to change the type of a transaction automagically
+- [Issue 1701](https://github.com/firefly-iii/firefly-iii/issues/1701) Fix reference to PHP executable ([hertzg](https://github.com/hertzg))
+- Budget limits have currency information, for future expansion.
+- Some charts and pages can handle multiple currencies better.
+- New GA code for those who use it.
+- The credit card liability type has been removed.
+- [Issue 896](https://github.com/firefly-iii/firefly-iii/issues/896) Better redirection when coming from deleted objects.
+- [Issue 1519](https://github.com/firefly-iii/firefly-iii/issues/1519) Fix autocomplete tags
+- [Issue 1607](https://github.com/firefly-iii/firefly-iii/issues/1607) Some fixes for the bunq api calls
+- [Issue 1650](https://github.com/firefly-iii/firefly-iii/issues/1650) Add a negated amount column for CSV imports ([hamuz](https://github.com/hamuz))
+- [Issue 1658](https://github.com/firefly-iii/firefly-iii/issues/1658) Make font heavy again.
+- [Issue 1660](https://github.com/firefly-iii/firefly-iii/issues/1660) Add a negated amount column for CSV imports ([hamuz](https://github.com/hamuz))
+- [Issue 1667](https://github.com/firefly-iii/firefly-iii/issues/1667) Fix pie charts
+- [Issue 1668](https://github.com/firefly-iii/firefly-iii/issues/1668) YNAB iso_code fix
+- [Issue 1670](https://github.com/firefly-iii/firefly-iii/issues/1670) Fix piggy bank API error
+- [Issue 1671](https://github.com/firefly-iii/firefly-iii/issues/1671) More options for liability accounts.
+- [Issue 1673](https://github.com/firefly-iii/firefly-iii/issues/1673) Fix reconciliation issues.
+- [Issue 1675](https://github.com/firefly-iii/firefly-iii/issues/1675) Wrong sum in tag report.
+- [Issue 1679](https://github.com/firefly-iii/firefly-iii/issues/1679) Change type of a transaction wouldn't trigger rules.
+- [Issue 1682](https://github.com/firefly-iii/firefly-iii/issues/1682) Add liability accounts to transaction conversion
+- [Issue 1683](https://github.com/firefly-iii/firefly-iii/issues/1683) See matching transaction showed transfers twice.
+- [Issue 1685](https://github.com/firefly-iii/firefly-iii/issues/1685) fix autocomplete for rules
+- [Issue 1690](https://github.com/firefly-iii/firefly-iii/issues/1690) Missing highlighted button in intro popup
+- [Issue 1691](https://github.com/firefly-iii/firefly-iii/issues/1691) No mention of liabilities in demo text
+- [Issue 1695](https://github.com/firefly-iii/firefly-iii/issues/1695) Small fixes in bills pages.
+- [Issue 1708](https://github.com/firefly-iii/firefly-iii/issues/1708) Fix by [mathieupost](https://github.com/mathieupost) for bunq
+- [Issue 1709](https://github.com/firefly-iii/firefly-iii/issues/1709) Fix oauth buttons 
+- [Issue 1712](https://github.com/firefly-iii/firefly-iii/issues/1712) Double slash fix by [hamuz](https://github.com/hamuz)
+- [Issue 1719](https://github.com/firefly-iii/firefly-iii/issues/1719) Add missing accounts to API
+- [Issue 1720](https://github.com/firefly-iii/firefly-iii/issues/1720) Fix validation for transaction type.
+- [Issue 1723](https://github.com/firefly-iii/firefly-iii/issues/1723) API broken for currency exchange rates.
+- [Issue 1728](https://github.com/firefly-iii/firefly-iii/issues/1728) Fix problem with transaction factory.
+- [Issue 1729](https://github.com/firefly-iii/firefly-iii/issues/1729) Fix bulk transaction editor
+- [Issue 1731](https://github.com/firefly-iii/firefly-iii/issues/1731) API failure for budget limits.
+- Secure headers now allow Mapbox and the 2FA QR code.
+
+# 4.7.6.2
+- Docker file builds again.
+- Fix CSS of OAuth2 authorization view.
+
+# 4.7.6.1
+- An issue where I switched variables from the Docker `.env` file to the normal `.env` file and vice versa -- breaking both.
+- [Issue 1649](https://github.com/firefly-iii/firefly-iii/issues/1649) 2FA QR code would not show up due to very strict security policy headers
+- Docker build gave a cURL error whenever it runs PHP commands.
+
+# 4.7.6
+- [Issue 145](https://github.com/firefly-iii/firefly-iii/issues/145) You can now download transactions from YNAB.
+- [Issue 306](https://github.com/firefly-iii/firefly-iii/issues/306) You can now add liabilities to Firefly III.
+- [Issue 740](https://github.com/firefly-iii/firefly-iii/issues/740) Various charts are now currency aware.
+- [Issue 833](https://github.com/firefly-iii/firefly-iii/issues/833) Bills can use non-default currencies.
+- [Issue 1578](https://github.com/firefly-iii/firefly-iii/issues/1578) Firefly III will notify you if the cron job hasn't fired.
+- [Issue 1623](https://github.com/firefly-iii/firefly-iii/issues/1623) New transactions will link back from the success message.
+- [Issue 1624](https://github.com/firefly-iii/firefly-iii/issues/1624) transactions will link to the object.
+- You can call the cron job over the web now (see docs).
+- You don't need to call the cron job every minute any more.
+- Various charts are now red/green to signify income and expenses.
+- Option to add or remove accounts from the net worth calculations.
+- This will be the last release on PHP 7.1. Future versions will require PHP 7.2.
+- [Issue 1460](https://github.com/firefly-iii/firefly-iii/issues/1460) Downloading transactions from bunq should go more smoothly.
+- [Issue 1464](https://github.com/firefly-iii/firefly-iii/issues/1464) Fixed the docker file to work on Raspberry Pi's.
+- [Issue 1540](https://github.com/firefly-iii/firefly-iii/issues/1540) The Docker file now has a working cron job for recurring transactions.
+- [Issue 1564](https://github.com/firefly-iii/firefly-iii/issues/1564) Fix double transfers when importing from bunq.
+- [Issue 1575](https://github.com/firefly-iii/firefly-iii/issues/1575) Some views would give a XSRF token warning
+- [Issue 1576](https://github.com/firefly-iii/firefly-iii/issues/1576) Fix assigning budgets
+- [Issue 1580](https://github.com/firefly-iii/firefly-iii/issues/1580) Missing string for translation
+- [Issue 1581](https://github.com/firefly-iii/firefly-iii/issues/1581) Expand help text
+- [Issue 1584](https://github.com/firefly-iii/firefly-iii/issues/1584) Link to administration is back.
+- [Issue 1586](https://github.com/firefly-iii/firefly-iii/issues/1586) Date fields in import were mislabeled.
+- [Issue 1593](https://github.com/firefly-iii/firefly-iii/issues/1593) Link types are translatable.
+- [Issue 1594](https://github.com/firefly-iii/firefly-iii/issues/1594) Very long breadcrumbs are weird.
+- [Issue 1598](https://github.com/firefly-iii/firefly-iii/issues/1598) Fix budget calculations.
+- [Issue 1597](https://github.com/firefly-iii/firefly-iii/issues/1597) Piggy banks are always inactive.
+- [Issue 1605](https://github.com/firefly-iii/firefly-iii/issues/1605) System will ignore foreign currency setting if user doesn't indicate the amount.
+- [Issue 1608](https://github.com/firefly-iii/firefly-iii/issues/1608) Spelling error in command line import.
+- [Issue 1609](https://github.com/firefly-iii/firefly-iii/issues/1609) Link to budgets page was absolute.
+- [Issue 1615](https://github.com/firefly-iii/firefly-iii/issues/1615) Fix currency bug in transactions.
+- [Issue 1616](https://github.com/firefly-iii/firefly-iii/issues/1616) Fix null pointer exception in pie charts.
+- [Issue 1617](https://github.com/firefly-iii/firefly-iii/issues/1617) Fix for complex tag names in URL's.
+- [Issue 1620](https://github.com/firefly-iii/firefly-iii/issues/1620) Fixed index reference in API.
+- [Issue 1639](https://github.com/firefly-iii/firefly-iii/issues/1639) Firefly III trusts the Heroku load balancer, fixing deployment on Heroku.
+- [Issue 1642](https://github.com/firefly-iii/firefly-iii/issues/1642) Fix issue with split journals.
+- [Issue 1643](https://github.com/firefly-iii/firefly-iii/issues/1643) Fix reconciliation issue.
+- Users can no longer give income a budget.
+- Fix bug in Spectre import.
+- Heroku would not make you owner.
+- Add `.htaccess` files to all public directories.
+- New secure headers will make Firefly III slightly more secure.
+- The rule "tester" will now also take the "strict"-checkbox into account.
+
+# 4.7.5.3
+- [Issue 1527](https://github.com/firefly-iii/firefly-iii/issues/1527), fixed views for transactions without a budget.
+- [Issue 1553](https://github.com/firefly-iii/firefly-iii/issues/1553), report could not handle transactions before the first one in the system.
+- [Issue 1549](https://github.com/firefly-iii/firefly-iii/issues/1549) update a budget will also update any rules that refer to that budget.
+- [Issue 1530](https://github.com/firefly-iii/firefly-iii/issues/1530), fix issue with bill chart.
+- [Issue 1563](https://github.com/firefly-iii/firefly-iii/issues/1563), fix piggy bank suggested amount
+- [Issue 1571](https://github.com/firefly-iii/firefly-iii/issues/1571), fix OAuth in Sandstorm
+- [Issue 1568](https://github.com/firefly-iii/firefly-iii/issues/1568), bug in Sandstorm user code.
+- [Issue 1569](https://github.com/firefly-iii/firefly-iii/issues/1569), optimized Sandstorm build by [ocdtrekkie](https://github.com/ocdtrekkie)
+- Fixed a bug where transfers would be stored inversely when using the CSV import.
+- Retired the "Rabobank description"-fix, because it is no longer necessary.
+- Fixed a bug where users could not delete budget limits in the API.
+- Piggy bank notes are visible again.
+
 # 4.7.5.1
 - [Issue 1531](https://github.com/firefly-iii/firefly-iii/issues/1531), the database routine incorrectly reports empty categories.
 - [Issue 1532](https://github.com/firefly-iii/firefly-iii/issues/1532), broken dropdown for autosuggest things.

.sandstorm/global-setup.sh

@@ -9,6 +9,10 @@ CURL_OPTS="--silent --show-error"
 echo localhost > /etc/hostname
 hostname localhost
 
+# Install curl that is needed below.
+apt-get update
+apt-get install -y curl
+
 # The following line copies stderr through stderr to cat without accidentally leaving it in the
 # output file. Be careful when changing. See: https://github.com/sandstorm-io/vagrant-spk/pull/159
 curl $CURL_OPTS https://install.sandstorm.io/ 2>&1 > /host-dot-sandstorm/caches/install.sh | cat

.sandstorm/launcher.sh

@@ -25,9 +25,9 @@ mkdir -p /var/storage/build
 mkdir -p /var/storage/database
 mkdir -p /var/storage/debugbar
 mkdir -p /var/storage/export
-mkdir -p /var/storage/framework/cache
+mkdir -p /var/storage/framework/cache/v1
 mkdir -p /var/storage/framework/sessions
-mkdir -p /var/storage/framework/views
+mkdir -p /var/storage/framework/views/v1
 mkdir -p /var/storage/logs
 mkdir -p /var/storage/upload
 
@@ -37,15 +37,15 @@ HOME=/etc/mysql /usr/bin/mysql_install_db --force
 # Spawn mysqld, php
 HOME=/etc/mysql /usr/sbin/mysqld &
 
-/usr/sbin/php-fpm7.1 --nodaemonize --fpm-config /etc/php/7.1/fpm/php-fpm.conf &
+/usr/sbin/php-fpm7.2 --nodaemonize --fpm-config /etc/php/7.2/fpm/php-fpm.conf &
 
 # Wait until mysql and php have bound their sockets, indicating readiness
 while [ ! -e /var/run/mysqld/mysqld.sock ] ; do
     echo "waiting for mysql to be available at /var/run/mysqld/mysqld.sock"
     sleep .5
 done
-while [ ! -e /var/run/php7.1-fpm.sock ] ; do
-    echo "waiting for php7.1-fpm to be available at /var/run/php7.1-fpm.sock"
+while [ ! -e /var/run/php7.2-fpm.sock ] ; do
+    echo "waiting for php7.2-fpm to be available at /var/run/php7.2-fpm.sock"
     sleep .5
 done
 
@@ -58,9 +58,5 @@ echo "Migrating..."
 php /opt/app/artisan migrate --seed --force
 echo "Done!"
 
-echo "Clear cache.."
-php /opt/app/artisan cache:clear
-echo "Done"
-
 # Start nginx.
 /usr/sbin/nginx -c /opt/app/.sandstorm/service-config/nginx.conf -g "daemon off;"

.sandstorm/sandstorm-pkgdef.capnp

@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
 
   manifest = (
     appTitle = (defaultText = "Firefly III"),
-    appVersion = 14,
-    appMarketingVersion = (defaultText = "4.7.5.1"),
+    appVersion = 22,
+    appMarketingVersion = (defaultText = "4.7.12"),
 
     actions = [
       # Define your "new document" handlers here.
@@ -103,7 +103,7 @@ const pkgdef :Spk.PackageDefinition = (
   # not have been detected as a dependency during `spk dev`. If you list
   # a directory here, its entire contents will be included recursively.
 
-  #bridgeConfig = (
+  bridgeConfig = (
   #  # Used for integrating permissions and roles into the Sandstorm shell
   #  # and for sandstorm-http-bridge to pass to your app.
   #  # Uncomment this block and adjust the permissions and roles to make
@@ -165,12 +165,12 @@ const pkgdef :Spk.PackageDefinition = (
   #      ),
   #    ],
   #  ),
-  #  #apiPath = "/api",
+  apiPath = "/api/v1/",
   #  # Apps can export an API to the world.  The API is to be used primarily by Javascript
   #  # code and native apps, so it can't serve out regular HTML to browsers.  If a request
   #  # comes in to your app's API, sandstorm-http-bridge will prefix the request's path with
   #  # this string, if specified.
-  #),
+  ),
 );
 
 const myCommand :Spk.Manifest.Command = (

.sandstorm/service-config/nginx.conf

@@ -53,7 +53,7 @@ http {
 		}
 		location ~ \.php$ {
 			try_files $uri =404;
-            fastcgi_pass unix:/var/run/php7.1-fpm.sock;
+            fastcgi_pass unix:/var/run/php7.2-fpm.sock;
             fastcgi_index index.php;
             fastcgi_split_path_info ^(.+\.php)(/.+)$;
 			fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;

.sandstorm/setup.sh

@@ -13,17 +13,15 @@ apt-get update
 apt-get install -y python-software-properties software-properties-common
 
 # install all languages
-sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
-
 sed -i 's/# es_ES.UTF-8 UTF-8/es_ES.UTF-8 UTF-8/g' /etc/locale.gen
+sed -i 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# id_ID.UTF-8 UTF-8/id_ID.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# it_IT.UTF-8 UTF-8/it_IT.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# nl_NL.UTF-8 UTF-8/nl_NL.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# pl_PL.UTF-8 UTF-8/pl_PL.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# pt_BR.UTF-8 UTF-8/pt_BR.UTF-8 UTF-8/g' /etc/locale.gen
 sed -i 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/g' /etc/locale.gen
-sed -i 's/# tr_TR.UTF-8 UTF-8/tr_TR.UTF-8 UTF-8/g' /etc/locale.gen
+sed -i 's/# zh_TW.UTF-8 UTF-8/zh_TW.UTF-8 UTF-8/g' /etc/locale.gen
 
 dpkg-reconfigure --frontend=noninteractive locales
 
@@ -35,43 +33,43 @@ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E9C74FEEA2098A6E
 add-apt-repository "deb http://packages.dotdeb.org jessie all"
 
 # add another repos
-apt-get install apt-transport-https lsb-release ca-certificates
+apt-get install -y apt-transport-https lsb-release ca-certificates
 wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
 echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
 
 # install packages.
 apt-get update
-apt-get install -y nginx php7.1-fpm php7.1-mysql php7.1-gd php7.1-cli php7.1-curl git php7.1-dev php7.1-zip php7.1-intl php7.1-dom php7.1-mbstring php7.1-bcmath mysql-server
+apt-get install -y nginx php7.2-fpm php7.2-mysql php7.2-gd php7.2-cli php7.2-curl php7.2-ldap git php7.2-dev php7.2-zip php7.2-intl php7.2-dom php7.2-mbstring php7.2-bcmath mysql-server
 service nginx stop
-service php7.1-fpm stop
+service php7.2-fpm stop
 service mysql stop
 systemctl disable nginx
-systemctl disable php7.1-fpm
+systemctl disable php7.2-fpm
 systemctl disable mysql
 
 # make php.ini display errors:
-sed -i 's/display_errors = Off/display_errors = On/g' /etc/php/7.1/fpm/php.ini
+sed -i 's/display_errors = Off/display_errors = On/g' /etc/php/7.2/fpm/php.ini
 
-# patch /etc/php/7.1/fpm/pool.d/www.conf to not change uid/gid to www-data
+# patch /etc/php/7.2/fpm/pool.d/www.conf to not change uid/gid to www-data
 sed --in-place='' \
        --expression='s/^listen.owner = www-data/;listen.owner = www-data/' \
        --expression='s/^listen.group = www-data/;listen.group = www-data/' \
-       /etc/php/7.1/fpm/pool.d/www.conf
-# patch /etc/php/7.1/fpm/php-fpm.conf to not have a pidfile
+       /etc/php/7.2/fpm/pool.d/www.conf
+# patch /etc/php/7.2/fpm/php-fpm.conf to not have a pidfile
 sed --in-place='' \
        --expression='s/^pid =/;pid =/' \
-       /etc/php/7.1/fpm/php-fpm.conf
+       /etc/php/7.2/fpm/php-fpm.conf
 
 # move sock file to better dir:
 sed --in-place='' \
-       --expression='s/^listen = \/run\/php\/php7.1-fpm.sock/listen = \/var\/run\/php7.1-fpm.sock/' \
-       /etc/php/7.1/fpm/pool.d/www.conf
+       --expression='s/^listen = \/run\/php\/php7.2-fpm.sock/listen = \/var\/run\/php7.2-fpm.sock/' \
+       /etc/php/7.2/fpm/pool.d/www.conf
 
-# patch /etc/php/7.1/fpm/pool.d/www.conf to no clear environment variables
+# patch /etc/php/7.2/fpm/pool.d/www.conf to no clear environment variables
 # so we can pass in SANDSTORM=1 to apps
 sed --in-place='' \
        --expression='s/^;clear_env = no/clear_env=no/' \
-       /etc/php/7.1/fpm/pool.d/www.conf
+       /etc/php/7.2/fpm/pool.d/www.conf
 # patch mysql conf to not change uid, and to use /var/tmp over /tmp
 # for secure-file-priv see https://github.com/sandstorm-io/vagrant-spk/issues/195
 sed --in-place='' \

.travis.yml

@@ -1,29 +1,29 @@
-language: php
-php:
-  - 7.1.18
+sudo: required
+language: bash
+env:
+  - VERSION=4.7.12
 
-cache:
-    directories:
-        - vendor
-        - $HOME/.composer/cache
-
-install:
-  - rm composer.lock
-  - composer update --no-scripts
-  - cp .env.testing .env
-  - php artisan clear-compiled
-  - php artisan env
-  - wget -q https://github.com/firefly-iii/test-data/raw/master/storage/database.sqlite -O storage/database/database.sqlite
-  - mkdir -p build/logs
-
-script:
-  - ./vendor/bin/phpunit -c phpunit.coverage.xml
-
-after_success:
-  - travis_retry php vendor/bin/php-coveralls -x storage/build/clover-all.xml
+dist: xenial
 
 # safelist
 branches:
   only:
   - develop
   - master
+
+services:
+  - docker
+
+script:
+  # enable experimental features.
+  - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
+  - mkdir $HOME/.docker
+  - touch $HOME/.docker/config.json
+  - echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json
+  - sudo service docker restart
+  - docker version -f '{{.Server.Experimental}}'
+  - docker version
+  # build everything
+  - .deploy/docker/build-amd64.sh
+  - .deploy/docker/build-arm.sh
+  - .deploy/docker/manifest.sh

Dockerfile

@@ -1,93 +1,51 @@
-# use PHP 7.1 and Apache as a base.
-FROM php:7.1-apache
+FROM php:7.2-apache
 
-# set working dir
-ENV FIREFLY_PATH /var/www/firefly-iii
-ENV CURL_VERSION 7.60.0
-ENV OPENSSL_VERSION 1.1.1-pre6
+ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
+LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"
+
+# Create volumes
+VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
+
+# Install some stuff
+RUN apt-get update && apt-get install -y libpng-dev \
+                                            libicu-dev \
+                                            unzip \
+                                            gettext-base \
+                                            libldap2-dev \
+                                            libpq-dev \
+                                            locales \
+                                            libmemcached-dev && \
+                                            apt-get clean && \
+                                            rm -rf /var/lib/apt/lists/*
+
+# Copy in Firefly III source
 WORKDIR $FIREFLY_PATH
 ADD . $FIREFLY_PATH
 
-# install packages
-RUN apt-get update -y && \
-    apt-get install -y --no-install-recommends libcurl4-openssl-dev \
-                                               zlib1g-dev \
-                                               libjpeg62-turbo-dev \
-                                               wget \
-                                               libpng-dev \
-                                               libicu-dev \
-                                               libedit-dev \
-                                               libtidy-dev \
-                                               libxml2-dev \
-                                               libsqlite3-dev \
-                                               libpq-dev \
-                                               libbz2-dev \
-                                               gettext-base \
-                                               cron \
-                                               locales && \
-                                               apt-get clean && \
-                                               rm -rf /var/lib/apt/lists/*
-
-# Setup the Composer installer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-# Install latest curl
-RUN cd /tmp && \
-    wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \
-    tar -xvf openssl-${OPENSSL_VERSION}.tar.gz && \
-    cd openssl-${OPENSSL_VERSION} && \
-    ./config && \
-    make && \
-    make install
-
-RUN cd /tmp && \
-    wget https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz && \
-    tar -xvf curl-${CURL_VERSION}.tar.gz && \
-    cd curl-${CURL_VERSION} && \
-    ./configure --with-ssl && \
-    make && \
-    make install
-
-
-# Create the log file to be able to run tail
-RUN touch /var/log/cron.log
-
-# Setup cron job
-RUN (crontab -l ; echo "* * * * * root $FIREFLY_PATH/artisan schedule:run >> /var/log/cron.log") | crontab
-
-# Install PHP exentions.
-RUN docker-php-ext-install -j$(nproc) curl gd intl json readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql
-
-# Generate locales supported by Firefly III
-RUN echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8pt_BR.UTF-8 UTF-8ru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\n\n" > /etc/locale.gen && locale-gen
+# copy ca certs to correct location
+COPY ./.deploy/docker/cacert.pem /usr/local/ssl/cert.pem
 
 # copy Apache config to correct spot.
 COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
 
-# Enable apache mod rewrite..
-RUN a2enmod rewrite
-
-# Enable apache mod ssl..
-RUN a2enmod ssl
-
-# Create volumes for several directories:
-VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
-
 # Enable default site (Firefly III)
 COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
 
-# Make sure we own Firefly III directory
-RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage
-
-# Run composer
-RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest
+# Run a lot of installation commands:
+RUN chown -R www-data:www-data /var/www && \
+    chmod -R 775 $FIREFLY_PATH/storage && \
+    a2enmod rewrite && a2enmod ssl && \
+    docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ && \
+    docker-php-ext-install -j$(nproc) zip bcmath ldap gd pdo_pgsql pdo_mysql intl opcache && \
+    pecl install memcached-3.1.3 && \
+    docker-php-ext-enable memcached && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
+    echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen && \
+    locale-gen && \
+    composer install --prefer-dist --no-dev --no-scripts --no-suggest
 
 # Expose port 80
 EXPOSE 80
 
-# Run the command on container startup
-CMD cron
-
 # Run entrypoint thing
 ENTRYPOINT [".deploy/docker/entrypoint.sh"]
-

Dockerfile.amd64

@@ -0,0 +1,51 @@
+FROM php:7.2-apache
+ARG ARCH
+ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
+LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"
+
+# Create volumes
+VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
+
+# Install some stuff
+RUN apt-get update && apt-get install -y libpng-dev \
+                                            libicu-dev \
+                                            unzip \
+                                            gettext-base \
+                                            libldap2-dev \
+                                            libpq-dev \
+                                            locales \
+                                            libmemcached-dev && \
+                                            apt-get clean && \
+                                            rm -rf /var/lib/apt/lists/*
+
+# Copy in Firefly III source
+WORKDIR $FIREFLY_PATH
+ADD . $FIREFLY_PATH
+
+# copy ca certs to correct location
+COPY ./.deploy/docker/cacert.pem /usr/local/ssl/cert.pem
+
+# copy Apache config to correct spot.
+COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
+
+# Enable default site (Firefly III)
+COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
+
+# Run a lot of installation commands:
+RUN chown -R www-data:www-data /var/www && \
+    chmod -R 775 $FIREFLY_PATH/storage && \
+    a2enmod rewrite && a2enmod ssl && \
+    docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ && \
+    docker-php-ext-install -j$(nproc) zip bcmath ldap gd pdo_pgsql pdo_mysql intl opcache && \
+    pecl install memcached-3.1.3 && \
+    docker-php-ext-enable memcached && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
+    echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen && \
+    locale-gen && \
+    composer install --prefer-dist --no-dev --no-scripts --no-suggest
+
+# Expose port 80
+EXPOSE 80
+
+# Run entrypoint thing
+ENTRYPOINT [".deploy/docker/entrypoint.sh"]

Dockerfile.arm

@@ -0,0 +1,50 @@
+FROM arm32v7/php:7.2.8-apache-stretch
+ARG ARCH
+COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static
+ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
+LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"
+
+# Create volumes
+VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
+
+# Install some stuff
+RUN apt-get update && apt-get install -y libpng-dev \
+                                            libicu-dev \
+                                            unzip \
+                                            gettext-base \
+                                            libldap2-dev \
+                                            libpq-dev \
+                                            locales \
+                                            libmemcached-dev
+
+# Copy in Firefly III source
+WORKDIR $FIREFLY_PATH
+ADD . $FIREFLY_PATH
+
+# copy ca certs to correct location
+COPY ./.deploy/docker/cacert.pem /usr/local/ssl/cert.pem
+
+# copy Apache config to correct spot.
+COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
+
+# Enable default site (Firefly III)
+COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
+
+# Run a lot of installation commands:
+RUN chown -R www-data:www-data /var/www && \
+    chmod -R 775 $FIREFLY_PATH/storage && \
+    a2enmod rewrite && a2enmod ssl && \
+    docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ && \
+    docker-php-ext-install -j$(nproc) zip bcmath ldap gd pdo_pgsql pdo_mysql intl opcache && \
+    pecl install memcached-3.1.3 && \
+    docker-php-ext-enable memcached && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
+    echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen && \
+    locale-gen && \
+    composer install --prefer-dist --no-dev --no-scripts --no-suggest
+
+# Expose port 80
+EXPOSE 80
+
+# Run entrypoint thing
+ENTRYPOINT [".deploy/docker/entrypoint.sh"]

Dockerfile.arm64

@@ -0,0 +1,50 @@
+FROM arm32v7/php:7.2.8-apache-stretch
+ARG ARCH
+COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static
+ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1
+LABEL version="1.3" maintainer="thegrumpydictator@gmail.com"
+
+# Create volumes
+VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
+
+# Install some stuff
+RUN apt-get update && apt-get install -y libpng-dev \
+                                            libicu-dev \
+                                            unzip \
+                                            gettext-base \
+                                            libldap2-dev \
+                                            libpq-dev \
+                                            locales \
+                                            libmemcached-dev
+
+# Copy in Firefly III source
+WORKDIR $FIREFLY_PATH
+ADD . $FIREFLY_PATH
+
+# copy ca certs to correct location
+COPY ./.deploy/docker/cacert.pem /usr/local/ssl/cert.pem
+
+# copy Apache config to correct spot.
+COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf
+
+# Enable default site (Firefly III)
+COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf
+
+# Run a lot of installation commands:
+RUN chown -R www-data:www-data /var/www && \
+    chmod -R 775 $FIREFLY_PATH/storage && \
+    a2enmod rewrite && a2enmod ssl && \
+    docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ && \
+    docker-php-ext-install -j$(nproc) zip bcmath ldap gd pdo_pgsql pdo_mysql intl opcache && \
+    pecl install memcached-3.1.3 && \
+    docker-php-ext-enable memcached && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
+    echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen && \
+    locale-gen && \
+    composer install --prefer-dist --no-dev --no-scripts --no-suggest
+
+# Expose port 80
+EXPOSE 80
+
+# Run entrypoint thing
+ENTRYPOINT [".deploy/docker/entrypoint.sh"]

app.json

@@ -51,6 +51,9 @@
   "buildpacks": [
     {
       "url": "heroku/php"
+    },
+    {
+      "url": "https://github.com/heroku/heroku-buildpack-locale"
     }
   ],
   "env": {

app/Api/V1/Controllers/AboutController.php

@@ -60,7 +60,7 @@ class AboutController extends Controller
             'driver'      => $currentDriver,
         ];
 
-        return response()->json(['data' => $data], 200)->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $data])->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
@@ -75,7 +75,12 @@ class AboutController extends Controller
         $manager = new Manager();
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item(auth()->user(), new UserTransformer($this->parameters), 'users');
+
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item(auth()->user(), $transformer, 'users');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }

app/Api/V1/Controllers/AccountController.php

@@ -24,15 +24,21 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\AccountRequest;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\Transformers\PiggyBankTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
@@ -46,8 +52,7 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class AccountController extends Controller
 {
-    /** @var CurrencyRepositoryInterface The currency repository */
-    private $currencyRepository;
+    use AccountFilter, TransactionFilter;
     /** @var AccountRepositoryInterface The account repository */
     private $repository;
 
@@ -65,9 +70,6 @@ class AccountController extends Controller
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->currencyRepository->setUser($user);
-
                 return $next($request);
             }
         );
@@ -105,7 +107,7 @@ class AccountController extends Controller
         $this->parameters->set('type', $type);
 
         // types to get, page size:
-        $types    = $this->mapTypes($this->parameters->get('type'));
+        $types    = $this->mapAccountTypes($this->parameters->get('type'));
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of accounts. Count it and split it.
@@ -119,12 +121,58 @@ class AccountController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($accounts, new AccountTransformer($this->parameters), 'accounts');
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($accounts, $transformer, 'accounts');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     * @param Account $account
+     *
+     * @return JsonResponse]
+     */
+    public function piggyBanks(Request $request, Account $account): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->repository->getPiggyBanks($account);
+        $count      = $collection->count();
+        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]) . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var PiggyBankTransformer $transformer */
+        $transformer = app(PiggyBankTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
     /**
      * Show single instance.
      *
@@ -136,14 +184,13 @@ class AccountController extends Controller
     public function show(Request $request, Account $account): JsonResponse
     {
         $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($account, $transformer, 'accounts');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -157,18 +204,80 @@ class AccountController extends Controller
      */
     public function store(AccountRequest $request): JsonResponse
     {
-        $data = $request->getAll();
-        // if currency ID is 0, find the currency by the code:
-        if (0 === $data['currency_id']) {
-            $currency            = $this->currencyRepository->findByCodeNull($data['currency_code']);
-            $data['currency_id'] = null === $currency ? 0 : $currency->id;
-        }
+        $data    = $request->getAll();
         $account = $this->repository->store($data);
         $manager = new Manager;
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($account, $transformer, 'accounts');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Show all transactions.
+     *
+     * @param Request $request
+     * @param Account $account
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, Account $account): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        // user can overrule page size with limit parameter.
+        $limit = $this->parameters->get('limit');
+        if (null !== $limit && $limit > 0) {
+            $pageSize = $limit;
+        }
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        if ($this->repository->isAsset($account)) {
+            $collector->setAccounts(new Collection([$account]));
+        }
+        if (!$this->repository->isAsset($account)) {
+            $collector->setOpposingAccounts(new Collection([$account]));
+        }
+
+        if (\in_array(TransactionType::TRANSFER, $types, true)) {
+            $collector->removeFilter(InternalTransferFilter::class);
+        }
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedTransactions();
+        $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]) . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -183,60 +292,18 @@ class AccountController extends Controller
      */
     public function update(AccountRequest $request, Account $account): JsonResponse
     {
-        $data = $request->getAll();
-        // if currency ID is 0, find the currency by the code:
-        if (0 === $data['currency_id']) {
-            $currency            = $this->currencyRepository->findByCodeNull($data['currency_code']);
-            $data['currency_id'] = null === $currency ? 0 : $currency->id;
-        }
-        // set correct type:
+        $data         = $request->getAll();
         $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
         $this->repository->update($account, $data);
         $manager = new Manager;
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($account, new AccountTransformer($this->parameters), 'accounts');
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($account, $transformer, 'accounts');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
-
-    /**
-     * All the available types.
-     *
-     * @param string $type
-     *
-     * @return array
-     */
-    private function mapTypes(string $type): array
-    {
-        $types  = [
-            'all'                        => [AccountType::DEFAULT, AccountType::CASH, AccountType::ASSET, AccountType::EXPENSE, AccountType::REVENUE,
-                                             AccountType::INITIAL_BALANCE, AccountType::BENEFICIARY, AccountType::IMPORT, AccountType::RECONCILIATION,
-                                             AccountType::LOAN,],
-            'asset'                      => [AccountType::DEFAULT, AccountType::ASSET,],
-            'cash'                       => [AccountType::CASH,],
-            'expense'                    => [AccountType::EXPENSE, AccountType::BENEFICIARY,],
-            'revenue'                    => [AccountType::REVENUE,],
-            'special'                    => [AccountType::CASH, AccountType::INITIAL_BALANCE, AccountType::IMPORT, AccountType::RECONCILIATION,
-                                             AccountType::LOAN,],
-            'hidden'                     => [AccountType::INITIAL_BALANCE, AccountType::IMPORT, AccountType::RECONCILIATION, AccountType::LOAN,],
-            AccountType::DEFAULT         => [AccountType::DEFAULT],
-            AccountType::CASH            => [AccountType::CASH],
-            AccountType::ASSET           => [AccountType::ASSET],
-            AccountType::EXPENSE         => [AccountType::EXPENSE],
-            AccountType::REVENUE         => [AccountType::REVENUE],
-            AccountType::INITIAL_BALANCE => [AccountType::INITIAL_BALANCE],
-            AccountType::BENEFICIARY     => [AccountType::BENEFICIARY],
-            AccountType::IMPORT          => [AccountType::IMPORT],
-            AccountType::RECONCILIATION  => [AccountType::RECONCILIATION],
-            AccountType::LOAN            => [AccountType::LOAN],
-        ];
-        $return = $types['all'];
-        if (isset($types[$type])) {
-            $return = $types[$type];
-        }
-
-        return $return; // @codeCoverageIgnore
-    }
 }

app/Api/V1/Controllers/AttachmentController.php

@@ -100,7 +100,7 @@ class AttachmentController extends Controller
             $quoted  = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\'));
 
             /** @var LaravelResponse $response */
-            $response = response($content, 200);
+            $response = response($content);
             $response
                 ->header('Content-Description', 'File Transfer')
                 ->header('Content-Type', 'application/octet-stream')
@@ -144,7 +144,12 @@ class AttachmentController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($attachments, new AttachmentTransformer($this->parameters), 'attachments');
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($attachments, $transformer, 'attachments');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -161,14 +166,14 @@ class AttachmentController extends Controller
     public function show(Request $request, Attachment $attachment): JsonResponse
     {
         $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($attachment, $transformer, 'attachments');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -188,7 +193,12 @@ class AttachmentController extends Controller
         $manager    = new Manager;
         $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($attachment, $transformer, 'attachments');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -209,7 +219,11 @@ class AttachmentController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($attachment, new AttachmentTransformer($this->parameters), 'attachments');
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($attachment, $transformer, 'attachments');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -232,4 +246,4 @@ class AttachmentController extends Controller
         return response()->json([], 204);
     }
 
-}
+}

app/Api/V1/Controllers/AvailableBudgetController.php

@@ -24,10 +24,10 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\AvailableBudgetRequest;
-use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Factory\TransactionCurrencyFactory;
 use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Transformers\AvailableBudgetTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -46,8 +46,6 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class AvailableBudgetController extends Controller
 {
-    /** @var CurrencyRepositoryInterface The currency repository */
-    private $currencyRepository;
     /** @var BudgetRepositoryInterface The budget repository */
     private $repository;
 
@@ -60,9 +58,8 @@ class AvailableBudgetController extends Controller
         $this->middleware(
             function ($request, $next) {
                 /** @var User $user */
-                $user                     = auth()->user();
-                $this->repository         = app(BudgetRepositoryInterface::class);
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $user             = auth()->user();
+                $this->repository = app(BudgetRepositoryInterface::class);
                 $this->repository->setUser($user);
 
                 return $next($request);
@@ -101,7 +98,20 @@ class AvailableBudgetController extends Controller
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of available budgets. Count it and split it.
-        $collection       = $this->repository->getAvailableBudgets();
+        $collection = $this->repository->getAvailableBudgets();
+
+        // filter list on start and end date, if present.
+        // TODO: put this in the query.
+        $start = $this->parameters->get('start');
+        $end   = $this->parameters->get('end');
+        if (null !== $start && null !== $end) {
+            $collection = $collection->filter(
+                function (AvailableBudget $availableBudget) use ($start, $end) {
+                    return $availableBudget->start_date->gte($start) && $availableBudget->end_date->lte($end);
+                }
+            );
+        }
+
         $count            = $collection->count();
         $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
@@ -111,7 +121,12 @@ class AvailableBudgetController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($availableBudgets, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -127,16 +142,15 @@ class AvailableBudgetController extends Controller
      */
     public function show(Request $request, AvailableBudget $availableBudget): JsonResponse
     {
-
         $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -147,25 +161,32 @@ class AvailableBudgetController extends Controller
      * @param AvailableBudgetRequest $request
      *
      * @return JsonResponse
-     * @throws FireflyException
      */
     public function store(AvailableBudgetRequest $request): JsonResponse
     {
-        $data     = $request->getAll();
-        $currency = $this->currencyRepository->findNull($data['transaction_currency_id']);
+        $data = $request->getAll();
+        /** @var TransactionCurrencyFactory $factory */
+        $factory  = app(TransactionCurrencyFactory::class);
+        $currency = $factory->find($data['currency_id'], $data['currency_code']);
+
         if (null === $currency) {
-            throw new FireflyException('Could not find the indicated currency.');
+            $currency = app('amount')->getDefaultCurrency();
         }
-        $availableBudget = $this->repository->setAvailableBudget($currency, $data['start_date'], $data['end_date'], $data['amount']);
+        $availableBudget = $this->repository->setAvailableBudget($currency, $data['start'], $data['end'], $data['amount']);
         $manager         = new Manager;
         $baseUrl         = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+
     /**
      * Update the specified resource in storage.
      *
@@ -177,14 +198,34 @@ class AvailableBudgetController extends Controller
     public function update(AvailableBudgetRequest $request, AvailableBudget $availableBudget): JsonResponse
     {
         $data = $request->getAll();
+
+        /** @var TransactionCurrencyFactory $factory */
+        $factory = app(TransactionCurrencyFactory::class);
+        /** @var TransactionCurrency $currency */
+        $currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
+
+        if (null === $currency) {
+            // use default currency:
+            $currency = app('amount')->getDefaultCurrency();
+        }
+        $currency->enabled = true;
+        $currency->save();
+        unset($data['currency_code']);
+        $data['currency_id'] = $currency->id;
+
+
         $this->repository->updateAvailableBudget($availableBudget, $data);
         $manager = new Manager;
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($availableBudget, new AvailableBudgetTransformer($this->parameters), 'available_budgets');
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($availableBudget, $transformer, 'available_budgets');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/BillController.php

@@ -26,12 +26,18 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\BillRequest;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\BillTransformer;
+use FireflyIII\Transformers\RuleTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -44,6 +50,7 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class BillController extends Controller
 {
+    use TransactionFilter;
     /** @var BillRepositoryInterface The bill repository */
     private $repository;
 
@@ -67,6 +74,43 @@ class BillController extends Controller
         );
     }
 
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     * @param Bill    $bill
+     *
+     * @return JsonResponse
+     */
+    public function attachments(Request $request, Bill $bill): JsonResponse
+    {
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getAttachments($bill);
+
+        $count       = $collection->count();
+        $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]) . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($attachments, $transformer, 'attachments');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
     /**
      * Remove the specified resource from storage.
      *
@@ -99,12 +143,56 @@ class BillController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new FractalCollection($bills, new BillTransformer($this->parameters), 'bills');
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($bills, $transformer, 'bills');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     * @param Bill    $bill
+     *
+     * @return JsonResponse
+     */
+    public function rules(Request $request, Bill $bill): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->repository->getRulesForBill($bill);
+        $count      = $collection->count();
+        $rules      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.bills.rules', [$bill->id]) . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+
+        $resource = new FractalCollection($rules, $transformer, 'rules');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
 
     /**
      * Show the specified bill.
@@ -117,14 +205,14 @@ class BillController extends Controller
     public function show(Request $request, Bill $bill): JsonResponse
     {
         $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($bill, $transformer, 'bills');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -145,7 +233,11 @@ class BillController extends Controller
             $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
             $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-            $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
+            /** @var BillTransformer $transformer */
+            $transformer = app(BillTransformer::class);
+            $transformer->setParameters($this->parameters);
+
+            $resource = new Item($bill, $transformer, 'bills');
 
             return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
         }
@@ -153,6 +245,53 @@ class BillController extends Controller
 
     }
 
+    /**
+     * Show all transactions.
+     *
+     * @param Request $request
+     *
+     * @param Bill    $bill
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, Bill $bill): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+        $collector->setBills(new Collection([$bill]));
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedTransactions();
+        $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]) . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
 
     /**
      * Update a bill.
@@ -170,7 +309,11 @@ class BillController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($bill, new BillTransformer($this->parameters), 'bills');
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($bill, $transformer, 'bills');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

app/Api/V1/Controllers/BudgetController.php

@@ -23,11 +23,16 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
+use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
 use FireflyIII\Api\V1\Requests\BudgetRequest;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\Transformers\BudgetTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -45,6 +50,7 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class BudgetController extends Controller
 {
+    use TransactionFilter;
     /** @var BudgetRepositoryInterface The budget repository */
     private $repository;
 
@@ -68,6 +74,39 @@ class BudgetController extends Controller
         );
     }
 
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     * @param Budget  $budget
+     *
+     * @return JsonResponse
+     */
+    public function budgetLimits(Request $request, Budget $budget): JsonResponse
+    {
+        $manager  = new Manager;
+        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $this->parameters->set('budget_id', $budget->id);
+        $collection   = $this->repository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
+        $count        = $collection->count();
+        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]) . $this->buildParams());
+
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+
+        $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
     /**
      * Remove the specified resource from storage.
      *
@@ -109,13 +148,17 @@ class BudgetController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($budgets, new BudgetTransformer($this->parameters), 'budgets');
+
+        /** @var BudgetTransformer $transformer */
+        $transformer = app(BudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($budgets, $transformer, 'budgets');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
-
     /**
      * Show a budget.
      *
@@ -127,14 +170,14 @@ class BudgetController extends Controller
     public function show(Request $request, Budget $budget): JsonResponse
     {
         $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
+        /** @var BudgetTransformer $transformer */
+        $transformer = app(BudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budget, $transformer, 'budgets');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -155,13 +198,99 @@ class BudgetController extends Controller
             $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
             $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-            $resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
+            /** @var BudgetTransformer $transformer */
+            $transformer = app(BudgetTransformer::class);
+            $transformer->setParameters($this->parameters);
+
+            $resource = new Item($budget, $transformer, 'budgets');
 
             return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
         }
         throw new FireflyException('Could not store new budget.'); // @codeCoverageIgnore
     }
 
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param BudgetLimitRequest $request
+     * @param Budget             $budget
+     *
+     * @return JsonResponse
+     */
+    public function storeBudgetLimit(BudgetLimitRequest $request, Budget $budget): JsonResponse
+    {
+        $data           = $request->getAll();
+        $data['budget'] = $budget;
+        $budgetLimit    = $this->repository->storeBudgetLimit($data);
+        $manager        = new Manager;
+        $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Show all transactions.
+     *
+     * @param Request $request
+     *
+     * @param Budget  $budget
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, Budget $budget): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // user can overrule page size with limit parameter.
+        $limit = $this->parameters->get('limit');
+        if (null !== $limit && $limit > 0) {
+            $pageSize = $limit;
+        }
+
+        $type = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+        $collector->setBudget($budget);
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedTransactions();
+        $paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]) . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
 
     /**
      * Update a budget.
@@ -179,10 +308,14 @@ class BudgetController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($budget, new BudgetTransformer($this->parameters), 'budgets');
+        /** @var BudgetTransformer $transformer */
+        $transformer = app(BudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budget, $transformer, 'budgets');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
 
-}
+}

app/Api/V1/Controllers/BudgetLimitController.php

@@ -23,24 +23,26 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use Carbon\Carbon;
+
 use FireflyIII\Api\V1\Requests\BudgetLimitRequest;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\BudgetLimitTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
-use InvalidArgumentException;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
-use Log;
+
 
 /**
  * Class BudgetLimitController.
@@ -49,6 +51,7 @@ use Log;
  */
 class BudgetLimitController extends Controller
 {
+    use TransactionFilter;
     /** @var BudgetRepositoryInterface The budget repository */
     private $repository;
 
@@ -95,34 +98,17 @@ class BudgetLimitController extends Controller
     {
         $manager  = new Manager;
         $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-        $start    = null;
-        $end      = null;
         $budgetId = (int)($request->get('budget_id') ?? 0);
         $budget   = $this->repository->findNull($budgetId);
-        $this->parameters->set('budget_id', $budgetId);
-
-        try {
-            $start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
-            $this->parameters->set('start', $start->format('Y-m-d'));
-        } catch (InvalidArgumentException $e) {
-            Log::debug(sprintf('Invalid date: %s', $e->getMessage()));
-        }
-
-        try {
-            $end = Carbon::createFromFormat('Y-m-d', $request->get('end'));
-            $this->parameters->set('end', $end->format('Y-m-d'));
-        } catch (InvalidArgumentException $e) {
-            Log::debug(sprintf('Invalid date: %s', $e->getMessage()));
-        }
-
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $this->parameters->set('budget_id', $budgetId);
 
         $collection = new Collection;
         if (null === $budget) {
-            $collection = $this->repository->getAllBudgetLimits($start, $end);
+            $collection = $this->repository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
         }
         if (null !== $budget) {
-            $collection = $this->repository->getBudgetLimits($budget, $start, $end);
+            $collection = $this->repository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         }
 
         $count        = $collection->count();
@@ -131,7 +117,12 @@ class BudgetLimitController extends Controller
         $paginator->setPath(route('api.v1.budget_limits.index') . $this->buildParams());
 
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($budgetLimits, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -148,14 +139,14 @@ class BudgetLimitController extends Controller
     public function show(Request $request, BudgetLimit $budgetLimit): JsonResponse
     {
         $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -181,7 +172,55 @@ class BudgetLimitController extends Controller
         $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Show all transactions.
+     *
+     * @param Request     $request
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, BudgetLimit $budgetLimit): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+        $collector->setBudget($budgetLimit->budget);
+        $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedTransactions();
+        $paginator->setPath(route('api.v1.budget_limits.transactions', [$budgetLimit->id]) . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -196,20 +235,20 @@ class BudgetLimitController extends Controller
      */
     public function update(BudgetLimitRequest $request, BudgetLimit $budgetLimit): JsonResponse
     {
-        $data   = $request->getAll();
-        $budget = $this->repository->findNull($data['budget_id']);
-        if (null === $budget) {
-            $budget = $budgetLimit->budget;
-        }
-        $data['budget'] = $budget;
+        $data           = $request->getAll();
+        $data['budget'] = $budgetLimit->budget;
         $budgetLimit    = $this->repository->updateBudgetLimit($budgetLimit, $data);
         $manager        = new Manager;
         $baseUrl        = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($budgetLimit, new BudgetLimitTransformer($this->parameters), 'budget_limits');
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/CategoryController.php

@@ -25,9 +25,14 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\CategoryRequest;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\Category;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CategoryTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -45,6 +50,7 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class CategoryController extends Controller
 {
+    use TransactionFilter;
     /** @var CategoryRepositoryInterface The category repository */
     private $repository;
 
@@ -109,7 +115,13 @@ class CategoryController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($categories, new CategoryTransformer($this->parameters), 'categories');
+
+        /** @var CategoryTransformer $transformer */
+        $transformer = app(CategoryTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+
+        $resource = new FractalCollection($categories, $transformer, 'categories');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -127,14 +139,14 @@ class CategoryController extends Controller
     public function show(Request $request, Category $category): JsonResponse
     {
         $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
+        /** @var CategoryTransformer $transformer */
+        $transformer = app(CategoryTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($category, $transformer, 'categories');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -155,13 +167,68 @@ class CategoryController extends Controller
             $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
             $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-            $resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
+            /** @var CategoryTransformer $transformer */
+            $transformer = app(CategoryTransformer::class);
+            $transformer->setParameters($this->parameters);
+
+            $resource = new Item($category, $transformer, 'categories');
 
             return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
         }
         throw new FireflyException('Could not store new category.'); // @codeCoverageIgnore
     }
 
+    /**
+     * Show all transactions.
+     *
+     * @param Request  $request
+     *
+     * @param Category $category
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, Category $category): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+        $collector->setCategory($category);
+
+        if (\in_array(TransactionType::TRANSFER, $types, true)) {
+            $collector->removeFilter(InternalTransferFilter::class);
+        }
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedTransactions();
+        $paginator->setPath(route('api.v1.categories.transactions', [$category->id]) . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
 
     /**
      * Update the category.
@@ -179,10 +246,14 @@ class CategoryController extends Controller
         $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($category, new CategoryTransformer($this->parameters), 'categories');
+        /** @var CategoryTransformer $transformer */
+        $transformer = app(CategoryTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($category, $transformer, 'categories');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
 
-}
+}

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

@@ -0,0 +1,348 @@
+<?php
+
+/**
+ * AccountController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    /** @var CurrencyRepositoryInterface */
+    private $currencyRepository;
+    /** @var AccountRepositoryInterface */
+    private $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
+                $this->currencyRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function expenseOverview(Request $request): JsonResponse
+    {
+        // parameters for chart:
+        $start = (string)$request->get('start');
+        $end   = (string)$request->get('end');
+        if ('' === $start || '' === $end) {
+            throw new FireflyException('Start and end are mandatory parameters.');
+        }
+
+        $start = Carbon::createFromFormat('Y-m-d', $start);
+        $end   = Carbon::createFromFormat('Y-m-d', $end);
+        $start->subDay();
+
+        // prep some vars:
+        $currencies = [];
+        $chartData  = [];
+        $tempData   = [];
+
+        // grab all accounts and names
+        $accounts      = $this->repository->getAccountsByType([AccountType::EXPENSE]);
+        $accountNames  = $this->extractNames($accounts);
+        $startBalances = app('steam')->balancesPerCurrencyByAccounts($accounts, $start);
+        $endBalances   = app('steam')->balancesPerCurrencyByAccounts($accounts, $end);
+
+        // loop the end balances. This is an array for each account ($expenses)
+        foreach ($endBalances as $accountId => $expenses) {
+            $accountId = (int)$accountId;
+            // loop each expense entry (each entry can be a different currency).
+            foreach ($expenses as $currencyId => $endAmount) {
+                $currencyId = (int)$currencyId;
+
+                // see if there is an accompanying start amount.
+                // grab the difference and find the currency.
+                $startAmount             = $startBalances[$accountId][$currencyId] ?? '0';
+                $diff                    = bcsub($endAmount, $startAmount);
+                $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->findNull($currencyId);
+                if (0 !== bccomp($diff, '0')) {
+                    // store the values in a temporary array.
+                    $tempData[] = [
+                        'name'        => $accountNames[$accountId],
+                        'difference'  => $diff,
+                        'diff_float'  => (float)$diff,
+                        'currency_id' => $currencyId,
+                    ];
+                }
+            }
+        }
+
+        // sort temp array by amount.
+        $amounts = array_column($tempData, 'diff_float');
+        array_multisort($amounts, SORT_DESC, $tempData);
+
+        // loop all found currencies and build the data array for the chart.
+        /**
+         * @var int                 $currencyId
+         * @var TransactionCurrency $currency
+         */
+        foreach ($currencies as $currencyId => $currency) {
+            $currentSet             = [
+                'label'                   => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'type'                    => 'bar', // line, area or bar
+                'yAxisID'                 => 0, // 0, 1, 2
+                'entries'                 => $this->expandNames($tempData),
+            ];
+            $chartData[$currencyId] = $currentSet;
+        }
+
+        // loop temp data and place data in correct array:
+        foreach ($tempData as $entry) {
+            $currencyId                               = $entry['currency_id'];
+            $name                                     = $entry['name'];
+            $chartData[$currencyId]['entries'][$name] = round($entry['difference'], $chartData[$currencyId]['currency_decimal_places']);
+        }
+        $chartData = array_values($chartData);
+
+        return response()->json($chartData);
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function overview(Request $request): JsonResponse
+    {
+        // parameters for chart:
+        $start = (string)$request->get('start');
+        $end   = (string)$request->get('end');
+        if ('' === $start || '' === $end) {
+            throw new FireflyException('Start and end are mandatory parameters.');
+        }
+
+        $start = Carbon::createFromFormat('Y-m-d', $start);
+        $end   = Carbon::createFromFormat('Y-m-d', $end);
+
+        // user's preferences
+        $defaultSet = $this->repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray();
+        $frontPage  = app('preferences')->get('frontPageAccounts', $defaultSet);
+        $default    = app('amount')->getDefaultCurrency();
+        if (0 === \count($frontPage->data)) {
+            $frontPage->data = $defaultSet;
+            $frontPage->save();
+        }
+
+        // get accounts:
+        $accounts  = $this->repository->getAccountsById($frontPage->data);
+        $chartData = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $currency = $this->repository->getAccountCurrency($account);
+            if (null === $currency) {
+                $currency = $default;
+            }
+            $currentSet = [
+                'label'                   => $account->name,
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'type'                    => 'line', // line, area or bar
+                'yAxisID'                 => 0, // 0, 1, 2
+                'entries'                 => [],
+            ];
+
+            $currentStart = clone $start;
+            $range        = app('steam')->balanceInRange($account, $start, clone $end);
+            $previous     = round(array_values($range)[0], 12);
+            while ($currentStart <= $end) {
+                $format   = $currentStart->format('Y-m-d');
+                $label    = $currentStart->format('Y-m-d');
+                $balance  = isset($range[$format]) ? round($range[$format], 12) : $previous;
+                $previous = $balance;
+                $currentStart->addDay();
+                $currentSet['entries'][$label] = $balance;
+            }
+            $chartData[] = $currentSet;
+        }
+
+        return response()->json($chartData);
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function revenueOverview(Request $request): JsonResponse
+    {
+        // parameters for chart:
+        $start = (string)$request->get('start');
+        $end   = (string)$request->get('end');
+        if ('' === $start || '' === $end) {
+            throw new FireflyException('Start and end are mandatory parameters.');
+        }
+
+        $start = Carbon::createFromFormat('Y-m-d', $start);
+        $end   = Carbon::createFromFormat('Y-m-d', $end);
+        $start->subDay();
+
+        // prep some vars:
+        $currencies = [];
+        $chartData  = [];
+        $tempData   = [];
+
+        // grab all accounts and names
+        $accounts      = $this->repository->getAccountsByType([AccountType::REVENUE]);
+        $accountNames  = $this->extractNames($accounts);
+        $startBalances = app('steam')->balancesPerCurrencyByAccounts($accounts, $start);
+        $endBalances   = app('steam')->balancesPerCurrencyByAccounts($accounts, $end);
+
+        // loop the end balances. This is an array for each account ($expenses)
+        foreach ($endBalances as $accountId => $expenses) {
+            $accountId = (int)$accountId;
+            // loop each expense entry (each entry can be a different currency).
+            foreach ($expenses as $currencyId => $endAmount) {
+                $currencyId = (int)$currencyId;
+
+                // see if there is an accompanying start amount.
+                // grab the difference and find the currency.
+                $startAmount             = $startBalances[$accountId][$currencyId] ?? '0';
+                $diff                    = bcsub($endAmount, $startAmount);
+                $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->findNull($currencyId);
+                if (0 !== bccomp($diff, '0')) {
+                    // store the values in a temporary array.
+                    $tempData[] = [
+                        'name'        => $accountNames[$accountId],
+                        'difference'  => bcmul($diff, '-1'),
+                        'diff_float'  => (float)$diff * -1,
+                        'currency_id' => $currencyId,
+                    ];
+                }
+            }
+        }
+
+        // sort temp array by amount.
+        $amounts = array_column($tempData, 'diff_float');
+        array_multisort($amounts, SORT_DESC, $tempData);
+
+        // loop all found currencies and build the data array for the chart.
+        /**
+         * @var int                 $currencyId
+         * @var TransactionCurrency $currency
+         */
+        foreach ($currencies as $currencyId => $currency) {
+            $currentSet             = [
+                'label'                   => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'type'                    => 'bar', // line, area or bar
+                'yAxisID'                 => 0, // 0, 1, 2
+                'entries'                 => $this->expandNames($tempData),
+            ];
+            $chartData[$currencyId] = $currentSet;
+        }
+
+        // loop temp data and place data in correct array:
+        foreach ($tempData as $entry) {
+            $currencyId                               = $entry['currency_id'];
+            $name                                     = $entry['name'];
+            $chartData[$currencyId]['entries'][$name] = round($entry['difference'], $chartData[$currencyId]['currency_decimal_places']);
+        }
+        $chartData = array_values($chartData);
+
+        return response()->json($chartData);
+    }
+
+    /**
+     * Small helper function for the revenue and expense account charts.
+     * TODO should include Trait instead of doing this.
+     *
+     * @param array $names
+     *
+     * @return array
+     */
+    protected function expandNames(array $names): array
+    {
+        $result = [];
+        foreach ($names as $entry) {
+            $result[$entry['name']] = 0;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Small helper function for the revenue and expense account charts.
+     * TODO should include Trait instead of doing this.
+     *
+     * @param Collection $accounts
+     *
+     * @return array
+     */
+    protected function extractNames(Collection $accounts): array
+    {
+        $return = [];
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $return[$account->id] = $account->name;
+        }
+
+        return $return;
+    }
+
+}

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

@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * AvailableBudgetController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Chart;
+
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+
+/**
+ * Class AvailableBudgetController
+ */
+class AvailableBudgetController extends Controller
+{
+    /** @var BudgetRepositoryInterface */
+    private $repository;
+
+    /**
+     * AvailableBudgetController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(BudgetRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param AvailableBudget $availableBudget
+     *
+     * @return JsonResponse
+     */
+    public function overview(AvailableBudget $availableBudget): JsonResponse
+    {
+        $currency          = $availableBudget->transactionCurrency;
+        $budgets           = $this->repository->getActiveBudgets();
+        $budgetInformation = $this->repository->spentInPeriodMc($budgets, new Collection, $availableBudget->start_date, $availableBudget->end_date);
+        $spent             = 0.0;
+
+        // get for current currency
+        foreach ($budgetInformation as $spentInfo) {
+            if ($spentInfo['currency_id'] === $availableBudget->transaction_currency_id) {
+                $spent = $spentInfo['amount'];
+            }
+        }
+        $left = bcadd($availableBudget->amount, (string)$spent);
+        // left less than zero? Set to zero.
+        if (bccomp($left, '0') === -1) {
+            $left = '0';
+        }
+
+        $chartData = [
+            [
+                'label'                   => trans('firefly.spent'),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'type'                    => 'pie',
+                'yAxisID'                 => 0, // 0, 1, 2
+                'entries'                 => [$spent * -1],
+            ],
+            [
+                'label'                   => trans('firefly.left'),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'type'                    => 'line', // line, area or bar
+                'yAxisID'                 => 0, // 0, 1, 2
+                'entries'                 => [round($left, $currency->decimal_places)],
+            ],
+        ];
+
+        return response()->json($chartData);
+    }
+
+}

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

@@ -0,0 +1,209 @@
+<?php
+
+/**
+ * CategoryController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+
+/**
+ * Class CategoryController
+ */
+class CategoryController extends Controller
+{
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                     = auth()->user();
+                $this->categoryRepository = app(CategoryRepositoryInterface::class);
+                $this->categoryRepository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function overview(Request $request): JsonResponse
+    {
+        // parameters for chart:
+        $start = (string)$request->get('start');
+        $end   = (string)$request->get('end');
+        if ('' === $start || '' === $end) {
+            throw new FireflyException('Start and end are mandatory parameters.');
+        }
+        $start      = Carbon::createFromFormat('Y-m-d', $start);
+        $end        = Carbon::createFromFormat('Y-m-d', $end);
+        $tempData   = [];
+        $spent      = $this->categoryRepository->spentInPeriodPerCurrency(new Collection, new Collection, $start, $end);
+        $earned     = $this->categoryRepository->earnedInPeriodPerCurrency(new Collection, new Collection, $start, $end);
+        $categories = [];
+
+        // earned:
+        foreach ($earned as $categoryId => $row) {
+            $categoryName = $row['name'];
+            foreach ($row['earned'] as $currencyId => $income) {
+                // find or make set for currency:
+                $key           = sprintf('%s-e', $currencyId);
+                $decimalPlaces = $income['currency_decimal_places'];
+                if (!isset($tempData[$key])) {
+                    $tempData[$key] = [
+                        'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $income['currency_symbol']]),
+                        'currency_id'             => $income['currency_id'],
+                        'currency_code'           => $income['currency_code'],
+                        'currency_symbol'         => $income['currency_symbol'],
+                        'currency_decimal_places' => $decimalPlaces,
+                        'type'                    => 'bar', // line, area or bar
+                        'yAxisID'                 => 0, // 0, 1, 2
+                        'entries'                 => [],
+                    ];
+                }
+                $amount                    = round($income['earned'], $decimalPlaces);
+                $categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
+                $tempData[$key]['entries'][$categoryName]
+                                           = $amount;
+
+            }
+        }
+
+        // earned with no category:
+        $noCategory = $this->categoryRepository->earnedInPeriodPcWoCategory(new Collection, $start, $end);
+        foreach ($noCategory as $currencyId => $income) {
+            $categoryName = (string)trans('firefly.no_category');
+            // find or make set for currency:
+            $key           = sprintf('%s-e', $currencyId);
+            $decimalPlaces = $income['currency_decimal_places'];
+            if (!isset($tempData[$key])) {
+                $tempData[$key] = [
+                    'label'                   => (string)trans('firefly.box_earned_in_currency', ['currency' => $income['currency_symbol']]),
+                    'currency_id'             => $income['currency_id'],
+                    'currency_code'           => $income['currency_code'],
+                    'currency_symbol'         => $income['currency_symbol'],
+                    'currency_decimal_places' => $decimalPlaces,
+                    'type'                    => 'bar', // line, area or bar
+                    'yAxisID'                 => 0, // 0, 1, 2
+                    'entries'                 => [],
+                ];
+            }
+            $amount                    = round($income['spent'], $decimalPlaces);
+            $categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
+            $tempData[$key]['entries'][$categoryName]
+                                       = $amount;
+        }
+
+
+        // spent
+        foreach ($spent as $categoryId => $row) {
+            $categoryName = $row['name'];
+            // create a new set if necessary, "spent (EUR)":
+            foreach ($row['spent'] as $currencyId => $expense) {
+                // find or make set for currency:
+                $key           = sprintf('%s-s', $currencyId);
+                $decimalPlaces = $expense['currency_decimal_places'];
+                if (!isset($tempData[$key])) {
+                    $tempData[$key] = [
+                        'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $expense['currency_symbol']]),
+                        'currency_id'             => $expense['currency_id'],
+                        'currency_code'           => $expense['currency_code'],
+                        'currency_symbol'         => $expense['currency_symbol'],
+                        'currency_decimal_places' => $decimalPlaces,
+                        'type'                    => 'bar', // line, area or bar
+                        'yAxisID'                 => 0, // 0, 1, 2
+                        'entries'                 => [],
+                    ];
+                }
+                $amount                    = round($expense['spent'], $decimalPlaces);
+                $categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
+                $tempData[$key]['entries'][$categoryName]
+                                           = $amount;
+
+            }
+        }
+
+        // spent with no category
+        $noCategory = $this->categoryRepository->spentInPeriodPcWoCategory(new Collection, $start, $end);
+        foreach ($noCategory as $currencyId => $expense) {
+            $categoryName = (string)trans('firefly.no_category');
+            // find or make set for currency:
+            $key           = sprintf('%s-s', $currencyId);
+            $decimalPlaces = $expense['currency_decimal_places'];
+            if (!isset($tempData[$key])) {
+                $tempData[$key] = [
+                    'label'                   => (string)trans('firefly.box_spent_in_currency', ['currency' => $expense['currency_symbol']]),
+                    'currency_id'             => $expense['currency_id'],
+                    'currency_code'           => $expense['currency_code'],
+                    'currency_symbol'         => $expense['currency_symbol'],
+                    'currency_decimal_places' => $decimalPlaces,
+                    'type'                    => 'bar', // line, area or bar
+                    'yAxisID'                 => 0, // 0, 1, 2
+                    'entries'                 => [],
+                ];
+            }
+            $amount                    = round($expense['spent'], $decimalPlaces);
+            $categories[$categoryName] = isset($categories[$categoryName]) ? $categories[$categoryName] + $amount : $amount;
+            $tempData[$key]['entries'][$categoryName]
+                                       = $amount;
+        }
+
+
+        asort($categories);
+        $keys = array_keys($categories);
+
+        // re-sort every spent array and add 0 for missing entries.
+        foreach ($tempData as $index => $set) {
+            $oldSet = $set['entries'];
+            $newSet = [];
+            foreach ($keys as $key) {
+                $value        = $oldSet[$key] ?? 0;
+                $value        = $value < 0 ? $value * -1 : $value;
+                $newSet[$key] = $value;
+            }
+            $tempData[$index]['entries'] = $newSet;
+        }
+        $chartData = array_values($tempData);
+
+        return response()->json($chartData);
+    }
+}

app/Api/V1/Controllers/ConfigurationController.php

@@ -23,12 +23,12 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
+use FireflyIII\Api\V1\Requests\ConfigurationRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Configuration;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 
 /**
  * Class ConfigurationController.
@@ -71,40 +71,25 @@ class ConfigurationController extends Controller
     {
         $configData = $this->getConfigData();
 
-        return response()->json(['data' => $configData], 200)->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
      * Update the configuration.
      *
-     * @param Request $request
+     * @param ConfigurationRequest $request
+     * @param string               $name
      *
      * @return JsonResponse
-     * @throws FireflyException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function update(Request $request): JsonResponse
+    public function update(ConfigurationRequest $request, string $name): JsonResponse
     {
-        $name  = $request->get('name');
-        $value = $request->get('value');
-        $valid = ['is_demo_site', 'permission_update_check', 'single_user_mode'];
-        if (!\in_array($name, $valid, true)) {
-            throw new FireflyException('You cannot edit this configuration value.');
-        }
-        $configValue = '';
-        switch ($name) {
-            case 'is_demo_site':
-            case 'single_user_mode':
-                $configValue = 'true' === $value;
-                break;
-            case 'permission_update_check':
-                $configValue = (int)$value >= -1 && (int)$value <= 1 ? (int)$value : -1;
-                break;
-        }
-        app('fireflyconfig')->set($name, $configValue);
+        $data = $request->getAll();
+        app('fireflyconfig')->set($name, $data['value']);
         $configData = $this->getConfigData();
 
-        return response()->json(['data' => $configData], 200)->header('Content-Type', 'application/vnd.api+json');
+        return response()->json(['data' => $configData])->header('Content-Type', 'application/vnd.api+json');
     }
 
     /**
@@ -132,4 +117,4 @@ class ConfigurationController extends Controller
 
         return $data;
     }
-}
+}

app/Api/V1/Controllers/Controller.php

@@ -100,11 +100,11 @@ class Controller extends BaseController
         // some date fields:
         $dates = ['start', 'end', 'date'];
         foreach ($dates as $field) {
-            $date = request()->get($field);
+            $date = request()->query->get($field);
             $obj  = null;
             if (null !== $date) {
                 try {
-                    $obj = new Carbon($date);
+                    $obj = Carbon::parse($date);
                 } catch (InvalidDateException $e) {
                     // don't care
                     Log::error(sprintf('Invalid date exception in API controller: %s', $e->getMessage()));
@@ -113,6 +113,15 @@ class Controller extends BaseController
             $bag->set($field, $obj);
         }
 
+        // integer fields:
+        $integers = ['limit'];
+        foreach ($integers as $integer) {
+            $value = request()->query->get($integer);
+            if (null !== $value) {
+                $bag->set($integer, (int)$value);
+            }
+        }
+
         return $bag;
 
     }

app/Api/V1/Controllers/CurrencyController.php

@@ -26,14 +26,41 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\CurrencyRequest;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\Recurrence;
+use FireflyIII\Models\RecurrenceTransaction;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Support\Http\Api\AccountFilter;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\AccountTransformer;
+use FireflyIII\Transformers\AvailableBudgetTransformer;
+use FireflyIII\Transformers\BillTransformer;
+use FireflyIII\Transformers\BudgetLimitTransformer;
+use FireflyIII\Transformers\CurrencyExchangeRateTransformer;
 use FireflyIII\Transformers\CurrencyTransformer;
+use FireflyIII\Transformers\RecurrenceTransformer;
+use FireflyIII\Transformers\RuleTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
@@ -47,6 +74,7 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class CurrencyController extends Controller
 {
+    use AccountFilter, TransactionFilter;
     /** @var CurrencyRepositoryInterface The currency repository */
     private $repository;
     /** @var UserRepositoryInterface The user repository */
@@ -73,6 +101,243 @@ class CurrencyController extends Controller
         );
     }
 
+    /**
+     * Display a list of accounts.
+     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function accounts(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // read type from URI
+        $type = $request->get('type') ?? 'all';
+        $this->parameters->set('type', $type);
+
+        // types to get, page size:
+        $types    = $this->mapAccountTypes($this->parameters->get('type'));
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of accounts. Count it and split it.
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $unfiltered        = $accountRepository->getAccountsByType($types);
+
+        // filter list on currency preference:
+        $collection = $unfiltered->filter(
+            function (Account $account) use ($currency, $accountRepository) {
+                $currencyId = (int)$accountRepository->getMetaValue($account, 'currency_id');
+
+                return $currencyId === $currency->id;
+            }
+        );
+
+        $count    = $collection->count();
+        $accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.accounts', [$currency->code]) . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+
+        $resource = new FractalCollection($accounts, $transformer, 'accounts');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request             $request
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function availableBudgets(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        /** @var User $admin */
+        $admin = auth()->user();
+
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of available budgets. Count it and split it.
+        /** @var BudgetRepositoryInterface $repository */
+        $repository = app(BudgetRepositoryInterface::class);
+        $repository->setUser($admin);
+        $unfiltered = $repository->getAvailableBudgets();
+
+        // filter list.
+        $collection = $unfiltered->filter(
+            function (AvailableBudget $availableBudget) use ($currency) {
+                return $availableBudget->transaction_currency_id === $currency->id;
+            }
+        );
+
+        $count            = $collection->count();
+        $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.available_budgets', [$currency->code]) . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var AvailableBudgetTransformer $transformer */
+        $transformer = app(AvailableBudgetTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * List all bills
+     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function bills(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        /** @var BillRepositoryInterface $repository */
+        $repository = app(BillRepositoryInterface::class);
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $paginator  = $repository->getPaginator($pageSize);
+        /** @var Collection $bills */
+        $unfiltered = $paginator->getCollection();
+
+        // filter and paginate list:
+        $collection = $unfiltered->filter(
+            function (Bill $bill) use ($currency) {
+                return $bill->transaction_currency_id === $currency->id;
+            }
+        );
+        $count      = $collection->count();
+        $bills      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.bills', [$currency->code]) . $this->buildParams());
+
+
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($bills, $transformer, 'bills');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * List all budget limits
+     *
+     * @param Request             $request
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function budgetLimits(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        /** @var BudgetRepositoryInterface $repository */
+        $repository = app(BudgetRepositoryInterface::class);
+        $manager    = new Manager;
+        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $unfiltered = $repository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
+
+        // TODO replace this
+        // filter budget limits on currency ID
+        $collection = $unfiltered->filter(
+            function (BudgetLimit $budgetLimit) use ($currency) {
+                return $budgetLimit->transaction_currency_id === $currency->id;
+            }
+        );
+
+        $count        = $collection->count();
+        $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.budget_limits', [$currency->code]) . $this->buildParams());
+
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Show a list of known exchange rates
+     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function cer(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        // create some objects:
+        $manager    = new Manager;
+        $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $collection = $this->repository->getExchangeRates($currency);
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+
+        $count         = $collection->count();
+        $exchangeRates = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator     = new LengthAwarePaginator($exchangeRates, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.cer', [$currency->code]) . $this->buildParams());
+
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var CurrencyExchangeRateTransformer $transformer */
+        $transformer = app(CurrencyExchangeRateTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($exchangeRates, $transformer, 'currency_exchange_rates');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
     /**
      * Remove the specified resource from storage.
      *
@@ -90,7 +355,7 @@ class CurrencyController extends Controller
             // access denied:
             throw new FireflyException('No access to method, user is not owner.'); // @codeCoverageIgnore
         }
-        if (!$this->repository->canDeleteCurrency($currency)) {
+        if ($this->repository->currencyInUse($currency)) {
             throw new FireflyException('No access to method, currency is in use.'); // @codeCoverageIgnore
         }
         $this->repository->destroy($currency);
@@ -98,6 +363,66 @@ class CurrencyController extends Controller
         return response()->json([], 204);
     }
 
+    /**
+     * Disable a currency.
+     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function disable(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        // must be unused.
+        if ($this->repository->currencyInUse($currency)) {
+            return response()->json([], 409);
+        }
+        $this->repository->disable($currency);
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Enable a currency.
+     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function enable(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        $this->repository->enable($currency);
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
+        $this->parameters->set('defaultCurrency', $defaultCurrency);
+
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
     /**
      * Display a listing of the resource.
      *
@@ -108,7 +433,7 @@ class CurrencyController extends Controller
     public function index(Request $request): JsonResponse
     {
         $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $collection = $this->repository->get();
+        $collection = $this->repository->getAll();
         $count      = $collection->count();
         // slice them:
         $currencies = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -122,12 +447,158 @@ class CurrencyController extends Controller
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
-        $resource = new FractalCollection($currencies, new CurrencyTransformer($this->parameters), 'currencies');
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($currencies, $transformer, 'currencies');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * Make the currency a default currency.
+     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function makeDefault(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        $this->repository->enable($currency);
+
+        app('preferences')->set('currencyPreference', $currency->code);
+        app('preferences')->mark();
+
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $this->parameters->set('defaultCurrency', $currency);
+
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List all recurring transactions.
+     *
+     * @param Request             $request
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse]
+     */
+    public function recurrences(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        /** @var RecurringRepositoryInterface $repository */
+        $repository = app(RecurringRepositoryInterface::class);
+        $unfiltered = $repository->getAll();
+
+        // filter selection
+        $collection = $unfiltered->filter(
+            function (Recurrence $recurrence) use ($currency) {
+                /** @var RecurrenceTransaction $transaction */
+                foreach ($recurrence->recurrenceTransactions as $transaction) {
+                    if ($transaction->transaction_currency_id === $currency->id || $transaction->foreign_currency_id === $currency->id) {
+                        return $recurrence;
+                    }
+                }
+
+                return null;
+            }
+        );
+
+
+        $count      = $collection->count();
+        $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.recurrences', [$currency->code]) . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List all of them.
+     *
+     * @param Request             $request
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse]
+     */
+    public function rules(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        $manager  = new Manager;
+        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        /** @var RuleRepositoryInterface $repository */
+        $repository = app(RuleRepositoryInterface::class);
+        $unfiltered = $repository->getAll();
+
+        $collection = $unfiltered->filter(
+            function (Rule $rule) use ($currency) {
+                /** @var RuleTrigger $trigger */
+                foreach ($rule->ruleTriggers as $trigger) {
+                    if ('currency_is' === $trigger->trigger_type && $currency->name === $trigger->trigger_value) {
+                        return $rule;
+                    }
+                }
+
+                return null;
+            }
+        );
+
+        $count = $collection->count();
+        $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($rules, $transformer, 'rules');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
 
     /**
      * Show a currency.
@@ -140,16 +611,16 @@ class CurrencyController extends Controller
     public function show(Request $request, TransactionCurrency $currency): JsonResponse
     {
         $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
-        $resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -177,7 +648,11 @@ class CurrencyController extends Controller
             $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
             $this->parameters->set('defaultCurrency', $defaultCurrency);
 
-            $resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
+            /** @var CurrencyTransformer $transformer */
+            $transformer = app(CurrencyTransformer::class);
+            $transformer->setParameters($this->parameters);
+
+            $resource = new Item($currency, $transformer, 'currencies');
 
             return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
         }
@@ -185,6 +660,57 @@ class CurrencyController extends Controller
 
     }
 
+    /**
+     * Show all transactions.
+     *
+     * @param Request             $request
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, TransactionCurrency $currency): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+        $collector->setCurrency($currency);
+
+        if (\in_array(TransactionType::TRANSFER, $types, true)) {
+            $collector->removeFilter(InternalTransferFilter::class);
+        }
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedTransactions();
+        $paginator->setPath(route('api.v1.currencies.transactions', [$currency->code]) . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
 
     /**
      * Update a currency.
@@ -211,7 +737,11 @@ class CurrencyController extends Controller
         $defaultCurrency = app('amount')->getDefaultCurrencyByUser(auth()->user());
         $this->parameters->set('defaultCurrency', $defaultCurrency);
 
-        $resource = new Item($currency, new CurrencyTransformer($this->parameters), 'currencies');
+        /** @var CurrencyTransformer $transformer */
+        $transformer = app(CurrencyTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($currency, $transformer, 'currencies');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

app/Api/V1/Controllers/CurrencyExchangeRateController.php

@@ -92,6 +92,7 @@ class CurrencyExchangeRateController extends Controller
         $this->parameters->set('from', $fromCurrency->code);
         $this->parameters->set('to', $toCurrency->code);
         $this->parameters->set('date', $dateObj->format('Y-m-d'));
+        $this->parameters->set('amount', $request->get('amount'));
 
         $rate = $this->repository->getExchangeRate($fromCurrency, $toCurrency, $dateObj);
         if (null === $rate) {
@@ -103,9 +104,11 @@ class CurrencyExchangeRateController extends Controller
             $service->setUser($admin);
             $rate = $service->getRate($fromCurrency, $toCurrency, $dateObj);
         }
-
-        $resource = new Item($rate, new CurrencyExchangeRateTransformer($this->parameters), 'currency_exchange_rates');
+        /** @var CurrencyExchangeRateTransformer $transformer */
+        $transformer = app(CurrencyExchangeRateTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($rate, $transformer, 'currency_exchange_rates');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
-}
+}

app/Api/V1/Controllers/ImportController.php

@@ -0,0 +1,185 @@
+<?php
+/**
+ * ImportController.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Models\ImportJob;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\ImportJobTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
+use League\Fractal\Manager;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+use League\Fractal\Serializer\JsonApiSerializer;
+
+/**
+ * Class ImportController
+ */
+class ImportController extends Controller
+{
+    use TransactionFilter;
+    /** @var ImportJobRepositoryInterface Import job repository. */
+    private $repository;
+
+    /**
+     * LinkTypeController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user             = auth()->user();
+                $this->repository = app(ImportJobRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse
+     */
+    public function listAll(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager  = new Manager;
+        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of accounts. Count it and split it.
+        $collection = $this->repository->get();
+        $count      = $collection->count();
+        $importJobs = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($importJobs, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.import.list') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var ImportJobTransformer $transformer */
+        $transformer = app(ImportJobTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($importJobs, $transformer, 'import_jobs');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @param Request   $request
+     * @param ImportJob $importJob
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, ImportJob $importJob): JsonResponse
+    {
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var ImportJobTransformer $transformer */
+        $transformer = app(ImportJobTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($importJob, $transformer, 'import_jobs');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Show all transactions
+     *
+     * @param Request   $request
+     * @param ImportJob $importJob
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, ImportJob $importJob): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $tag          = $importJob->tag;
+        $transactions = new Collection();
+        $paginator    = new LengthAwarePaginator($transactions, 0, $pageSize);
+        $paginator->setPath(route('api.v1.import.transactions', [$importJob->key]) . $this->buildParams());
+
+        if (null !== $tag) {
+            /** @var User $admin */
+            $admin = auth()->user();
+            /** @var TransactionCollectorInterface $collector */
+            $collector = app(TransactionCollectorInterface::class);
+            $collector->setUser($admin);
+            $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+            $collector->setAllAssetAccounts();
+            $collector->setTag($tag);
+
+            if (\in_array(TransactionType::TRANSFER, $types, true)) {
+                $collector->removeFilter(InternalTransferFilter::class);
+            }
+
+            if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+                $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+            }
+            $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+            $collector->setTypes($types);
+            $paginator = $collector->getPaginatedTransactions();
+            $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
+            $transactions = $paginator->getCollection();
+        }
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+}

app/Api/V1/Controllers/LinkTypeController.php

@@ -25,10 +25,15 @@ namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\LinkTypeRequest;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\LinkType;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\LinkTypeTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -46,6 +51,7 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class LinkTypeController extends Controller
 {
+    use TransactionFilter;
     /** @var LinkTypeRepositoryInterface The link type repository */
     private $repository;
 
@@ -84,7 +90,7 @@ class LinkTypeController extends Controller
         if (false === $linkType->editable) {
             throw new FireflyException(sprintf('You cannot delete this link type (#%d, "%s")', $linkType->id, $linkType->name));
         }
-        $this->repository->destroy($linkType, null);
+        $this->repository->destroy($linkType);
 
         return response()->json([], 204);
     }
@@ -114,7 +120,12 @@ class LinkTypeController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($linkTypes, new LinkTypeTransformer($this->parameters), 'link_types');
+
+        /** @var LinkTypeTransformer $transformer */
+        $transformer = app(LinkTypeTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($linkTypes, $transformer, 'link_types');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -132,14 +143,13 @@ class LinkTypeController extends Controller
     public function show(Request $request, LinkType $linkType): JsonResponse
     {
         $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
+        /** @var LinkTypeTransformer $transformer */
+        $transformer = app(LinkTypeTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($linkType, $transformer, 'link_types');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -168,12 +178,70 @@ class LinkTypeController extends Controller
         $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
+        /** @var LinkTypeTransformer $transformer */
+        $transformer = app(LinkTypeTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new Item($linkType, $transformer, 'link_types');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
 
+    /**
+     * Delete the resource.
+     *
+     * @param Request  $request
+     * @param LinkType $linkType
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, LinkType $linkType): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // whatever is returned by the query, it must be part of these journals:
+        $journalIds = $this->repository->getJournalIds($linkType);
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+        $collector->setJournalIds($journalIds);
+
+        if (\in_array(TransactionType::TRANSFER, $types, true)) {
+            $collector->removeFilter(InternalTransferFilter::class);
+        }
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedTransactions();
+        $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+
     /**
      * Update object.
      *
@@ -202,9 +270,13 @@ class LinkTypeController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($linkType, new LinkTypeTransformer($this->parameters), 'link_types');
+        /** @var LinkTypeTransformer $transformer */
+        $transformer = app(LinkTypeTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($linkType, $transformer, 'link_types');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/PiggyBankController.php

@@ -27,6 +27,7 @@ use FireflyIII\Api\V1\Requests\PiggyBankRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Transformers\PiggyBankEventTransformer;
 use FireflyIII\Transformers\PiggyBankTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -110,7 +111,47 @@ class PiggyBankController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($piggyBanks, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+
+        /** @var PiggyBankTransformer $transformer */
+        $transformer = app(PiggyBankTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Request   $request
+     * @param PiggyBank $piggyBank
+     *
+     * @return JsonResponse
+     */
+    public function piggyBankEvents(Request $request, PiggyBank $piggyBank): JsonResponse
+    {
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $manager  = new Manager();
+        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $collection = $this->repository->getEvents($piggyBank);
+        $count      = $collection->count();
+        $events     = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]) . $this->buildParams());
+
+        /** @var PiggyBankEventTransformer $transformer */
+        $transformer = app(PiggyBankEventTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($events, $transformer, 'piggy_bank_events');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -128,14 +169,14 @@ class PiggyBankController extends Controller
     public function show(Request $request, PiggyBank $piggyBank): JsonResponse
     {
         $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+        /** @var PiggyBankTransformer $transformer */
+        $transformer = app(PiggyBankTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -157,11 +198,15 @@ class PiggyBankController extends Controller
             $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
             $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-            $resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+            /** @var PiggyBankTransformer $transformer */
+            $transformer = app(PiggyBankTransformer::class);
+            $transformer->setParameters($this->parameters);
+
+            $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
             return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
         }
-        throw new FireflyException('Could not store new piggy bank.'); // @codeCoverageIgnore
+        throw new FireflyException('Could not store new piggy bank.');
 
     }
 
@@ -180,9 +225,13 @@ class PiggyBankController extends Controller
         $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($piggyBank, new PiggyBankTransformer($this->parameters), 'piggy_banks');
+        /** @var PiggyBankTransformer $transformer */
+        $transformer = app(PiggyBankTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/PreferenceController.php

@@ -24,7 +24,9 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\PreferenceRequest;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Preference;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Transformers\PreferenceTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -34,7 +36,6 @@ use League\Fractal\Manager;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
-use Preferences;
 
 /**
  *
@@ -42,6 +43,34 @@ use Preferences;
  */
 class PreferenceController extends Controller
 {
+    /**
+     * LinkTypeController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user       = auth()->user();
+                $repository = app(AccountRepositoryInterface::class);
+                $repository->setUser($user);
+
+                // an important fallback is that the frontPageAccount array gets refilled automatically
+                // when it turns up empty.
+                $frontPageAccounts = app('preferences')->getForUser($user, 'frontPageAccounts', [])->data;
+                if (0 === \count($frontPageAccounts)) {
+                    /** @var Collection $accounts */
+                    $accounts   = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+                    $accountIds = $accounts->pluck('id')->toArray();
+                    app('preferences')->setForUser($user, 'frontPageAccounts', $accountIds);
+                }
+
+                return $next($request);
+            }
+        );
+    }
+
     /**
      * List all of them.
      *
@@ -52,15 +81,16 @@ class PreferenceController extends Controller
     public function index(Request $request): JsonResponse
     {
         /** @var User $user */
-        $user        = auth()->user();
-        $available   = [
+        $user      = auth()->user();
+        $available = [
             'language', 'customFiscalYear', 'fiscalYearStart', 'currencyPreference',
             'transaction_journal_optional_fields', 'frontPageAccounts', 'viewRange',
             'listPageSize, twoFactorAuthEnabled',
         ];
+
         $preferences = new Collection;
         foreach ($available as $name) {
-            $pref = Preferences::getForUser($user, $name);
+            $pref = app('preferences')->getForUser($user, $name);
             if (null !== $pref) {
                 $preferences->push($pref);
             }
@@ -72,7 +102,12 @@ class PreferenceController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($preferences, new PreferenceTransformer($this->parameters), 'preferences');
+
+        /** @var PreferenceTransformer $transformer */
+        $transformer = app(PreferenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($preferences, $transformer, 'preferences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -80,12 +115,13 @@ class PreferenceController extends Controller
     }
 
     /**
-     * List single resource.
+     * Return a single preference by name.
      *
      * @param Request    $request
      * @param Preference $preference
      *
      * @return JsonResponse
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function show(Request $request, Preference $preference): JsonResponse
     {
@@ -95,10 +131,13 @@ class PreferenceController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($preference, new PreferenceTransformer($this->parameters), 'preferences');
+        /** @var PreferenceTransformer $transformer */
+        $transformer = app(PreferenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($preference, $transformer, 'preferences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
     }
 
     /**
@@ -130,7 +169,7 @@ class PreferenceController extends Controller
                 $newValue = 1 === (int)$data['data'];
                 break;
         }
-        $result = Preferences::set($preference->name, $newValue);
+        $result = app('preferences')->set($preference->name, $newValue);
 
         // create some objects:
         $manager = new Manager;
@@ -138,9 +177,13 @@ class PreferenceController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($result, new PreferenceTransformer($this->parameters), 'preferences');
+        /** @var PreferenceTransformer $transformer */
+        $transformer = app(PreferenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($result, $transformer, 'preferences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/RecurrenceController.php

@@ -24,9 +24,16 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\RecurrenceRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\Recurrence;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use FireflyIII\Support\Cronjobs\RecurringCronjob;
+use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\RecurrenceTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -36,12 +43,14 @@ use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
+use Log;
 
 /**
  * Class RecurrenceController
  */
 class RecurrenceController extends Controller
 {
+    use TransactionFilter;
     /** @var RecurringRepositoryInterface The recurring transaction repository */
     private $repository;
 
@@ -106,7 +115,12 @@ class RecurrenceController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($piggyBanks, new RecurrenceTransformer($this->parameters), 'recurrences');
+
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -124,14 +138,14 @@ class RecurrenceController extends Controller
     public function show(Request $request, Recurrence $recurrence): JsonResponse
     {
         $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($recurrence, new RecurrenceTransformer($this->parameters), 'recurrences');
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($recurrence, $transformer, 'recurrences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -151,11 +165,94 @@ class RecurrenceController extends Controller
         $manager    = new Manager();
         $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($recurrence, new RecurrenceTransformer($this->parameters), 'recurrences');
+
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($recurrence, $transformer, 'recurrences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * Show transactions for this recurrence.
+     *
+     * @param Request    $request
+     * @param Recurrence $recurrence
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, Recurrence $recurrence): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        // whatever is returned by the query, it must be part of these journals:
+        $journalIds = $this->repository->getJournalIds($recurrence);
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+        $collector->setJournalIds($journalIds);
+
+        if (\in_array(TransactionType::TRANSFER, $types, true)) {
+            $collector->removeFilter(InternalTransferFilter::class);
+        }
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedTransactions();
+        $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function trigger(): JsonResponse
+    {
+        /** @var RecurringCronjob $recurring */
+        $recurring = app(RecurringCronjob::class);
+        try {
+            $result = $recurring->fire();
+        } catch (FireflyException $e) {
+            Log::error($e->getMessage());
+            throw new FireflyException('Could not fire recurring cron job.');
+        }
+        if (false === $result) {
+            return response()->json([], 204);
+        }
+        if (true === $result) {
+            return response()->json();
+        }
+
+        return response()->json([], 418); // @codeCoverageIgnore
+    }
+
     /**
      * Update single recurrence.
      *
@@ -171,10 +268,13 @@ class RecurrenceController extends Controller
         $manager  = new Manager();
         $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        /** @var RecurrenceTransformer $transformer */
+        $transformer = app(RecurrenceTransformer::class);
+        $transformer->setParameters($this->parameters);
 
-        $resource = new Item($category, new RecurrenceTransformer($this->parameters), 'recurrences');
+        $resource = new Item($category, $transformer, 'recurrences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/RuleController.php

@@ -23,25 +23,36 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
+use Carbon\Carbon;
 use FireflyIII\Api\V1\Requests\RuleRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Rule;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
+use FireflyIII\TransactionRules\TransactionMatcher;
 use FireflyIII\Transformers\RuleTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
+use Log;
 
 /**
  * Class RuleController
  */
 class RuleController extends Controller
 {
+    /** @var AccountRepositoryInterface Account repository */
+    private $accountRepository;
     /** @var RuleRepositoryInterface The rule repository */
     private $ruleRepository;
 
@@ -59,6 +70,9 @@ class RuleController extends Controller
                 $this->ruleRepository = app(RuleRepositoryInterface::class);
                 $this->ruleRepository->setUser($user);
 
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+                $this->accountRepository->setUser($user);
+
                 return $next($request);
             }
         );
@@ -101,11 +115,16 @@ class RuleController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($rules, new RuleTransformer($this->parameters), 'rules');
+
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -123,14 +142,14 @@ class RuleController extends Controller
     public function show(Request $request, Rule $rule): JsonResponse
     {
         $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'rules');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -150,11 +169,127 @@ class RuleController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'rules');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * @param Request $request
+     * @param Rule    $rule
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function testRule(Request $request, Rule $rule): JsonResponse
+    {
+        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $page         = 0 === (int)$request->query('page') ? 1 : (int)$request->query('page');
+        $startDate    = null === $request->query('start_date') ? null : Carbon::createFromFormat('Y-m-d', $request->query('start_date'));
+        $endDate      = null === $request->query('end_date') ? null : Carbon::createFromFormat('Y-m-d', $request->query('end_date'));
+        $searchLimit  = 0 === (int)$request->query('search_limit') ? (int)config('firefly.test-triggers.limit') : (int)$request->query('search_limit');
+        $triggerLimit = 0 === (int)$request->query('triggered_limit') ? (int)config('firefly.test-triggers.range') : (int)$request->query('triggered_limit');
+        $accountList  = '' === (string)$request->query('accounts') ? [] : explode(',', $request->query('accounts'));
+        $accounts     = new Collection;
+
+        foreach ($accountList as $accountId) {
+            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
+            $account = $this->accountRepository->findNull((int)$accountId);
+            if (null !== $account && AccountType::ASSET === $account->accountType->type) {
+                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
+                $accounts->push($account);
+            }
+            if (null === $account) {
+                Log::debug(sprintf('No asset account with id "%s"', $accountId));
+            }
+        }
+
+        /** @var Rule $rule */
+        Log::debug(sprintf('Now testing rule #%d, "%s"', $rule->id, $rule->title));
+        /** @var TransactionMatcher $matcher */
+        $matcher = app(TransactionMatcher::class);
+        // set all parameters:
+        $matcher->setRule($rule);
+        $matcher->setStartDate($startDate);
+        $matcher->setEndDate($endDate);
+        $matcher->setSearchLimit($searchLimit);
+        $matcher->setTriggeredLimit($triggerLimit);
+        $matcher->setAccounts($accounts);
+
+        $matchingTransactions = $matcher->findTransactionsByRule();
+        $matchingTransactions = $matchingTransactions->unique('id');
+
+        // make paginator out of results.
+        $count        = $matchingTransactions->count();
+        $transactions = $matchingTransactions->slice(($page - 1) * $pageSize, $pageSize);
+        // make paginator:
+        $paginator = new LengthAwarePaginator($transactions, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.rules.test', [$rule->id]) . $this->buildParams());
+
+        // resulting list is presented as JSON thing.
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($matchingTransactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Execute the given rule group on a set of existing transactions.
+     *
+     * @param Request $request
+     * @param Rule    $rule
+     *
+     * @return JsonResponse
+     */
+    public function triggerRule(Request $request, Rule $rule): JsonResponse
+    {
+        // Get parameters specified by the user
+        /** @var User $user */
+        $user        = auth()->user();
+        $startDate   = new Carbon($request->get('start_date'));
+        $endDate     = new Carbon($request->get('end_date'));
+        $accountList = '' === (string)$request->query('accounts') ? [] : explode(',', $request->query('accounts'));
+        $accounts    = new Collection;
+
+        foreach ($accountList as $accountId) {
+            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
+            $account = $this->accountRepository->findNull((int)$accountId);
+            if (null !== $account && $this->accountRepository->isAsset($account)) {
+                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
+                $accounts->push($account);
+            }
+            if (null === $account) {
+                Log::debug(sprintf('No asset account with id "%s"', $accountId));
+            }
+        }
+
+        // Create a job to do the work asynchronously
+        $job = new ExecuteRuleOnExistingTransactions($rule);
+
+        // Apply parameters to the job
+        $job->setUser($user);
+        $job->setAccounts($accounts);
+        $job->setStartDate($startDate);
+        $job->setEndDate($endDate);
+
+        // Dispatch a new job to execute it in a queue
+        $this->dispatch($job);
+
+        return response()->json([], 204);
+    }
+
     /**
      * Update a rule.
      *
@@ -170,9 +305,13 @@ class RuleController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($rule, new RuleTransformer($this->parameters), 'rules');
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'rules');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/RuleGroupController.php

@@ -23,19 +23,30 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
+use Carbon\Carbon;
 use FireflyIII\Api\V1\Requests\RuleGroupRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\TransactionRules\TransactionMatcher;
 use FireflyIII\Transformers\RuleGroupTransformer;
+use FireflyIII\Transformers\RuleTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
 use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
+use Log;
 
 
 /**
@@ -43,6 +54,8 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class RuleGroupController extends Controller
 {
+    /** @var AccountRepositoryInterface Account repository */
+    private $accountRepository;
     /** @var RuleGroupRepositoryInterface The rule group repository */
     private $ruleGroupRepository;
 
@@ -60,6 +73,9 @@ class RuleGroupController extends Controller
                 $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
                 $this->ruleGroupRepository->setUser($user);
 
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+                $this->accountRepository->setUser($user);
+
                 return $next($request);
             }
         );
@@ -95,7 +111,7 @@ class RuleGroupController extends Controller
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
-        // get list of budgets. Count it and split it.
+        // get list of rule groups. Count it and split it.
         $collection = $this->ruleGroupRepository->get();
         $count      = $collection->count();
         $ruleGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
@@ -106,12 +122,55 @@ class RuleGroupController extends Controller
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($ruleGroups, new RuleGroupTransformer($this->parameters), 'rule_groups');
+
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($ruleGroups, $transformer, 'rule_groups');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * @param Request   $request
+     * @param RuleGroup $group
+     *
+     * @return JsonResponse
+     */
+    public function rules(Request $request, RuleGroup $group): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->ruleGroupRepository->getRules($group);
+        $count      = $collection->count();
+        $rules      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.rule_groups.rules', [$group->id]) . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var RuleTransformer $transformer */
+        $transformer = app(RuleTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($rules, $transformer, 'rules');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
     /**
      * List single resource.
      *
@@ -123,14 +182,14 @@ class RuleGroupController extends Controller
     public function show(Request $request, RuleGroup $ruleGroup): JsonResponse
     {
         $manager = new Manager();
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -150,14 +209,128 @@ class RuleGroupController extends Controller
         $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
 
+    /**
+     * @param Request   $request
+     * @param RuleGroup $group
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function testGroup(Request $request, RuleGroup $group): JsonResponse
+    {
+        Log::debug('Now in testGroup()');
+        /** @var Collection $rules */
+        $rules = $this->ruleGroupRepository->getActiveRules($group);
+        if (0 === $rules->count()) {
+            throw new FireflyException('No rules in this rule group.');
+        }
+        $parameters           = $this->getTestParameters($request);
+        $accounts             = $this->getAccountParameter($parameters['account_list']);
+        $matchingTransactions = new Collection;
+
+        Log::debug(sprintf('Going to test %d rules', $rules->count()));
+        /** @var Rule $rule */
+        foreach ($rules as $rule) {
+            Log::debug(sprintf('Now testing rule #%d, "%s"', $rule->id, $rule->title));
+            /** @var TransactionMatcher $matcher */
+            $matcher = app(TransactionMatcher::class);
+            // set all parameters:
+            $matcher->setRule($rule);
+            $matcher->setStartDate($parameters['start_date']);
+            $matcher->setEndDate($parameters['end_date']);
+            $matcher->setSearchLimit($parameters['search_limit']);
+            $matcher->setTriggeredLimit($parameters['trigger_limit']);
+            $matcher->setAccounts($accounts);
+
+            $result               = $matcher->findTransactionsByRule();
+            $matchingTransactions = $result->merge($matchingTransactions);
+        }
+        $matchingTransactions = $matchingTransactions->unique('id');
+
+        // make paginator out of results.
+        $count        = $matchingTransactions->count();
+        $transactions = $matchingTransactions->slice(($parameters['page'] - 1) * $parameters['page_size'], $parameters['page_size']);
+        // make paginator:
+        $paginator = new LengthAwarePaginator($transactions, $count, $parameters['page_size'], $parameters['page']);
+        $paginator->setPath(route('api.v1.rule_groups.test', [$group->id]) . $this->buildParams());
+
+        // resulting list is presented as JSON thing.
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($matchingTransactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Execute the given rule group on a set of existing transactions.
+     *
+     * @param Request   $request
+     * @param RuleGroup $group
+     *
+     * @return JsonResponse
+     */
+    public function triggerGroup(Request $request, RuleGroup $group): JsonResponse
+    {
+        // Get parameters specified by the user
+        /** @var User $user */
+        $user        = auth()->user();
+        $startDate   = new Carbon($request->get('start_date'));
+        $endDate     = new Carbon($request->get('end_date'));
+        $accountList = '' === (string)$request->query('accounts') ? [] : explode(',', $request->query('accounts'));
+        $accounts    = new Collection;
+
+        foreach ($accountList as $accountId) {
+            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
+            $account = $this->accountRepository->findNull((int)$accountId);
+            if (null !== $account && AccountType::ASSET === $account->accountType->type) {
+                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
+                $accounts->push($account);
+            }
+            if (null === $account) {
+                Log::debug(sprintf('No asset account with id "%s"', $accountId));
+            }
+        }
+
+        /** @var Collection $rules */
+        $rules = $this->ruleGroupRepository->getActiveRules($group);
+        foreach ($rules as $rule) {
+            // Create a job to do the work asynchronously
+            $job = new ExecuteRuleOnExistingTransactions($rule);
+
+            // Apply parameters to the job
+            $job->setUser($user);
+            $job->setAccounts($accounts);
+            $job->setStartDate($startDate);
+            $job->setEndDate($endDate);
+
+            // Dispatch a new job to execute it in a queue
+            $this->dispatch($job);
+        }
+
+        return response()->json([], 204);
+    }
+
     /**
      * Update a rule group.
+     * TODO update order of rule group
      *
      * @param RuleGroupRequest $request
      * @param RuleGroup        $ruleGroup
@@ -171,9 +344,58 @@ class RuleGroupController extends Controller
         $baseUrl   = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $resource = new Item($ruleGroup, new RuleGroupTransformer($this->parameters), 'rule_groups');
+        /** @var RuleGroupTransformer $transformer */
+        $transformer = app(RuleGroupTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($ruleGroup, $transformer, 'rule_groups');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+
+    /**
+     * @param array $accounts
+     *
+     * @return Collection
+     */
+    private function getAccountParameter(array $accounts): Collection
+    {
+        $return = new Collection;
+        foreach ($accounts as $accountId) {
+            Log::debug(sprintf('Searching for asset account with id "%s"', $accountId));
+            $account = $this->accountRepository->findNull((int)$accountId);
+            if (null !== $account && AccountType::ASSET === $account->accountType->type) {
+                Log::debug(sprintf('Found account #%d ("%s") and its an asset account', $account->id, $account->name));
+                $return->push($account);
+            }
+            if (null === $account) {
+                Log::debug(sprintf('No asset account with id "%s"', $accountId));
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return array
+     */
+    private function getTestParameters(Request $request): array
+    {
+        return [
+            'page_size'     => (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data,
+            'page'          => 0 === (int)$request->query('page') ? 1 : (int)$request->query('page'),
+            'start_date'    => null === $request->query('start_date') ? null : Carbon::createFromFormat('Y-m-d', $request->query('start_date')),
+            'end_date'      => null === $request->query('end_date') ? null : Carbon::createFromFormat('Y-m-d', $request->query('end_date')),
+            'search_limit'  => 0 === (int)$request->query('search_limit') ? (int)config('firefly.test-triggers.limit') : (int)$request->query('search_limit'),
+            'trigger_limit' => 0 === (int)$request->query('triggered_limit')
+                ? (int)config('firefly.test-triggers.range')
+                : (int)$request->query(
+                    'triggered_limit'
+                ),
+            'account_list'  => '' === (string)$request->query('accounts') ? [] : explode(',', $request->query('accounts')),
+        ];
+    }
+}

app/Api/V1/Controllers/SummaryController.php

@@ -0,0 +1,417 @@
+<?php
+
+/**
+ * SummaryController.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+
+use Carbon\Carbon;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Report\NetWorthInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+
+/**
+ * Class SummaryController
+ */
+class SummaryController extends Controller
+{
+    /** @var AccountRepositoryInterface */
+    private $accountRepository;
+    /** @var BillRepositoryInterface */
+    private $billRepository;
+    /** @var BudgetRepositoryInterface */
+    private $budgetRepository;
+    /** @var CurrencyRepositoryInterface */
+    private $currencyRepos;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user                    = auth()->user();
+                $this->currencyRepos     = app(CurrencyRepositoryInterface::class);
+                $this->billRepository    = app(BillRepositoryInterface::class);
+                $this->budgetRepository  = app(BudgetRepositoryInterface::class);
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+
+                $this->billRepository->setUser($user);
+                $this->currencyRepos->setUser($user);
+                $this->budgetRepository->setUser($user);
+                $this->accountRepository->setUser($user);
+
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function basic(Request $request): JsonResponse
+    {
+        // parameters for boxes:
+        $start = (string)$request->get('start');
+        $end   = (string)$request->get('end');
+        if ('' === $start || '' === $end) {
+            throw new FireflyException('Start and end are mandatory parameters.');
+        }
+        $start = Carbon::createFromFormat('Y-m-d', $start);
+        $end   = Carbon::createFromFormat('Y-m-d', $end);
+        // balance information:
+        $balanceData  = $this->getBalanceInformation($start, $end);
+        $billData     = $this->getBillInformation($start, $end);
+        $spentData    = $this->getLeftToSpendInfo($start, $end);
+        $networthData = $this->getNetWorthInfo($start, $end);
+        $total        = array_merge($balanceData, $billData, $spentData, $networthData);
+
+        // TODO: liabilities with icon line-chart
+
+        return response()->json($total);
+
+    }
+
+    /**
+     * Check if date is outside session range.
+     *
+     * @param Carbon $date
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return bool
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    protected function notInDateRange(Carbon $date, Carbon $start, Carbon $end): bool // Validate a preference
+    {
+        $result = false;
+        if ($start->greaterThanOrEqualTo($date) && $end->greaterThanOrEqualTo($date)) {
+            $result = true;
+        }
+        // start and end in the past? use $end
+        if ($start->lessThanOrEqualTo($date) && $end->lessThanOrEqualTo($date)) {
+            $result = true;
+        }
+
+        return $result;
+    }
+
+    /**
+     * This method will scroll through the results of the spentInPeriodMc() array and return the correct info.
+     *
+     * @param array               $spentInfo
+     * @param TransactionCurrency $currency
+     *
+     * @return float
+     */
+    private function findInSpentArray(array $spentInfo, TransactionCurrency $currency): float
+    {
+        foreach ($spentInfo as $array) {
+            if ($array['currency_id'] === $currency->id) {
+                return $array['amount'];
+            }
+        }
+
+        return 0.0;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getBalanceInformation(Carbon $start, Carbon $end): array
+    {
+        // prep some arrays:
+        $incomes  = [];
+        $expenses = [];
+        $sums     = [];
+        $return   = [];
+
+        // collect income of user:
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)
+                  ->setTypes([TransactionType::DEPOSIT])
+                  ->withOpposingAccount();
+        $set = $collector->getTransactions();
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $currencyId           = (int)$transaction->transaction_currency_id;
+            $incomes[$currencyId] = $incomes[$currencyId] ?? '0';
+            $incomes[$currencyId] = bcadd($incomes[$currencyId], $transaction->transaction_amount);
+            $sums[$currencyId]    = $sums[$currencyId] ?? '0';
+            $sums[$currencyId]    = bcadd($sums[$currencyId], $transaction->transaction_amount);
+        }
+
+        // collect expenses:
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)
+                  ->setTypes([TransactionType::WITHDRAWAL])
+                  ->withOpposingAccount();
+        $set = $collector->getTransactions();
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $currencyId            = (int)$transaction->transaction_currency_id;
+            $expenses[$currencyId] = $expenses[$currencyId] ?? '0';
+            $expenses[$currencyId] = bcadd($expenses[$currencyId], $transaction->transaction_amount);
+            $sums[$currencyId]     = $sums[$currencyId] ?? '0';
+            $sums[$currencyId]     = bcadd($sums[$currencyId], $transaction->transaction_amount);
+        }
+
+        // format amounts:
+        $keys = array_keys($sums);
+        foreach ($keys as $currencyId) {
+            $currency = $this->currencyRepos->findNull($currencyId);
+            if (null === $currency) {
+                continue;
+            }
+            // create objects for big array.
+            $return[] = [
+                'key'                     => sprintf('balance-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_balance_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($sums[$currencyId] ?? 0, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $sums[$currencyId] ?? '0', false),
+                'local_icon'              => 'balance-scale',
+                'sub_title'               => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false) .
+                                             ' + ' . app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
+            ];
+            $return[] = [
+                'key'                     => sprintf('spent-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($expenses[$currencyId] ?? 0, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false),
+                'local_icon'              => 'balance-scale',
+                'sub_title'               => '',
+            ];
+            $return[] = [
+                'key'                     => sprintf('earned-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($incomes[$currencyId] ?? 0, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
+                'local_icon'              => 'balance-scale',
+                'sub_title'               => '',
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getBillInformation(Carbon $start, Carbon $end): array
+    {
+        /*
+         * Since both this method and the chart use the exact same data, we can suffice
+         * with calling the one method in the bill repository that will get this amount.
+         */
+        $paidAmount   = $this->billRepository->getBillsPaidInRangePerCurrency($start, $end);
+        $unpaidAmount = $this->billRepository->getBillsUnpaidInRangePerCurrency($start, $end);
+        $return       = [];
+        foreach ($paidAmount as $currencyId => $amount) {
+            $amount   = bcmul($amount, '-1');
+            $currency = $this->currencyRepos->findNull((int)$currencyId);
+            if (null === $currency) {
+                continue;
+            }
+            $return[] = [
+                'key'                     => sprintf('bills-paid-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($amount, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $amount, false),
+                'local_icon'              => 'check',
+                'sub_title'               => '',
+            ];
+        }
+
+        foreach ($unpaidAmount as $currencyId => $amount) {
+            $amount   = bcmul($amount, '-1');
+            $currency = $this->currencyRepos->findNull((int)$currencyId);
+            if (null === $currency) {
+                continue;
+            }
+            $return[] = [
+                'key'                     => sprintf('bills-unpaid-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($amount, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $amount, false),
+                'local_icon'              => 'calendar-o',
+                'sub_title'               => '',
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
+    {
+        $return    = [];
+        $today     = new Carbon;
+        $available = $this->budgetRepository->getAvailableBudgetWithCurrency($start, $end);
+        $budgets   = $this->budgetRepository->getActiveBudgets();
+        $spentInfo = $this->budgetRepository->spentInPeriodMc($budgets, new Collection, $start, $end);
+        foreach ($available as $currencyId => $amount) {
+            $currency = $this->currencyRepos->findNull($currencyId);
+            if (null === $currency) {
+                continue;
+            }
+            $spentInCurrency = (string)$this->findInSpentArray($spentInfo, $currency);
+            $leftToSpend     = bcadd($amount, $spentInCurrency);
+
+            $days   = $today->diffInDays($end) + 1;
+            $perDay = '0';
+            if (0 !== $days && bccomp($leftToSpend, '0') > -1) {
+                $perDay = bcdiv($leftToSpend, (string)$days);
+            }
+
+            $return[] = [
+                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => round($leftToSpend, $currency->decimal_places),
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $leftToSpend, false),
+                'local_icon'              => 'money',
+                'sub_title'               => (string)trans('firefly.box_spend_per_day', ['amount' => app('amount')->formatAnything($currency, $perDay, false)]),
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return array
+     */
+    private function getNetWorthInfo(Carbon $start, Carbon $end): array
+    {
+        /** @var User $user */
+        $user = auth()->user();
+        $date = Carbon::create()->startOfDay();
+
+
+        // start and end in the future? use $end
+        if ($this->notInDateRange($date, $start, $end)) {
+            /** @var Carbon $date */
+            $date = session('end', Carbon::now()->endOfMonth());
+        }
+
+        /** @var NetWorthInterface $netWorthHelper */
+        $netWorthHelper = app(NetWorthInterface::class);
+        $netWorthHelper->setUser($user);
+        $allAccounts = $this->accountRepository->getActiveAccountsByType([AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE]);
+
+        // filter list on preference of being included.
+        $filtered = $allAccounts->filter(
+            function (Account $account) {
+                $includeNetWorth = $this->accountRepository->getMetaValue($account, 'include_net_worth');
+
+                return null === $includeNetWorth ? true : '1' === $includeNetWorth;
+            }
+        );
+
+        $netWorthSet = $netWorthHelper->getNetWorthByCurrency($filtered, $date);
+        $return      = [];
+        foreach ($netWorthSet as $index => $data) {
+            /** @var TransactionCurrency $currency */
+            $currency = $data['currency'];
+            $amount   = round($data['balance'], $currency->decimal_places);
+            if (0.0 === $amount) {
+                continue;
+            }
+            // return stuff
+            $return[] = [
+                'key'                     => sprintf('net-worth-in-%s', $currency->code),
+                'title'                   => trans('firefly.box_net_worth_in_currency', ['currency' => $currency->symbol]),
+                'monetary_value'          => $amount,
+                'currency_id'             => $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'value_parsed'            => app('amount')->formatAnything($currency, $data['balance'], false),
+                'local_icon'              => 'line-chart',
+                'sub_title'               => '',
+            ];
+        }
+
+        return $return;
+    }
+
+}

app/Api/V1/Controllers/TagController.php

@@ -0,0 +1,298 @@
+<?php
+/**
+ * TagController.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Requests\TagRequest;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\TagTransformer;
+use FireflyIII\Transformers\TransactionTransformer;
+use FireflyIII\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Pagination\LengthAwarePaginator;
+use League\Fractal\Manager;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
+use League\Fractal\Serializer\JsonApiSerializer;
+
+/**
+ * Class TagController
+ */
+class TagController extends Controller
+{
+    use TransactionFilter;
+
+    /** @var TagRepositoryInterface The tag repository */
+    private $repository;
+
+    /**
+     * RuleController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                /** @var User $user */
+                $user = auth()->user();
+
+                $this->repository = app(TagRepositoryInterface::class);
+                $this->repository->setUser($user);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return JsonResponse
+     * @throws FireflyException
+     */
+    public function cloud(Request $request): JsonResponse
+    {
+        // parameters for cloud:
+        $start = (string)$request->get('start');
+        $end   = (string)$request->get('end');
+        if ('' === $start || '' === $end) {
+            throw new FireflyException('Start and end are mandatory parameters.');
+        }
+        $start = Carbon::createFromFormat('Y-m-d', $start);
+        $end   = Carbon::createFromFormat('Y-m-d', $end);
+
+        // get all tags:
+        $tags   = $this->repository->get();
+        $min    = null;
+        $max    = 0;
+        $return = [
+            'tags' => [],
+        ];
+        /** @var Tag $tag */
+        foreach ($tags as $tag) {
+            $earned = (float)$this->repository->earnedInPeriod($tag, $start, $end);
+            $spent  = (float)$this->repository->spentInPeriod($tag, $start, $end);
+            $size   = ($spent * -1) + $earned;
+            $min    = $min ?? $size;
+            if ($size > 0) {
+                $max              = $size > $max ? $size : $max;
+                $return['tags'][] = [
+                    'tag'  => $tag->tag,
+                    'id'   => $tag->id,
+                    'size' => $size,
+                ];
+            }
+        }
+        foreach ($return['tags'] as $index => $info) {
+            $return['tags'][$index]['relative'] = $return['tags'][$index]['size'] / $max;
+        }
+        $return['min'] = $min;
+        $return['max'] = $max;
+
+
+        return response()->json($return);
+    }
+
+    /**
+     * Delete the resource.
+     *
+     * @param Tag $tag
+     *
+     * @return JsonResponse
+     */
+    public function delete(Tag $tag): JsonResponse
+    {
+        $this->repository->destroy($tag);
+
+        return response()->json([], 204);
+    }
+
+    /**
+     * List all of them.
+     *
+     * @param Request $request
+     *
+     * @return JsonResponse]
+     */
+    public function index(Request $request): JsonResponse
+    {
+        // create some objects:
+        $manager = new Manager;
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+
+        // types to get, page size:
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+
+        // get list of budgets. Count it and split it.
+        $collection = $this->repository->get();
+        $count      = $collection->count();
+        $rules      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.tags.index') . $this->buildParams());
+
+        // present to user.
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var TagTransformer $transformer */
+        $transformer = app(TagTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($rules, $transformer, 'tags');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * List single resource.
+     *
+     * @param Request $request
+     * @param Tag     $tag
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Tag $tag): JsonResponse
+    {
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var TagTransformer $transformer */
+        $transformer = app(TagTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($tag, $transformer, 'tags');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
+    /**
+     * Store new object.
+     *
+     * @param TagRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function store(TagRequest $request): JsonResponse
+    {
+        $rule    = $this->repository->store($request->getAll());
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var TagTransformer $transformer */
+        $transformer = app(TagTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'tags');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Show all transactions.
+     *
+     * @param Request $request
+     * @param Tag     $tag
+     *
+     * @return JsonResponse
+     */
+    public function transactions(Request $request, Tag $tag): JsonResponse
+    {
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $type     = $request->get('type') ?? 'default';
+        $this->parameters->set('type', $type);
+
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        /** @var User $admin */
+        $admin = auth()->user();
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($admin);
+        $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
+        $collector->setAllAssetAccounts();
+        $collector->setTag($tag);
+
+        if (\in_array(TransactionType::TRANSFER, $types, true)) {
+            $collector->removeFilter(InternalTransferFilter::class);
+        }
+
+        if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
+            $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
+        }
+        $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
+        $collector->setTypes($types);
+        $paginator = $collector->getPaginatedTransactions();
+        $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
+        $transactions = $paginator->getCollection();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+    }
+
+    /**
+     * Update a rule.
+     *
+     * @param TagRequest $request
+     * @param Tag        $tag
+     *
+     * @return JsonResponse
+     */
+    public function update(TagRequest $request, Tag $tag): JsonResponse
+    {
+        $rule    = $this->repository->update($tag, $request->getAll());
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+        /** @var TagTransformer $transformer */
+        $transformer = app(TagTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($rule, $transformer, 'tags');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+}

app/Api/V1/Controllers/TransactionController.php

@@ -25,14 +25,19 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;
 
 use FireflyIII\Api\V1\Requests\TransactionRequest;
+use FireflyIII\Events\StoredTransactionJournal;
+use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Helpers\Filter\NegativeAmountFilter;
 use FireflyIII\Helpers\Filter\PositiveAmountFilter;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\AttachmentTransformer;
+use FireflyIII\Transformers\PiggyBankEventTransformer;
 use FireflyIII\Transformers\TransactionTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -49,6 +54,7 @@ use League\Fractal\Serializer\JsonApiSerializer;
  */
 class TransactionController extends Controller
 {
+    use TransactionFilter;
 
     /** @var JournalRepositoryInterface The journal repository */
     private $repository;
@@ -73,6 +79,30 @@ class TransactionController extends Controller
         );
     }
 
+    /**
+     * @param Request     $request
+     * @param Transaction $transaction
+     *
+     * @return JsonResponse
+     */
+    public function attachments(Request $request, Transaction $transaction): JsonResponse
+    {
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $attachments = $this->repository->getAttachmentsByTr($transaction);
+
+        /** @var AttachmentTransformer $transformer */
+        $transformer = app(AttachmentTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($attachments, $transformer, 'attachments');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
+
     /**
      * Remove the specified resource from storage.
      *
@@ -101,15 +131,15 @@ class TransactionController extends Controller
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
-        $types   = $this->mapTypes($this->parameters->get('type'));
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
         $manager = new Manager();
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         /** @var User $admin */
         $admin = auth()->user();
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setUser($admin);
         $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
         $collector->setAllAssetAccounts();
@@ -123,39 +153,60 @@ class TransactionController extends Controller
         }
         $collector->setLimit($pageSize)->setPage($this->parameters->get('page'));
         $collector->setTypes($types);
-        $paginator = $collector->getPaginatedJournals();
+        $paginator = $collector->getPaginatedTransactions();
         $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
         $transactions = $paginator->getCollection();
 
-        $resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
 
+    /**
+     * @param Request     $request
+     * @param Transaction $transaction
+     *
+     * @return JsonResponse
+     */
+    public function piggyBankEvents(Request $request, Transaction $transaction): JsonResponse
+    {
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $events = $this->repository->getPiggyBankEventsbyTr($transaction);
+
+        /** @var PiggyBankEventTransformer $transformer */
+        $transformer = app(PiggyBankEventTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($events, $transformer, 'piggy_bank_events');
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
+
+    }
 
     /**
      * Show a single transaction.
      *
      * @param Request     $request
      * @param Transaction $transaction
-     * @param string      $include
      *
      * @return JsonResponse
      */
-    public function show(Request $request, Transaction $transaction, string $include = null): JsonResponse
+    public function show(Request $request, Transaction $transaction): JsonResponse
     {
         $manager = new Manager();
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        // add include parameter:
-        $include = $include ?? '';
-        $include = $request->get('include') ?? $include;
-        $manager->parseIncludes($include);
-
         // collect transactions using the journal collector
-        $collector = app(JournalCollectorInterface::class);
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setUser(auth()->user());
         $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
         // filter on specific journals.
@@ -167,11 +218,14 @@ class TransactionController extends Controller
             $collector->addFilter(PositiveAmountFilter::class);
         }
         if (!($transactionType === TransactionType::WITHDRAWAL)) {
-            $collector->addFilter(NegativeAmountFilter::class);
+            $collector->addFilter(NegativeAmountFilter::class); // @codeCoverageIgnore
         }
 
-        $transactions = $collector->getJournals();
-        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+        $transactions = $collector->getTransactions();
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -192,16 +246,14 @@ class TransactionController extends Controller
         $data['user'] = auth()->user()->id;
         $journal      = $repository->store($data);
 
+        event(new StoredTransactionJournal($journal));
+
         $manager = new Manager();
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         // collect transactions using the journal collector
-        $collector = app(JournalCollectorInterface::class);
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setUser(auth()->user());
         $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
         // filter on specific journals.
@@ -216,8 +268,13 @@ class TransactionController extends Controller
             $collector->addFilter(NegativeAmountFilter::class);
         }
 
-        $transactions = $collector->getJournals();
-        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+        $transactions = $collector->getTransactions();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -241,13 +298,11 @@ class TransactionController extends Controller
         $baseUrl      = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
+        event(new UpdatedTransactionJournal($journal));
 
         // needs a lot of extra data to match the journal collector. Or just expand that one.
         // collect transactions using the journal collector
-        $collector = app(JournalCollectorInterface::class);
+        $collector = app(TransactionCollectorInterface::class);
         $collector->setUser(auth()->user());
         $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
         // filter on specific journals.
@@ -262,46 +317,15 @@ class TransactionController extends Controller
             $collector->addFilter(NegativeAmountFilter::class);
         }
 
-        $transactions = $collector->getJournals();
-        $resource     = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions');
+        $transactions = $collector->getTransactions();
+
+        /** @var TransactionTransformer $transformer */
+        $transformer = app(TransactionTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-
-    /**
-     * All the types you can request.
-     *
-     * @param string $type
-     *
-     * @return array
-     */
-    private function mapTypes(string $type): array
-    {
-        $types  = [
-            'all'             => [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE,
-                                  TransactionType::RECONCILIATION,],
-            'withdrawal'      => [TransactionType::WITHDRAWAL,],
-            'withdrawals'     => [TransactionType::WITHDRAWAL,],
-            'expense'         => [TransactionType::WITHDRAWAL,],
-            'income'          => [TransactionType::DEPOSIT,],
-            'deposit'         => [TransactionType::DEPOSIT,],
-            'deposits'        => [TransactionType::DEPOSIT,],
-            'transfer'        => [TransactionType::TRANSFER,],
-            'transfers'       => [TransactionType::TRANSFER,],
-            'opening_balance' => [TransactionType::OPENING_BALANCE,],
-            'reconciliation'  => [TransactionType::RECONCILIATION,],
-            'reconciliations' => [TransactionType::RECONCILIATION,],
-            'special'         => [TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION,],
-            'specials'        => [TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION,],
-            'default'         => [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER,],
-        ];
-        $return = $types['default'];
-        if (isset($types[$type])) {
-            $return = $types[$type];
-        }
-
-        return $return;
-
-    }
 }

app/Api/V1/Controllers/TransactionLinkController.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * JournalLinkController.php
+ * TransactionLinkController.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com
  *
  * This file is part of Firefly III.
@@ -23,12 +23,13 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers;
 
-use FireflyIII\Api\V1\Requests\JournalLinkRequest;
+use FireflyIII\Api\V1\Requests\TransactionLinkRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionJournalLink;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
-use FireflyIII\Transformers\JournalLinkTransformer;
+use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Transformers\TransactionLinkTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -40,12 +41,12 @@ use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
 
 /**
- * Class JournalLinkController.
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Class TransactionLinkController
  */
-class JournalLinkController extends Controller
+class TransactionLinkController extends Controller
 {
+    use TransactionFilter;
+
     /** @var JournalRepositoryInterface The journal repository */
     private $journalRepository;
     /** @var LinkTypeRepositoryInterface The link type repository */
@@ -105,21 +106,25 @@ class JournalLinkController extends Controller
 
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-
         $linkType = $this->repository->findByName($name);
 
-        // get list of accounts. Count it and split it.
+        // get list of transaction links. Count it and split it.
         $collection   = $this->repository->getJournalLinks($linkType);
         $count        = $collection->count();
         $journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
         // make paginator:
         $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.journal_links.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.transaction_links.index') . $this->buildParams());
 
         // present to user.
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new FractalCollection($journalLinks, new JournalLinkTransformer($this->parameters), 'journal_links');
+
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -137,14 +142,14 @@ class JournalLinkController extends Controller
     public function show(Request $request, TransactionJournalLink $journalLink): JsonResponse
     {
         $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
-        $resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($journalLink, $transformer, 'transaction_links');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -153,19 +158,14 @@ class JournalLinkController extends Controller
     /**
      * Store new object.
      *
-     * @param JournalLinkRequest $request
+     * @param TransactionLinkRequest $request
      *
      * @return JsonResponse
      * @throws FireflyException
      */
-    public function store(JournalLinkRequest $request): JsonResponse
+    public function store(TransactionLinkRequest $request): JsonResponse
     {
         $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         $data    = $request->getAll();
         $inward  = $this->journalRepository->findNull($data['inward_id'] ?? 0);
         $outward = $this->journalRepository->findNull($data['outward_id'] ?? 0);
@@ -176,7 +176,11 @@ class JournalLinkController extends Controller
 
         $journalLink = $this->repository->storeLink($data, $inward, $outward);
 
-        $resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($journalLink, $transformer, 'transaction_links');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
@@ -185,21 +189,15 @@ class JournalLinkController extends Controller
     /**
      * Update object.
      *
-     * @param JournalLinkRequest     $request
+     * @param TransactionLinkRequest $request
      * @param TransactionJournalLink $journalLink
      *
      * @return JsonResponse
      * @throws FireflyException
      */
-    public function update(JournalLinkRequest $request, TransactionJournalLink $journalLink): JsonResponse
+    public function update(TransactionLinkRequest $request, TransactionJournalLink $journalLink): JsonResponse
     {
-        $manager = new Manager;
-
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
-
+        $manager         = new Manager;
         $data            = $request->getAll();
         $data['inward']  = $this->journalRepository->findNull($data['inward_id'] ?? 0);
         $data['outward'] = $this->journalRepository->findNull($data['outward_id'] ?? 0);
@@ -209,9 +207,13 @@ class JournalLinkController extends Controller
         $data['direction'] = 'inward';
         $journalLink       = $this->repository->updateLink($journalLink, $data);
 
-        $resource = new Item($journalLink, new JournalLinkTransformer($this->parameters), 'journal_links');
+        /** @var TransactionLinkTransformer $transformer */
+        $transformer = app(TransactionLinkTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($journalLink, $transformer, 'transaction_links');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 
     }
-}
+}

app/Api/V1/Controllers/UserController.php

@@ -78,7 +78,7 @@ class UserController extends Controller
     {
         /** @var User $admin */
         $admin = auth()->user();
-        if ($this->repository->hasRole($admin, 'owner')) {
+        if ($admin->id !== $user->id && $this->repository->hasRole($admin, 'owner')) {
             $this->repository->destroy($user);
 
             return response()->json([], 204);
@@ -113,7 +113,11 @@ class UserController extends Controller
         $paginator->setPath(route('api.v1.users.index') . $this->buildParams());
 
         // make resource
-        $resource = new FractalCollection($users, new UserTransformer($this->parameters), 'users');
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($users, $transformer, 'users');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -134,12 +138,12 @@ class UserController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         // make resource
-        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($user, $transformer, 'users');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -161,12 +165,13 @@ class UserController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         // make resource
-        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($user, $transformer, 'users');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -189,12 +194,12 @@ class UserController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        // add include parameter:
-        $include = $request->get('include') ?? '';
-        $manager->parseIncludes($include);
-
         // make resource
-        $resource = new Item($user, new UserTransformer($this->parameters), 'users');
+        /** @var UserTransformer $transformer */
+        $transformer = app(UserTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new Item($user, $transformer, 'users');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

app/Api/V1/Requests/AccountRequest.php

@@ -23,6 +23,9 @@
 declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Rules\IsBoolean;
+
 /**
  * Class AccountRequest
  */
@@ -47,9 +50,19 @@ class AccountRequest extends Request
      */
     public function getAll(): array
     {
+        $active          = true;
+        $includeNetWorth = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+        if (null !== $this->get('include_net_worth')) {
+            $includeNetWorth = $this->boolean('include_net_worth');
+        }
+
         $data = [
             'name'                 => $this->string('name'),
-            'active'               => $this->boolean('active'),
+            'active'               => $active,
+            'include_net_worth'    => $includeNetWorth,
             'accountType'          => $this->string('type'),
             'account_type_id'      => null,
             'currency_id'          => $this->integer('currency_id'),
@@ -61,11 +74,20 @@ class AccountRequest extends Request
             'accountRole'          => $this->string('account_role'),
             'openingBalance'       => $this->string('opening_balance'),
             'openingBalanceDate'   => $this->date('opening_balance_date'),
-            'ccType'               => $this->string('cc_type'),
-            'ccMonthlyPaymentDate' => $this->string('cc_monthly_payment_date'),
+            'ccType'               => $this->string('credit_card_type'),
+            'ccMonthlyPaymentDate' => $this->string('monthly_payment_date'),
             'notes'                => $this->string('notes'),
+            'interest'             => $this->string('interest'),
+            'interest_period'      => $this->string('interest_period'),
         ];
 
+        if ('liability' === $data['accountType']) {
+            $data['openingBalance']     = bcmul($this->string('liability_amount'), '-1');
+            $data['openingBalanceDate'] = $this->date('liability_start_date');
+            $data['accountType']        = $this->string('liability_type');
+            $data['account_type_id']    = null;
+        }
+
         return $data;
     }
 
@@ -80,21 +102,27 @@ class AccountRequest extends Request
         $types          = implode(',', array_keys(config('firefly.subTitlesByIdentifier')));
         $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
         $rules          = [
-            'name'                    => 'required|min:1|uniqueAccountForUser',
-            'opening_balance'         => 'numeric|required_with:opening_balance_date|nullable',
-            'opening_balance_date'    => 'date|required_with:opening_balance|nullable',
-            'iban'                    => 'iban|nullable',
-            'bic'                     => 'bic|nullable',
-            'virtual_balance'         => 'numeric|nullable',
-            'currency_id'             => 'numeric|exists:transaction_currencies,id|required_without:currency_code',
-            'currency_code'           => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id',
-            'account_number'          => 'between:1,255|nullable|uniqueAccountNumberForUser',
-            'account_role'            => 'in:' . $accountRoles . '|required_if:type,asset',
-            'active'                  => 'required|boolean',
-            'cc_type'                 => 'in:' . $ccPaymentTypes . '|required_if:account_role,ccAsset',
-            'cc_monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:cc_type,monthlyFull',
-            'type'                    => 'required|in:' . $types,
-            'notes'                   => 'min:0|max:65536',
+            'name'                 => 'required|min:1|uniqueAccountForUser',
+            'type'                 => 'required|in:' . $types,
+            'iban'                 => 'iban|nullable',
+            'bic'                  => 'bic|nullable',
+            'account_number'       => 'between:1,255|nullable|uniqueAccountNumberForUser',
+            'opening_balance'      => 'numeric|required_with:opening_balance_date|nullable',
+            'opening_balance_date' => 'date|required_with:opening_balance|nullable',
+            'virtual_balance'      => 'numeric|nullable',
+            'currency_id'          => 'numeric|exists:transaction_currencies,id',
+            'currency_code'        => 'min:3|max:3|exists:transaction_currencies,code',
+            'active'               => [new IsBoolean],
+            'include_net_worth'    => [new IsBoolean],
+            'account_role'         => 'in:' . $accountRoles . '|required_if:type,asset',
+            'credit_card_type'     => 'in:' . $ccPaymentTypes . '|required_if:account_role,ccAsset',
+            'monthly_payment_date' => 'date' . '|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull',
+            'liability_type'       => 'required_if:type,liability|in:loan,debt,mortgage',
+            'liability_amount'     => 'required_if:type,liability|min:0|numeric',
+            'liability_start_date' => 'required_if:type,liability|date',
+            'interest'             => 'required_if:type,liability|between:0,100|numeric',
+            'interest_period'      => 'required_if:type,liability|in:daily,monthly,yearly',
+            'notes'                => 'min:0|max:65536',
         ];
         switch ($this->method()) {
             default:

app/Api/V1/Requests/AttachmentRequest.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\ImportJob;
+use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Rules\IsValidAttachmentModel;
 
@@ -69,9 +70,10 @@ class AttachmentRequest extends Request
     {
         $models = implode(
             ',', [
-                   Bill::class,
-                   ImportJob::class,
-                   TransactionJournal::class,
+                   str_replace('FireflyIII\\Models\\', '', Bill::class),
+                   str_replace('FireflyIII\\Models\\', '', ImportJob::class),
+                   str_replace('FireflyIII\\Models\\', '', TransactionJournal::class),
+                   str_replace('FireflyIII\\Models\\', '', Transaction::class),
                ]
         );
         $model  = $this->string('model');
@@ -94,4 +96,4 @@ class AttachmentRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/AvailableBudgetRequest.php

@@ -47,15 +47,15 @@ class AvailableBudgetRequest extends Request
     public function getAll(): array
     {
         return [
-            'transaction_currency_id' => $this->integer('transaction_currency_id'),
-            'amount'                  => $this->string('amount'),
-            'start_date'              => $this->date('start_date'),
-            'end_date'                => $this->date('end_date'),
+            'currency_id'   => $this->integer('currency_id'),
+            'currency_code' => $this->string('currency_code'),
+            'amount'        => $this->string('amount'),
+            'start'         => $this->date('start'),
+            'end'           => $this->date('end'),
         ];
     }
 
     /**
-     * TODO must also accept currency code.
      * The rules that the incoming request must be matched against.
      *
      * @return array
@@ -63,14 +63,15 @@ class AvailableBudgetRequest extends Request
     public function rules(): array
     {
         $rules = [
-            'transaction_currency_id' => 'required|numeric|exists:transaction_currencies,id',
-            'amount'                  => 'required|numeric|more:0',
-            'start_date'              => 'required|date|before:end_date',
-            'end_date'                => 'required|date|after:start_date',
+            'currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
+            'amount'        => 'required|numeric|more:0',
+            'start'         => 'required|date|before:end',
+            'end'           => 'required|date|after:start',
         ];
 
         return $rules;
     }
 
 
-}
+}

app/Api/V1/Requests/BillRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Rules\IsBoolean;
 use Illuminate\Validation\Validator;
 
 /**
@@ -50,6 +51,11 @@ class BillRequest extends Request
      */
     public function getAll(): array
     {
+        $active = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+
         $data = [
             'name'          => $this->string('name'),
             'amount_min'    => $this->string('amount_min'),
@@ -59,8 +65,7 @@ class BillRequest extends Request
             'date'          => $this->date('date'),
             'repeat_freq'   => $this->string('repeat_freq'),
             'skip'          => $this->integer('skip'),
-            'automatch'     => $this->boolean('automatch'),
-            'active'        => $this->boolean('active'),
+            'active'        => $active,
             'notes'         => $this->string('notes'),
         ];
 
@@ -78,13 +83,13 @@ class BillRequest extends Request
             'name'          => 'required|between:1,255|uniqueObjectForUser:bills,name',
             'amount_min'    => 'required|numeric|more:0',
             'amount_max'    => 'required|numeric|more:0',
-            'currency_id'   => 'numeric|exists:transaction_currencies,id|required_without:currency_code',
-            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code|required_without:currency_id',
+            'currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
             'date'          => 'required|date',
             'repeat_freq'   => 'required|in:weekly,monthly,quarterly,half-year,yearly',
-            'skip'          => 'required|between:0,31',
-            'automatch'     => 'required|boolean',
-            'active'        => 'required|boolean',
+            'skip'          => 'between:0,31',
+            'automatch'     => [new IsBoolean],
+            'active'        => [new IsBoolean],
             'notes'         => 'between:1,65536',
         ];
         switch ($this->method()) {
@@ -115,7 +120,7 @@ class BillRequest extends Request
                 $min  = (float)($data['amount_min'] ?? 0);
                 $max  = (float)($data['amount_max'] ?? 0);
                 if ($min > $max) {
-                    $validator->errors()->add('amount_min', trans('validation.amount_min_over_max'));
+                    $validator->errors()->add('amount_min', (string)trans('validation.amount_min_over_max'));
                 }
             }
         );

app/Api/V1/Requests/BudgetLimitRequest.php

@@ -48,10 +48,12 @@ class BudgetLimitRequest extends Request
     public function getAll(): array
     {
         return [
-            'budget_id'  => $this->integer('budget_id'),
-            'start_date' => $this->date('start_date'),
-            'end_date'   => $this->date('end_date'),
-            'amount'     => $this->string('amount'),
+            'budget_id'     => $this->integer('budget_id'),
+            'start'         => $this->date('start'),
+            'end'           => $this->date('end'),
+            'amount'        => $this->string('amount'),
+            'currency_id'   => $this->integer('currency_id'),
+            'currency_code' => $this->string('currency_code'),
         ];
     }
 
@@ -63,10 +65,12 @@ class BudgetLimitRequest extends Request
     public function rules(): array
     {
         $rules = [
-            'budget_id'  => 'required|exists:budgets,id|belongsToUser:budgets,id',
-            'start_date' => 'required|before:end_date|date',
-            'end_date'   => 'required|after:start_date|date',
-            'amount'     => 'required|more:0',
+            'budget_id'     => 'required|exists:budgets,id|belongsToUser:budgets,id',
+            'start'         => 'required|before:end|date',
+            'end'           => 'required|after:start|date',
+            'amount'        => 'required|more:0',
+            'currency_id'   => 'numeric|exists:transaction_currencies,id',
+            'currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
         ];
         switch ($this->method()) {
             default:
@@ -76,8 +80,14 @@ class BudgetLimitRequest extends Request
                 $rules['budget_id'] = 'required|exists:budgets,id|belongsToUser:budgets,id';
                 break;
         }
+        // if request has a budget already, drop the rule.
+        $budget = $this->route()->parameter('budget');
+        if (null !== $budget) {
+            unset($rules['budget_id']);
+        }
+
 
         return $rules;
     }
 
-}
+}

app/Api/V1/Requests/BudgetRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\Budget;
+use FireflyIII\Rules\IsBoolean;
 
 /**
  * Class BudgetRequest
@@ -48,9 +49,14 @@ class BudgetRequest extends Request
      */
     public function getAll(): array
     {
+        $active = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+
         return [
             'name'   => $this->string('name'),
-            'active' => $this->boolean('active'),
+            'active' => $active,
             'order'  => 0,
         ];
     }
@@ -64,7 +70,7 @@ class BudgetRequest extends Request
     {
         $rules = [
             'name'   => 'required|between:1,100|uniqueObjectForUser:budgets,name',
-            'active' => 'required|boolean',
+            'active' => [new IsBoolean],
         ];
         switch ($this->method()) {
             default:
@@ -79,4 +85,4 @@ class BudgetRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/CategoryRequest.php

@@ -49,8 +49,7 @@ class CategoryRequest extends Request
     public function getAll(): array
     {
         return [
-            'name'   => $this->string('name'),
-            'active' => $this->boolean('active'),
+            'name' => $this->string('name'),
         ];
     }
 
@@ -62,8 +61,7 @@ class CategoryRequest extends Request
     public function rules(): array
     {
         $rules = [
-            'name'   => 'required|between:1,100|uniqueObjectForUser:categories,name',
-            'active' => 'required|boolean',
+            'name' => 'required|between:1,100|uniqueObjectForUser:categories,name',
         ];
         switch ($this->method()) {
             default:
@@ -78,4 +76,4 @@ class CategoryRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/ConfigurationRequest.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * JournalLinkRequest.php
+ * ConfigurationRequest.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com
  *
  * This file is part of Firefly III.
@@ -23,13 +24,14 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Rules\IsBoolean;
 
 /**
- *
- * Class JournalLinkRequest
+ * Class ConfigurationRequest
  */
-class JournalLinkRequest extends Request
+class ConfigurationRequest extends Request
 {
+
     /**
      * Authorize logged in users.
      *
@@ -48,30 +50,34 @@ class JournalLinkRequest extends Request
      */
     public function getAll(): array
     {
-        return [
-            'link_type_id' => $this->integer('link_type_id'),
-            'inward_id'    => $this->integer('inward_id'),
-            'outward_id'   => $this->integer('outward_id'),
-            'notes'        => $this->string('notes'),
-        ];
+        $name = $this->route()->parameter('configName');
+        switch ($name) {
+            case 'is_demo_site':
+            case 'single_user_mode':
+                return ['value' => $this->boolean('value')];
+            case 'permission_update_check':
+                return ['value' => $this->integer('value')];
+        }
+
+        return ['value' => $this->string('value')]; // @codeCoverageIgnore
     }
 
     /**
-     * TODO include link-type name as optional parameter.
-     * TODO be consistent and remove notes from this object.
-     *
      * The rules that the incoming request must be matched against.
      *
      * @return array
      */
     public function rules(): array
     {
-        return [
-            'link_type_id' => 'required|exists:link_types,id',
-            'inward_id'    => 'required|belongsToUser:transaction_journals,id',
-            'outward_id'   => 'required|belongsToUser:transaction_journals,id',
-            'notes'        => 'between:0,65000',
-        ];
-    }
+        $name = $this->route()->parameter('configName');
+        switch ($name) {
+            case 'is_demo_site':
+            case 'single_user_mode':
+                return ['value' => ['required', new IsBoolean]];
+            case 'permission_update_check':
+                return ['value' => 'required|numeric|between:-1,1'];
+        }
 
-}
+        return ['value' => 'required']; // @codeCoverageIgnore
+    }
+}

app/Api/V1/Requests/CurrencyRequest.php

@@ -23,6 +23,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Rules\IsBoolean;
+
 
 /**
  * Class CurrencyRequest
@@ -47,12 +49,22 @@ class CurrencyRequest extends Request
      */
     public function getAll(): array
     {
+        $enabled = true;
+        $default = false;
+        if (null !== $this->get('enabled')) {
+            $enabled = $this->boolean('enabled');
+        }
+        if (null !== $this->get('default')) {
+            $default = $this->boolean('default');
+        }
+
         return [
             'name'           => $this->string('name'),
             'code'           => $this->string('code'),
             'symbol'         => $this->string('symbol'),
             'decimal_places' => $this->integer('decimal_places'),
-            'default'        => $this->boolean('default'),
+            'default'        => $default,
+            'enabled'        => $enabled,
         ];
     }
 
@@ -67,8 +79,10 @@ class CurrencyRequest extends Request
             'name'           => 'required|between:1,255|unique:transaction_currencies,name',
             'code'           => 'required|between:3,3|unique:transaction_currencies,code',
             'symbol'         => 'required|between:1,5|unique:transaction_currencies,symbol',
-            'decimal_places' => 'required|between:0,20|numeric|min:0|max:20',
-            'default'        => 'boolean',
+            'decimal_places' => 'between:0,20|numeric|min:0|max:20',
+            'enabled'        => [new IsBoolean()],
+            'default'        => [new IsBoolean()],
+
         ];
 
         switch ($this->method()) {
@@ -76,7 +90,7 @@ class CurrencyRequest extends Request
                 break;
             case 'PUT':
             case 'PATCH':
-                $currency        = $this->route()->parameter('currency');
+                $currency        = $this->route()->parameter('currency_code');
                 $rules['name']   = 'required|between:1,255|unique:transaction_currencies,name,' . $currency->id;
                 $rules['code']   = 'required|between:1,255|unique:transaction_currencies,code,' . $currency->id;
                 $rules['symbol'] = 'required|between:1,255|unique:transaction_currencies,symbol,' . $currency->id;

app/Api/V1/Requests/LinkTypeRequest.php

@@ -71,7 +71,6 @@ class LinkTypeRequest extends Request
             'outward' => 'required|unique:link_types,outward|min:1|different:inward',
             'inward'  => 'required|unique:link_types,inward|min:1|different:outward',
         ];
-        //        Rule::unique('users')->ignore($user->id),
 
 
         switch ($this->method()) {
@@ -89,4 +88,4 @@ class LinkTypeRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/PiggyBankRequest.php

@@ -50,14 +50,17 @@ class PiggyBankRequest extends Request
      */
     public function getAll(): array
     {
+        $current = $this->string('current_amount');
+        $current = '' === $current ? '0' : $current;
+
         return [
             'name'           => $this->string('name'),
             'account_id'     => $this->integer('account_id'),
             'targetamount'   => $this->string('target_amount'),
-            'current_amount' => $this->string('current_amount'),
-            'start_date'     => $this->date('start_date'),
-            'target_date'    => $this->date('target_date'),
-            'note'           => $this->string('notes'),
+            'current_amount' => $current,
+            'startdate'      => $this->date('start_date'),
+            'targetdate'     => $this->date('target_date'),
+            'notes'          => $this->string('notes'),
         ];
     }
 
@@ -74,7 +77,7 @@ class PiggyBankRequest extends Request
             'target_amount'  => 'required|numeric|more:0',
             'current_amount' => 'numeric|more:0|lte:target_amount',
             'start_date'     => 'date|nullable',
-            'target_date'    => 'date|nullable',
+            'target_date'    => 'date|nullable|after:start_date',
             'notes'          => 'max:65000',
         ];
 
@@ -93,4 +96,4 @@ class PiggyBankRequest extends Request
         return $rules;
     }
 
-}
+}

app/Api/V1/Requests/PreferenceRequest.php

@@ -66,4 +66,4 @@ class PreferenceRequest extends Request
         ];
     }
 
-}
+}

app/Api/V1/Requests/RecurrenceRequest.php

@@ -25,6 +25,7 @@ namespace FireflyIII\Api\V1\Requests;
 
 use Carbon\Carbon;
 use FireflyIII\Rules\BelongsUser;
+use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Validation\RecurrenceValidation;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Validation\Validator;
@@ -54,6 +55,14 @@ class RecurrenceRequest extends Request
      */
     public function getAll(): array
     {
+        $active     = true;
+        $applyRules = true;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+        if (null !== $this->get('apply_rules')) {
+            $applyRules = $this->boolean('apply_rules');
+        }
         $return = [
             'recurrence'   => [
                 'type'         => $this->string('type'),
@@ -62,8 +71,8 @@ class RecurrenceRequest extends Request
                 'first_date'   => $this->date('first_date'),
                 'repeat_until' => $this->date('repeat_until'),
                 'repetitions'  => $this->integer('nr_of_repetitions'),
-                'apply_rules'  => $this->boolean('apply_rules'),
-                'active'       => $this->boolean('active'),
+                'apply_rules'  => $applyRules,
+                'active'       => $active,
             ],
             'meta'         => [
                 'piggy_bank_id'   => $this->integer('piggy_bank_id'),
@@ -84,27 +93,28 @@ class RecurrenceRequest extends Request
      */
     public function rules(): array
     {
-        $today = new Carbon;
-        $today->addDay();
+        $today = Carbon::now()->addDay();
 
         return [
             'type'                                 => 'required|in:withdrawal,transfer,deposit',
             'title'                                => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
             'description'                          => 'between:1,65000',
             'first_date'                           => sprintf('required|date|after:%s', $today->format('Y-m-d')),
+            'apply_rules'                          => [new IsBoolean],
+            'active'                               => [new IsBoolean],
             'repeat_until'                         => sprintf('date|after:%s', $today->format('Y-m-d')),
             'nr_of_repetitions'                    => 'numeric|between:1,31',
-            'apply_rules'                          => 'required|boolean',
-            'active'                               => 'required|boolean',
             'tags'                                 => 'between:1,64000',
             'piggy_bank_id'                        => 'numeric',
             'repetitions.*.type'                   => 'required|in:daily,weekly,ndom,monthly,yearly',
             'repetitions.*.moment'                 => 'between:0,10',
             'repetitions.*.skip'                   => 'required|numeric|between:0,31',
             'repetitions.*.weekend'                => 'required|numeric|min:1|max:4',
-            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id|required_without:transactions.*.currency_code',
-            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code|required_without:transactions.*.currency_id',
+            'transactions.*.description'           => 'required|between:1,255',
+            'transactions.*.amount'                => 'required|numeric|more:0',
             'transactions.*.foreign_amount'        => 'numeric|more:0',
+            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
             'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',
             'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
             'transactions.*.budget_id'             => ['mustExist:budgets,id', new BelongsUser],
@@ -113,8 +123,8 @@ class RecurrenceRequest extends Request
             'transactions.*.source_name'           => 'between:1,255|nullable',
             'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
             'transactions.*.destination_name'      => 'between:1,255|nullable',
-            'transactions.*.amount'                => 'required|numeric|more:0',
-            'transactions.*.description'           => 'required|between:1,255',
+
+
         ];
     }
 
@@ -201,4 +211,4 @@ class RecurrenceRequest extends Request
 
         return $return;
     }
-}
+}

app/Api/V1/Requests/RuleGroupRequest.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Models\RuleGroup;
+use FireflyIII\Rules\IsBoolean;
 
 
 /**
@@ -50,10 +51,16 @@ class RuleGroupRequest extends Request
      */
     public function getAll(): array
     {
+        $active = true;
+
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+
         return [
             'title'       => $this->string('title'),
             'description' => $this->string('description'),
-            'active'      => $this->boolean('active'),
+            'active'      => $active,
         ];
     }
 
@@ -67,7 +74,7 @@ class RuleGroupRequest extends Request
         $rules = [
             'title'       => 'required|between:1,100|uniqueObjectForUser:rule_groups,title',
             'description' => 'between:1,5000|nullable',
-            'active'      => 'required|boolean',
+            'active'      => [new IsBoolean],
         ];
         switch ($this->method()) {
             default:
@@ -82,4 +89,4 @@ class RuleGroupRequest extends Request
 
         return $rules;
     }
-}
+}

app/Api/V1/Requests/RuleRequest.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests;
 
+use FireflyIII\Rules\IsBoolean;
 use Illuminate\Validation\Validator;
 
 
@@ -49,34 +50,32 @@ class RuleRequest extends Request
      */
     public function getAll(): array
     {
+        $strict         = true;
+        $active         = true;
+        $stopProcessing = false;
+        if (null !== $this->get('active')) {
+            $active = $this->boolean('active');
+        }
+        if (null !== $this->get('strict')) {
+            $strict = $this->boolean('strict');
+        }
+        if (null !== $this->get('stop_processing')) {
+            $stopProcessing = $this->boolean('stop_processing');
+        }
+
         $data = [
             'title'            => $this->string('title'),
             'description'      => $this->string('description'),
             'rule_group_id'    => $this->integer('rule_group_id'),
             'rule_group_title' => $this->string('rule_group_title'),
             'trigger'          => $this->string('trigger'),
-            'strict'           => $this->boolean('strict'),
-            'stop-processing'  => $this->boolean('stop_processing'),
-            'active'           => $this->boolean('active'),
-            'rule-triggers'    => [],
-            'rule-actions'     => [],
+            'strict'           => $strict,
+            'stop_processing'  => $stopProcessing,
+            'active'           => $active,
+            'triggers'         => $this->getRuleTriggers(),
+            'actions'          => $this->getRuleActions(),
         ];
 
-        foreach ($this->get('rule-triggers') as $trigger) {
-            $data['rule-triggers'][] = [
-                'name'            => $trigger['name'],
-                'value'           => $trigger['value'],
-                'stop-processing' => 1 === (int)($trigger['stop-processing'] ?? 0),
-            ];
-        }
-        foreach ($this->get('rule-actions') as $action) {
-            $data['rule-actions'][] = [
-                'name'            => $action['name'],
-                'value'           => $action['value'],
-                'stop-processing' => 1 === (int)($action['stop-processing'] ?? 0),
-            ];
-        }
-
         return $data;
     }
 
@@ -90,24 +89,26 @@ class RuleRequest extends Request
         $validTriggers = array_keys(config('firefly.rule-triggers'));
         $validActions  = array_keys(config('firefly.rule-actions'));
 
-        // some actions require text:
-        $contextActions = implode(',', config('firefly.rule-actions-text'));
-
-        $rules = [
-            'title'                           => 'required|between:1,100|uniqueObjectForUser:rules,title',
-            'description'                     => 'between:1,5000|nullable',
-            'rule_group_id'                   => 'required|belongsToUser:rule_groups|required_without:rule_group_title',
-            'rule_group_title'                => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title',
-            'trigger'                         => 'required|in:store-journal,update-journal',
-            'rule-triggers.*.name'            => 'required|in:' . implode(',', $validTriggers),
-            'rule-triggers.*.stop-processing' => 'boolean',
-            'rule-triggers.*.value'           => 'required|min:1|ruleTriggerValue', //
-            'rule-actions.*.name'             => 'required|in:' . implode(',', $validActions),
-            'rule-actions.*.value'            => 'required_if:rule-action.*.type,' . $contextActions . '|ruleActionValue',
-            'rule-actions.*.stop-processing'  => 'boolean',
-            'strict'                          => 'required|boolean',
-            'stop_processing'                 => 'required|boolean',
-            'active'                          => 'required|boolean',
+        // some triggers and actions require text:
+        $contextTriggers = implode(',', config('firefly.context-rule-triggers'));
+        $contextActions  = implode(',', config('firefly.context-rule-actions'));
+        $rules           = [
+            'title'                      => 'required|between:1,100|uniqueObjectForUser:rules,title',
+            'description'                => 'between:1,5000|nullable',
+            'rule_group_id'              => 'required|belongsToUser:rule_groups|required_without:rule_group_title',
+            'rule_group_title'           => 'nullable|between:1,255|required_without:rule_group_id|belongsToUser:rule_groups,title',
+            'trigger'                    => 'required|in:store-journal,update-journal',
+            'triggers.*.type'            => 'required|in:' . implode(',', $validTriggers),
+            'triggers.*.value'           => 'required_if:actions.*.type,' . $contextTriggers . '|min:1|ruleTriggerValue',
+            'triggers.*.stop_processing' => [new IsBoolean],
+            'triggers.*.active'          => [new IsBoolean],
+            'actions.*.type'             => 'required|in:' . implode(',', $validActions),
+            'actions.*.value'            => 'required_if:actions.*.type,' . $contextActions . '|ruleActionValue',
+            'actions.*.stop_processing'  => [new IsBoolean],
+            'actions.*.active'           => [new IsBoolean],
+            'strict'                     => [new IsBoolean],
+            'stop_processing'            => [new IsBoolean],
+            'active'                     => [new IsBoolean],
         ];
 
         return $rules;
@@ -137,11 +138,11 @@ class RuleRequest extends Request
      */
     protected function atLeastOneAction(Validator $validator): void
     {
-        $data        = $validator->getData();
-        $repetitions = $data['rule-actions'] ?? [];
-        // need at least one transaction
-        if (0 === \count($repetitions)) {
-            $validator->errors()->add('title', trans('validation.at_least_one_action'));
+        $data    = $validator->getData();
+        $actions = $data['actions'] ?? [];
+        // need at least one trigger
+        if (0 === \count($actions)) {
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_action'));
         }
     }
 
@@ -152,11 +153,53 @@ class RuleRequest extends Request
      */
     protected function atLeastOneTrigger(Validator $validator): void
     {
-        $data        = $validator->getData();
-        $repetitions = $data['rule-triggers'] ?? [];
-        // need at least one transaction
-        if (0 === \count($repetitions)) {
-            $validator->errors()->add('title', trans('validation.at_least_one_trigger'));
+        $data     = $validator->getData();
+        $triggers = $data['triggers'] ?? [];
+        // need at least one trugger
+        if (0 === \count($triggers)) {
+            $validator->errors()->add('title', (string)trans('validation.at_least_one_trigger'));
         }
     }
-}
+
+    /**
+     * @return array
+     */
+    private function getRuleActions(): array
+    {
+        $actions = $this->get('actions');
+        $return  = [];
+        if (\is_array($actions)) {
+            foreach ($actions as $action) {
+                $return[] = [
+                    'type'            => $action['type'],
+                    'value'           => $action['value'],
+                    'active'          => $this->convertBoolean((string)($action['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string)($action['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * @return array
+     */
+    private function getRuleTriggers(): array
+    {
+        $triggers = $this->get('triggers');
+        $return   = [];
+        if (\is_array($triggers)) {
+            foreach ($triggers as $trigger) {
+                $return[] = [
+                    'type'            => $trigger['type'],
+                    'value'           => $trigger['value'],
+                    'active'          => $this->convertBoolean((string)($trigger['active'] ?? 'false')),
+                    'stop_processing' => $this->convertBoolean((string)($trigger['stop_processing'] ?? 'false')),
+                ];
+            }
+        }
+
+        return $return;
+    }
+}

app/Api/V1/Requests/TagRequest.php

@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * TagRequest.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Models\Tag;
+
+/**
+ * Class TagRequest
+ */
+class TagRequest extends Request
+{
+
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    public function getAll(): array
+    {
+        $data = [
+            'tag'         => $this->string('tag'),
+            'date'        => $this->date('date'),
+            'description' => $this->string('description'),
+            'latitude'    => '' === $this->string('latitude') ? null : $this->string('latitude'),
+            'longitude'   => '' === $this->string('longitude') ? null : $this->string('longitude'),
+            'zoom_level'  => $this->integer('zoom_level'),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'tag'         => 'required|min:1|uniqueObjectForUser:tags,tag',
+            'description' => 'min:1|nullable',
+            'date'        => 'date|nullable',
+            'latitude'    => 'numeric|min:-90|max:90|nullable|required_with:longitude',
+            'longitude'   => 'numeric|min:-180|max:180|nullable|required_with:latitude',
+            'zoom_level'  => 'numeric|min:0|max:80|nullable',
+        ];
+        switch ($this->method()) {
+            default:
+                break;
+            case 'PUT':
+            case 'PATCH':
+                /** @var Tag $tag */
+                $tag          = $this->route()->parameter('tagOrId');
+                $rules['tag'] = 'required|min:1|uniqueObjectForUser:tags,tag,' . $tag->id;
+                break;
+        }
+
+        return $rules;
+    }
+}

app/Api/V1/Requests/TransactionLinkRequest.php

@@ -0,0 +1,138 @@
+<?php
+/**
+ * TransactionLinkRequest.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests;
+
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use FireflyIII\User;
+use Illuminate\Validation\Validator;
+
+/**
+ *
+ * Class TransactionLinkRequest
+ */
+class TransactionLinkRequest extends Request
+{
+    /**
+     * Authorize logged in users.
+     *
+     * @return bool
+     */
+    public function authorize(): bool
+    {
+        // Only allow authenticated users
+        return auth()->check();
+    }
+
+    /**
+     * Get all data from the request.
+     *
+     * @return array
+     */
+    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'),
+            'notes'          => $this->string('notes'),
+        ];
+    }
+
+    /**
+     *
+     * The rules that the incoming request must be matched against.
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'link_type_id'   => 'exists:link_types,id|required_without:link_type_name',
+            'link_type_name' => 'exists:link_types,name|required_without:link_type_id',
+            'inward_id'      => 'required|belongsToUser:transaction_journals,id|different:outward_id',
+            'outward_id'     => 'required|belongsToUser:transaction_journals,id|different:inward_id',
+            'notes'          => 'between:0,65000',
+        ];
+    }
+
+    /**
+     * Configure the validator instance.
+     *
+     * @param  Validator $validator
+     *
+     * @return void
+     */
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator) {
+                $this->validateExistingLink($validator);
+            }
+        );
+    }
+
+    /**
+     * @param Validator $validator
+     */
+    private function validateExistingLink(Validator $validator): void
+    {
+        /** @var User $user */
+        $user = auth()->user();
+        /** @var LinkTypeRepositoryInterface $repository */
+        $repository = app(LinkTypeRepositoryInterface::class);
+        $repository->setUser($user);
+
+        /** @var JournalRepositoryInterface $journalRepos */
+        $journalRepos = app(JournalRepositoryInterface::class);
+        $journalRepos->setUser($user);
+
+        $data      = $validator->getData();
+        $inwardId  = (int)($data['inward_id'] ?? 0);
+        $outwardId = (int)($data['outward_id'] ?? 0);
+        $inward    = $journalRepos->findNull($inwardId);
+        $outward   = $journalRepos->findNull($outwardId);
+
+        if (null === $inward) {
+            $validator->errors()->add('inward_id', 'Invalid inward ID.');
+
+            return;
+        }
+        if (null === $outward) {
+            $validator->errors()->add('outward_id', 'Invalid outward ID.');
+
+            return;
+        }
+
+        if ($repository->findLink($inward, $outward)) {
+            // only if not updating:
+            $link = $this->route()->parameter('journalLink');
+            if (null === $link) {
+                $validator->errors()->add('outward_id', 'Already have a link between inward and outward.');
+                $validator->errors()->add('inward_id', 'Already have a link between inward and outward.');
+            }
+        }
+    }
+}

app/Api/V1/Requests/TransactionRequest.php

@@ -25,6 +25,8 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Rules\BelongsUser;
+use FireflyIII\Rules\IsBoolean;
+use FireflyIII\Rules\IsDateOrTime;
 use FireflyIII\Validation\TransactionValidation;
 use Illuminate\Validation\Validator;
 
@@ -58,13 +60,22 @@ class TransactionRequest extends Request
     {
         $data = [
             'type'               => $this->string('type'),
-            'date'               => $this->date('date'),
+            'date'               => $this->dateTime('date'),
             'description'        => $this->string('description'),
             'piggy_bank_id'      => $this->integer('piggy_bank_id'),
             'piggy_bank_name'    => $this->string('piggy_bank_name'),
             'bill_id'            => $this->integer('bill_id'),
             'bill_name'          => $this->string('bill_name'),
             'tags'               => explode(',', $this->string('tags')),
+            'notes'              => $this->string('notes'),
+            'sepa-cc'            => $this->string('sepa_cc'),
+            'sepa-ct-op'         => $this->string('sepa_ct_op'),
+            'sepa-ct-id'         => $this->string('sepa_ct_id'),
+            'sepa-db'            => $this->string('sepa_db'),
+            'sepa-country'       => $this->string('sepa_country'),
+            'sepa-ep'            => $this->string('sepa_ep'),
+            'sepa-ci'            => $this->string('sepa_ci'),
+            'sepa-batch-id'      => $this->string('sepa_batch_id'),
             'interest_date'      => $this->date('interest_date'),
             'book_date'          => $this->date('book_date'),
             'process_date'       => $this->date('process_date'),
@@ -72,7 +83,9 @@ class TransactionRequest extends Request
             'payment_date'       => $this->date('payment_date'),
             'invoice_date'       => $this->date('invoice_date'),
             'internal_reference' => $this->string('internal_reference'),
-            'notes'              => $this->string('notes'),
+            'bunq_payment_id'    => $this->string('bunq_payment_id'),
+            'external_id'        => $this->string('external_id'),
+            'original-source'    => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
             'transactions'       => $this->getTransactionData(),
         ];
 
@@ -89,9 +102,9 @@ class TransactionRequest extends Request
     {
         $rules = [
             // basic fields for journal:
-            'type'                                 => 'required|in:withdrawal,deposit,transfer',
-            'date'                                 => 'required|date',
+            'type'                                 => 'required|in:withdrawal,deposit,transfer,opening-balance,reconciliation',
             'description'                          => 'between:1,255',
+            'date'                                 => ['required', new IsDateOrTime],
             'piggy_bank_id'                        => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUser],
             'piggy_bank_name'                      => ['between:1,255', 'nullable', new BelongsUser],
             'bill_id'                              => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser],
@@ -99,6 +112,19 @@ class TransactionRequest extends Request
             'tags'                                 => 'between:1,255',
 
             // then, custom fields for journal
+            'notes'                                => 'min:1,max:50000|nullable',
+
+            // SEPA fields:
+            'sepa_cc'                              => 'min:1,max:255|nullable',
+            'sepa_ct_op'                           => 'min:1,max:255|nullable',
+            'sepa_ct_id'                           => 'min:1,max:255|nullable',
+            'sepa_db'                              => 'min:1,max:255|nullable',
+            'sepa_country'                         => 'min:1,max:255|nullable',
+            'sepa_ep'                              => 'min:1,max:255|nullable',
+            'sepa_ci'                              => 'min:1,max:255|nullable',
+            'sepa_batch_id'                        => 'min:1,max:255|nullable',
+
+            // dates
             'interest_date'                        => 'date|nullable',
             'book_date'                            => 'date|nullable',
             'process_date'                         => 'date|nullable',
@@ -106,13 +132,14 @@ class TransactionRequest extends Request
             'payment_date'                         => 'date|nullable',
             'invoice_date'                         => 'date|nullable',
             'internal_reference'                   => 'min:1,max:255|nullable',
-            'notes'                                => 'min:1,max:50000|nullable',
+            'bunq_payment_id'                      => 'min:1,max:255|nullable',
+            'external_id'                          => 'min:1,max:255|nullable',
 
             // transaction rules (in array for splits):
-            'transactions.*.description'           => 'nullable|between:1,255',
             'transactions.*.amount'                => 'required|numeric|more:0',
-            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id|required_without:transactions.*.currency_code',
-            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code|required_without:transactions.*.currency_id',
+            'transactions.*.description'           => 'nullable|between:1,255',
+            'transactions.*.currency_id'           => 'numeric|exists:transaction_currencies,id',
+            'transactions.*.currency_code'         => 'min:3|max:3|exists:transaction_currencies,code',
             'transactions.*.foreign_amount'        => 'numeric|more:0',
             'transactions.*.foreign_currency_id'   => 'numeric|exists:transaction_currencies,id',
             'transactions.*.foreign_currency_code' => 'min:3|max:3|exists:transaction_currencies,code',
@@ -120,8 +147,7 @@ class TransactionRequest extends Request
             'transactions.*.budget_name'           => ['between:1,255', 'nullable', new BelongsUser],
             'transactions.*.category_id'           => ['mustExist:categories,id', new BelongsUser],
             'transactions.*.category_name'         => 'between:1,255|nullable',
-            'transactions.*.reconciled'            => 'boolean|nullable',
-            // basic rules will be expanded later.
+            'transactions.*.reconciled'            => [new IsBoolean],
             'transactions.*.source_id'             => ['numeric', 'nullable', new BelongsUser],
             'transactions.*.source_name'           => 'between:1,255|nullable',
             'transactions.*.destination_id'        => ['numeric', 'nullable', new BelongsUser],
@@ -171,8 +197,8 @@ class TransactionRequest extends Request
         $return = [];
         foreach ($this->get('transactions') as $index => $transaction) {
             $return[] = [
-                'description'           => $transaction['description'] ?? null,
                 'amount'                => $transaction['amount'],
+                'description'           => $transaction['description'] ?? null,
                 'currency_id'           => isset($transaction['currency_id']) ? (int)$transaction['currency_id'] : null,
                 'currency_code'         => $transaction['currency_code'] ?? null,
                 'foreign_amount'        => $transaction['foreign_amount'] ?? null,
@@ -186,7 +212,7 @@ class TransactionRequest extends Request
                 'source_name'           => isset($transaction['source_name']) ? (string)$transaction['source_name'] : null,
                 'destination_id'        => isset($transaction['destination_id']) ? (int)$transaction['destination_id'] : null,
                 'destination_name'      => isset($transaction['destination_name']) ? (string)$transaction['destination_name'] : null,
-                'reconciled'            => $transaction['reconciled'] ?? false,
+                'reconciled'            => $this->convertBoolean((string)($transaction['reconciled'] ?? 'false')),
                 'identifier'            => $index,
             ];
         }

app/Api/V1/Requests/UserRequest.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests;
 
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\Rules\IsBoolean;
 use FireflyIII\User;
 
 
@@ -64,10 +65,15 @@ class UserRequest extends Request
      */
     public function getAll(): array
     {
+        $blocked = false;
+        if (null === $this->get('blocked')) {
+            $blocked = $this->boolean('blocked');
+        }
         $data = [
             'email'        => $this->string('email'),
-            'blocked'      => $this->boolean('blocked'),
+            'blocked'      => $blocked,
             'blocked_code' => $this->string('blocked_code'),
+            'role'         => $this->string('role'),
         ];
 
         return $data;
@@ -82,8 +88,9 @@ class UserRequest extends Request
     {
         $rules = [
             'email'        => 'required|email|unique:users,email,',
-            'blocked'      => 'required|boolean',
+            'blocked'      => [new IsBoolean],
             'blocked_code' => 'in:email_changed',
+            'role'         => 'in:owner,demo',
         ];
         switch ($this->method()) {
             default:

app/Console/Commands/ApplyRules.php

@@ -0,0 +1,420 @@
+<?php
+
+/**
+ * ApplyRules.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands;
+
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Rule;
+use FireflyIII\Models\RuleGroup;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use FireflyIII\TransactionRules\Processor;
+use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
+
+/**
+ *
+ * Class ApplyRules
+ *
+ * @codeCoverageIgnore
+ */
+class ApplyRules extends Command
+{
+    use VerifiesAccessToken;
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command will apply your rules and rule groups on a selection of your transactions.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature
+        = 'firefly:apply-rules
+                            {--user=1 : The user ID that the import should import for.}
+                            {--token= : The user\'s access token.}
+                            {--accounts= : A comma-separated list of asset accounts or liabilities to apply your rules to.}
+                            {--rule_groups= : A comma-separated list of rule groups to apply. Take the ID\'s of these rule groups from the Firefly III interface.}
+                            {--rules= : A comma-separated list of rules to apply. Take the ID\'s of these rules from the Firefly III interface. Using this option overrules the option that selects rule groups.}
+                            {--all_rules : If set, will overrule both settings and simply apply ALL of your rules.}
+                            {--start_date= : The date of the earliest transaction to be included (inclusive). If omitted, will be your very first transaction ever. Format: YYYY-MM-DD}
+                            {--end_date= : The date of the latest transaction to be included (inclusive). If omitted, will be your latest transaction ever. Format: YYYY-MM-DD}';
+    /** @var Collection */
+    private $accounts;
+    /** @var Carbon */
+    private $endDate;
+    /** @var Collection */
+    private $results;
+    /** @var Collection */
+    private $ruleGroups;
+    /** @var Collection */
+    private $rules;
+    /** @var Carbon */
+    private $startDate;
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->accounts   = new Collection;
+        $this->rules      = new Collection;
+        $this->ruleGroups = new Collection;
+        $this->results    = new Collection;
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    public function handle(): int
+    {
+        if (!$this->verifyAccessToken()) {
+            $this->error('Invalid access token.');
+
+            return 1;
+        }
+
+        $result = $this->verifyInput();
+        if (false === $result) {
+            return 1;
+        }
+
+
+        // get transactions from asset accounts.
+        /** @var TransactionCollectorInterface $collector */
+        $collector = app(TransactionCollectorInterface::class);
+        $collector->setUser($this->getUser());
+        $collector->setAccounts($this->accounts);
+        $collector->setRange($this->startDate, $this->endDate);
+        $transactions = $collector->getTransactions();
+        $count        = $transactions->count();
+
+        // first run all rule groups:
+        /** @var RuleGroupRepositoryInterface $ruleGroupRepos */
+        $ruleGroupRepos = app(RuleGroupRepositoryInterface::class);
+        $ruleGroupRepos->setUser($this->getUser());
+
+        /** @var RuleGroup $ruleGroup */
+        foreach ($this->ruleGroups as $ruleGroup) {
+            $this->line(sprintf('Going to apply rule group "%s" to %d transaction(s).', $ruleGroup->title, $count));
+            $rules = $ruleGroupRepos->getActiveStoreRules($ruleGroup);
+            $this->applyRuleSelection($rules, $transactions, true);
+        }
+
+        // then run all rules (rule groups should be empty).
+        if ($this->rules->count() > 0) {
+
+            $this->line(sprintf('Will apply %d rule(s) to %d transaction(s)', $this->rules->count(), $transactions->count()));
+            $this->applyRuleSelection($this->rules, $transactions, false);
+        }
+
+        // filter results:
+        $this->results = $this->results->unique(
+            function (Transaction $transaction) {
+                return (int)$transaction->journal_id;
+            }
+        );
+
+        $this->line('');
+        if (0 === $this->results->count()) {
+            $this->line('The rules were fired but did not influence any transactions.');
+        }
+        if ($this->results->count() > 0) {
+            $this->line(sprintf('The rule(s) was/were fired, and influenced %d transaction(s).', $this->results->count()));
+            foreach ($this->results as $result) {
+                $this->line(
+                    vsprintf(
+                        'Transaction #%d: "%s" (%s %s)',
+                        [
+                            $result->journal_id,
+                            $result->description,
+                            $result->transaction_currency_code,
+                            round($result->transaction_amount, $result->transaction_currency_dp),
+                        ]
+                    )
+                );
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * @param Collection $rules
+     * @param Collection $transactions
+     * @param bool       $breakProcessing
+     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    private function applyRuleSelection(Collection $rules, Collection $transactions, bool $breakProcessing): void
+    {
+        $bar = $this->output->createProgressBar($rules->count() * $transactions->count());
+
+        /** @var Rule $rule */
+        foreach ($rules as $rule) {
+            /** @var Processor $processor */
+            $processor = app(Processor::class);
+            $processor->make($rule, true);
+
+            /** @var Transaction $transaction */
+            foreach ($transactions as $transaction) {
+                /** @noinspection DisconnectedForeachInstructionInspection */
+                $bar->advance();
+                $result = $processor->handleTransaction($transaction);
+                if (true === $result) {
+                    $this->results->push($transaction);
+                }
+            }
+            if (true === $rule->stop_processing && true === $breakProcessing) {
+                $this->line('');
+                $this->line(sprintf('Rule #%d ("%s") says to stop processing.', $rule->id, $rule->title));
+
+                return;
+            }
+        }
+        $this->line('');
+    }
+
+    /**
+     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    private function grabAllRules(): void
+    {
+        if (true === $this->option('all_rules')) {
+            /** @var RuleRepositoryInterface $ruleRepos */
+            $ruleRepos = app(RuleRepositoryInterface::class);
+            $ruleRepos->setUser($this->getUser());
+            $this->rules = $ruleRepos->getAll();
+
+            // reset rule groups.
+            $this->ruleGroups = new Collection;
+        }
+    }
+
+    /**
+     *
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    private function parseDates(): void
+    {
+        // parse start date.
+        $startDate   = Carbon::create()->startOfMonth();
+        $startString = $this->option('start_date');
+        if (null === $startString) {
+            /** @var JournalRepositoryInterface $repository */
+            $repository = app(JournalRepositoryInterface::class);
+            $repository->setUser($this->getUser());
+            $first = $repository->firstNull();
+            if (null !== $first) {
+                $startDate = $first->date;
+            }
+        }
+        if (null !== $startString && '' !== $startString) {
+            $startDate = Carbon::createFromFormat('Y-m-d', $startString);
+        }
+
+        // parse end date
+        $endDate   = Carbon::now();
+        $endString = $this->option('end_date');
+        if (null !== $endString && '' !== $endString) {
+            $endDate = Carbon::createFromFormat('Y-m-d', $endString);
+        }
+
+        if ($startDate > $endDate) {
+            [$endDate, $startDate] = [$startDate, $endDate];
+        }
+
+        $this->startDate = $startDate;
+        $this->endDate   = $endDate;
+    }
+
+    /**
+     * @return bool
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    private function verifyInput(): bool
+    {
+        // verify account.
+        $result = $this->verifyInputAccounts();
+        if (false === $result) {
+            return $result;
+        }
+
+        // verify rule groups.
+        $result = $this->verifyRuleGroups();
+        if (false === $result) {
+            return $result;
+        }
+
+        // verify rules.
+        $result = $this->verifyRules();
+        if (false === $result) {
+            return $result;
+        }
+
+        $this->grabAllRules();
+        $this->parseDates();
+
+        //$this->line('Number of rules found: ' . $this->rules->count());
+        $this->line('Start date is ' . $this->startDate->format('Y-m-d'));
+        $this->line('End date is ' . $this->endDate->format('Y-m-d'));
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    private function verifyInputAccounts(): bool
+    {
+        $accountString = $this->option('accounts');
+        if (null === $accountString || '' === $accountString) {
+            $this->error('Please use the --accounts to indicate the accounts to apply rules to.');
+
+            return false;
+        }
+        $finalList   = new Collection;
+        $accountList = explode(',', $accountString);
+
+        if (0 === \count($accountList)) {
+            $this->error('Please use the --accounts to indicate the accounts to apply rules to.');
+
+            return false;
+        }
+
+        /** @var AccountRepositoryInterface $accountRepository */
+        $accountRepository = app(AccountRepositoryInterface::class);
+        $accountRepository->setUser($this->getUser());
+
+        foreach ($accountList as $accountId) {
+            $accountId = (int)$accountId;
+            $account   = $accountRepository->findNull($accountId);
+            if (null !== $account
+                && \in_array(
+                    $account->accountType->type, [AccountType::DEFAULT, AccountType::DEBT, AccountType::ASSET, AccountType::LOAN, AccountType::MORTGAGE], true
+                )) {
+                $finalList->push($account);
+            }
+        }
+
+        if (0 === $finalList->count()) {
+            $this->error('Please make sure all accounts in --accounts are asset accounts or liabilities.');
+
+            return false;
+        }
+        $this->accounts = $finalList;
+
+        return true;
+
+    }
+
+    /**
+     * @return bool
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    private function verifyRuleGroups(): bool
+    {
+        $ruleGroupString = $this->option('rule_groups');
+        if (null === $ruleGroupString || '' === $ruleGroupString) {
+            // can be empty.
+            return true;
+        }
+        $ruleGroupList = explode(',', $ruleGroupString);
+
+        if (0 === \count($ruleGroupList)) {
+            // can be empty.
+
+            return true;
+        }
+        /** @var RuleGroupRepositoryInterface $ruleGroupRepos */
+        $ruleGroupRepos = app(RuleGroupRepositoryInterface::class);
+        $ruleGroupRepos->setUser($this->getUser());
+
+        foreach ($ruleGroupList as $ruleGroupId) {
+            $ruleGroupId = (int)$ruleGroupId;
+            $ruleGroup   = $ruleGroupRepos->find($ruleGroupId);
+            $this->ruleGroups->push($ruleGroup);
+        }
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     * @throws \FireflyIII\Exceptions\FireflyException
+     */
+    private function verifyRules(): bool
+    {
+        $ruleString = $this->option('rules');
+        if (null === $ruleString || '' === $ruleString) {
+            // can be empty.
+            return true;
+        }
+        $finalList = new Collection;
+        $ruleList  = explode(',', $ruleString);
+
+        if (0 === \count($ruleList)) {
+            // can be empty.
+
+            return true;
+        }
+        /** @var RuleRepositoryInterface $ruleRepos */
+        $ruleRepos = app(RuleRepositoryInterface::class);
+        $ruleRepos->setUser($this->getUser());
+
+        foreach ($ruleList as $ruleId) {
+            $ruleId = (int)$ruleId;
+            $rule   = $ruleRepos->find($ruleId);
+            if (null !== $rule) {
+                $finalList->push($rule);
+            }
+        }
+        if ($finalList->count() > 0) {
+            // reset rule groups.
+            $this->ruleGroups = new Collection;
+            $this->rules      = $finalList;
+        }
+
+        return true;
+    }
+
+
+}

app/Console/Commands/CreateExport.php

@@ -33,12 +33,14 @@ use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
-use Storage;
+use Illuminate\Support\Facades\Storage;
 
 /**
  * Class CreateExport.
  *
  * Generates export from the command line.
+ *
+ * @codeCoverageIgnore
  */
 class CreateExport extends Command
 {
@@ -132,12 +134,16 @@ class CreateExport extends Command
         }
 
         $processor->createZipFile();
-        $disk     = Storage::disk('export');
-        $fileName = sprintf('export-%s.zip', date('Y-m-d_H-i-s'));
-        $disk->move($job->key . '.zip', $fileName);
+        $disk      = Storage::disk('export');
+        $fileName  = sprintf('export-%s.zip', date('Y-m-d_H-i-s'));
+        $localPath = storage_path('export') . '/' . $job->key . '.zip';
 
-        $this->line('The export has finished! You can find the ZIP file in this location:');
-        $this->line(storage_path(sprintf('export/%s', $fileName)));
+        // "move" from local to export disk
+        $disk->put($fileName, file_get_contents($localPath));
+        unlink($localPath);
+
+        $this->line('The export has finished! You can find the ZIP file in export disk with file name:');
+        $this->line($fileName);
 
         return 0;
     }

app/Console/Commands/CreateImport.php

@@ -34,10 +34,11 @@ use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Console\Command;
 use Log;
-use Preferences;
 
 /**
  * Class CreateImport.
+ *
+ * @codeCoverageIgnore
  */
 class CreateImport extends Command
 {
@@ -96,7 +97,7 @@ class CreateImport extends Command
 
             return 1;
         }
-        if (\strlen($configuration) > 0) {
+        if ('' !== $configuration) {
             $configurationData = json_decode(file_get_contents($configuration), true);
             if (null === $configurationData) {
                 $this->errorLine(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd));
@@ -135,7 +136,7 @@ class CreateImport extends Command
         }
 
         // store file as attachment.
-        if (\strlen($file) > 0) {
+        if ('' !== $file) {
             $messages = $jobRepository->storeCLIUpload($importJob, 'import_file', $file);
             if ($messages->count() > 0) {
                 $this->errorLine($messages->first());
@@ -151,7 +152,7 @@ class CreateImport extends Command
 
 
         if (true === $this->option('start')) {
-            $this->infoLine('The has started. The process is not visible. Please wait.');
+            $this->infoLine('The import routine has started. The process is not visible. Please wait.');
             Log::debug('Go for import!');
 
             // run it!
@@ -232,7 +233,7 @@ class CreateImport extends Command
             }
         }
         // clear cache for user:
-        Preferences::setForUser($user, 'lastActivity', microtime());
+        app('preferences')->setForUser($user, 'lastActivity', microtime());
 
         return 0;
     }
@@ -266,8 +267,8 @@ class CreateImport extends Command
      */
     private function validArguments(): bool
     {
-        $file          = $this->argument('file');
-        $configuration = $this->argument('configuration');
+        $file          = (string)$this->argument('file');
+        $configuration = (string)$this->argument('configuration');
         $cwd           = getcwd();
         $validTypes    = config('import.options.file.import_formats');
         $type          = strtolower($this->option('type'));

app/Console/Commands/Cron.php

@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Cron.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands;
+
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Support\Cronjobs\RecurringCronjob;
+use Illuminate\Console\Command;
+
+/**
+ * Class Cron
+ *
+ * @codeCoverageIgnore
+ */
+class Cron extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Runs all Firefly III cron-job related commands. Configure a cron job according to the official Firefly III documentation.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:cron';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle(): int
+    {
+        $recurring = new RecurringCronjob;
+        try {
+            $result = $recurring->fire();
+        } catch (FireflyException $e) {
+            $this->error($e->getMessage());
+
+            return 0;
+        }
+        if (false === $result) {
+            $this->line('The recurring transaction cron job did not fire.');
+        }
+        if (true === $result) {
+            $this->line('The recurring transaction cron job fired successfully.');
+        }
+
+        $this->info('More feedback on the cron jobs can be found in the log files.');
+
+        return 0;
+    }
+
+
+}

app/Console/Commands/DecryptAttachment.php

@@ -31,6 +31,8 @@ use Log;
 
 /**
  * Class DecryptAttachment.
+ *
+ * @codeCoverageIgnore
  */
 class DecryptAttachment extends Command
 {
@@ -63,9 +65,9 @@ class DecryptAttachment extends Command
         $repository     = app(AttachmentRepositoryInterface::class);
         $attachmentId   = (int)$this->argument('id');
         $attachment     = $repository->findWithoutUser($attachmentId);
-        $attachmentName = trim($this->argument('name'));
-        $storagePath    = realpath(trim($this->argument('directory')));
-        if (null === $attachment->id) {
+        $attachmentName = trim((string)$this->argument('name'));
+        $storagePath    = realpath(trim((string)$this->argument('directory')));
+        if (null === $attachment) {
             $this->error(sprintf('No attachment with id #%d', $attachmentId));
             Log::error(sprintf('DecryptAttachment: No attachment with id #%d', $attachmentId));
 

app/Console/Commands/DecryptDatabase.php

@@ -0,0 +1,138 @@
+<?php
+
+/**
+ * DecryptDatabase.php
+ * Copyright (c) 2019 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands;
+
+use Crypt;
+use DB;
+use FireflyIII\Support\Facades\FireflyConfig;
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Encryption\DecryptException;
+use Log;
+
+/**
+ *
+ * Class DecryptDatabase
+ */
+class DecryptDatabase extends Command
+{
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Decrypts the database.';
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'firefly:decrypt-all';
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->line('Going to decrypt the database.');
+        $tables = [
+            'accounts'             => ['name', 'iban'],
+            'attachments'          => ['filename', 'mime', 'title', 'description'],
+            'bills'                => ['name', 'match'],
+            'budgets'              => ['name'],
+            'categories'           => ['name'],
+            'piggy_banks'          => ['name'],
+            'preferences'          => ['data'],
+            'tags'                 => ['tag', 'description'],
+            'transaction_journals' => ['description'],
+            'transactions'         => ['description'],
+            'journal_links'        => ['comment'],
+        ];
+
+        foreach ($tables as $table => $fields) {
+            if ($this->isDecrypted($table)) {
+                $this->info(sprintf('No decryption required for table "%s".', $table));
+                continue;
+            }
+            foreach ($fields as $field) {
+                $rows = DB::table($table)->get(['id', $field]);
+                foreach ($rows as $row) {
+                    $original = $row->$field;
+                    if (null === $original) {
+                        continue;
+                    }
+                    $id    = $row->id;
+                    $value = $this->tryDecrypt($original);
+                    if ($value !== $original) {
+                        Log::debug(sprintf('Decrypted field "%s" "%s" to "%s" in table "%s" (row #%d)', $field, $original, $value, $table, $id));
+                        DB::table($table)->where('id', $id)->update([$field => $value]);
+                    }
+                }
+            }
+            $this->line(sprintf('Decrypted the data in table "%s".', $table));
+            // mark as decrypted:
+            $configName = sprintf('is_decrypted_%s', $table);
+            FireflyConfig::set($configName, true);
+
+        }
+        $this->info('Done!');
+
+        return 0;
+    }
+
+    /**
+     * @param string $table
+     *
+     * @return bool
+     */
+    private function isDecrypted(string $table): bool
+    {
+        $configName = sprintf('is_decrypted_%s', $table);
+        $configVar  = FireflyConfig::get($configName, false);
+        if (null !== $configVar) {
+            return (bool)$configVar->data;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * @param $value
+     *
+     * @return mixed
+     */
+    private function tryDecrypt($value)
+    {
+        try {
+            $value = Crypt::decrypt($value);
+        } catch (DecryptException $e) {
+            Log::debug(sprintf('Could not decrypt. %s', $e->getMessage()));
+        }
+
+        return $value;
+    }
+}

app/Console/Commands/EncryptFile.php

@@ -29,6 +29,8 @@ use Illuminate\Console\Command;
 
 /**
  * Class EncryptFile.
+ *
+ * @codeCoverageIgnore
  */
 class EncryptFile extends Command
 {
@@ -37,7 +39,7 @@ class EncryptFile extends Command
      *
      * @var string
      */
-    protected $description = 'Encrypts a file and places it in the storage/upload directory.';
+    protected $description = 'Encrypts a file and places it in the upload disk.';
 
     /**
      * The name and signature of the console command.

app/Console/Commands/Import.php

@@ -35,6 +35,8 @@ use Log;
 
 /**
  * Class Import.
+ *
+ * @codeCoverageIgnore
  */
 class Import extends Command
 {
@@ -59,20 +61,21 @@ class Import extends Command
      *
      * @throws FireflyException
      */
-    public function handle(): void
+    public function handle(): int
     {
         Log::debug('Start start-import command');
-        $jobKey = $this->argument('key');
-        $job    = ImportJob::where('key', $jobKey)->first();
+        $jobKey = (string)$this->argument('key');
+        /** @var ImportJob $job */
+        $job = ImportJob::where('key', $jobKey)->first();
         if (null === $job) {
             $this->errorLine(sprintf('No job found with key "%s"', $jobKey));
 
-            return;
+            return 1;
         }
         if (!$this->isValid($job)) {
             $this->errorLine('Job is not valid for some reason. Exit.');
 
-            return;
+            return 1;
         }
 
         $this->infoLine(sprintf('Going to import job with key "%s" of type "%s"', $job->key, $job->file_type));
@@ -106,6 +109,8 @@ class Import extends Command
         }
 
         $this->infoLine(sprintf('The import has finished. %d transactions have been imported.', $count));
+
+        return 0;
     }
 
     /**

app/Console/Commands/ScanAttachments.php

@@ -34,6 +34,8 @@ use Storage;
 
 /**
  * Class ScanAttachments.
+ *
+ * @codeCoverageIgnore
  */
 class ScanAttachments extends Command
 {
@@ -54,7 +56,7 @@ class ScanAttachments extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(): int
     {
         $attachments = Attachment::get();
         $disk        = Storage::disk('upload');
@@ -82,5 +84,7 @@ class ScanAttachments extends Command
             $attachment->save();
             $this->line(sprintf('Fixed attachment #%d', $attachment->id));
         }
+
+        return 0;
     }
 }

app/Console/Commands/UpgradeDatabase.php

@@ -35,6 +35,8 @@ use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Bill;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\Note;
 use FireflyIII\Models\Preference;
 use FireflyIII\Models\Rule;
@@ -54,7 +56,6 @@ use Illuminate\Console\Command;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Collection;
 use Log;
-use Preferences;
 use Schema;
 use UnexpectedValueException;
 
@@ -64,6 +65,8 @@ use UnexpectedValueException;
  * Upgrade user database.
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @codeCoverageIgnore
  */
 class UpgradeDatabase extends Command
 {
@@ -83,7 +86,7 @@ class UpgradeDatabase extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(): int
     {
         $this->setTransactionIdentifier();
         $this->updateAccountCurrencies();
@@ -95,8 +98,12 @@ class UpgradeDatabase extends Command
         $this->migrateNotes();
         $this->migrateAttachmentData();
         $this->migrateBillsToRules();
+        $this->budgetLimitCurrency();
+        $this->removeCCLiabilities();
 
         $this->info('Firefly III database is up to date.');
+
+        return 0;
     }
 
     /**
@@ -110,10 +117,10 @@ class UpgradeDatabase extends Command
     {
         foreach (User::get() as $user) {
             /** @var Preference $lang */
-            $lang               = Preferences::getForUser($user, 'language', 'en_US');
+            $lang               = app('preferences')->getForUser($user, 'language', 'en_US');
             $groupName          = (string)trans('firefly.rulegroup_for_bills_title', [], $lang->data);
             $ruleGroup          = $user->ruleGroups()->where('title', $groupName)->first();
-            $currencyPreference = Preferences::getForUser($user, 'currencyPreference', config('firefly.default_currency', 'EUR'));
+            $currencyPreference = app('preferences')->getForUser($user, 'currencyPreference', config('firefly.default_currency', 'EUR'));
 
             if (null === $currencyPreference) {
                 $this->error('User has no currency preference. Impossible.');
@@ -124,7 +131,7 @@ class UpgradeDatabase extends Command
             $currency = TransactionCurrency::where('code', $currencyPreference->data)->first();
             if (null === $currency) {
                 $this->line('Fall back to default currency in migrateBillsToRules().');
-                $currency = app('amount')->getDefaultCurrency();
+                $currency = app('amount')->getDefaultCurrencyByUser($user);
             }
 
             if (null === $ruleGroup) {
@@ -198,7 +205,7 @@ class UpgradeDatabase extends Command
                             [
                                 'rule_id'         => $rule->id,
                                 'trigger_type'    => 'amount_more',
-                                'trigger_value'   => round($bill->amount_min, $currency->decimal_places),
+                                'trigger_value'   => round((float)$bill->amount_min, $currency->decimal_places),
                                 'active'          => 1,
                                 'stop_processing' => 0,
                                 'order'           => 4,
@@ -210,7 +217,7 @@ class UpgradeDatabase extends Command
                             [
                                 'rule_id'         => $rule->id,
                                 'trigger_type'    => 'amount_exactly',
-                                'trigger_value'   => round($bill->amount_min, $currency->decimal_places),
+                                'trigger_value'   => round((float)$bill->amount_min, $currency->decimal_places),
                                 'active'          => 1,
                                 'stop_processing' => 0,
                                 'order'           => 3,
@@ -266,6 +273,7 @@ class UpgradeDatabase extends Command
                                         ->whereNull('transactions.deleted_at')
                                         ->groupBy(['transaction_journals.id'])
                                         ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
+        /** @noinspection PhpStrictTypeCheckingInspection */
         $result     = DB::table(DB::raw('(' . $subQuery->toSql() . ') AS derived'))
                         ->mergeBindings($subQuery->getQuery())
                         ->where('t_count', '>', 2)
@@ -294,7 +302,7 @@ class UpgradeDatabase extends Command
             function (Account $account) use ($repository) {
                 $repository->setUser($account->user);
                 // get users preference, fall back to system pref.
-                $defaultCurrencyCode = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
+                $defaultCurrencyCode = app('preferences')->getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
                 $defaultCurrency     = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
                 $accountCurrency     = (int)$repository->getMetaValue($account, 'currency_id');
                 $openingBalance      = $account->getOpeningBalance();
@@ -433,6 +441,35 @@ class UpgradeDatabase extends Command
         );
     }
 
+    /**
+     *
+     */
+    private function budgetLimitCurrency(): void
+    {
+        $budgetLimits = BudgetLimit::get();
+        /** @var BudgetLimit $budgetLimit */
+        foreach ($budgetLimits as $budgetLimit) {
+            if (null === $budgetLimit->transaction_currency_id) {
+                /** @var Budget $budget */
+                $budget = $budgetLimit->budget;
+                if (null !== $budget) {
+                    $user = $budget->user;
+                    if (null !== $user) {
+                        $currency                             = app('amount')->getDefaultCurrencyByUser($user);
+                        $budgetLimit->transaction_currency_id = $currency->id;
+                        $budgetLimit->save();
+                        $this->line(
+                            sprintf('Budget limit #%d (part of budget "%s") now has a currency setting (%s).', $budgetLimit->id, $budget->name, $currency->name)
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     *
+     */
     private function createNewTypes(): void
     {
         // create transaction type "Reconciliation".
@@ -459,7 +496,7 @@ class UpgradeDatabase extends Command
 
             // move description:
             $description = (string)$att->description;
-            if (\strlen($description) > 0) {
+            if ('' !== $description) {
                 // find or create note:
                 $note = $att->notes()->first();
                 if (null === $note) {
@@ -505,6 +542,28 @@ class UpgradeDatabase extends Command
         }
     }
 
+    /**
+     *
+     */
+    private function removeCCLiabilities(): void
+    {
+        $ccType   = AccountType::where('type', AccountType::CREDITCARD)->first();
+        $debtType = AccountType::where('type', AccountType::DEBT)->first();
+        if (null === $ccType || null === $debtType) {
+            return;
+        }
+        /** @var Collection $accounts */
+        $accounts = Account::where('account_type_id', $ccType->id)->get();
+        foreach ($accounts as $account) {
+            $account->account_type_id = $debtType->id;
+            $account->save();
+            $this->line(sprintf('Converted credit card liability account "%s" (#%d) to generic debt liability.', $account->name, $account->id));
+        }
+        if ($accounts->count() > 0) {
+            $this->info('Credit card liability types are no longer supported and have been converted to generic debts. See: http://bit.ly/FF3-credit-cards');
+        }
+    }
+
     /**
      * This method makes sure that the transaction journal uses the currency given in the transaction.
      *

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -27,6 +27,8 @@ use Illuminate\Console\Command;
 
 /**
  * Class UpgradeFireflyInstructions.
+ *
+ * @codeCoverageIgnore
  */
 class UpgradeFireflyInstructions extends Command
 {
@@ -46,14 +48,16 @@ class UpgradeFireflyInstructions extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(): int
     {
-        if ('update' === $this->argument('task')) {
+        if ('update' === (string)$this->argument('task')) {
             $this->updateInstructions();
         }
-        if ('install' === $this->argument('task')) {
+        if ('install' === (string)$this->argument('task')) {
             $this->installInstructions();
         }
+
+        return 0;
     }
 
     /**

app/Console/Commands/UseEncryption.php

@@ -1,91 +0,0 @@
-<?php
-/**
- * UseEncryption.php
- * Copyright (c) 2018 thegrumpydictator@gmail.com
- *
- * This file is part of Firefly III.
- *
- * Firefly III is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Firefly III 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Str;
-
-/**
- * Class UseEncryption.
- */
-class UseEncryption extends Command
-{
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'This command will make sure that entries in the database will be encrypted (or not) according to the settings in .env';
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'firefly:use-encryption';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): void
-    {
-        if (true === config('firefly.encryption')) {
-            $this->info('Firefly III configuration calls for encrypted data.');
-        }
-        if (false === config('firefly.encryption')) {
-            $this->info('Firefly III configuration calls for unencrypted data.');
-        }
-        $this->handleObjects('Account', 'name', 'encrypted');
-        $this->handleObjects('Bill', 'name', 'name_encrypted');
-        $this->handleObjects('Bill', 'match', 'match_encrypted');
-        $this->handleObjects('Budget', 'name', 'encrypted');
-        $this->handleObjects('Category', 'name', 'encrypted');
-        $this->handleObjects('PiggyBank', 'name', 'encrypted');
-        $this->handleObjects('TransactionJournal', 'description', 'encrypted');
-    }
-
-    /**
-     * Run each object and encrypt them (or not).
-     *
-     * @param string $class
-     * @param string $field
-     * @param string $indicator
-     */
-    public function handleObjects(string $class, string $field, string $indicator): void
-    {
-        $fqn     = sprintf('FireflyIII\Models\%s', $class);
-        $encrypt = true === config('firefly.encryption') ? 0 : 1;
-        /** @noinspection PhpUndefinedMethodInspection */
-        $set = $fqn::where($indicator, $encrypt)->get();
-
-        foreach ($set as $entry) {
-            $newName       = $entry->$field;
-            $entry->$field = $newName;
-            /** @noinspection PhpUndefinedMethodInspection */
-            $entry->save();
-        }
-
-        /** @noinspection PhpUndefinedMethodInspection */
-        $this->line(sprintf('Updated %d %s.', $set->count(), strtolower(Str::plural($class))));
-    }
-}

app/Console/Commands/VerifiesAccessToken.php

@@ -23,17 +23,37 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
 
+use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
 use Log;
-use Preferences;
 
 /**
  * Trait VerifiesAccessToken.
  *
  * Verifies user access token for sensitive commands.
+ *
+ * @codeCoverageIgnore
  */
 trait VerifiesAccessToken
 {
+    /**
+     * @return User
+     * @throws FireflyException
+     */
+    public function getUser(): User
+    {
+        $userId = (int)$this->option('user');
+        /** @var UserRepositoryInterface $repository */
+        $repository = app(UserRepositoryInterface::class);
+        $user       = $repository->findNull($userId);
+        if (null === $user) {
+            throw new FireflyException('User is unexpectedly NULL');
+        }
+
+        return $user;
+    }
+
     /**
      * Abstract method to make sure trait knows about method "option".
      *
@@ -61,7 +81,7 @@ trait VerifiesAccessToken
 
             return false;
         }
-        $accessToken = Preferences::getForUser($user, 'access_token', null);
+        $accessToken = app('preferences')->getForUser($user, 'access_token', null);
         if (null === $accessToken) {
             Log::error(sprintf('User #%d has no access token, so cannot access command line options.', $userId));
 

app/Console/Commands/VerifyDatabase.php

@@ -25,24 +25,24 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands;
 
-use Crypt;
 use DB;
 use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountMeta;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\LinkType;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Database\Eloquent\Builder;
-use Log;
-use Preferences;
+use Illuminate\Support\Collection;
 use Schema;
 use stdClass;
 
@@ -51,6 +51,7 @@ use stdClass;
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @codeCoverageIgnore
  */
 class VerifyDatabase extends Command
 {
@@ -70,11 +71,11 @@ class VerifyDatabase extends Command
     /**
      * Execute the console command.
      */
-    public function handle(): void
+    public function handle(): int
     {
         // if table does not exist, return false
         if (!Schema::hasTable('users')) {
-            return;
+            return 1;
         }
 
         $this->reportEmptyBudgets();
@@ -95,6 +96,9 @@ class VerifyDatabase extends Command
         $this->fixDoubleAmounts();
         $this->fixBadMeta();
         $this->removeBills();
+        $this->enableCurrencies();
+
+        return 0;
     }
 
     /**
@@ -106,10 +110,10 @@ class VerifyDatabase extends Command
         $users = User::get();
         /** @var User $user */
         foreach ($users as $user) {
-            $pref = Preferences::getForUser($user, 'access_token', null);
+            $pref = app('preferences')->getForUser($user, 'access_token', null);
             if (null === $pref) {
                 $token = $user->generateAccessToken();
-                Preferences::setForUser($user, 'access_token', $token);
+                app('preferences')->setForUser($user, 'access_token', $token);
                 $this->line(sprintf('Generated access token for user %s', $user->email));
                 ++$count;
             }
@@ -148,6 +152,45 @@ class VerifyDatabase extends Command
         }
     }
 
+    /**
+     * Will make sure that all currencies in use are actually enabled.
+     */
+    private function enableCurrencies(): void
+    {
+        $found = [];
+        // get all meta entries
+        /** @var Collection $meta */
+        $meta = AccountMeta::where('name', 'currency_id')->groupBy('data')->get(['data']);
+        foreach ($meta as $entry) {
+            $found[] = (int)$entry->data;
+        }
+
+        // get all from journals:
+        /** @var Collection $journals */
+        $journals = TransactionJournal::groupBy('transaction_currency_id')->get(['transaction_currency_id']);
+        foreach ($journals as $entry) {
+            $found[] = (int)$entry->transaction_currency_id;
+        }
+
+        // get all from transactions
+        /** @var Collection $transactions */
+        $transactions = Transaction::groupBy('transaction_currency_id')->get(['transaction_currency_id']);
+        foreach ($transactions as $entry) {
+            $found[] = (int)$entry->transaction_currency_id;
+        }
+
+        // get all from budget limits
+        /** @var Collection $limits */
+        $limits = BudgetLimit::groupBy('transaction_currency_id')->get(['transaction_currency_id']);
+        foreach ($limits as $entry) {
+            $found[] = (int)$entry->transaction_currency_id;
+        }
+
+        $found = array_unique($found);
+        TransactionCurrency::whereIn('id', $found)->update(['enabled' => true]);
+
+    }
+
     /**
      * Fix the situation where the matching transactions of a journal somehow have non-matching categories or budgets.
      *
@@ -404,12 +447,6 @@ class VerifyDatabase extends Command
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $objName = $entry->name;
-            try {
-                $objName = Crypt::decrypt($objName);
-            } catch (DecryptException $e) {
-                // it probably was not encrypted.
-                Log::debug(sprintf('Not a problem: %s', $e->getMessage()));
-            }
 
             // also count the transactions:
             $countTransactions = DB::table('budget_transaction')->where('budget_id', $entry->id)->count();
@@ -442,12 +479,6 @@ class VerifyDatabase extends Command
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $objName = $entry->name;
-            try {
-                $objName = Crypt::decrypt($objName);
-            } catch (DecryptException $e) {
-                // it probably was not encrypted.
-                Log::debug(sprintf('Not a problem: %s', $e->getMessage()));
-            }
 
             // also count the transactions:
             $countTransactions = DB::table('category_transaction')->where('category_id', $entry->id)->count();
@@ -581,12 +612,6 @@ class VerifyDatabase extends Command
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $objName = $entry->name;
-            try {
-                $objName = Crypt::decrypt($objName);
-            } catch (DecryptException $e) {
-                // it probably was not encrypted.
-                Log::debug(sprintf('Not a problem: %s', $e->getMessage()));
-            }
 
             $line = sprintf(
                 'User #%d (%s) has %s #%d ("%s") which has no transactions.',

app/Console/Kernel.php

@@ -24,13 +24,14 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console;
 
-use Carbon\Carbon;
-use FireflyIII\Jobs\CreateRecurringTransactions;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Log;
 
 /**
  * File to make sure commands work.
+ *
+ * @codeCoverageIgnore
  */
 class Kernel extends ConsoleKernel
 {
@@ -52,6 +53,23 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule): void
     {
-        $schedule->job(new CreateRecurringTransactions(new Carbon))->daily();
+        $schedule->call(
+            function () {
+                Log::error(
+                    'Firefly III no longer users the Laravel scheduler to do cron jobs! Please read the instructions at https://firefly-iii.readthedocs.io/en/latest/'
+                );
+                echo "\n";
+                echo '------------';
+                echo "\n";
+                echo wordwrap('Firefly III no longer users the Laravel scheduler to do cron jobs! Please read the instructions here:');
+                echo "\n";
+                echo 'https://firefly-iii.readthedocs.io/en/latest/';
+                echo "\n\n";
+                echo 'Disable this cron job!';
+                echo "\n";
+                echo '------------';
+                echo "\n";
+            }
+        )->everyMinute();
     }
 }

app/Events/AdminRequestedTestMessage.php

@@ -30,6 +30,8 @@ use Log;
 
 /**
  * Class AdminRequestedTestMessage.
+ *
+ * @codeCoverageIgnore
  */
 class AdminRequestedTestMessage extends Event
 {

app/Events/Event.php

@@ -26,6 +26,8 @@ namespace FireflyIII\Events;
 
 /**
  * Class Event.
+ *
+ * @codeCoverageIgnore
  */
 abstract class Event
 {

app/Events/RegisteredUser.php

@@ -29,6 +29,8 @@ use Illuminate\Queue\SerializesModels;
 
 /**
  * Class RegisteredUser.
+ *
+ * @codeCoverageIgnore
  */
 class RegisteredUser extends Event
 {

app/Events/RequestedNewPassword.php

@@ -29,6 +29,8 @@ use Illuminate\Queue\SerializesModels;
 
 /**
  * Class RequestedNewPassword.
+ *
+ * @codeCoverageIgnore
  */
 class RequestedNewPassword extends Event
 {
@@ -36,10 +38,10 @@ class RequestedNewPassword extends Event
 
     /** @var string The users IP address */
     public $ipAddress;
-    /** @var User The user */
-    public $user;
     /** @var string The token */
     public $token;
+    /** @var User The user */
+    public $user;
 
     /**
      * Create a new event instance. This event is triggered when a users tries to reset his or her password.

app/Events/RequestedReportOnJournals.php

@@ -1,4 +1,26 @@
 <?php
+
+/**
+ * RequestedReportOnJournals.php
+ * Copyright (c) 2018 thegrumpydictator@gmail.com
+ *
+ * This file is part of Firefly III.
+ *
+ * Firefly III is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Firefly III 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
 /**
  * RequestedReportOnJournals.php
  * Copyright (c) 2018 thegrumpydictator@gmail.com
@@ -30,6 +52,8 @@ use Log;
 
 /**
  * Class RequestedReportOnJournals
+ *
+ * @codeCoverageIgnore
  */
 class RequestedReportOnJournals
 {