Merge branch 'release/4.4.3'

* 'develop' of https://github.com/firefly-iii/firefly-iii: (45 commits)
  New translations validation.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations passwords.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations csv.php (Slovenian)
  New translations config.php (Slovenian)
  New translations breadcrumbs.php (Slovenian)
  New translations breadcrumbs.php (Slovenian)
  New translations auth.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations breadcrumbs.php (Slovenian)
  New translations demo.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations firefly.php (Slovenian)
  New translations form.php (Slovenian)
  ...

.env.example

@@ -41,6 +41,8 @@ SHOW_INCOMPLETE_TRANSLATIONS=false
 
 CACHE_PREFIX=firefly
 
+EXCHANGE_RATE_SERVICE=fixerio
+
 GOOGLE_MAPS_API_KEY=
 ANALYTICS_ID=
 SITE_OWNER=mail@example.com

.env.testing

@@ -3,6 +3,7 @@ APP_DEBUG=true
 APP_FORCE_SSL=false
 APP_FORCE_ROOT=
 APP_KEY=TestTestTestTestTestTestTestTest
+APP_LOG=daily
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 
@@ -25,7 +26,7 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
+MAIL_DRIVER=log
 MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
 MAIL_FROM=changeme@example.com

.github/CONTRIBUTING.md

@@ -17,3 +17,7 @@ Take the time to read the [installation guide FAQ](https://firefly-iii.github.io
 ## Pull requests
 
 I can only accept pull requests against the `develop` branch, never the `master` branch.
+
+## Translations :us: :fr: :de:
+
+If you see a spelling error, grammatical error or a weird translation in your language, please join [our CrowdIn](https://crowdin.com/project/firefly-iii) project. There, you can submit your translations and fixes. The GitHub repository will download these automatically and they will be included in the next release. 

.gitignore

@@ -1,14 +1,7 @@
 /node_modules
 /public/storage
 /vendor
-/.idea
 Homestead.json
 Homestead.yaml
 .env
-_development
-.env.local
-result.html
-test-import.sh
-test-import-report.txt
 public/google*.html
-.env.backup

.sandstorm/sandstorm-files.list

@@ -232,27 +232,52 @@ opt/app/app/Console/Kernel.php
 opt/app/app/Exceptions/Handler.php
 opt/app/app/Generator/Chart/Basic/ChartJsGenerator.php
 opt/app/app/Generator/Chart/Basic/GeneratorInterface.php
+opt/app/app/Generator/Report/ReportGeneratorFactory.php
+opt/app/app/Generator/Report/ReportGeneratorInterface.php
+opt/app/app/Generator/Report/Standard/MonthReportGenerator.php
 opt/app/app/Helpers/Attachments/AttachmentHelper.php
 opt/app/app/Helpers/Attachments/AttachmentHelperInterface.php
+opt/app/app/Helpers/Collection/Balance.php
+opt/app/app/Helpers/Collection/BalanceEntry.php
+opt/app/app/Helpers/Collection/BalanceHeader.php
+opt/app/app/Helpers/Collection/BalanceLine.php
+opt/app/app/Helpers/Collection/Bill.php
 opt/app/app/Helpers/Collector/JournalCollector.php
 opt/app/app/Helpers/Collector/JournalCollectorInterface.php
 opt/app/app/Helpers/FiscalHelper.php
 opt/app/app/Helpers/FiscalHelperInterface.php
+opt/app/app/Helpers/Report/BalanceReportHelper.php
+opt/app/app/Helpers/Report/BalanceReportHelperInterface.php
+opt/app/app/Helpers/Report/BudgetReportHelper.php
+opt/app/app/Helpers/Report/BudgetReportHelperInterface.php
 opt/app/app/Helpers/Report/ReportHelper.php
 opt/app/app/Helpers/Report/ReportHelperInterface.php
+opt/app/app/Http/Controllers/AccountController.php
 opt/app/app/Http/Controllers/Auth/LoginController.php
+opt/app/app/Http/Controllers/BillController.php
 opt/app/app/Http/Controllers/BudgetController.php
+opt/app/app/Http/Controllers/CategoryController.php
 opt/app/app/Http/Controllers/Chart/AccountController.php
 opt/app/app/Http/Controllers/Chart/BudgetController.php
 opt/app/app/Http/Controllers/Chart/CategoryController.php
 opt/app/app/Http/Controllers/Controller.php
 opt/app/app/Http/Controllers/HomeController.php
+opt/app/app/Http/Controllers/ImportController.php
 opt/app/app/Http/Controllers/JavascriptController.php
 opt/app/app/Http/Controllers/JsonController.php
 opt/app/app/Http/Controllers/NewUserController.php
+opt/app/app/Http/Controllers/PiggyBankController.php
 opt/app/app/Http/Controllers/ProfileController.php
+opt/app/app/Http/Controllers/Report/AccountController.php
+opt/app/app/Http/Controllers/Report/BalanceController.php
+opt/app/app/Http/Controllers/Report/BudgetController.php
+opt/app/app/Http/Controllers/Report/CategoryController.php
+opt/app/app/Http/Controllers/Report/OperationsController.php
 opt/app/app/Http/Controllers/ReportController.php
+opt/app/app/Http/Controllers/RuleController.php
+opt/app/app/Http/Controllers/TagController.php
 opt/app/app/Http/Controllers/Transaction/SingleController.php
+opt/app/app/Http/Controllers/TransactionController.php
 opt/app/app/Http/Kernel.php
 opt/app/app/Http/Middleware/Authenticate.php
 opt/app/app/Http/Middleware/AuthenticateTwoFactor.php
@@ -263,10 +288,16 @@ opt/app/app/Http/Middleware/RedirectIfAuthenticated.php
 opt/app/app/Http/Middleware/Sandstorm.php
 opt/app/app/Http/Middleware/StartFireflySession.php
 opt/app/app/Http/Middleware/VerifyCsrfToken.php
+opt/app/app/Http/Requests/BudgetFormRequest.php
+opt/app/app/Http/Requests/BudgetIncomeRequest.php
+opt/app/app/Http/Requests/CategoryFormRequest.php
 opt/app/app/Http/Requests/JournalFormRequest.php
 opt/app/app/Http/Requests/NewUserFormRequest.php
+opt/app/app/Http/Requests/PiggyBankFormRequest.php
 opt/app/app/Http/Requests/ProfileFormRequest.php
+opt/app/app/Http/Requests/ReportFormRequest.php
 opt/app/app/Http/Requests/Request.php
+opt/app/app/Http/Requests/TagFormRequest.php
 opt/app/app/Http/breadcrumbs.php
 opt/app/app/Jobs/Job.php
 opt/app/app/Jobs/MailError.php
@@ -279,9 +310,15 @@ opt/app/app/Models/Budget.php
 opt/app/app/Models/BudgetLimit.php
 opt/app/app/Models/Category.php
 opt/app/app/Models/Configuration.php
+opt/app/app/Models/Note.php
 opt/app/app/Models/PiggyBank.php
+opt/app/app/Models/PiggyBankRepetition.php
 opt/app/app/Models/Preference.php
 opt/app/app/Models/Role.php
+opt/app/app/Models/Rule.php
+opt/app/app/Models/RuleAction.php
+opt/app/app/Models/RuleGroup.php
+opt/app/app/Models/RuleTrigger.php
 opt/app/app/Models/Tag.php
 opt/app/app/Models/Transaction.php
 opt/app/app/Models/TransactionCurrency.php
@@ -317,14 +354,24 @@ opt/app/app/Repositories/Budget/BudgetRepository.php
 opt/app/app/Repositories/Budget/BudgetRepositoryInterface.php
 opt/app/app/Repositories/Category/CategoryRepository.php
 opt/app/app/Repositories/Category/CategoryRepositoryInterface.php
+opt/app/app/Repositories/Currency/CurrencyRepository.php
+opt/app/app/Repositories/Currency/CurrencyRepositoryInterface.php
 opt/app/app/Repositories/Journal/JournalRepository.php
 opt/app/app/Repositories/Journal/JournalRepositoryInterface.php
 opt/app/app/Repositories/PiggyBank/PiggyBankRepository.php
 opt/app/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php
+opt/app/app/Repositories/Rule/RuleRepository.php
+opt/app/app/Repositories/Rule/RuleRepositoryInterface.php
+opt/app/app/Repositories/RuleGroup/RuleGroupRepository.php
+opt/app/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php
 opt/app/app/Repositories/Tag/TagRepository.php
 opt/app/app/Repositories/Tag/TagRepositoryInterface.php
+opt/app/app/Repositories/User/UserRepository.php
 opt/app/app/Repositories/User/UserRepositoryInterface.php
 opt/app/app/Support/Amount.php
+opt/app/app/Support/Binder/AccountList.php
+opt/app/app/Support/Binder/BinderInterface.php
+opt/app/app/Support/Binder/Date.php
 opt/app/app/Support/CacheProperties.php
 opt/app/app/Support/Domain.php
 opt/app/app/Support/ExpandedForm.php
@@ -386,25 +433,40 @@ opt/app/database/seeds/PermissionSeeder.php
 opt/app/database/seeds/TransactionCurrencySeeder.php
 opt/app/database/seeds/TransactionTypeSeeder.php
 opt/app/public/css/bootstrap-multiselect.css
+opt/app/public/css/bootstrap-sortable.css
 opt/app/public/css/bootstrap-tagsinput.css
 opt/app/public/css/bootstrap-tour.min.css
 opt/app/public/css/daterangepicker.css
 opt/app/public/css/firefly.css
 opt/app/public/css/jquery-ui/jquery-ui.structure.min.css
 opt/app/public/css/jquery-ui/jquery-ui.theme.min.css
+opt/app/public/favicon-16x16.png
+opt/app/public/favicon-32x32.png
 opt/app/public/index.php
+opt/app/public/js/ff/accounts/edit.js
+opt/app/public/js/ff/bills/create.js
 opt/app/public/js/ff/budgets/index.js
+opt/app/public/js/ff/categories/index.js
 opt/app/public/js/ff/charts.defaults.js
 opt/app/public/js/ff/charts.js
 opt/app/public/js/ff/firefly.js
 opt/app/public/js/ff/guest.js
 opt/app/public/js/ff/help.js
 opt/app/public/js/ff/index.js
+opt/app/public/js/ff/piggy-banks/create.js
+opt/app/public/js/ff/piggy-banks/index.js
+opt/app/public/js/ff/reports/default/all.js
+opt/app/public/js/ff/reports/default/month.js
 opt/app/public/js/ff/reports/index.js
+opt/app/public/js/ff/rules/index.js
+opt/app/public/js/ff/tags/create-edit.js
+opt/app/public/js/ff/tags/index.js
+opt/app/public/js/ff/transactions/list.js
 opt/app/public/js/ff/transactions/single/create.js
 opt/app/public/js/lib/Chart.bundle.min.js
 opt/app/public/js/lib/accounting.min.js
 opt/app/public/js/lib/bootstrap-multiselect.js
+opt/app/public/js/lib/bootstrap-sortable.js
 opt/app/public/js/lib/bootstrap-tagsinput.min.js
 opt/app/public/js/lib/bootstrap-tour.min.js
 opt/app/public/js/lib/bootstrap3-typeahead.min.js
@@ -417,6 +479,7 @@ opt/app/public/lib/adminlte/css/AdminLTE.min.css
 opt/app/public/lib/adminlte/css/skins/skin-blue-light.min.css
 opt/app/public/lib/adminlte/js/app.min.js
 opt/app/public/lib/bootstrap/css/bootstrap.min.css
+opt/app/public/lib/bootstrap/fonts/glyphicons-halflings-regular.woff2
 opt/app/public/lib/bootstrap/js/bootstrap.min.js
 opt/app/public/lib/font-awesome/css/font-awesome.min.css
 opt/app/public/lib/font-awesome/fonts/fontawesome-webfont.woff2
@@ -425,9 +488,19 @@ opt/app/resources/lang/en_US/config.php
 opt/app/resources/lang/en_US/firefly.php
 opt/app/resources/lang/en_US/form.php
 opt/app/resources/lang/en_US/help.php
+opt/app/resources/lang/en_US/list.php
 opt/app/resources/lang/en_US/validation.php
+opt/app/resources/views/accounts/delete.twig
+opt/app/resources/views/accounts/edit.twig
+opt/app/resources/views/accounts/index.twig
 opt/app/resources/views/auth/login.twig
+opt/app/resources/views/bills/create.twig
+opt/app/resources/views/bills/index.twig
+opt/app/resources/views/budgets/create.twig
+opt/app/resources/views/budgets/income.twig
 opt/app/resources/views/budgets/index.twig
+opt/app/resources/views/categories/create.twig
+opt/app/resources/views/categories/index.twig
 opt/app/resources/views/emails/error-html.twig
 opt/app/resources/views/emails/error-text.twig
 opt/app/resources/views/emails/footer-html.twig
@@ -437,18 +510,31 @@ opt/app/resources/views/emails/header-text.twig
 opt/app/resources/views/error.twig
 opt/app/resources/views/form/amount.twig
 opt/app/resources/views/form/balance.twig
+opt/app/resources/views/form/checkbox.twig
 opt/app/resources/views/form/date.twig
 opt/app/resources/views/form/feedback.twig
+opt/app/resources/views/form/file.twig
 opt/app/resources/views/form/help.twig
+opt/app/resources/views/form/integer.twig
+opt/app/resources/views/form/location.twig
+opt/app/resources/views/form/multiRadio.twig
 opt/app/resources/views/form/options.twig
 opt/app/resources/views/form/select.twig
+opt/app/resources/views/form/tags.twig
 opt/app/resources/views/form/text.twig
+opt/app/resources/views/form/textarea.twig
+opt/app/resources/views/import/index.twig
 opt/app/resources/views/index.twig
 opt/app/resources/views/javascript/variables.twig
 opt/app/resources/views/json/tour.twig
 opt/app/resources/views/layout/default.twig
 opt/app/resources/views/layout/guest.twig
+opt/app/resources/views/list/accounts.twig
+opt/app/resources/views/list/bills.twig
+opt/app/resources/views/list/categories.twig
+opt/app/resources/views/list/journals-tasker.twig
 opt/app/resources/views/list/journals-tiny-tasker.twig
+opt/app/resources/views/list/piggy-banks.twig
 opt/app/resources/views/new-user/index.twig
 opt/app/resources/views/partials/boxes.twig
 opt/app/resources/views/partials/control-bar.twig
@@ -456,11 +542,25 @@ opt/app/resources/views/partials/favicons.twig
 opt/app/resources/views/partials/flashes.twig
 opt/app/resources/views/partials/menu-sidebar.twig
 opt/app/resources/views/partials/page-header.twig
+opt/app/resources/views/piggy-banks/create.twig
+opt/app/resources/views/piggy-banks/index.twig
 opt/app/resources/views/profile/change-password.twig
 opt/app/resources/views/profile/delete-account.twig
 opt/app/resources/views/profile/index.twig
+opt/app/resources/views/reports/default/month.twig
 opt/app/resources/views/reports/index.twig
 opt/app/resources/views/reports/options/no-options.twig
+opt/app/resources/views/reports/partials/accounts.twig
+opt/app/resources/views/reports/partials/balance.twig
+opt/app/resources/views/reports/partials/bills.twig
+opt/app/resources/views/reports/partials/budgets.twig
+opt/app/resources/views/reports/partials/categories.twig
+opt/app/resources/views/reports/partials/income-expenses.twig
+opt/app/resources/views/reports/partials/operations.twig
+opt/app/resources/views/rules/index.twig
+opt/app/resources/views/tags/create.twig
+opt/app/resources/views/tags/index.twig
+opt/app/resources/views/transactions/index.twig
 opt/app/resources/views/transactions/single/create.twig
 opt/app/routes/api.php
 opt/app/routes/console.php
@@ -612,6 +712,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Http/Kernel.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Logging/Log.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Mail/MailQueue.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Mail/Mailer.php
+opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Pagination/LengthAwarePaginator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Pagination/Paginator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Pipeline/Pipeline.php
 opt/app/vendor/laravel/framework/src/Illuminate/Contracts/Queue/Factory.php
@@ -682,6 +783,8 @@ opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Conc
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php
+opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphMany.php
+opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/Scope.php
 opt/app/vendor/laravel/framework/src/Illuminate/Database/Eloquent/SoftDeletes.php
@@ -808,8 +911,11 @@ opt/app/vendor/laravel/framework/src/Illuminate/Notifications/Notifiable.php
 opt/app/vendor/laravel/framework/src/Illuminate/Notifications/NotificationServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Notifications/RoutesNotifications.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pagination/AbstractPaginator.php
+opt/app/vendor/laravel/framework/src/Illuminate/Pagination/LengthAwarePaginator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pagination/Paginator.php
+opt/app/vendor/laravel/framework/src/Illuminate/Pagination/UrlWindow.php
+opt/app/vendor/laravel/framework/src/Illuminate/Pagination/resources/views/default.blade.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php
 opt/app/vendor/laravel/framework/src/Illuminate/Pipeline/PipelineServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Queue/CallQueuedHandler.php
@@ -884,12 +990,14 @@ opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/App.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Auth.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Config.php
+opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Gate.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Input.php
+opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php
@@ -914,6 +1022,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Support/ViewErrorBag.php
 opt/app/vendor/laravel/framework/src/Illuminate/Support/helpers.php
 opt/app/vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php
 opt/app/vendor/laravel/framework/src/Illuminate/Translation/LoaderInterface.php
+opt/app/vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php
 opt/app/vendor/laravel/framework/src/Illuminate/Translation/TranslationServiceProvider.php
 opt/app/vendor/laravel/framework/src/Illuminate/Translation/Translator.php
 opt/app/vendor/laravel/framework/src/Illuminate/Validation/Concerns/FormatsMessages.php
@@ -1214,14 +1323,17 @@ opt/app/vendor/twig/twig/lib/Twig/Node/Expression.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
+opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
+opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
+opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
 opt/app/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php

.sandstorm/sandstorm-pkgdef.capnp

@@ -16,7 +16,7 @@ const pkgdef :Spk.PackageDefinition = (
   manifest = (
     appTitle = (defaultText = "Firefly III"),
     appVersion = 1,
-    appMarketingVersion = (defaultText = "3.4.3"),
+    appMarketingVersion = (defaultText = "3.4.6"),
     actions = [
       # Define your "new document" handlers here.
       ( nounPhrase = (defaultText = "administration"),
@@ -97,7 +97,7 @@ const pkgdef :Spk.PackageDefinition = (
   # `spk dev` will write a list of all the files your app uses to this file.
   # You should review it later, before shipping your app.
 
-  alwaysInclude = [],
+  alwaysInclude = ["app","bootstrap","config","database","public","resources","routes"],
   # Fill this list with more names of files or directories that should be
   # included in your package, even if not listed in sandstorm-files.list.
   # Use this to force-include stuff that you know you need but which may

.travis.yml

@@ -9,7 +9,6 @@ cache:
         - $HOME/.composer/cache
 
 install:
-  - if [[ "$(php -v | grep 'PHP 7')" ]]; then phpenv config-rm xdebug.ini; fi
   - rm composer.lock
   - composer update --no-scripts
   - cp .env.testing .env
@@ -18,9 +17,13 @@ install:
   - php artisan env
   - cp .env.testing .env
   - mv storage/database/databasecopy.sqlite storage/database/database.sqlite
+  - mkdir -p build/logs
 
 script:
-  - phpunit
+  - phpunit -c phpunit.xml
+
+#after_success:
+#  - travis_retry php vendor/bin/coveralls -x storage/build/clover.xml
 
 # safelist
 branches:

CHANGELOG.md

@@ -2,6 +2,85 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.4.3] - 2017-05-03
+### Added
+- Added support for Slovenian
+- Removed support for Spanish. No translations whatsoever by the guy who requested it.
+- Removed support for Russian. Same thing.
+- Removed support for Croatian. Same thing.
+- Removed support for Chinese Traditional, Hong Kong. Same thing.
+
+### Changed
+- The journal collector, an internal piece of code to collect transactions, now uses a slightly different method of collecting journals. This may cause problems.
+
+### Fixed
+- Issue #638 as reported by [worldworm](https://github.com/worldworm).
+- Possible fix for #624
+
+## [4.4.2] - 2017-04-27
+### Fixed
+- Fixed a bug where the opening balance could not be stored.
+
+## [4.4.1] - 2017-04-27
+
+### Added
+- Support for deployment on Heroku
+
+### Fixed
+- Bug in new-user routine.
+
+## [4.4.0] - 2017-04-23
+### Added
+- Firefly III can now handle foreign currencies better, including some code to get the exchange rate live from the web.
+- Can now make rules for attachments, see #608, as suggested by dzaikos.
+
+### Fixed
+- Fixed #629, reported by forcaeluz
+- Fixed #630, reported by welbert
+- And more various bug fixes.
+
+## [4.3.8] - 2017-04-08
+
+### Added
+- Better overview / show pages.
+- #628, as reported by [xzaz](https://github.com/xzaz).
+- Greatly expanded test coverage
+
+### Fixed
+- #619, as reported by [dfiel](https://github.com/dfiel).
+- #620, as reported by [forcaeluz](https://github.com/forcaeluz).
+- Attempt to fix #624, as reported by [TheSerenin](https://github.com/TheSerenin).
+- Favicon link is relative now, fixed by [welbert](https://github.com/welbert).
+- Some search bugs
+
+## [4.3.7] - 2017-03-06
+### Added
+- Nice user friendly views for empty lists.
+- Extended contribution guidelines.
+- First version of financial report filtered on tags.
+- Suggested monthly savings for piggy banks, by [Zsub](https://github.com/Zsub)
+- Better test coverage.
+
+### Changed
+- Slightly changed tag overview.
+- Consistent icon for bill in list.
+- Slightly changed account overview.
+
+### Removed
+- Removed IDE specific views from .gitignore, issue #598
+
+### Fixed
+- Force key generation during installation.
+- The `date` function takes the fieldname where a date is stored, not the literal date by [Zsub](https://github.com/Zsub)
+- Improved budget frontpage chart, as suggested by [skibbipl](https://github.com/skibbipl)
+- Issue #602 and #607, as reported by [skibbipl](https://github.com/skibbipl) and [dzaikos](https://github.com/dzaikos).
+- Issue #605, as reported by [Zsub](https://github.com/Zsub).
+- Issue #599, as reported by [leander091](https://github.com/leander091).
+- Issue #610, as reported by [skibbipl](https://github.com/skibbipl).
+- Issue #611, as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
+- Issue #612, as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson).
+- Issue #614, as reported by [worldworm](https://github.com/worldworm).
+- Various other bug fixes.
 
 ## [4.3.6] - 2017-02-20
 ### Fixed
@@ -159,13 +238,6 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Updated all email messages.
 - Made some fonts local
 
-
-### Deprecated
-- Initial release.
-
-### Removed
-- Initial release.
-
 ### Fixed
 - Issue #408
 - Various issues with split journals
@@ -174,11 +246,6 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - Issue #422, thx [xzaz](https://github.com/xzaz)
 - Various import bugs, such as #416 ([zjean](https://github.com/zjean))
 
-
-### Security
-- Initial release.
-
-
 ## [4.1.7] - 2016-11-19
 ### Added
 - Check for database table presence in console commands.
@@ -301,15 +368,6 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - New Presidents Choice specific to fix #307
 - Added some trimming (#335)
 
-### Changed
-- Initial release.
-
-### Deprecated
-- Initial release.
-
-### Removed
-- Initial release.
-
 ### Fixed
 - Fixed a bug where incoming transactions would not be properly filtered in several reports.
 - #334 by [cyberkov](https://github.com/cyberkov)
@@ -317,12 +375,6 @@ An intermediate release because something in the Twig and Twigbridge libraries i
 - #336
 - #338 found by [roberthorlings](https://github.com/roberthorlings)
 
-### Security
-- Initial release.
-
-
-
-
 ## [4.0.0] - 2015-09-26
 ### Added
 - Upgraded to Laravel 5.3, most other libraries upgraded as well.

Procfile

@@ -0,0 +1 @@
+web: vendor/bin/heroku-php-nginx -C nginx_app.conf public/

README.md

@@ -1,6 +1,6 @@
 # Firefly III: A personal finances manager 
 
-[![Requires PHP7](https://img.shields.io/badge/php-7.0-red.svg)](https://secure.php.net/downloads.php#v7.0.4) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/?branch=master) [![Build Status](https://travis-ci.org/firefly-iii/firefly-iii.svg?branch=master)](https://travis-ci.org/firefly-iii/firefly-iii) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) 
+[![Requires PHP7](https://img.shields.io/badge/php-7.0-red.svg)](https://secure.php.net/downloads.php) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![License](https://img.shields.io/badge/license-CC%20BY--SA%204.0-lightgrey.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) 
 
 [![The index of Firefly III](https://i.nder.be/hurdhgyg/400)](https://i.nder.be/h2b37243) [![The account overview of Firefly III](https://i.nder.be/hnkfkdpr/400)](https://i.nder.be/hv70pbwc)
 
@@ -10,11 +10,15 @@
 
 ## Try it out!
 
-Try out Firefly III on the [demo site](https://firefly-iii.nder.be/).
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/firefly-iii/firefly-iii/tree/master)
+
+Firefly III can be run on Heroku. Register for a free Heroku account and instantly run Firefly III on your very own cloud instance.
+
+There is also a [demo site](https://firefly-iii.nder.be) with an example financial administration already present. 
 
 ## Installation
 
-To install Firefly III, you'll need a web server (preferrably on Linux) and access to the command line. Then, please read the [installation guide](https://firefly-iii.github.io/installation-guide/).
+To install Firefly III, you'll need a web server (preferrably on Linux) and access to the command line. Then, please read the [installation guide](https://firefly-iii.github.io/using-installing.html).
 
 ## More about Firefly III
 
@@ -34,3 +38,5 @@ Firefly is pretty awesome. [You can read more about Firefly III, and its feature
 If you like Firefly and if it helps you save lots of money, why not send me [a dime for every dollar saved](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) (this is a joke, although the Paypal form works just fine, try it!)
 
 If you want to contact me, please open an issue or [email me](mailto:thegrumpydictator@gmail.com).
+
+[![Build Status](https://travis-ci.org/firefly-iii/firefly-iii.svg?branch=master)](https://travis-ci.org/firefly-iii/firefly-iii) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/firefly-iii/firefly-iii/?branch=master) [![Coverage Status](https://coveralls.io/repos/github/firefly-iii/firefly-iii/badge.svg?branch=master)](https://coveralls.io/github/firefly-iii/firefly-iii?branch=master)

app.json

@@ -0,0 +1,59 @@
+{
+  "name": "Firefly III",
+  "description": "A free and open source personal finances manager",
+  "repository": "https://github.com/firefly-iii/firefly-iii",
+  "logo": "https://raw.githubusercontent.com/firefly-iii/firefly-iii/master/public/mstile-150x150.png",
+  "keywords": [
+    "finance",
+    "finances",
+    "manager",
+    "management",
+    "euro",
+    "dollar",
+    "laravel",
+    "money",
+    "currency",
+    "financials",
+    "financial",
+    "budgets",
+    "administration",
+    "tool",
+    "tooling",
+    "help",
+    "helper",
+    "assistant",
+    "planning",
+    "organizing",
+    "bills",
+    "personal finance",
+    "budgets",
+    "budgeting",
+    "budgeting tool",
+    "budgeting application",
+    "transactions",
+    "self hosted",
+    "self-hosted",
+    "transfers",
+    "management"
+  ],
+  "website": "https://firefly-iii.github.io/",
+  "addons": [
+    {
+      "plan": "heroku-postgresql"
+    }
+  ],
+  "scripts": {
+    "postdeploy": "export APP_KEY=$(php artisan --no-ansi key:generate --show)"
+  },
+  "buildpacks": [
+    {
+      "url": "heroku/php"
+    }
+  ],
+  "env": {
+    "APP_KEY": {
+      "description": "This key is used to encrypt your data.",
+      "value": "base64:If1gJN4pyycXTq+WS5TjneDympKuu+8SKvTl6RZnhJg="
+    }
+  }
+}

app/Bootstrap/ConfigureLogging.php

@@ -1,63 +0,0 @@
-<?php
-/**
- * ConfigureLogging.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Bootstrap;
-
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Foundation\Bootstrap\ConfigureLogging as IlluminateConfigureLogging;
-use Illuminate\Log\Writer;
-
-/**
- * Class ConfigureLogging
- *
- * @package FireflyIII\Bootstrap
- */
-class ConfigureLogging extends IlluminateConfigureLogging
-{
-
-    /**
-     * Configure the Monolog handlers for the application.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application $app
-     * @param  \Illuminate\Log\Writer                       $log
-     *
-     * @return void
-     */
-    protected function configureDailyHandler(Application $app, Writer $log)
-    {
-        $config = $app->make('config');
-
-        $maxFiles = $config->get('app.log_max_files');
-
-        $log->useDailyFiles(
-            $app->storagePath() . '/logs/firefly-iii.log', is_null($maxFiles) ? 5 : $maxFiles,
-            $config->get('app.log_level', 'debug')
-        );
-    }
-
-    /**
-     * Configure the Monolog handlers for the application.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application $app
-     * @param  \Illuminate\Log\Writer                       $log
-     *
-     * @return void
-     */
-    protected function configureSingleHandler(Application $app, Writer $log)
-    {
-        $log->useFiles(
-            $app->storagePath() . '/logs/firefly-iii.log',
-            $app->make('config')->get('app.log_level', 'debug')
-        );
-    }
-}

app/Console/Commands/CreateImport.php

@@ -84,7 +84,7 @@ class CreateImport extends Command
         $job = $jobRepository->create($type);
         $this->line(sprintf('Created job "%s"...', $job->key));
 
-        Artisan::call('firefly:encrypt', ['file' => $file, 'key' => $job->key]);
+        Artisan::call('firefly:encrypt-file', ['file' => $file, 'key' => $job->key]);
         $this->line('Stored import data...');
 
         $job->configuration = $configurationData;

app/Console/Commands/Import.php

@@ -58,7 +58,12 @@ class Import extends Command
     {
         Log::debug('Start start-import command');
         $jobKey = $this->argument('key');
-        $job    = ImportJob::whereKey($jobKey)->first();
+        $job    = ImportJob::where('key', $jobKey)->first();
+        if (is_null($job)) {
+            $this->error(sprintf('No job found with key "%s"', $jobKey));
+
+            return;
+        }
         if (!$this->isValid($job)) {
             Log::error('Job is not valid for some reason. Exit.');
 

app/Console/Commands/UpgradeDatabase.php

@@ -15,13 +15,22 @@ namespace FireflyIII\Console\Commands;
 
 
 use DB;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use Illuminate\Console\Command;
+use Illuminate\Database\Query\JoinClause;
 use Illuminate\Database\QueryException;
 use Log;
+use Preferences;
 use Schema;
 
 /**
@@ -60,8 +69,15 @@ class UpgradeDatabase extends Command
     {
         $this->setTransactionIdentifier();
         $this->migrateRepetitions();
+        $this->repairPiggyBanks();
+        $this->updateAccountCurrencies();
+        $this->updateJournalCurrencies();
+        $this->info('Firefly III database is up to date.');
     }
 
+    /**
+     *  Migrate budget repetitions to new format.
+     */
     private function migrateRepetitions()
     {
         if (!Schema::hasTable('budget_limits')) {
@@ -69,7 +85,9 @@ class UpgradeDatabase extends Command
         }
         // get all budget limits with end_date NULL
         $set = BudgetLimit::whereNull('end_date')->get();
+        if ($set->count() > 0) {
             $this->line(sprintf('Found %d budget limit(s) to update', $set->count()));
+        }
         /** @var BudgetLimit $budgetLimit */
         foreach ($set as $budgetLimit) {
             // get limit repetition (should be just one):
@@ -84,6 +102,37 @@ class UpgradeDatabase extends Command
         }
     }
 
+    /**
+     * Make sure there are only transfers linked to piggy bank events.
+     */
+    private function repairPiggyBanks()
+    {
+        // if table does not exist, return false
+        if (!Schema::hasTable('piggy_bank_events')) {
+            return;
+        }
+        $set = PiggyBankEvent::with(['PiggyBank', 'TransactionJournal', 'TransactionJournal.TransactionType'])->get();
+        /** @var PiggyBankEvent $event */
+        foreach ($set as $event) {
+
+            if (is_null($event->transaction_journal_id)) {
+                continue;
+            }
+            /** @var TransactionJournal $journal */
+            $journal = $event->transactionJournal()->first();
+            if (is_null($journal)) {
+                continue;
+            }
+
+            $type = $journal->transactionType->type;
+            if ($type !== TransactionType::TRANSFER) {
+                $event->transaction_journal_id = null;
+                $event->save();
+                $this->line(sprintf('Piggy bank #%d was referenced by an invalid event. This has been fixed.', $event->piggy_bank_id));
+            }
+        }
+    }
+
     /**
      * This is strangely complex, because the HAVING modifier is a no-no. And subqueries in Laravel are weird.
      */
@@ -112,6 +161,57 @@ class UpgradeDatabase extends Command
         }
     }
 
+    /**
+     *
+     */
+    private function updateAccountCurrencies()
+    {
+        $accounts = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+                           ->whereIn('account_types.type', [AccountType::DEFAULT, AccountType::ASSET])->get(['accounts.*']);
+
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            // get users preference, fall back to system pref.
+            $defaultCurrencyCode    = Preferences::getForUser($account->user, 'currencyPreference', config('firefly.default_currency', 'EUR'))->data;
+            $defaultCurrency        = TransactionCurrency::where('code', $defaultCurrencyCode)->first();
+            $accountCurrency        = intval($account->getMeta('currency_id'));
+            $openingBalance         = $account->getOpeningBalance();
+            $openingBalanceCurrency = intval($openingBalance->transaction_currency_id);
+
+            // both 0? set to default currency:
+            if ($accountCurrency === 0 && $openingBalanceCurrency === 0) {
+                AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $defaultCurrency->id]);
+                $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
+                continue;
+            }
+
+            // opening balance 0, account not zero? just continue:
+            if ($accountCurrency > 0 && $openingBalanceCurrency === 0) {
+                continue;
+            }
+            // account is set to 0, opening balance is not?
+            if ($accountCurrency === 0 && $openingBalanceCurrency > 0) {
+                AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $openingBalanceCurrency]);
+                $this->line(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $defaultCurrencyCode));
+                continue;
+            }
+
+            // both are equal, just continue:
+            if ($accountCurrency === $openingBalanceCurrency) {
+                continue;
+            }
+            // do not match:
+            if ($accountCurrency !== $openingBalanceCurrency) {
+                // update opening balance:
+                $openingBalance->transaction_currency_id = $accountCurrency;
+                $openingBalance->save();
+                $this->line(sprintf('Account #%d ("%s") now has a correct currency for opening balance.', $account->id, $account->name));
+                continue;
+            }
+        }
+
+    }
+
     /**
      * grab all positive transactiosn from this journal that are not deleted. for each one, grab the negative opposing one
      * which has 0 as an identifier and give it the same identifier.
@@ -151,9 +251,87 @@ class UpgradeDatabase extends Command
                 $opposing->save();
                 $processed[] = $transaction->id;
                 $processed[] = $opposing->id;
-                $this->line(sprintf('Database upgrade for journal #%d, transactions #%d and #%d', $journalId, $transaction->id, $opposing->id));
             }
             $identifier++;
         }
     }
+
+    /**
+     * Makes sure that withdrawals, deposits and transfers have
+     * a currency setting matching their respective accounts
+     */
+    private function updateJournalCurrencies()
+    {
+        $types        = [
+            TransactionType::WITHDRAWAL => '<',
+            TransactionType::DEPOSIT    => '>',
+        ];
+        $repository   = app(CurrencyRepositoryInterface::class);
+        $notification = '%s #%d uses %s but should use %s. It has been updated. Please verify this in Firefly III.';
+        $transfer     = 'Transfer #%d has been updated to use the correct currencies. Please verify this in Firefly III.';
+
+        foreach ($types as $type => $operator) {
+            $set = TransactionJournal
+                ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')->leftJoin(
+                    'transactions', function (JoinClause $join) use ($operator) {
+                    $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', $operator, '0');
+                }
+                )
+                ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
+                ->where('transaction_types.type', $type)
+                ->where('account_meta.name', 'currency_id')
+                ->where('transaction_journals.transaction_currency_id', '!=', DB::raw('account_meta.data'))
+                ->get(['transaction_journals.*', 'account_meta.data as expected_currency_id', 'transactions.amount as transaction_amount']);
+            /** @var TransactionJournal $journal */
+            foreach ($set as $journal) {
+                $expectedCurrency = $repository->find(intval($journal->expected_currency_id));
+                $line             = sprintf($notification, $type, $journal->id, $journal->transactionCurrency->code, $expectedCurrency->code);
+
+                $journal->setMeta('foreign_amount', $journal->transaction_amount);
+                $journal->setMeta('foreign_currency_id', $journal->transaction_currency_id);
+                $journal->transaction_currency_id = $expectedCurrency->id;
+                $journal->save();
+                $this->line($line);
+            }
+        }
+        /*
+         * For transfers it's slightly different. Both source and destination
+         * must match the respective currency preference. So we must verify ALL
+         * transactions.
+         */
+        $set = TransactionJournal
+            ::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+            ->where('transaction_types.type', TransactionType::TRANSFER)
+            ->get(['transaction_journals.*']);
+        /** @var TransactionJournal $journal */
+        foreach ($set as $journal) {
+            $updated = false;
+            /** @var Transaction $sourceTransaction */
+            $sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first();
+            $sourceCurrency    = $repository->find(intval($sourceTransaction->account->getMeta('currency_id')));
+
+            if ($sourceCurrency->id !== $journal->transaction_currency_id) {
+                $updated                          = true;
+                $journal->transaction_currency_id = $sourceCurrency->id;
+                $journal->save();
+            }
+
+            // destination
+            $destinationTransaction = $journal->transactions()->where('amount', '>', 0)->first();
+            $destinationCurrency    = $repository->find(intval($destinationTransaction->account->getMeta('currency_id')));
+
+            if ($destinationCurrency->id !== $journal->transaction_currency_id) {
+                $updated = true;
+                $journal->deleteMeta('foreign_amount');
+                $journal->deleteMeta('foreign_currency_id');
+                $journal->setMeta('foreign_amount', $destinationTransaction->amount);
+                $journal->setMeta('foreign_currency_id', $destinationCurrency->id);
+            }
+            if ($updated) {
+                $line = sprintf($transfer, $journal->id);
+                $this->line($line);
+            }
+        }
+    }
 }

app/Console/Commands/VerifyDatabase.php

@@ -93,6 +93,7 @@ class VerifyDatabase extends Command
 
         // report on journals with the wrong types of accounts.
         $this->reportIncorrectJournals();
+
     }
 
     /**
@@ -131,7 +132,7 @@ class VerifyDatabase extends Command
         /** @var Budget $entry */
         foreach ($set as $entry) {
             $line = sprintf(
-                'Notice: User #%d (%s) has budget #%d ("%s") which has no budget limits.',
+                'User #%d (%s) has budget #%d ("%s") which has no budget limits.',
                 $entry->user_id, $entry->email, $entry->id, $entry->name
             );
             $this->line($line);
@@ -277,7 +278,7 @@ class VerifyDatabase extends Command
             }
 
             $line = sprintf(
-                'Notice: User #%d (%s) has %s #%d ("%s") which has no transactions.',
+                'User #%d (%s) has %s #%d ("%s") which has no transactions.',
                 $entry->user_id, $entry->email, $name, $entry->id, $objName
             );
             $this->line($line);

app/Console/Kernel.php

@@ -41,7 +41,6 @@ class Kernel extends ConsoleKernel
         = [
             'Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables',
             'Illuminate\Foundation\Bootstrap\LoadConfiguration',
-            //'FireflyIII\Bootstrap\ConfigureLogging',
             'Illuminate\Foundation\Bootstrap\HandleExceptions',
             'Illuminate\Foundation\Bootstrap\RegisterFacades',
             'Illuminate\Foundation\Bootstrap\SetRequestForConsole',

app/Events/Event.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Events;
 
 /**

app/Events/StoredTransactionJournal.php

@@ -26,7 +26,9 @@ class StoredTransactionJournal extends Event
 
     use SerializesModels;
 
+    /** @var TransactionJournal  */
     public $journal;
+    /** @var int  */
     public $piggyBankId;
 
     /**

app/Events/UpdatedTransactionJournal.php

@@ -26,6 +26,7 @@ class UpdatedTransactionJournal extends Event
 
     use SerializesModels;
 
+    /** @var TransactionJournal  */
     public $journal;
 
     /**

app/Exceptions/FireflyException.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Exceptions;
 
 

app/Exceptions/Handler.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Exceptions;
 
 use ErrorException;
@@ -97,6 +98,7 @@ class Handler extends ExceptionHandler
                 'file'         => $exception->getFile(),
                 'line'         => $exception->getLine(),
                 'code'         => $exception->getCode(),
+                'version'      => config('firefly.version'),
             ];
 
             // create job that will mail.

app/Exceptions/NotImplementedException.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Exceptions;
 
 

app/Exceptions/ValidationException.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Exceptions;
 
 /**

app/Export/Collector/JournalExportCollector.php

@@ -14,7 +14,6 @@ declare(strict_types = 1);
 namespace FireflyIII\Export\Collector;
 
 use Carbon\Carbon;
-use Crypt;
 use DB;
 use FireflyIII\Models\Transaction;
 use Illuminate\Database\Query\JoinClause;

app/Export/Entry/Entry.php

@@ -13,7 +13,6 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Export\Entry;
 
-use Crypt;
 use Steam;
 
 /**

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -81,6 +81,9 @@ class ChartJsGenerator implements GeneratorInterface
             if (isset($set['fill'])) {
                 $currentSet['fill'] = $set['fill'];
             }
+            if (isset($set['currency_symbol'])) {
+                $currentSet['currency_symbol'] = $set['currency_symbol'];
+            }
 
             $chartData['datasets'][] = $currentSet;
         }
@@ -105,6 +108,10 @@ class ChartJsGenerator implements GeneratorInterface
             ],
             'labels'   => [],
         ];
+
+        // sort by value, keep keys.
+        asort($data);
+
         $index     = 0;
         foreach ($data as $key => $value) {
 

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -18,6 +18,9 @@ use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
@@ -141,52 +144,10 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
-    /**
-     * @param Collection $collection
-     * @param int        $sortFlag
-     *
-     * @return array
-     */
-    private function getAverages(Collection $collection, int $sortFlag): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            // opposing name and ID:
-            $opposingId = $transaction->opposing_account_id;
-
-            // is not set?
-            if (!isset($result[$opposingId])) {
-                $name                = $transaction->opposing_account_name;
-                $result[$opposingId] = [
-                    'name'    => $name,
-                    'count'   => 1,
-                    'id'      => $opposingId,
-                    'average' => $transaction->transaction_amount,
-                    'sum'     => $transaction->transaction_amount,
-                ];
-                continue;
-            }
-            $result[$opposingId]['count']++;
-            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
-            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
-        }
-
-        // sort result by average:
-        $average = [];
-        foreach ($result as $key => $row) {
-            $average[$key] = floatval($row['average']);
-        }
-
-        array_multisort($average, $sortFlag, $result);
-
-        return $result;
-    }
-
     /**
      * @return Collection
      */
-    private function getExpenses(): Collection
+    protected function getExpenses(): Collection
     {
         if ($this->expenses->count() > 0) {
             Log::debug('Return previous set of expenses.');
@@ -198,44 +159,18 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::WITHDRAWAL])
-                  ->setBudgets($this->budgets)->withOpposingAccount()->disableFilter();
+                  ->setBudgets($this->budgets)->withOpposingAccount();
+        $collector->removeFilter(TransferFilter::class);
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(PositiveAmountFilter::class);
 
-        $accountIds     = $this->accounts->pluck('id')->toArray();
         $transactions   = $collector->getJournals();
-        $transactions   = self::filterExpenses($transactions, $accountIds);
         $this->expenses = $transactions;
 
         return $transactions;
     }
 
-    /**
-     * @return Collection
-     */
-    private function getTopExpenses(): Collection
-    {
-        $transactions = $this->getExpenses()->sortBy('transaction_amount');
-
-        return $transactions;
-    }
-
-    /**
-     * @param Collection $collection
-     *
-     * @return array
-     */
-    private function summarizeByAccount(Collection $collection): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            $accountId          = $transaction->account_id;
-            $result[$accountId] = $result[$accountId] ?? '0';
-            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
-        }
-
-        return $result;
-    }
-
     /**
      * @param Collection $collection
      *

app/Generator/Report/Category/MonthReportGenerator.php

@@ -18,6 +18,10 @@ use Carbon\Carbon;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
 use FireflyIII\Generator\Report\Support;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Support\Collection;
@@ -151,52 +155,10 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         return $this;
     }
 
-    /**
-     * @param Collection $collection
-     * @param int        $sortFlag
-     *
-     * @return array
-     */
-    private function getAverages(Collection $collection, int $sortFlag): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            // opposing name and ID:
-            $opposingId = $transaction->opposing_account_id;
-
-            // is not set?
-            if (!isset($result[$opposingId])) {
-                $name                = $transaction->opposing_account_name;
-                $result[$opposingId] = [
-                    'name'    => $name,
-                    'count'   => 1,
-                    'id'      => $opposingId,
-                    'average' => $transaction->transaction_amount,
-                    'sum'     => $transaction->transaction_amount,
-                ];
-                continue;
-            }
-            $result[$opposingId]['count']++;
-            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
-            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
-        }
-
-        // sort result by average:
-        $average = [];
-        foreach ($result as $key => $row) {
-            $average[$key] = floatval($row['average']);
-        }
-
-        array_multisort($average, $sortFlag, $result);
-
-        return $result;
-    }
-
     /**
      * @return Collection
      */
-    private function getExpenses(): Collection
+    protected function getExpenses(): Collection
     {
         if ($this->expenses->count() > 0) {
             Log::debug('Return previous set of expenses.');
@@ -208,11 +170,13 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
-                  ->setCategories($this->categories)->withOpposingAccount()->disableFilter();
+                  ->setCategories($this->categories)->withOpposingAccount();
+        $collector->removeFilter(TransferFilter::class);
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(PositiveAmountFilter::class);
 
-        $accountIds     = $this->accounts->pluck('id')->toArray();
         $transactions   = $collector->getJournals();
-        $transactions   = self::filterExpenses($transactions, $accountIds);
         $this->expenses = $transactions;
 
         return $transactions;
@@ -221,7 +185,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     /**
      * @return Collection
      */
-    private function getIncome(): Collection
+    protected function getIncome(): Collection
     {
         if ($this->income->count() > 0) {
             return $this->income;
@@ -232,93 +196,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
                   ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
                   ->setCategories($this->categories)->withOpposingAccount();
-        $accountIds   = $this->accounts->pluck('id')->toArray();
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(NegativeAmountFilter::class);
+
         $transactions = $collector->getJournals();
-        $transactions = self::filterIncome($transactions, $accountIds);
         $this->income = $transactions;
 
         return $transactions;
     }
 
-    /**
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
-     * @param array $spent
-     * @param array $earned
-     *
-     * @return array
-     */
-    private function getObjectSummary(array $spent, array $earned): array
-    {
-        $return = [];
-
-        /**
-         * @var int    $accountId
-         * @var string $entry
-         */
-        foreach ($spent as $objectId => $entry) {
-            if (!isset($return[$objectId])) {
-                $return[$objectId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$objectId]['spent'] = $entry;
-        }
-        unset($entry);
-
-        /**
-         * @var int    $accountId
-         * @var string $entry
-         */
-        foreach ($earned as $objectId => $entry) {
-            if (!isset($return[$objectId])) {
-                $return[$objectId] = ['spent' => 0, 'earned' => 0];
-            }
-
-            $return[$objectId]['earned'] = $entry;
-        }
-
-
-        return $return;
-    }
-
-
-    /**
-     * @return Collection
-     */
-    private function getTopExpenses(): Collection
-    {
-        $transactions = $this->getExpenses()->sortBy('transaction_amount');
-
-        return $transactions;
-    }
-
-    /**
-     * @return Collection
-     */
-    private function getTopIncome(): Collection
-    {
-        $transactions = $this->getIncome()->sortByDesc('transaction_amount');
-
-        return $transactions;
-    }
-
-    /**
-     * @param Collection $collection
-     *
-     * @return array
-     */
-    private function summarizeByAccount(Collection $collection): array
-    {
-        $result = [];
-        /** @var Transaction $transaction */
-        foreach ($collection as $transaction) {
-            $accountId          = $transaction->account_id;
-            $result[$accountId] = $result[$accountId] ?? '0';
-            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
-        }
-
-        return $result;
-    }
-
     /**
      * @param Collection $collection
      *

app/Generator/Report/Category/MultiYearReportGenerator.php

@@ -17,7 +17,7 @@ namespace FireflyIII\Generator\Report\Category;
 /**
  * Class MultiYearReportGenerator
  *
- * @package FireflyIII\Generator\Report\Audit
+ * @package FireflyIII\Generator\Report\Category
  */
 class MultiYearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/Category/YearReportGenerator.php

@@ -17,7 +17,7 @@ namespace FireflyIII\Generator\Report\Category;
 /**
  * Class YearReportGenerator
  *
- * @package FireflyIII\Generator\Report\Audit
+ * @package FireflyIII\Generator\Report\Category
  */
 class YearReportGenerator extends MonthReportGenerator
 {

app/Generator/Report/ReportGeneratorFactory.php

@@ -49,7 +49,7 @@ class ReportGeneratorFactory
         $class = sprintf('FireflyIII\Generator\Report\%s\%sReportGenerator', $type, $period);
         if (class_exists($class)) {
             /** @var ReportGeneratorInterface $obj */
-            $obj = new $class;
+            $obj = app($class);
             $obj->setStartDate($start);
             $obj->setEndDate($end);
 

app/Generator/Report/Support.php

@@ -25,57 +25,122 @@ use Log;
  */
 class Support
 {
-
     /**
-     * @param Collection $collection
-     * @param array      $accounts
-     *
      * @return Collection
      */
-    public static function filterExpenses(Collection $collection, array $accounts): Collection
+    public function getTopExpenses(): Collection
     {
-        return self::filterTransactions($collection, $accounts, 1);
+        $transactions = $this->getExpenses()->sortBy('transaction_amount');
+
+        return $transactions;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getTopIncome(): Collection
+    {
+        $transactions = $this->getIncome()->sortByDesc('transaction_amount');
+
+        return $transactions;
     }
 
     /**
      * @param Collection $collection
-     * @param array      $accounts
+     * @param int        $sortFlag
      *
-     * @return Collection
+     * @return array
      */
-    public static function filterIncome(Collection $collection, array $accounts): Collection
+    protected function getAverages(Collection $collection, int $sortFlag): array
     {
-        return self::filterTransactions($collection, $accounts, -1);
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            // opposing name and ID:
+            $opposingId = $transaction->opposing_account_id;
+
+            // is not set?
+            if (!isset($result[$opposingId])) {
+                $name                = $transaction->opposing_account_name;
+                $result[$opposingId] = [
+                    'name'    => $name,
+                    'count'   => 1,
+                    'id'      => $opposingId,
+                    'average' => $transaction->transaction_amount,
+                    'sum'     => $transaction->transaction_amount,
+                ];
+                continue;
+            }
+            $result[$opposingId]['count']++;
+            $result[$opposingId]['sum']     = bcadd($result[$opposingId]['sum'], $transaction->transaction_amount);
+            $result[$opposingId]['average'] = bcdiv($result[$opposingId]['sum'], strval($result[$opposingId]['count']));
+        }
+
+        // sort result by average:
+        $average = [];
+        foreach ($result as $key => $row) {
+            $average[$key] = floatval($row['average']);
+        }
+
+        array_multisort($average, $sortFlag, $result);
+
+        return $result;
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
+     * @param array $spent
+     * @param array $earned
+     *
+     * @return array
+     */
+    protected function getObjectSummary(array $spent, array $earned): array
+    {
+        $return = [];
+
+        /**
+         * @var int    $accountId
+         * @var string $entry
+         */
+        foreach ($spent as $objectId => $entry) {
+            if (!isset($return[$objectId])) {
+                $return[$objectId] = ['spent' => 0, 'earned' => 0];
+            }
+
+            $return[$objectId]['spent'] = $entry;
+        }
+        unset($entry);
+
+        /**
+         * @var int    $accountId
+         * @var string $entry
+         */
+        foreach ($earned as $objectId => $entry) {
+            if (!isset($return[$objectId])) {
+                $return[$objectId] = ['spent' => 0, 'earned' => 0];
+            }
+
+            $return[$objectId]['earned'] = $entry;
+        }
+
+
+        return $return;
     }
 
     /**
      * @param Collection $collection
-     * @param array      $accounts
-     * @param int        $modifier
      *
-     * @return Collection
+     * @return array
      */
-    public static function filterTransactions(Collection $collection, array $accounts, int $modifier): Collection
+    protected function summarizeByAccount(Collection $collection): array
     {
-        $result = $collection->filter(
+        $result = [];
-            function (Transaction $transaction) use ($accounts, $modifier) {
+        /** @var Transaction $transaction */
-                $opposing = $transaction->opposing_account_id;
+        foreach ($collection as $transaction) {
-                // remove internal transfer
+            $accountId          = $transaction->account_id;
-                if (in_array($opposing, $accounts)) {
+            $result[$accountId] = $result[$accountId] ?? '0';
-                    Log::debug(sprintf('Filtered #%d because its opposite is in accounts.', $transaction->id));
+            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
-
-                    return null;
         }
-                // remove positive amount
-                if (bccomp($transaction->transaction_amount, '0') === $modifier) {
-                    Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
-
-                    return null;
-                }
-
-                return $transaction;
-            }
-        );
 
         return $result;
     }

app/Generator/Report/Tag/MonthReportGenerator.php

@@ -0,0 +1,227 @@
+<?php
+/**
+ * MonthReportGenerator.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Generator\Report\Tag;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Tag
+ */
+class MonthReportGenerator implements ReportGeneratorInterface
+{
+
+    /** @var Collection */
+    private $accounts;
+    /** @var  Carbon */
+    private $end;
+    /** @var Collection */
+    private $expenses;
+    /** @var Collection */
+    private $income;
+    /** @var  Carbon */
+    private $start;
+    /** @var Collection */
+    private $tags;
+
+    /**
+     * MonthReportGenerator constructor.
+     */
+    public function __construct()
+    {
+        $this->expenses = new Collection;
+        $this->income   = new Collection;
+    }
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
+        $tagTags         = join(',', $this->tags->pluck('tag')->toArray());
+        $reportType      = 'tag';
+        $expenses        = $this->getExpenses();
+        $income          = $this->getIncome();
+        $accountSummary  = $this->getObjectSummary($this->summarizeByAccount($expenses), $this->summarizeByAccount($income));
+        $tagSummary      = $this->getObjectSummary($this->summarizeByTag($expenses), $this->summarizeByTag($income));
+        $averageExpenses = $this->getAverages($expenses, SORT_ASC);
+        $averageIncome   = $this->getAverages($income, SORT_DESC);
+        $topExpenses     = $this->getTopExpenses();
+        $topIncome       = $this->getTopIncome();
+
+
+        // render!
+        return view(
+            'reports.tag.month', compact(
+                                   'accountIds', 'tagTags', 'reportType', 'accountSummary', 'tagSummary', 'averageExpenses', 'averageIncome', 'topIncome',
+                                   'topExpenses'
+                               )
+        )->with('start', $this->start)->with('end', $this->end)->with('tags', $this->tags)->with('accounts', $this->accounts)->render();
+    }
+
+    /**
+     * @param Collection $accounts
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setAccounts(Collection $accounts): ReportGeneratorInterface
+    {
+        $this->accounts = $accounts;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $budgets
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setBudgets(Collection $budgets): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Collection $categories
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setCategories(Collection $categories): ReportGeneratorInterface
+    {
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setEndDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->end = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setStartDate(Carbon $date): ReportGeneratorInterface
+    {
+        $this->start = $date;
+
+        return $this;
+    }
+
+    /**
+     * @param Collection $tags
+     *
+     * @return ReportGeneratorInterface
+     */
+    public function setTags(Collection $tags): ReportGeneratorInterface
+    {
+        $this->tags = $tags;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection
+     */
+    protected function getExpenses(): Collection
+    {
+        if ($this->expenses->count() > 0) {
+            Log::debug('Return previous set of expenses.');
+
+            return $this->expenses;
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
+                  ->setTags($this->tags)->withOpposingAccount();
+        $collector->removeFilter(TransferFilter::class);
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(PositiveAmountFilter::class);
+
+        $transactions = $collector->getJournals();
+
+        $this->expenses = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * @return Collection
+     */
+    protected function getIncome(): Collection
+    {
+        if ($this->income->count() > 0) {
+            return $this->income;
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
+                  ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
+                  ->setTags($this->tags)->withOpposingAccount();
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(NegativeAmountFilter::class);
+
+        $transactions = $collector->getJournals();
+        $this->income = $transactions;
+
+        return $transactions;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    protected function summarizeByTag(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $journal     = $transaction->transactionJournal;
+            $journalTags = $journal->tags;
+            /** @var Tag $journalTag */
+            foreach ($journalTags as $journalTag) {
+                $journalTagId          = $journalTag->id;
+                $result[$journalTagId] = $result[$journalTagId] ?? '0';
+                $result[$journalTagId] = bcadd($transaction->transaction_amount, $result[$journalTagId]);
+            }
+        }
+
+        return $result;
+    }
+}

app/Generator/Report/Tag/MultiYearReportGenerator.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * MultiYearReportGenerator.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Generator\Report\Tag;
+
+
+/**
+ * Class MultiYearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Tag
+ */
+class MultiYearReportGenerator extends MonthReportGenerator
+{
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Generator/Report/Tag/YearReportGenerator.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * YearReportGenerator.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Generator\Report\Tag;
+
+
+/**
+ * Class YearReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Tag
+ */
+class YearReportGenerator extends MonthReportGenerator
+{
+
+    /**
+     * Doesn't do anything different.
+     */
+}

app/Handlers/Events/StoredJournalEventHandler.php

@@ -14,59 +14,91 @@ declare(strict_types = 1);
 namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\StoredTransactionJournal;
-use FireflyIII\Models\PiggyBank;
-use FireflyIII\Models\PiggyBankEvent;
-use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
-use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface as JRI;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface as PRI;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface as RGRI;
 use FireflyIII\Rules\Processor;
 use FireflyIII\Support\Events\BillScanner;
 use Log;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class StoredJournalEventHandler
  *
  * @package FireflyIII\Handlers\Events
  */
 class StoredJournalEventHandler
 {
+    /** @var  JRI */
+    public $journalRepository;
+    /** @var  PRI */
+    public $repository;
+
+    /** @var  RGRI */
+    public $ruleGroupRepository;
+
+    /**
+     * StoredJournalEventHandler constructor.
+     */
+    public function __construct(PRI $repository, JRI $journalRepository, RGRI $ruleGroupRepository)
+    {
+        $this->repository          = $repository;
+        $this->journalRepository   = $journalRepository;
+        $this->ruleGroupRepository = $ruleGroupRepository;
+    }
+
     /**
      * This method connects a new transfer to a piggy bank.
      *
+     *
+     *
      * @param StoredTransactionJournal $event
      *
      * @return bool
      */
     public function connectToPiggyBank(StoredTransactionJournal $event): bool
     {
-        /** @var TransactionJournal $journal */
         $journal     = $event->journal;
         $piggyBankId = $event->piggyBankId;
-        Log::debug(sprintf('Trying to connect journal %d to piggy bank %d.', $journal->id, $piggyBankId));
+        $piggyBank   = $this->repository->find($piggyBankId);
 
-        /*
+        // is a transfer?
-         * Verify existence of piggy bank:
+        if (!$this->journalRepository->isTransfer($journal)) {
-         */
+            Log::info(sprintf('Will not connect %s #%d to a piggy bank.', $journal->transactionType->type, $journal->id));
-        if (!$this->verifyExistence($event)) {
-            Log::error(sprintf('No such piggy bank or no repetition on %s', $journal->date->format('Y-m-d')));
 
             return true;
         }
 
-        /*
+        // piggy exists?
-         * Get relevant data:
+        if (is_null($piggyBank->id)) {
-         */
+            Log::error(sprintf('There is no piggy bank with ID #%d', $piggyBankId));
-        $piggyBank                 = $journal->user->piggyBanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
+
-        $repetition                = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
+            return true;
-        $amount                    = $this->getExactAmount($journal, $piggyBank, $repetition);
+        }
-        $repetition->currentamount = bcadd($repetition->currentamount, $amount);
+
-        $repetition->save();
+        // repetition exists?
+        $repetition = $this->repository->getRepetition($piggyBank, $journal->date);
+        if (is_null($repetition->id)) {
+            Log::error(sprintf('No piggy bank repetition on %s!', $journal->date->format('Y-m-d')));
+
+            return true;
+        }
+
+        // get the amount
+        $amount = $this->repository->getExactAmount($piggyBank, $repetition, $journal);
+        if (bccomp($amount, '0') === 0) {
+            Log::debug('Amount is zero, will not create event.');
+
+            return true;
+        }
+
+        // update amount
+        $this->repository->addAmountToRepetition($repetition, $amount);
+        $event = $this->repository->createEventWithJournal($piggyBank, $amount, $journal);
 
-        /** @var PiggyBankEvent $event */
-        $event = PiggyBankEvent::create(
-            ['piggy_bank_id' => $piggyBank->id, 'transaction_journal_id' => $journal->id, 'date' => $journal->date, 'amount' => $amount]
-        );
         Log::debug(sprintf('Created piggy bank event #%d', $event->id));
 
         return true;
@@ -83,16 +115,11 @@ class StoredJournalEventHandler
     {
         // get all the user's rule groups, with the rules, order by 'order'.
         $journal = $storedJournalEvent->journal;
-        $groups  = $journal->user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        $groups  = $this->ruleGroupRepository->getActiveGroups($journal->user);
-        //
+
         /** @var RuleGroup $group */
         foreach ($groups as $group) {
-            $rules = $group->rules()
+            $rules = $this->ruleGroupRepository->getActiveStoreRules($group);
-                           ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
-                           ->where('rule_triggers.trigger_type', 'user_action')
-                           ->where('rule_triggers.trigger_value', 'store-journal')
-                           ->where('rules.active', 1)
-                           ->get(['rules.*']);
             /** @var Rule $rule */
             foreach ($rules as $rule) {
 
@@ -100,9 +127,8 @@ class StoredJournalEventHandler
                 $processor->handleTransactionJournal($journal);
 
                 if ($rule->stop_processing) {
-                    return true;
+                    break;
                 }
-
             }
         }
 
@@ -123,81 +149,4 @@ class StoredJournalEventHandler
 
         return true;
     }
-
-    /**
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 6 but I can live with it.
-     * @param TransactionJournal  $journal
-     * @param PiggyBank           $piggyBank
-     * @param PiggyBankRepetition $repetition
-     *
-     * @return string
-     */
-    private function getExactAmount(TransactionJournal $journal, PiggyBank $piggyBank, PiggyBankRepetition $repetition): string
-    {
-        $amount  = TransactionJournal::amountPositive($journal);
-        $sources = TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray();
-        $room    = bcsub(strval($piggyBank->targetamount), strval($repetition->currentamount));
-        $compare = bcmul($repetition->currentamount, '-1');
-
-        Log::debug(sprintf('Will add/remove %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
-
-        // if piggy account matches source account, the amount is positive
-        if (in_array($piggyBank->account_id, $sources)) {
-            $amount = bcmul($amount, '-1');
-            Log::debug(sprintf('Account #%d is the source, so will remove amount from piggy bank.', $piggyBank->account_id));
-        }
-
-
-        // if the amount is positive, make sure it fits in piggy bank:
-        if (bccomp($amount, '0') === 1 && bccomp($room, $amount) === -1) {
-            // amount is positive and $room is smaller than $amount
-            Log::debug(sprintf('Room in piggy bank for extra money is %f', $room));
-            Log::debug(sprintf('There is NO room to add %f to piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
-            Log::debug(sprintf('New amount is %f', $room));
-
-            return $room;
-        }
-
-        // amount is negative and $currentamount is smaller than $amount
-        if (bccomp($amount, '0') === -1 && bccomp($compare, $amount) === 1) {
-            Log::debug(sprintf('Max amount to remove is %f', $repetition->currentamount));
-            Log::debug(sprintf('Cannot remove %f from piggy bank #%d ("%s")', $amount, $piggyBank->id, $piggyBank->name));
-            Log::debug(sprintf('New amount is %f', $compare));
-
-            return $compare;
-        }
-
-        return $amount;
-    }
-
-    /**
-     * @param StoredTransactionJournal $event
-     *
-     * @return bool
-     */
-    private function verifyExistence(StoredTransactionJournal $event): bool
-    {
-        /** @var TransactionJournal $journal */
-        $journal     = $event->journal;
-        $piggyBankId = $event->piggyBankId;
-
-        /** @var PiggyBank $piggyBank */
-        $piggyBank = $journal->user->piggyBanks()->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']);
-
-        if (is_null($piggyBank)) {
-            Log::error('No such piggy bank!');
-
-            return false;
-        }
-        Log::debug(sprintf('Found piggy bank #%d: "%s"', $piggyBank->id, $piggyBank->name));
-        // update piggy bank rep for date of transaction journal.
-        $repetition = $piggyBank->piggyBankRepetitions()->relevantOnDate($journal->date)->first();
-        if (is_null($repetition)) {
-            Log::error(sprintf('No piggy bank repetition on %s!', $journal->date->format('Y-m-d')));
-
-            return false;
-        }
-
-        return true;
-    }
 }

app/Handlers/Events/UpdatedJournalEventHandler.php

@@ -17,16 +17,29 @@ namespace FireflyIII\Handlers\Events;
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
+use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use FireflyIII\Rules\Processor;
 use FireflyIII\Support\Events\BillScanner;
 
 /**
+ * @codeCoverageIgnore
+ * 
  * Class UpdatedJournalEventHandler
  *
  * @package FireflyIII\Handlers\Events
  */
 class UpdatedJournalEventHandler
 {
+    /** @var  RuleGroupRepositoryInterface */
+    public $repository;
+
+    /**
+     * StoredJournalEventHandler constructor.
+     */
+    public function __construct(RuleGroupRepositoryInterface $ruleGroupRepository)
+    {
+        $this->repository = $ruleGroupRepository;
+    }
 
     /**
      * This method will check all the rules when a journal is updated.
@@ -39,16 +52,11 @@ class UpdatedJournalEventHandler
     {
         // get all the user's rule groups, with the rules, order by 'order'.
         $journal = $updatedJournalEvent->journal;
-        $groups  = $journal->user->ruleGroups()->where('rule_groups.active', 1)->orderBy('order', 'ASC')->get();
+        $groups = $this->repository->getActiveGroups($journal->user);
-        //
+
         /** @var RuleGroup $group */
         foreach ($groups as $group) {
-            $rules = $group->rules()
+            $rules = $this->repository->getActiveUpdateRules($group);
-                           ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
-                           ->where('rule_triggers.trigger_type', 'user_action')
-                           ->where('rule_triggers.trigger_value', 'update-journal')
-                           ->where('rules.active', 1)
-                           ->get(['rules.*']);
             /** @var Rule $rule */
             foreach ($rules as $rule) {
                 $processor = Processor::make($rule);

app/Handlers/Events/UserEventHandler.php

@@ -15,8 +15,9 @@ namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
+use FireflyIII\Mail\RegisteredUser as RegisteredUserMail;
+use FireflyIII\Mail\RequestedNewPassword as RequestedNewPasswordMail;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use Illuminate\Mail\Message;
 use Log;
 use Mail;
 use Swift_TransportException;
@@ -68,14 +69,12 @@ class UserEventHandler
 
         // send email.
         try {
-            Mail::send(
+            Mail::to($email)->send(new RequestedNewPasswordMail($url, $ipAddress));
-                ['emails.password-html', 'emails.password-text'], ['url' => $url, 'ip' => $ipAddress], function (Message $message) use ($email) {
+            // @codeCoverageIgnoreStart
-                $message->to($email, $email)->subject('Your password reset request');
-            }
-            );
         } catch (Swift_TransportException $e) {
             Log::error($e->getMessage());
         }
+        // @codeCoverageIgnoreEnd
 
         return true;
     }
@@ -93,22 +92,21 @@ class UserEventHandler
 
         $sendMail = env('SEND_REGISTRATION_MAIL', true);
         if (!$sendMail) {
-            return true;
+            return true; // @codeCoverageIgnore
         }
         // get the email address
         $email     = $event->user->email;
         $address   = route('index');
         $ipAddress = $event->ipAddress;
+
         // send email.
         try {
-            Mail::send(
+            Mail::to($email)->send(new RegisteredUserMail($address, $ipAddress));
-                ['emails.registered-html', 'emails.registered-text'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) {
+            // @codeCoverageIgnoreStart
-                $message->to($email, $email)->subject('Welcome to Firefly III!');
-            }
-            );
         } catch (Swift_TransportException $e) {
             Log::error($e->getMessage());
         }
+        // @codeCoverageIgnoreEnd
 
         return true;
     }

app/Helpers/Attachments/AttachmentHelper.php

@@ -10,15 +10,17 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Attachments;
 
 use Crypt;
 use FireflyIII\Models\Attachment;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 use Storage;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-
+use Log;
 /**
  * Class AttachmentHelper
  *
@@ -27,6 +29,8 @@ use Symfony\Component\HttpFoundation\File\UploadedFile;
 class AttachmentHelper implements AttachmentHelperInterface
 {
 
+    /** @var  Collection */
+    public $attachments;
     /** @var MessageBag */
     public $errors;
     /** @var MessageBag */
@@ -48,6 +52,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $this->allowedMimes  = (array)config('firefly.allowedMimes');
         $this->errors        = new MessageBag;
         $this->messages      = new MessageBag;
+        $this->attachments   = new Collection;
         $this->uploadDisk    = Storage::disk('upload');
     }
 
@@ -63,6 +68,14 @@ class AttachmentHelper implements AttachmentHelperInterface
         return $path;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getAttachments(): Collection
+    {
+        return $this->attachments;
+    }
+
     /**
      * @return MessageBag
      */
@@ -109,7 +122,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $md5   = md5_file($file->getRealPath());
         $name  = $file->getClientOriginalName();
         $class = get_class($model);
-        $count = auth()->user()->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
+        $count = $model->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
 
         if ($count > 0) {
             $msg = (string)trans('validation.file_already_attached', ['name' => $name]);
@@ -136,7 +149,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         }
 
         $attachment = new Attachment; // create Attachment object.
-        $attachment->user()->associate(auth()->user());
+        $attachment->user()->associate($model->user);
         $attachment->attachable()->associate($model);
         $attachment->md5      = md5_file($file->getRealPath());
         $attachment->filename = $file->getClientOriginalName();
@@ -155,6 +168,7 @@ class AttachmentHelper implements AttachmentHelperInterface
 
         $attachment->uploaded = 1; // update attachment
         $attachment->save();
+        $this->attachments->push($attachment);
 
         $name = e($file->getClientOriginalName()); // add message:
         $msg  = (string)trans('validation.file_attached', ['name' => $name]);
@@ -187,6 +201,7 @@ class AttachmentHelper implements AttachmentHelperInterface
     }
 
     /**
+     * @codeCoverageIgnore
      * @param UploadedFile $file
      *
      * @return bool
@@ -217,7 +232,7 @@ class AttachmentHelper implements AttachmentHelperInterface
             return false;
         }
         if (!$this->validSize($file)) {
-            return false;
+            return false; // @codeCoverageIgnore
         }
         if ($this->hasFile($file, $model)) {
             return false;

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -10,10 +10,12 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Attachments;
 
 use FireflyIII\Models\Attachment;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
 use Illuminate\Support\MessageBag;
 
 /**
@@ -31,6 +33,11 @@ interface AttachmentHelperInterface
      */
     public function getAttachmentLocation(Attachment $attachment): string;
 
+    /**
+     * @return Collection
+     */
+    public function getAttachments(): Collection;
+
     /**
      * @return MessageBag
      */
@@ -44,6 +51,8 @@ interface AttachmentHelperInterface
     /**
      * @param Model      $model
      *
+     * @param null|array $files
+     *
      * @return bool
      */
     public function saveAttachmentsForModel(Model $model, array $files = null): bool;

app/Helpers/Chart/MetaPieChart.php

@@ -12,13 +12,18 @@ declare(strict_types = 1);
 namespace FireflyIII\Helpers\Chart;
 
 use Carbon\Carbon;
-use FireflyIII\Generator\Report\Support;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
+use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 use Steam;
@@ -46,19 +51,20 @@ class MetaPieChart implements MetaPieChartInterface
             'account'  => ['opposing_account_id'],
             'budget'   => ['transaction_journal_budget_id', 'transaction_budget_id'],
             'category' => ['transaction_journal_category_id', 'transaction_category_id'],
+            'tag'      => [],
         ];
-
     /** @var array */
     protected $repositories
         = [
             'account'  => AccountRepositoryInterface::class,
             'budget'   => BudgetRepositoryInterface::class,
             'category' => CategoryRepositoryInterface::class,
+            'tag'      => TagRepositoryInterface::class,
         ];
-
-
     /** @var  Carbon */
     protected $start;
+    /** @var  Collection */
+    protected $tags;
     /** @var  string */
     protected $total = '0';
     /** @var  User */
@@ -69,6 +75,7 @@ class MetaPieChart implements MetaPieChartInterface
         $this->accounts   = new Collection;
         $this->budgets    = new Collection;
         $this->categories = new Collection;
+        $this->tags       = new Collection;
     }
 
     /**
@@ -99,6 +106,7 @@ class MetaPieChart implements MetaPieChartInterface
         if ($this->collectOtherObjects && $direction === 'income') {
             /** @var JournalCollectorInterface $collector */
             $collector = app(JournalCollectorInterface::class);
+            $collector->setUser($this->user);
             $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]);
             $journals                                            = $collector->getJournals();
             $sum                                                 = strval($journals->sum('transaction_amount'));
@@ -111,6 +119,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Collection $accounts
      *
      * @return MetaPieChartInterface
@@ -123,6 +133,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Collection $budgets
      *
      * @return MetaPieChartInterface
@@ -135,6 +147,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Collection $categories
      *
      * @return MetaPieChartInterface
@@ -147,6 +161,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param bool $collectOtherObjects
      *
      * @return MetaPieChartInterface
@@ -159,6 +175,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Carbon $end
      *
      * @return MetaPieChartInterface
@@ -171,6 +189,8 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param Carbon $start
      *
      * @return MetaPieChartInterface
@@ -183,6 +203,22 @@ class MetaPieChart implements MetaPieChartInterface
     }
 
     /**
+     * @codeCoverageIgnore
+     *
+     * @param Collection $tags
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setTags(Collection $tags): MetaPieChartInterface
+    {
+        $this->tags = $tags;
+
+        return $this;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     *
      * @param User $user
      *
      * @return MetaPieChartInterface
@@ -194,23 +230,32 @@ class MetaPieChart implements MetaPieChartInterface
         return $this;
     }
 
-    protected function getTransactions(string $direction)
+    /**
+     * @param string $direction
+     *
+     * @return Collection
+     */
+    protected function getTransactions(string $direction): Collection
     {
-        $types    = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
-        $modifier = -1;
-        if ($direction === 'expense') {
-            $types    = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
-            $modifier = 1;
-        }
         /** @var JournalCollectorInterface $collector */
         $collector = app(JournalCollectorInterface::class);
+        $types     = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
+        $collector->addFilter(NegativeAmountFilter::class);
+        if ($direction === 'expense') {
+            $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
+            $collector->addFilter(PositiveAmountFilter::class);
+            $collector->removeFilter(NegativeAmountFilter::class);
+        }
+
+        $collector->setUser($this->user);
         $collector->setAccounts($this->accounts);
         $collector->setRange($this->start, $this->end);
         $collector->setTypes($types);
         $collector->withOpposingAccount();
+        $collector->addFilter(OpposingAccountFilter::class);
 
         if ($direction === 'income') {
-            $collector->disableFilter();
+            $collector->removeFilter(TransferFilter::class);
         }
 
         if ($this->budgets->count() > 0) {
@@ -219,12 +264,13 @@ class MetaPieChart implements MetaPieChartInterface
         if ($this->categories->count() > 0) {
             $collector->setCategories($this->categories);
         }
+        if ($this->tags->count() > 0) {
+            $collector->setTags($this->tags);
+            $collector->withCategoryInformation();
+            $collector->withBudgetInformation();
+        }
 
-        $accountIds   = $this->accounts->pluck('id')->toArray();
+        return $collector->getJournals();
-        $transactions = $collector->getJournals();
-        $set          = Support::filterTransactions($transactions, $accountIds, $modifier);
-
-        return $set;
     }
 
     /**
@@ -233,8 +279,13 @@ class MetaPieChart implements MetaPieChartInterface
      *
      * @return array
      */
-    protected function groupByFields(Collection $set, array $fields)
+    protected function groupByFields(Collection $set, array $fields): array
     {
+        if (count($fields) === 0 && $this->tags->count() > 0) {
+            // do a special group on tags:
+            return $this->groupByTag($set);
+        }
+
         $grouped = [];
         /** @var Transaction $transaction */
         foreach ($set as $transaction) {
@@ -261,10 +312,11 @@ class MetaPieChart implements MetaPieChartInterface
         $chartData  = [];
         $names      = [];
         $repository = app($this->repositories[$type]);
+        $repository->setUser($this->user);
         foreach ($array as $objectId => $amount) {
             if (!isset($names[$objectId])) {
                 $object           = $repository->find(intval($objectId));
-                $names[$objectId] = $object->name;
+                $names[$objectId] = $object->name ?? $object->tag;
             }
             $amount                       = Steam::positive($amount);
             $this->total                  = bcadd($this->total, $amount);
@@ -274,4 +326,27 @@ class MetaPieChart implements MetaPieChartInterface
         return $chartData;
 
     }
+
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    private function groupByTag(Collection $set): array
+    {
+        $grouped = [];
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $journal = $transaction->transactionJournal;
+            $tags    = $journal->tags;
+            /** @var Tag $tag */
+            foreach ($tags as $tag) {
+                $tagId           = $tag->id;
+                $grouped[$tagId] = $grouped[$tagId] ?? '0';
+                $grouped[$tagId] = bcadd($transaction->transaction_amount, $grouped[$tagId]);
+            }
+        }
+
+        return $grouped;
+    }
 }

app/Helpers/Chart/MetaPieChartInterface.php

@@ -72,6 +72,13 @@ interface MetaPieChartInterface
      */
     public function setStart(Carbon $start): MetaPieChartInterface;
 
+    /**
+     * @param Collection $tags
+     *
+     * @return MetaPieChartInterface
+     */
+    public function setTags(Collection $tags): MetaPieChartInterface;
+
     /**
      * @param User $user
      *

app/Helpers/Collection/Balance.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collection;
 
 use Illuminate\Support\Collection;

app/Helpers/Collection/BalanceEntry.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collection;
 
 use FireflyIII\Models\Account as AccountModel;

app/Helpers/Collection/BalanceHeader.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collection;
 
 use FireflyIII\Models\Account as AccountModel;

app/Helpers/Collection/BalanceLine.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collection;
 
 use Carbon\Carbon;

app/Helpers/Collection/Bill.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collection;
 
 

app/Helpers/Collection/BillLine.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collection;
 
 use Carbon\Carbon;

app/Helpers/Collection/Category.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Collection;
 
 use FireflyIII\Models\Category as CategoryModel;

app/Helpers/Collector/JournalCollector.php

@@ -18,12 +18,17 @@ use Carbon\Carbon;
 use Crypt;
 use DB;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Helpers\Filter\FilterInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Contracts\Encryption\DecryptException;
@@ -74,6 +79,9 @@ class JournalCollector implements JournalCollectorInterface
     private $filterInternalTransfers;
     /** @var  bool */
     private $filterTransfers = false;
+    /** @var array */
+    private $filters = [InternalTransferFilter::class];
+
     /** @var  bool */
     private $joinedBudget = false;
     /** @var  bool */
@@ -95,6 +103,22 @@ class JournalCollector implements JournalCollectorInterface
     /** @var User */
     private $user;
 
+    /**
+     * @param string $filter
+     *
+     * @return JournalCollectorInterface
+     */
+    public function addFilter(string $filter): JournalCollectorInterface
+    {
+        $interfaces = class_implements($filter);
+        if (in_array(FilterInterface::class, $interfaces)) {
+            Log::debug(sprintf('Enabled filter %s', $filter));
+            $this->filters[] = $filter;
+        }
+
+        return $this;
+    }
+
     /**
      * @return int
      * @throws FireflyException
@@ -119,36 +143,6 @@ class JournalCollector implements JournalCollectorInterface
         return $this->count;
     }
 
-    /**
-     * @return JournalCollectorInterface
-     */
-    public function disableFilter(): JournalCollectorInterface
-    {
-        $this->filterTransfers = false;
-
-        return $this;
-    }
-
-    /**
-     * @return JournalCollectorInterface
-     */
-    public function disableInternalFilter(): JournalCollectorInterface
-    {
-        $this->filterInternalTransfers = false;
-
-        return $this;
-    }
-
-    /**
-     * @return JournalCollectorInterface
-     */
-    public function enableInternalFilter(): JournalCollectorInterface
-    {
-        $this->filterInternalTransfers = true;
-
-        return $this;
-    }
-
     /**
      * @return Collection
      */
@@ -157,14 +151,9 @@ class JournalCollector implements JournalCollectorInterface
         $this->run = true;
         /** @var Collection $set */
         $set = $this->query->get(array_values($this->fields));
-        Log::debug(sprintf('Count of set is %d', $set->count()));
-        $set = $this->filterTransfers($set);
-        Log::debug(sprintf('Count of set after filterTransfers() is %d', $set->count()));
-
-        // possibly filter "internal" transfers:
-        $set = $this->filterInternalTransfers($set);
-        Log::debug(sprintf('Count of set after filterInternalTransfers() is %d', $set->count()));
 
+        // run all filters:
+        $set = $this->filter($set);
 
         // loop for decryption.
         $set->each(
@@ -204,6 +193,22 @@ class JournalCollector implements JournalCollectorInterface
         return $journals;
     }
 
+    /**
+     * @param string $filter
+     *
+     * @return JournalCollectorInterface
+     */
+    public function removeFilter(string $filter): JournalCollectorInterface
+    {
+        $key = array_search($filter, $this->filters, true);
+        if (!($key === false)) {
+            Log::debug(sprintf('Removed filter %s', $filter));
+            unset($this->filters[$key]);
+        }
+
+        return $this;
+    }
+
     /**
      * @param Collection $accounts
      *
@@ -219,6 +224,7 @@ class JournalCollector implements JournalCollectorInterface
         }
 
         if ($accounts->count() > 1) {
+            $this->addFilter(TransferFilter::class);
             $this->filterTransfers = true;
         }
 
@@ -242,6 +248,7 @@ class JournalCollector implements JournalCollectorInterface
         }
 
         if ($accounts->count() > 1) {
+            $this->addFilter(TransferFilter::class);
             $this->filterTransfers = true;
         }
 
@@ -430,6 +437,20 @@ class JournalCollector implements JournalCollectorInterface
         return $this;
     }
 
+    /**
+     * @param Collection $tags
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setTags(Collection $tags): JournalCollectorInterface
+    {
+        $this->joinTagTables();
+        $tagIds = $tags->pluck('id')->toArray();
+        $this->query->whereIn('tag_transaction_journal.tag_id', $tagIds);
+
+        return $this;
+    }
+
     /**
      * @param array $types
      *
@@ -450,7 +471,9 @@ class JournalCollector implements JournalCollectorInterface
      */
     public function setUser(User $user)
     {
+        Log::debug(sprintf('Journal collector now collecting for user #%d', $user->id));
         $this->user = $user;
+        $this->startQuery();
     }
 
     /**
@@ -458,6 +481,7 @@ class JournalCollector implements JournalCollectorInterface
      */
     public function startQuery()
     {
+        Log::debug('journalCollector::startQuery');
         /** @var EloquentBuilder $query */
         $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
                             ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id')
@@ -546,79 +570,23 @@ class JournalCollector implements JournalCollectorInterface
      *
      * @return Collection
      */
-    private function filterInternalTransfers(Collection $set): Collection
+    private function filter(Collection $set): Collection
     {
-        if ($this->filterInternalTransfers === false) {
+        // create all possible filters:
-            Log::debug('Did NO filtering for internal transfers on given set.');
+        $filters = [
-
+            InternalTransferFilter::class => new InternalTransferFilter($this->accountIds),
-            return $set;
+            OpposingAccountFilter::class  => new OpposingAccountFilter($this->accountIds),
+            TransferFilter::class         => new TransferFilter,
+            PositiveAmountFilter::class   => new PositiveAmountFilter,
+            NegativeAmountFilter::class   => new NegativeAmountFilter,
+        ];
+        Log::debug(sprintf('Will run %d filters on the set.', count($this->filters)));
+        foreach ($this->filters as $enabled) {
+            if (isset($filters[$enabled])) {
+                Log::debug(sprintf('Before filter %s: %d', $enabled, $set->count()));
+                $set = $filters[$enabled]->filter($set);
+                Log::debug(sprintf('After filter %s: %d', $enabled, $set->count()));
             }
-        if ($this->joinedOpposing === false) {
-            Log::info('Cannot filter internal transfers because no opposing information is present.');
-
-            return $set;
-        }
-
-        $accountIds = $this->accountIds;
-        $set        = $set->filter(
-            function (Transaction $transaction) use ($accountIds) {
-                // both id's in $accountids?
-                if (in_array($transaction->account_id, $accountIds) && in_array($transaction->opposing_account_id, $accountIds)) {
-                    Log::debug(
-                        sprintf(
-                            'Transaction #%d has #%d and #%d in set, so removed',
-                            $transaction->id, $transaction->account_id, $transaction->opposing_account_id
-                        ), $accountIds
-                    );
-
-                    return false;
-                }
-
-                return $transaction;
-
-            }
-        );
-
-        return $set;
-    }
-
-    /**
-     * If the set of accounts used by the collector includes more than one asset
-     * account, chances are the set include double entries: transfers get selected
-     * on both the source, and then again on the destination account.
-     *
-     * This method filters them out by removing transfers that have been selected twice.
-     *
-     * @param Collection $set
-     *
-     * @return Collection
-     */
-    private function filterTransfers(Collection $set): Collection
-    {
-        if ($this->filterTransfers) {
-            $count = [];
-            $new   = new Collection;
-            /** @var Transaction $transaction */
-            foreach ($set as $transaction) {
-                if ($transaction->transaction_type_type !== TransactionType::TRANSFER) {
-                    $new->push($transaction);
-                    continue;
-                }
-                // make property string:
-                $journalId  = $transaction->transaction_journal_id;
-                $amount     = Steam::positive($transaction->transaction_amount);
-                $accountIds = [intval($transaction->account_id), intval($transaction->opposing_account_id)];
-                sort($accountIds);
-                $key = $journalId . '-' . join(',', $accountIds) . '-' . $amount;
-                Log::debug(sprintf('Key is %s', $key));
-                if (!isset($count[$key])) {
-                    // not yet counted? add to new set and count it:
-                    $new->push($transaction);
-                    $count[$key] = 1;
-                }
-            }
-
-            return $new;
         }
 
         return $set;

app/Helpers/Collector/JournalCollectorInterface.php

@@ -28,26 +28,18 @@ use Illuminate\Support\Collection;
  */
 interface JournalCollectorInterface
 {
+    /**
+     * @param string $filter
+     *
+     * @return JournalCollectorInterface
+     */
+    public function addFilter(string $filter): JournalCollectorInterface;
+
     /**
      * @return int
      */
     public function count(): int;
 
-    /**
-     * @return JournalCollectorInterface
-     */
-    public function disableFilter(): JournalCollectorInterface;
-
-    /**
-     * @return JournalCollectorInterface
-     */
-    public function disableInternalFilter(): JournalCollectorInterface;
-
-    /**
-     * @return JournalCollectorInterface
-     */
-    public function enableInternalFilter(): JournalCollectorInterface;
-
     /**
      * @return Collection
      */
@@ -58,6 +50,13 @@ interface JournalCollectorInterface
      */
     public function getPaginatedJournals(): LengthAwarePaginator;
 
+    /**
+     * @param string $filter
+     *
+     * @return JournalCollectorInterface
+     */
+    public function removeFilter(string $filter): JournalCollectorInterface;
+
     /**
      * @param Collection $accounts
      *
@@ -141,6 +140,13 @@ interface JournalCollectorInterface
      */
     public function setTag(Tag $tag): JournalCollectorInterface;
 
+    /**
+     * @param Collection $tags
+     *
+     * @return JournalCollectorInterface
+     */
+    public function setTags(Collection $tags): JournalCollectorInterface;
+
     /**
      * @param array $types
      *

app/Helpers/Filter/AmountFilter.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * AmountFilter.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Filter;
+
+use FireflyIII\Models\Transaction;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class AmountFilter
+ *
+ * This filter removes transactions with either a positive amount ($parameters = 1) or a negative amount
+ * ($parameter = -1). This is helpful when a Collection has you with both transactions in a journal.
+ *
+ * @package FireflyIII\Helpers\Filter
+ */
+class AmountFilter implements FilterInterface
+{
+    /** @var int */
+    private $modifier = 0;
+
+    public function __construct(int $modifier)
+    {
+        $this->modifier = $modifier;
+    }
+
+    /**
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    public function filter(Collection $set): Collection
+    {
+        return $set->filter(
+            function (Transaction $transaction) {
+                // remove by amount
+                if (bccomp($transaction->transaction_amount, '0') === $this->modifier) {
+                    Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
+
+                    return null;
+                }
+
+                return $transaction;
+            }
+        );
+    }
+}

app/Helpers/Filter/EmptyFilter.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * EmptyFilter.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Filter;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Class EmptyFilter
+ *
+ * @package FireflyIII\Helpers\Filter
+ */
+class EmptyFilter implements FilterInterface
+{
+
+
+    /**
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    public function filter(Collection $set): Collection
+    {
+        return $set;
+    }
+}

app/Helpers/Filter/FilterInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * FilterInterface.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Filter;
+
+
+use Illuminate\Support\Collection;
+
+interface FilterInterface
+{
+    /**
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    public function filter(Collection $set): Collection;
+
+}

app/Helpers/Filter/InternalTransferFilter.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * InternalTransferFilter.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Filter;
+
+use FireflyIII\Models\Transaction;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class InternalTransferFilter
+ *
+ * This filter removes any filters that are from A to B or from B to A given a set of
+ * account id's (in $parameters) where A and B are mentioned. So transfers between the mentioned
+ * accounts will be removed.
+ *
+ * @package FireflyIII\Helpers\Filter
+ */
+class InternalTransferFilter implements FilterInterface
+{
+    /** @var array  */
+    private $accounts = [];
+
+    /**
+     * InternalTransferFilter constructor.
+     *
+     * @param array $accounts
+     */
+    public function __construct(array $accounts)
+    {
+        $this->accounts = $accounts;
+    }
+
+    /**
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    public function filter(Collection $set): Collection
+    {
+        return $set->filter(
+            function (Transaction $transaction) {
+                if (is_null($transaction->opposing_account_id)) {
+                    return $transaction;
+                }
+                // both id's in $parameters?
+                if (in_array($transaction->account_id, $this->accounts) && in_array($transaction->opposing_account_id, $this->accounts)) {
+                    Log::debug(
+                        sprintf(
+                            'Transaction #%d has #%d and #%d in set, so removed',
+                            $transaction->id, $transaction->account_id, $transaction->opposing_account_id
+                        ), $this->accounts
+                    );
+
+                    return false;
+                }
+
+                return $transaction;
+
+            }
+        );
+
+
+    }
+}

app/Helpers/Filter/NegativeAmountFilter.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * NegativeAmountFilter.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Filter;
+
+use FireflyIII\Models\Transaction;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class NegativeAmountFilter
+ *
+ * This filter removes entries with a negative amount (the original modifier is -1).
+ *
+ * @package FireflyIII\Helpers\Filter
+ */
+class NegativeAmountFilter implements FilterInterface
+{
+    /**
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    public function filter(Collection $set): Collection
+    {
+        return $set->filter(
+            function (Transaction $transaction) {
+                // remove by amount
+                if (bccomp($transaction->transaction_amount, '0') === -1) {
+                    Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
+
+                    return null;
+                }
+
+                return $transaction;
+            }
+        );
+    }
+}

app/Helpers/Filter/OpposingAccountFilter.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * OpposingAccountFilter.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Filter;
+
+
+use FireflyIII\Models\Transaction;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class OpposingAccountFilter
+ *
+ * This filter is similar to the internal transfer filter but only removes transactions when the opposing account is
+ * amongst $parameters (list of account ID's).
+ *
+ * @package FireflyIII\Helpers\Filter
+ */
+class OpposingAccountFilter implements FilterInterface
+{
+    /** @var array */
+    private $accounts = [];
+
+    /**
+     * InternalTransferFilter constructor.
+     *
+     * @param array $accounts
+     */
+    public function __construct(array $accounts)
+    {
+        $this->accounts = $accounts;
+    }
+
+    /**
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    public function filter(Collection $set): Collection
+    {
+        return $set->filter(
+            function (Transaction $transaction) {
+                $opposing = $transaction->opposing_account_id;
+                // remove internal transfer
+                if (in_array($opposing, $this->accounts)) {
+                    Log::debug(sprintf('Filtered #%d because its opposite is in accounts.', $transaction->id), $this->accounts);
+
+                    return null;
+                }
+
+                return $transaction;
+            }
+        );
+    }
+}

app/Helpers/Filter/PositiveAmountFilter.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * PositiveAmountFilter.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Filter;
+
+use FireflyIII\Models\Transaction;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class PositiveAmountFilter
+ *
+ * This filter removes entries with a negative amount (the original modifier is -1).
+ *
+ * This filter removes transactions with either a positive amount ($parameters = 1) or a negative amount
+ * ($parameter = -1). This is helpful when a Collection has you with both transactions in a journal.
+ *
+ * @package FireflyIII\Helpers\Filter
+ */
+class PositiveAmountFilter implements FilterInterface
+{
+    /**
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    public function filter(Collection $set): Collection
+    {
+        return $set->filter(
+            function (Transaction $transaction) {
+                // remove by amount
+                if (bccomp($transaction->transaction_amount, '0') === 1) {
+                    Log::debug(sprintf('Filtered #%d because amount is %f.', $transaction->id, $transaction->transaction_amount));
+
+                    return null;
+                }
+
+                return $transaction;
+            }
+        );
+    }
+}

app/Helpers/Filter/TransferFilter.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * TransferFilter.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Filter;
+
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+use Steam;
+
+/**
+ * Class TransferFilter
+ *
+ * This filter removes any transfers that are in the collection twice (from A to B and from B to A).
+ *
+ * @package FireflyIII\Helpers\Filter
+ */
+class TransferFilter implements FilterInterface
+{
+    /**
+     * @param Collection $set
+     *
+     * @return Collection
+     */
+    public function filter(Collection $set): Collection
+    {
+        $count = [];
+        $new   = new Collection;
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            if ($transaction->transaction_type_type !== TransactionType::TRANSFER) {
+                $new->push($transaction);
+                continue;
+            }
+            // make property string:
+            $journalId  = $transaction->transaction_journal_id;
+            $amount     = Steam::positive($transaction->transaction_amount);
+            $accountIds = [intval($transaction->account_id), intval($transaction->opposing_account_id)];
+            sort($accountIds);
+            $key = $journalId . '-' . join(',', $accountIds) . '-' . $amount;
+            if (!isset($count[$key])) {
+                // not yet counted? add to new set and count it:
+                $new->push($transaction);
+                $count[$key] = 1;
+            }
+        }
+
+        return $new;
+    }
+}

app/Helpers/Help/Help.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Help;
 
 use Cache;
@@ -43,12 +44,12 @@ class Help implements HelpInterface
     }
 
     /**
-     * @param string $language
      * @param string $route
+     * @param string $language
      *
      * @return string
      */
-    public function getFromGithub(string $language, string $route): string
+    public function getFromGithub(string $route, string $language): string
     {
 
         $uri = sprintf('https://raw.githubusercontent.com/firefly-iii/help/master/%s/%s.md', $language, $route);
@@ -123,6 +124,7 @@ class Help implements HelpInterface
         if (strlen($content) > 0) {
             Log::debug(sprintf('Will store entry in cache: %s', $key));
             Cache::put($key, $content, 10080); // a week.
+
             return;
         }
         Log::info(sprintf('Will not cache %s because content is empty.', $key));

app/Helpers/Help/HelpInterface.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Helpers\Help;
 
 /**
@@ -29,12 +30,12 @@ interface HelpInterface
     public function getFromCache(string $route, string $language): string;
 
     /**
-     * @param string $language
      * @param string $route
+     * @param string $language
      *
      * @return string
      */
-    public function getFromGithub(string $language, string $route): string;
+    public function getFromGithub(string $route, string $language): string;
 
     /**
      * @param string $route

app/Helpers/Report/PopupReport.php

@@ -0,0 +1,199 @@
+<?php
+/**
+ * PopupReport.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Report;
+
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+
+/**
+ * Class PopupReport
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+class PopupReport implements PopupReportInterface
+{
+
+
+    /**
+     * @param $account
+     * @param $attributes
+     *
+     * @return Collection
+     */
+    public function balanceDifference($account, $attributes): Collection
+    {
+        // row that displays difference
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector
+            ->setAccounts(new Collection([$account]))
+            ->setTypes([TransactionType::WITHDRAWAL])
+            ->setRange($attributes['startDate'], $attributes['endDate'])
+            ->withoutBudget();
+        $journals = $collector->getJournals();
+
+
+        return $journals->filter(
+            function (Transaction $transaction) {
+                $tags = $transaction->transactionJournal->tags()->where('tagMode', 'balancingAct')->count();
+                if ($tags === 0) {
+                    return true;
+                }
+
+                return false;
+            }
+        );
+    }
+
+    /**
+     * @param Budget  $budget
+     * @param Account $account
+     * @param array   $attributes
+     *
+     * @return Collection
+     */
+    public function balanceForBudget(Budget $budget, Account $account, array $attributes): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setBudget($budget);
+        $journals = $collector->getJournals();
+
+        return $journals;
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $attributes
+     *
+     * @return Collection
+     */
+    public function balanceForNoBudget(Account $account, array $attributes): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector
+            ->setAccounts(new Collection([$account]))
+            ->setTypes([TransactionType::WITHDRAWAL])
+            ->setRange($attributes['startDate'], $attributes['endDate'])
+            ->withoutBudget();
+
+        return $collector->getJournals();
+    }
+
+    /**
+     * @param Budget $budget
+     * @param array  $attributes
+     *
+     * @return Collection
+     */
+    public function byBudget(Budget $budget, array $attributes): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+
+        $collector->setAccounts($attributes['accounts'])->setRange($attributes['startDate'], $attributes['endDate']);
+
+        if (is_null($budget->id)) {
+            $collector->setTypes([TransactionType::WITHDRAWAL])->withoutBudget();
+        }
+        if (!is_null($budget->id)) {
+            $collector->setBudget($budget);
+        }
+        $journals = $collector->getJournals();
+
+        return $journals;
+    }
+
+    /**
+     * @param Category $category
+     * @param array    $attributes
+     *
+     * @return Collection
+     */
+    public function byCategory(Category $category, array $attributes): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($attributes['accounts'])->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
+                  ->setRange($attributes['startDate'], $attributes['endDate'])
+                  ->setCategory($category);
+        $journals = $collector->getJournals();
+
+        return $journals;
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $attributes
+     *
+     * @return Collection
+     */
+    public function byExpenses(Account $account, array $attributes): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+
+        $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])
+                  ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]);
+        $journals = $collector->getJournals();
+
+        $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report
+
+        // filter for transfers and withdrawals TO the given $account
+        $journals = $journals->filter(
+            function (Transaction $transaction) use ($report) {
+                // get the destinations:
+                $sources = $transaction->transactionJournal->sourceAccountList()->pluck('id')->toArray();
+
+                // do these intersect with the current list?
+                return !empty(array_intersect($report, $sources));
+            }
+        );
+
+        return $journals;
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $attributes
+     *
+     * @return Collection
+     */
+    public function byIncome(Account $account, array $attributes): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])
+                  ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]);
+        $journals = $collector->getJournals();
+        $report   = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report
+
+        // filter the set so the destinations outside of $attributes['accounts'] are not included.
+        $journals = $journals->filter(
+            function (Transaction $transaction) use ($report) {
+                // get the destinations:
+                $destinations = $transaction->destinationAccountList($transaction->transactionJournal)->pluck('id')->toArray();
+
+                // do these intersect with the current list?
+                return !empty(array_intersect($report, $destinations));
+            }
+        );
+
+        return $journals;
+    }
+}

app/Helpers/Report/PopupReportInterface.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * PopupReportInterface.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Helpers\Report;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface PopupReportInterface
+ *
+ * @package FireflyIII\Helpers\Report
+ */
+interface PopupReportInterface
+{
+
+    /**
+     * @param $account
+     * @param $attributes
+     *
+     * @return Collection
+     */
+    public function balanceDifference($account, $attributes): Collection;
+
+    /**
+     * @param Budget  $budget
+     * @param Account $account
+     * @param array   $attributes
+     *
+     * @return Collection
+     */
+    public function balanceForBudget(Budget $budget, Account $account, array $attributes): Collection;
+
+    /**
+     * @param Account $account
+     * @param array   $attributes
+     *
+     * @return Collection
+     */
+    public function balanceForNoBudget(Account $account, array $attributes): Collection;
+
+    /**
+     * @param Budget $budget
+     * @param array  $attributes
+     *
+     * @return Collection
+     */
+    public function byBudget(Budget $budget, array $attributes): Collection;
+
+    /**
+     * @param Category $category
+     * @param array    $attributes
+     *
+     * @return Collection
+     */
+    public function byCategory(Category $category, array $attributes): Collection;
+
+    /**
+     * @param Account $account
+     * @param array   $attributes
+     *
+     * @return Collection
+     */
+    public function byExpenses(Account $account, array $attributes): Collection;
+
+    /**
+     * @param Account $account
+     * @param array   $attributes
+     *
+     * @return Collection
+     */
+    public function byIncome(Account $account, array $attributes): Collection;
+}

app/Http/Controllers/AccountController.php

@@ -22,9 +22,10 @@ use FireflyIII\Http\Requests\AccountFormRequest;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Account\AccountTaskerInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
@@ -69,7 +70,8 @@ class AccountController extends Controller
     {
         /** @var CurrencyRepositoryInterface $repository */
         $repository         = app(CurrencyRepositoryInterface::class);
-        $currencies      = ExpandedForm::makeSelectList($repository->get());
+        $allCurrencies      = $repository->get();
+        $currencySelectList = ExpandedForm::makeSelectList($allCurrencies);
         $defaultCurrency    = Amount::getDefaultCurrency();
         $subTitleIcon       = config('firefly.subIconsByIdentifier.' . $what);
         $subTitle           = trans('firefly.make_new_' . $what . '_account');
@@ -90,7 +92,7 @@ class AccountController extends Controller
         $request->session()->flash('gaEventCategory', 'accounts');
         $request->session()->flash('gaEventAction', 'create-' . $what);
 
-        return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle', 'currencies', 'roles'));
+        return view('accounts.create', compact('subTitleIcon', 'what', 'subTitle', 'currencySelectList', 'allCurrencies', 'roles'));
 
     }
 
@@ -146,13 +148,13 @@ class AccountController extends Controller
      */
     public function edit(Request $request, Account $account)
     {
-
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository         = app(CurrencyRepositoryInterface::class);
         $what               = config('firefly.shortNamesByFullName')[$account->accountType->type];
         $subTitle           = trans('firefly.edit_' . $what . '_account', ['name' => $account->name]);
         $subTitleIcon       = config('firefly.subIconsByIdentifier.' . $what);
-        /** @var CurrencyRepositoryInterface $repository */
+        $allCurrencies      = $repository->get();
-        $repository = app(CurrencyRepositoryInterface::class);
+        $currencySelectList = ExpandedForm::makeSelectList($allCurrencies);
-        $currencies = ExpandedForm::makeSelectList($repository->get());
         $roles              = [];
         foreach (config('firefly.accountRoles') as $role) {
             $roles[$role] = strval(trans('firefly.account_role_' . $role));
@@ -172,6 +174,7 @@ class AccountController extends Controller
         $openingBalanceAmount = $account->getOpeningBalanceAmount() === '0' ? '' : $openingBalanceAmount;
         $openingBalanceDate   = $account->getOpeningBalanceDate();
         $openingBalanceDate   = $openingBalanceDate->year === 1900 ? null : $openingBalanceDate->format('Y-m-d');
+        $currency             = $repository->find(intval($account->getMeta('currency_id')));
 
         $preFilled = [
             'accountNumber'        => $account->getMeta('accountNumber'),
@@ -182,13 +185,18 @@ class AccountController extends Controller
             'openingBalanceDate'   => $openingBalanceDate,
             'openingBalance'       => $openingBalanceAmount,
             'virtualBalance'       => $account->virtual_balance,
-            'currency_id'          => $account->getMeta('currency_id'),
+            'currency_id'          => $currency->id,
+
         ];
         $request->session()->flash('preFilled', $preFilled);
         $request->session()->flash('gaEventCategory', 'accounts');
         $request->session()->flash('gaEventAction', 'edit-' . $what);
 
-        return view('accounts.edit', compact('currencies', 'account', 'subTitle', 'subTitleIcon', 'openingBalance', 'what', 'roles'));
+        return view(
+            'accounts.edit', compact(
+                               'allCurrencies', 'currencySelectList', 'account', 'currency', 'subTitle', 'subTitleIcon', 'openingBalance', 'what', 'roles'
+                           )
+        );
     }
 
     /**
@@ -227,101 +235,99 @@ class AccountController extends Controller
         return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
     }
 
+
     /**
      * @param Request                    $request
-     * @param JournalCollectorInterface $collector
+     * @param JournalRepositoryInterface $repository
      * @param Account                    $account
+     * @param string                     $moment
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
-    public function show(Request $request, JournalCollectorInterface $collector, Account $account)
+    public function show(Request $request, JournalRepositoryInterface $repository, Account $account, string $moment = '')
     {
         if ($account->accountType->type === AccountType::INITIAL_BALANCE) {
             return $this->redirectToOriginalAccount($account);
         }
-        // show journals from current period only:
+        /** @var CurrencyRepositoryInterface $currencyRepos */
-        $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
+        $currencyRepos = app(CurrencyRepositoryInterface::class);
-        $subTitle     = $account->name;
         $range         = Preferences::get('viewRange', '1M')->data;
-        $start        = session('start', Navigation::startOfPeriod(new Carbon, $range));
+        $subTitleIcon  = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
-        $end          = session('end', Navigation::endOfPeriod(new Carbon, $range));
         $page          = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
         $pageSize      = intval(Preferences::get('transactionPageSize', 50)->data);
         $chartUri      = route('chart.account.single', [$account->id]);
-        $accountType  = $account->accountType->type;
+        $start         = null;
+        $end           = null;
+        $periods       = new Collection;
+        $currency      = $currencyRepos->find(intval($account->getMeta('currency_id')));
 
-        // grab those journals:
+        // prep for "all" view.
-        $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page);
+        if ($moment === 'all') {
-        $journals = $collector->getPaginatedJournals();
+            $subTitle = trans('firefly.all_journals_for_account', ['name' => $account->name]);
-        $journals->setPath('accounts/show/' . $account->id);
-
-        // generate entries for each period (and cache those)
-        $entries = $this->periodEntries($account);
-
-        return view('accounts.show', compact('account', 'accountType', 'entries', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
-    }
-
-    /**
-     * @param Request                    $request
-     * @param AccountRepositoryInterface $repository
-     * @param Account                    $account
-     *
-     * @return View
-     */
-    public function showAll(Request $request, AccountRepositoryInterface $repository, Account $account)
-    {
-        $subTitle = sprintf('%s (%s)', $account->name, strtolower(trans('firefly.everything')));
-        $page     = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
-        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
             $chartUri = route('chart.account.all', [$account->id]);
-
+            $first    = $repository->first();
-        // replace with journal collector:
+            $start    = $first->date ?? new Carbon;
-        /** @var JournalCollectorInterface $collector */
+            $end      = new Carbon;
-        $collector = app(JournalCollectorInterface::class);
-        $collector->setUser(auth()->user());
-        $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page);
-        $journals = $collector->getPaginatedJournals();
-        $journals->setPath('accounts/show/' . $account->id . '/all');
-
-        // get oldest and newest journal for account:
-        $start = $repository->oldestJournalDate($account);
-        $end   = $repository->newestJournalDate($account);
-
-        // same call, except "entries".
-        return view('accounts.show', compact('account', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
         }
 
-    /**
+        // prep for "specific date" view.
-     * @param Request $request
+        if (strlen($moment) > 0 && $moment !== 'all') {
-     * @param Account $account
+            $start    = new Carbon($moment);
-     * @param string  $date
+            $end      = Navigation::endOfPeriod($start, $range);
-     *
+            $subTitle = trans(
-     * @return View
+                'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-     */
+                                                           'end'  => $end->formatLocalized($this->monthAndDayFormat)]
-    public function showByDate(Request $request, Account $account, string $date)
+            );
-    {
+            $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d')]);
-        $carbon      = new Carbon($date);
+            $periods  = $this->getPeriodOverview($account);
-        $range       = Preferences::get('viewRange', '1M')->data;
+        }
-        $start       = Navigation::startOfPeriod($carbon, $range);
-        $end         = Navigation::endOfPeriod($carbon, $range);
-        $subTitle    = $account->name . ' (' . Navigation::periodShow($start, $range) . ')';
-        $page        = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
-        $pageSize    = intval(Preferences::get('transactionPageSize', 50)->data);
-        $chartUri    = route('chart.account.period', [$account->id, $carbon->format('Y-m-d')]);
-        $accountType = $account->accountType->type;
 
-        // replace with journal collector:
+        // prep for current period
-        /** @var JournalCollectorInterface $collector */
+        if (strlen($moment) === 0) {
+            $start    = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
+            $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
+            $subTitle = trans(
+                'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
+                                                           'end'  => $end->formatLocalized($this->monthAndDayFormat)]
+            );
+            $periods  = $this->getPeriodOverview($account);
+        }
+
+        $count       = 0;
+        $loop        = 0;
+        // grab journals, but be prepared to jump a period back to get the right ones:
+        Log::info('Now at loop start.');
+        while ($count === 0 && $loop < 3) {
+            $loop++;
             $collector = app(JournalCollectorInterface::class);
-        $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page);
+            Log::info('Count is zero, search for journals.');
+            $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page);
+            if (!is_null($start)) {
+                $collector->setRange($start, $end);
+            }
             $journals = $collector->getPaginatedJournals();
-        $journals->setPath('accounts/show/' . $account->id . '/' . $date);
+            $journals->setPath('accounts/show/' . $account->id . '/' . $moment);
+            $count = $journals->getCollection()->count();
+            if ($count === 0) {
+                $start->subDay();
+                $start = Navigation::startOfPeriod($start, $range);
+                $end   = Navigation::endOfPeriod($start, $range);
+                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
+            }
+        }
 
-        // generate entries for each period (and cache those)
+        if ($moment != 'all' && $loop > 1) {
-        $entries = $this->periodEntries($account);
+            $subTitle = trans(
+                'firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
+                                                           'end'  => $end->formatLocalized($this->monthAndDayFormat)]
+            );
+        }
 
-        // same call, except "entries".
+
-        return view('accounts.show', compact('account', 'accountType', 'entries', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
+        return view(
+            'accounts.show',
+            compact('account', 'currency', 'moment', 'periods', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri')
+        );
     }
 
     /**
@@ -335,7 +341,6 @@ class AccountController extends Controller
     {
         $data    = $request->getAccountData();
         $account = $repository->store($data);
-
         $request->session()->flash('success', strval(trans('firefly.stored_new_account', ['name' => $account->name])));
         Preferences::mark();
 
@@ -409,13 +414,10 @@ class AccountController extends Controller
      *
      * @return Collection
      */
-    private function periodEntries(Account $account): Collection
+    private function getPeriodOverview(Account $account): Collection
     {
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
-        /** @var AccountTaskerInterface $tasker */
-        $tasker = app(AccountTaskerInterface::class);
-
         $start      = $repository->oldestJournalDate($account);
         $range      = Preferences::get('viewRange', '1M')->data;
         $start      = Navigation::startOfPeriod($start, $range);
@@ -430,25 +432,39 @@ class AccountController extends Controller
         $cache->addProperty($account->id);
 
         if ($cache->has()) {
-            Log::debug('Entries are cached, return cache.');
+            return $cache->get(); // @codeCoverageIgnore
-
-            return $cache->get();
         }
 
-        // only include asset accounts when this account is an asset:
-        $assets = new Collection;
-        if (in_array($account->accountType->type, [AccountType::ASSET, AccountType::DEFAULT])) {
-            $assets = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]);
-        }
         Log::debug('Going to get period expenses and incomes.');
         while ($end >= $start) {
             $end        = Navigation::startOfPeriod($end, $range);
             $currentEnd = Navigation::endOfPeriod($end, $range);
-            $spent      = $tasker->amountOutInPeriod(new Collection([$account]), $assets, $end, $currentEnd);
+
-            $earned     = $tasker->amountInInPeriod(new Collection([$account]), $assets, $end, $currentEnd);
+            // try a collector for income:
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAccounts(new Collection([$account]))->setRange($end, $currentEnd)
+                      ->setTypes([TransactionType::DEPOSIT])
+                      ->withOpposingAccount();
+            $earned = strval($collector->getJournals()->sum('transaction_amount'));
+
+            // try a collector for expenses:
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAccounts(new Collection([$account]))->setRange($end, $currentEnd)
+                      ->setTypes([TransactionType::WITHDRAWAL])
+                      ->withOpposingAccount();
+            $spent    = strval($collector->getJournals()->sum('transaction_amount'));
             $dateStr  = $end->format('Y-m-d');
             $dateName = Navigation::periodShow($end, $range);
-            $entries->push([$dateStr, $dateName, $spent, $earned, clone $end]);
+            $entries->push(
+                [
+                    'string' => $dateStr,
+                    'name'   => $dateName,
+                    'spent'  => $spent,
+                    'earned' => $earned,
+                    'date'   => clone $end]
+            );
             $end = Navigation::subtractPeriod($end, $range, 1);
 
         }
@@ -476,7 +492,7 @@ class AccountController extends Controller
         $opposingTransaction = $journal->transactions()->where('transactions.id', '!=', $transaction->id)->first();
 
         if (is_null($opposingTransaction)) {
-            throw new FireflyException('Expected an opposing transaction. This account has none. BEEP, error.');
+            throw new FireflyException('Expected an opposing transaction. This account has none. BEEP, error.'); // @codeCoverageIgnore
         }
 
         return redirect(route('accounts.show', [$opposingTransaction->account_id]));

app/Http/Controllers/Admin/UserController.php

@@ -18,6 +18,7 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\UserFormRequest;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
+use Log;
 use Preferences;
 use Session;
 use View;
@@ -127,31 +128,31 @@ class UserController extends Controller
      * @param UserFormRequest         $request
      * @param User                    $user
      *
+     * @param UserRepositoryInterface $repository
+     *
      * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function update(UserFormRequest $request, User $user)
+    public function update(UserFormRequest $request, User $user, UserRepositoryInterface $repository)
     {
+        Log::debug('Actually here');
         $data = $request->getUserData();
 
         // update password
         if (strlen($data['password']) > 0) {
-            $user->password = bcrypt($data['password']);
+            $repository->changePassword($user, $data['password']);
-            $user->save();
         }
 
-        // change blocked status and code:
+        $repository->changeStatus($user, $data['blocked'], $data['blocked_code']);
-        $user->blocked      = $data['blocked'];
-        $user->blocked_code = $data['blocked_code'];
-        $user->save();
 
         Session::flash('success', strval(trans('firefly.updated_user', ['email' => $user->email])));
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
-            // set value so edit routine will not overwrite URL:
+            // @codeCoverageIgnoreStart
             Session::put('users.edit.fromUpdate', true);
 
             return redirect(route('admin.users.edit', [$user->id]))->withInput(['return_to_edit' => 1]);
+            // @codeCoverageIgnoreEnd
         }
 
         // redirect to previous URL.

app/Http/Controllers/AttachmentController.php

@@ -176,10 +176,11 @@ class AttachmentController extends Controller
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
-            // set value so edit routine will not overwrite URL:
+            // @codeCoverageIgnoreStart
             $request->session()->put('attachments.edit.fromUpdate', true);
 
             return redirect(route('attachments.edit', [$attachment->id]))->withInput(['return_to_edit' => 1]);
+            // @codeCoverageIgnoreEnd
         }
 
         // redirect to previous URL.

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -13,6 +13,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Controllers\Auth;
 
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\Request;
@@ -42,23 +43,22 @@ class ForgotPasswordController extends Controller
      *
      * @param  Request                $request
      *
+     * @param UserRepositoryInterface $repository
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
-    public function sendResetLinkEmail(Request $request)
+    public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
     {
         $this->validate($request, ['email' => 'required|email']);
 
         // verify if the user is not a demo user. If so, we give him back an error.
         $user = User::where('email', $request->get('email'))->first();
-        if (!is_null($user) && $user->hasRole('demo')) {
+
-            return back()->withErrors(
+        if (!is_null($user) && $repository->hasRole($user, 'demo')) {
-                ['email' => trans('firefly.cannot_reset_demo_user')]
+            return back()->withErrors(['email' => trans('firefly.cannot_reset_demo_user')]);
-            );
         }
 
-        $response = $this->broker()->sendResetLink(
+        $response = $this->broker()->sendResetLink($request->only('email'));
-            $request->only('email')
-        );
 
         if ($response === Password::RESET_LINK_SENT) {
             return back()->with('status', trans($response));
@@ -67,8 +67,6 @@ class ForgotPasswordController extends Controller
         // If an error was returned by the password broker, we will get this message
         // translated so we can notify a user of the problem. We'll redirect back
         // to where the users came from so they can attempt this process again.
-        return back()->withErrors(
+        return back()->withErrors(['email' => trans($response)]); // @codeCoverageIgnore
-            ['email' => trans($response)]
-        );
     }
 }

app/Http/Controllers/Auth/LoginController.php

@@ -22,6 +22,8 @@ use Illuminate\Http\Request;
 use Lang;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class LoginController
  *
  * @package FireflyIII\Http\Controllers\Auth
@@ -110,10 +112,14 @@ class LoginController extends Controller
      *
      * @param Request   $request
      *
+     * @param CookieJar $cookieJar
+     *
      * @return \Illuminate\Http\Response
      */
-    public function showLoginForm(Request $request)
+    public function showLoginForm(Request $request, CookieJar $cookieJar)
     {
+        // forget 2fa cookie:
+        $cookie = $cookieJar->forever('twoFactorAuthenticated', 'false');
         // is allowed to?
         $singleUserMode    = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
         $userCount         = User::count();
@@ -125,7 +131,7 @@ class LoginController extends Controller
         $email    = $request->old('email');
         $remember = $request->old('remember');
 
-        return view('auth.login', compact('allowRegistration', 'email', 'remember'));
+        return view('auth.login', compact('allowRegistration', 'email', 'remember'))->withCookie($cookie);
     }
 
     /**

app/Http/Controllers/Auth/PasswordController.php

@@ -22,6 +22,8 @@ use Illuminate\Support\Facades\Password;
 
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class PasswordController
  *
  * @package FireflyIII\Http\Controllers\Auth

app/Http/Controllers/Auth/RegisterController.php

@@ -24,6 +24,8 @@ use Session;
 use Validator;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class RegisterController
  *
  * @package FireflyIII\Http\Controllers\Auth
@@ -122,12 +124,15 @@ class RegisterController extends Controller
      */
     protected function create(array $data)
     {
-        return User::create(
+        /** @var User $user */
+        $user = User::create(
             [
                 'email'    => $data['email'],
                 'password' => bcrypt($data['password']),
             ]
         );
+
+        return $user;
     }
 
     /**

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -16,6 +16,8 @@ use FireflyIII\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 /**
+ * @codeCoverageIgnore
+ *
  * Class ResetPasswordController
  *
  * @package FireflyIII\Http\Controllers\Auth

app/Http/Controllers/Auth/TwoFactorController.php

@@ -41,11 +41,12 @@ class TwoFactorController extends Controller
         $user = auth()->user();
 
         // to make sure the validator in the next step gets the secret, we push it in session
-        $secret = Preferences::get('twoFactorAuthSecret', null)->data;
+        $secretPreference = Preferences::get('twoFactorAuthSecret', null);
+        $secret           = is_null($secretPreference) ? null : $secretPreference->data;
         $title            = strval(trans('firefly.two_factor_title'));
 
         // make sure the user has two factor configured:
-        $has2FA = Preferences::get('twoFactorAuthEnabled', null)->data;
+        $has2FA = Preferences::get('twoFactorAuthEnabled', false)->data;
         if (is_null($has2FA) || $has2FA === false) {
             return redirect(route('index'));
         }
@@ -79,9 +80,11 @@ class TwoFactorController extends Controller
 
     /**
      * @param TokenFormRequest $request
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter) // it's unused but the class does some validation.
+     * @param CookieJar        $cookieJar
      *
      * @return mixed
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter) // it's unused but the class does some validation.
+     *
      */
     public function postIndex(TokenFormRequest $request, CookieJar $cookieJar)
     {

app/Http/Controllers/BillController.php

@@ -240,10 +240,11 @@ class BillController extends Controller
         Preferences::mark();
 
         if (intval($request->get('create_another')) === 1) {
-            // set value so create routine will not overwrite URL:
+            // @codeCoverageIgnoreStart
             $request->session()->put('bills.create.fromStore', true);
 
             return redirect(route('bills.create'))->withInput();
+            // @codeCoverageIgnoreEnd
         }
 
         // redirect to previous URL.
@@ -267,10 +268,11 @@ class BillController extends Controller
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
-            // set value so edit routine will not overwrite URL:
+            // @codeCoverageIgnoreStart
             $request->session()->put('bills.edit.fromUpdate', true);
 
             return redirect(route('bills.edit', [$bill->id]))->withInput(['return_to_edit' => 1]);
+            // @codeCoverageIgnoreEnd
         }
 
         return redirect($this->getPreviousUri('bills.edit.uri'));

app/Http/Controllers/BudgetController.php

@@ -22,11 +22,15 @@ use FireflyIII\Http\Requests\BudgetIncomeRequest;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Log;
+use Navigation;
 use Preferences;
 use Response;
 use View;
@@ -105,6 +109,7 @@ class BudgetController extends Controller
     }
 
     /**
+     * @param Request $request
      * @param Budget  $budget
      *
      * @return View
@@ -187,33 +192,87 @@ class BudgetController extends Controller
 
     /**
      * @param Request                    $request
+     * @param JournalRepositoryInterface $repository
+     * @param string                     $moment
      *
      * @return View
      */
-    public function noBudget(Request $request)
+    public function noBudget(Request $request, JournalRepositoryInterface $repository, string $moment = '')
     {
-        /** @var Carbon $start */
+        // default values:
-        $start = session('start', Carbon::now()->startOfMonth());
+        $range   = Preferences::get('viewRange', '1M')->data;
-        /** @var Carbon $end */
+        $start   = null;
-        $end      = session('end', Carbon::now()->endOfMonth());
+        $end     = null;
-        $page     = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $periods = new Collection;
-        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
+
+        // prep for "all" view.
+        if ($moment === 'all') {
+            $subTitle = trans('firefly.all_journals_without_budget');
+            $first    = $repository->first();
+            $start    = $first->date ?? new Carbon;
+            $end      = new Carbon;
+        }
+
+        // prep for "specific date" view.
+        if (strlen($moment) > 0 && $moment !== 'all') {
+            $start    = new Carbon($moment);
+            $end      = Navigation::endOfPeriod($start, $range);
             $subTitle = trans(
                 'firefly.without_budget_between',
                 ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
             );
+            $periods  = $this->getPeriodOverview();
+        }
 
-        // collector
+        // prep for current period
+        if (strlen($moment) === 0) {
+            $start    = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
+            $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
+            $periods  = $this->getPeriodOverview();
+            $subTitle = trans(
+                'firefly.without_budget_between',
+                ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
+            );
+        }
+
+        $page     = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
+
+        $count = 0;
+        $loop  = 0;
+        // grab journals, but be prepared to jump a period back to get the right ones:
+        Log::info('Now at no-budget loop start.');
+        while ($count === 0 && $loop < 3) {
+            $loop++;
+            Log::info('Count is zero, search for journals.');
             /** @var JournalCollectorInterface $collector */
             $collector = app(JournalCollectorInterface::class);
-        $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget();
+            $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page)
+                      ->withoutBudget()->withOpposingAccount();
             $journals = $collector->getPaginatedJournals();
-        $journals->setPath('/budgets/list/noBudget');
+            $journals->setPath('/budgets/list/no-budget');
+            $count = $journals->getCollection()->count();
+            if ($count === 0) {
+                $start->subDay();
+                $start = Navigation::startOfPeriod($start, $range);
+                $end   = Navigation::endOfPeriod($start, $range);
+                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
+            }
+        }
 
-        return view('budgets.no-budget', compact('journals', 'subTitle'));
+        if ($moment != 'all' && $loop > 1) {
+            $subTitle = trans(
+                'firefly.without_budget_between',
+                ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
+            );
+        }
+
+        return view('budgets.no-budget', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end'));
     }
 
     /**
+     * @param BudgetIncomeRequest $request
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
     public function postUpdateIncome(BudgetIncomeRequest $request)
@@ -252,7 +311,7 @@ class BudgetController extends Controller
         $journals->setPath('/budgets/show/' . $budget->id);
 
 
-        $subTitle = e($budget->name);
+        $subTitle = trans('firefly.all_journals_for_budget', ['name' => $budget->name]);
 
         return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle'));
     }
@@ -312,10 +371,11 @@ class BudgetController extends Controller
         Preferences::mark();
 
         if (intval($request->get('create_another')) === 1) {
-            // set value so create routine will not overwrite URL:
+            // @codeCoverageIgnoreStart
             $request->session()->put('budgets.create.fromStore', true);
 
             return redirect(route('budgets.create'))->withInput();
+            // @codeCoverageIgnoreEnd
         }
 
         return redirect($this->getPreviousUri('budgets.create.uri'));
@@ -336,10 +396,11 @@ class BudgetController extends Controller
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
-            // set value so edit routine will not overwrite URL:
+            // @codeCoverageIgnoreStart
             $request->session()->put('budgets.edit.fromUpdate', true);
 
             return redirect(route('budgets.edit', [$budget->id]))->withInput(['return_to_edit' => 1]);
+            // @codeCoverageIgnoreEnd
         }
 
         return redirect($this->getPreviousUri('budgets.edit.uri'));
@@ -402,7 +463,6 @@ class BudgetController extends Controller
         return $return;
     }
 
-
     /**
      * @param Budget $budget
      * @param Carbon $start
@@ -420,7 +480,7 @@ class BudgetController extends Controller
         $cache->addProperty('get-limits');
 
         if ($cache->has()) {
-            return $cache->get();
+            return $cache->get(); // @codeCoverageIgnore
         }
 
         /** @var AccountRepositoryInterface $accountRepository */
@@ -439,4 +499,57 @@ class BudgetController extends Controller
         return $set;
     }
 
+    /**
+     * @return Collection
+     */
+    private function getPeriodOverview(): Collection
+    {
+        $repository = app(JournalRepositoryInterface::class);
+        $first      = $repository->first();
+        $start      = $first->date ?? new Carbon;
+        $range      = Preferences::get('viewRange', '1M')->data;
+        $start      = Navigation::startOfPeriod($start, $range);
+        $end        = Navigation::endOfX(new Carbon, $range);
+        $entries    = new Collection;
+
+        // properties for cache
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('no-budget-period-entries');
+
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        Log::debug('Going to get period expenses and incomes.');
+        while ($end >= $start) {
+            $end        = Navigation::startOfPeriod($end, $range);
+            $currentEnd = Navigation::endOfPeriod($end, $range);
+
+            // count journals without budget in this period:
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutBudget()->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL]);
+            $set      = $collector->getJournals();
+            $sum      = $set->sum('transaction_amount');
+            $journals = $set->count();
+            $dateStr  = $end->format('Y-m-d');
+            $dateName = Navigation::periodShow($end, $range);
+            $entries->push(
+                [
+                    'string' => $dateStr,
+                    'name'   => $dateName,
+                    'count'  => $journals,
+                    'sum'    => $sum,
+                    'date'   => clone $end,
+                ]
+            );
+            $end = Navigation::subtractPeriod($end, $range, 1);
+        }
+        $cache->store($entries);
+
+        return $entries;
+    }
+
 }

app/Http/Controllers/CategoryController.php

@@ -15,16 +15,21 @@ namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Http\Requests\CategoryFormRequest;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Category;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
+use Log;
 use Navigation;
 use Preferences;
+use Steam;
 use View;
 
 /**
@@ -150,118 +155,171 @@ class CategoryController extends Controller
     }
 
     /**
+     * @param Request                    $request
+     * @param JournalRepositoryInterface $repository
+     * @param string                     $moment
+     *
      * @return View
      */
-    public function noCategory()
+    public function noCategory(Request $request, JournalRepositoryInterface $repository, string $moment = '')
     {
-        /** @var Carbon $start */
+        // default values:
-        $start = session('start', Carbon::now()->startOfMonth());
+        $range   = Preferences::get('viewRange', '1M')->data;
-        /** @var Carbon $end */
+        $start   = null;
-        $end = session('end', Carbon::now()->startOfMonth());
+        $end     = null;
+        $periods = new Collection;
 
-        // new collector:
+        // prep for "all" view.
-        /** @var JournalCollectorInterface $collector */
+        if ($moment === 'all') {
-        $collector = app(JournalCollectorInterface::class);
+            $subTitle = trans('firefly.all_journals_without_category');
-        $collector->setAllAssetAccounts()->setRange($start, $end)->withoutCategory();//->groupJournals();
+            $first    = $repository->first();
-        $journals = $collector->getJournals();
+            $start    = $first->date ?? new Carbon;
+            $end      = new Carbon;
+        }
+
+        // prep for "specific date" view.
+        if (strlen($moment) > 0 && $moment !== 'all') {
+            $start    = new Carbon($moment);
+            $end      = Navigation::endOfPeriod($start, $range);
             $subTitle = trans(
                 'firefly.without_category_between',
                 ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
             );
-
+            $periods  = $this->getNoCategoryPeriodOverview();
-        return view('categories.no-category', compact('journals', 'subTitle'));
         }
 
-    /**
+        // prep for current period
-     * @param Request                   $request
+        if (strlen($moment) === 0) {
-     * @param JournalCollectorInterface $collector
+            $start    = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
-     * @param Category                  $category
+            $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
-     *
+            $periods  = $this->getNoCategoryPeriodOverview();
-     * @return View
+            $subTitle = trans(
-     */
+                'firefly.without_category_between',
-    public function show(Request $request, JournalCollectorInterface $collector, Category $category)
+                ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
-    {
+            );
-        $range        = Preferences::get('viewRange', '1M')->data;
+        }
-        $start        = session('start', Navigation::startOfPeriod(new Carbon, $range));
+
-        $end          = session('end', Navigation::endOfPeriod(new Carbon, $range));
+        $page     = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
-        $hideCategory = true; // used in list.
-        $page         = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
         $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
-        $subTitle     = $category->name;
-        $subTitleIcon = 'fa-bar-chart';
-        $entries      = $this->getGroupedEntries($category);
-        $method       = 'default';
 
-        // get journals
+        $count = 0;
-        $collector->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category)->withBudgetInformation();
+        $loop  = 0;
+        // grab journals, but be prepared to jump a period back to get the right ones:
+        Log::info('Now at no-cat loop start.');
+        while ($count === 0 && $loop < 3) {
+            $loop++;
+            Log::info('Count is zero, search for journals.');
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount();
+            $collector->removeFilter(InternalTransferFilter::class);
             $journals = $collector->getPaginatedJournals();
-        $journals->setPath('categories/show/' . $category->id);
+            $journals->setPath('/categories/list/no-category');
+            $count = $journals->getCollection()->count();
+            if ($count === 0) {
+                $start->subDay();
+                $start = Navigation::startOfPeriod($start, $range);
+                $end   = Navigation::endOfPeriod($start, $range);
+                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
+            }
+        }
 
+        if ($moment != 'all' && $loop > 1) {
+            $subTitle = trans(
+                'firefly.without_category_between',
+                ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
+            );
+        }
 
-        return view('categories.show', compact('category', 'method', 'journals', 'entries', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end'));
+        return view('categories.no-category', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end'));
     }
 
     /**
      * @param Request                     $request
      * @param CategoryRepositoryInterface $repository
      * @param Category                    $category
+     * @param string                      $moment
      *
      * @return View
      */
-    public function showAll(Request $request, CategoryRepositoryInterface $repository, Category $category)
+    public function show(Request $request, CategoryRepositoryInterface $repository, Category $category, string $moment = '')
     {
+        // default values:
+        $subTitle     = $category->name;
+        $subTitleIcon = 'fa-bar-chart';
+        $page         = intval($request->get('page')) == 0 ? 1 : intval($request->get('page'));
+        $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
+        $count        = 0;
+        $loop         = 0;
         $range        = Preferences::get('viewRange', '1M')->data;
+        $start        = null;
+        $end          = null;
+        $periods      = new Collection;
+
+
+        // prep for "all" view.
+        if ($moment === 'all') {
+            $subTitle = trans('firefly.all_journals_for_category', ['name' => $category->name]);
             $start    = $repository->firstUseDate($category);
-        if ($start->year == 1900) {
+            $end      = new Carbon;
-            $start = new Carbon;
         }
-        $end          = Navigation::endOfPeriod(new Carbon, $range);
-        $subTitle     = $category->name;
-        $subTitleIcon = 'fa-bar-chart';
-        $hideCategory = true; // used in list.
-        $page         = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
-        $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
-        $method       = 'all';
 
+        // prep for "specific date" view.
+        if (strlen($moment) > 0 && $moment !== 'all') {
+            $start    = new Carbon($moment);
+            $end      = Navigation::endOfPeriod($start, $range);
+            $subTitle = trans(
+                'firefly.journals_in_period_for_category',
+                ['name'  => $category->name,
+                 'start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
+            );
+            $periods  = $this->getPeriodOverview($category);
+        }
+
+        // prep for current period
+        if (strlen($moment) === 0) {
+            $start    = clone session('start', Navigation::startOfPeriod(new Carbon, $range));
+            $end      = clone session('end', Navigation::endOfPeriod(new Carbon, $range));
+            $periods  = $this->getPeriodOverview($category);
+            $subTitle = trans(
+                'firefly.journals_in_period_for_category',
+                ['name' => $category->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
+                 'end'  => $end->formatLocalized($this->monthAndDayFormat)]
+            );
+        }
+        // grab journals, but be prepared to jump a period back to get the right ones:
+        Log::info('Now at category loop start.');
+        while ($count === 0 && $loop < 3) {
+            $loop++;
+            Log::info('Count is zero, search for journals.');
             /** @var JournalCollectorInterface $collector */
             $collector = app(JournalCollectorInterface::class);
-        $collector->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setCategory($category)->withBudgetInformation();
+            $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount()
+                      ->setCategory($category)->withBudgetInformation()->withCategoryInformation();
+            $collector->removeFilter(InternalTransferFilter::class);
             $journals = $collector->getPaginatedJournals();
-        $journals->setPath('categories/show/' . $category->id . '/all');
+            $journals->setPath('categories/show/' . $category->id);
-
+            $count = $journals->getCollection()->count();
-        return view('categories.show', compact('category', 'method', 'journals', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end'));
+            if ($count === 0) {
+                $start->subDay();
+                $start = Navigation::startOfPeriod($start, $range);
+                $end   = Navigation::endOfPeriod($start, $range);
+                Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
+            }
         }
 
-    /**
+        if ($moment != 'all' && $loop > 1) {
-     * @param Request  $request
+            $subTitle = trans(
-     * @param Category $category
+                'firefly.journals_in_period_for_category',
-     * @param string   $date
+                ['name' => $category->name, 'start' => $start->formatLocalized($this->monthAndDayFormat),
-     *
+                 'end'  => $end->formatLocalized($this->monthAndDayFormat)]
-     * @return View
+            );
-     */
-    public function showByDate(Request $request, Category $category, string $date)
-    {
-        $carbon       = new Carbon($date);
-        $range        = Preferences::get('viewRange', '1M')->data;
-        $start        = Navigation::startOfPeriod($carbon, $range);
-        $end          = Navigation::endOfPeriod($carbon, $range);
-        $subTitle     = $category->name;
-        $subTitleIcon = 'fa-bar-chart';
-        $hideCategory = true; // used in list.
-        $page         = intval($request->get('page')) === 0 ? 1 : intval($request->get('page'));
-        $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
-        $entries      = $this->getGroupedEntries($category);
-        $method       = 'date';
-
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-        $collector->setLimit($pageSize)->setPage($page)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category)->withBudgetInformation();
-        $journals = $collector->getPaginatedJournals();
-        $journals->setPath('categories/show/' . $category->id . '/' . $date);
-
-        return view('categories.show', compact('category', 'method', 'entries', 'journals', 'hideCategory', 'subTitle', 'subTitleIcon', 'start', 'end'));
         }
 
+        return view('categories.show', compact('category', 'moment', 'journals', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
+    }
+
+
     /**
      * @param CategoryFormRequest         $request
      * @param CategoryRepositoryInterface $repository
@@ -277,9 +335,11 @@ class CategoryController extends Controller
         Preferences::mark();
 
         if (intval($request->get('create_another')) === 1) {
+            // @codeCoverageIgnoreStart
             $request->session()->put('categories.create.fromStore', true);
 
             return redirect(route('categories.create'))->withInput();
+            // @codeCoverageIgnoreEnd
         }
 
         return redirect(route('categories.index'));
@@ -302,20 +362,100 @@ class CategoryController extends Controller
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
+            // @codeCoverageIgnoreStart
             $request->session()->put('categories.edit.fromUpdate', true);
 
             return redirect(route('categories.edit', [$category->id]));
+            // @codeCoverageIgnoreEnd
         }
 
         return redirect($this->getPreviousUri('categories.edit.uri'));
     }
 
+    /**
+     * @return Collection
+     */
+    private function getNoCategoryPeriodOverview(): Collection
+    {
+        $repository = app(JournalRepositoryInterface::class);
+        $first      = $repository->first();
+        $start      = $first->date ?? new Carbon;
+        $range      = Preferences::get('viewRange', '1M')->data;
+        $start      = Navigation::startOfPeriod($start, $range);
+        $end        = Navigation::endOfX(new Carbon, $range);
+        $entries    = new Collection;
+
+        // properties for cache
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('no-budget-period-entries');
+
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        Log::debug(sprintf('Going to get period expenses and incomes between %s and %s.', $start->format('Y-m-d'), $end->format('Y-m-d')));
+        while ($end >= $start) {
+            Log::debug('Loop!');
+            $end        = Navigation::startOfPeriod($end, $range);
+            $currentEnd = Navigation::endOfPeriod($end, $range);
+
+            // count journals without budget in this period:
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()
+                      ->withOpposingAccount();
+            $collector->removeFilter(InternalTransferFilter::class);
+            $count = $collector->getJournals()->count();
+
+            // amount transferred
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()
+                      ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
+            $collector->removeFilter(InternalTransferFilter::class);
+            $transferred = Steam::positive($collector->getJournals()->sum('transaction_amount'));
+
+            // amount spent
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL]);
+            $spent = $collector->getJournals()->sum('transaction_amount');
+
+            // amount earned
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()->withOpposingAccount()->setTypes([TransactionType::DEPOSIT]);
+            $earned = $collector->getJournals()->sum('transaction_amount');
+
+            $dateStr  = $end->format('Y-m-d');
+            $dateName = Navigation::periodShow($end, $range);
+            $entries->push(
+                [
+                    'string'      => $dateStr,
+                    'name'        => $dateName,
+                    'count'       => $count,
+                    'spent'       => $spent,
+                    'earned'      => $earned,
+                    'transferred' => $transferred,
+                    'date'        => clone $end,
+                ]
+            );
+            $end = Navigation::subtractPeriod($end, $range, 1);
+        }
+        Log::debug('End of loops');
+        $cache->store($entries);
+
+        return $entries;
+    }
+
     /**
      * @param Category $category
      *
      * @return Collection
      */
-    private function getGroupedEntries(Category $category): Collection
+    private function getPeriodOverview(Category $category): Collection
     {
         /** @var CategoryRepositoryInterface $repository */
         $repository = app(CategoryRepositoryInterface::class);
@@ -339,7 +479,7 @@ class CategoryController extends Controller
         $cache->addProperty($category->id);
 
         if ($cache->has()) {
-            return $cache->get();
+            return $cache->get(); // @codeCoverageIgnore
         }
         while ($end >= $first) {
             $end        = Navigation::startOfPeriod($end, $range);
@@ -348,7 +488,26 @@ class CategoryController extends Controller
             $earned     = $repository->earnedInPeriod(new Collection([$category]), $accounts, $end, $currentEnd);
             $dateStr    = $end->format('Y-m-d');
             $dateName   = Navigation::periodShow($end, $range);
-            $entries->push([$dateStr, $dateName, $spent, $earned, clone $end]);
+
+            // amount transferred
+            /** @var JournalCollectorInterface $collector */
+            $collector = app(JournalCollectorInterface::class);
+            $collector->setAllAssetAccounts()->setRange($end, $currentEnd)->setCategory($category)
+                      ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]);
+            $collector->removeFilter(InternalTransferFilter::class);
+            $transferred = Steam::positive($collector->getJournals()->sum('transaction_amount'));
+
+            $entries->push(
+                [
+                    'string'      => $dateStr,
+                    'name'        => $dateName,
+                    'spent'       => $spent,
+                    'earned'      => $earned,
+                    'sum'         => bcadd($earned, $spent),
+                    'transferred' => $transferred,
+                    'date'        => clone $end,
+                ]
+            );
             $end = Navigation::subtractPeriod($end, $range, 1);
         }
         $cache->store($entries);

app/Http/Controllers/Chart/AccountController.php

@@ -26,6 +26,7 @@ use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Log;
@@ -61,15 +62,12 @@ class AccountController extends Controller
      */
     public function all(Account $account)
     {
-        $cache = new CacheProperties();
+        $cache = new CacheProperties;
         $cache->addProperty('chart.account.all');
         $cache->addProperty($account->id);
         if ($cache->has()) {
-            Log::debug('Return chart.account.all from cache.');
+            return Response::json($cache->get()); // @codeCoverageIgnore
-
-            return Response::json($cache->get());
         }
-        Log::debug('Regenerate chart.account.all from scratch.');
 
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
@@ -112,7 +110,7 @@ class AccountController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('chart.account.expense-accounts');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
         $start->subDay();
 
@@ -139,14 +137,13 @@ class AccountController extends Controller
     }
 
     /**
-     * @param JournalCollectorInterface $collector
      * @param Account $account
      * @param Carbon  $start
      * @param Carbon  $end
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function expenseBudget(JournalCollectorInterface $collector, Account $account, Carbon $start, Carbon $end)
+    public function expenseBudget(Account $account, Carbon $start, Carbon $end)
     {
         $cache = new CacheProperties;
         $cache->addProperty($account->id);
@@ -154,12 +151,10 @@ class AccountController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('chart.account.expense-budget');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
-        $collector->setAccounts(new Collection([$account]))
+        $collector = app(JournalCollectorInterface::class);
-                  ->setRange($start, $end)
+        $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withBudgetInformation()->setTypes([TransactionType::WITHDRAWAL]);
-                  ->withBudgetInformation()
-                  ->setTypes([TransactionType::WITHDRAWAL]);
         $transactions = $collector->getJournals();
         $chartData    = [];
         $result       = [];
@@ -185,14 +180,27 @@ class AccountController extends Controller
     }
 
     /**
-     * @param JournalCollectorInterface $collector
+     * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function expenseBudgetAll(AccountRepositoryInterface $repository, Account $account)
+    {
+        $start = $repository->oldestJournalDate($account);
+        $end   = Carbon::now();
+
+        return $this->expenseBudget($account, $start, $end);
+    }
+
+    /**
      * @param Account $account
      * @param Carbon  $start
      * @param Carbon  $end
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function expenseCategory(JournalCollectorInterface $collector, Account $account, Carbon $start, Carbon $end)
+    public function expenseCategory(Account $account, Carbon $start, Carbon $end)
     {
         $cache = new CacheProperties;
         $cache->addProperty($account->id);
@@ -200,9 +208,10 @@ class AccountController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('chart.account.expense-category');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
+        $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionType::WITHDRAWAL]);
         $transactions = $collector->getJournals();
         $result       = [];
@@ -228,6 +237,20 @@ class AccountController extends Controller
 
     }
 
+    /**
+     * @param AccountRepositoryInterface $repository
+     * @param Account                    $account
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function expenseCategoryAll(AccountRepositoryInterface $repository, Account $account)
+    {
+        $start = $repository->oldestJournalDate($account);
+        $end   = Carbon::now();
+
+        return $this->expenseCategory($account, $start, $end);
+    }
+
     /**
      * Shows the balances for all the user's frontpage accounts.
      *
@@ -254,14 +277,13 @@ class AccountController extends Controller
     }
 
     /**
-     * @param JournalCollectorInterface $collector
      * @param Account $account
      * @param Carbon  $start
      * @param Carbon  $end
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function incomeCategory(JournalCollectorInterface $collector, Account $account, Carbon $start, Carbon $end)
+    public function incomeCategory(Account $account, Carbon $start, Carbon $end)
     {
         $cache = new CacheProperties;
         $cache->addProperty($account->id);
@@ -269,10 +291,11 @@ class AccountController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('chart.account.income-category');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         // grab all journals:
+        $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionType::DEPOSIT]);
         $transactions = $collector->getJournals();
         $result       = [];
@@ -298,20 +321,28 @@ class AccountController extends Controller
     }
 
     /**
+     * @param AccountRepositoryInterface $repository
      * @param Account                    $account
-     * @param string  $date
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function incomeCategoryAll(AccountRepositoryInterface $repository, Account $account)
+    {
+        $start = $repository->oldestJournalDate($account);
+        $end   = Carbon::now();
+
+        return $this->incomeCategory($account, $start, $end);
+    }
+
+    /**
+     * @param Account $account
+     * @param Carbon $start
      *
      * @return \Illuminate\Http\JsonResponse
      * @throws FireflyException
      */
-    public function period(Account $account, string $date)
+    public function period(Account $account, Carbon $start)
     {
-        try {
-            $start = new Carbon($date);
-        } catch (Exception $e) {
-            Log::error($e->getMessage());
-            throw new FireflyException('"' . e($date) . '" does not seem to be a valid date. Should be in the format YYYY-MM-DD');
-        }
         $range = Preferences::get('viewRange', '1M')->data;
         $end   = Navigation::endOfPeriod($start, $range);
         $cache = new CacheProperties();
@@ -320,7 +351,7 @@ class AccountController extends Controller
         $cache->addProperty('chart.account.period');
         $cache->addProperty($account->id);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $format    = (string)trans('config.month_and_day');
@@ -375,7 +406,7 @@ class AccountController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('chart.account.revenue-accounts');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
         $accounts = $repository->getAccountsByType([AccountType::REVENUE]);
 
@@ -421,7 +452,7 @@ class AccountController extends Controller
         $cache->addProperty('chart.account.single');
         $cache->addProperty($account->id);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $format    = (string)trans('config.month_and_day');
@@ -461,16 +492,19 @@ class AccountController extends Controller
         $cache->addProperty('chart.account.account-balance-chart');
         $cache->addProperty($accounts);
         if ($cache->has()) {
-            Log::debug('Return chart.account.account-balance-chart from cache.');
+            return $cache->get(); // @codeCoverageIgnore
-
-            return $cache->get();
         }
         Log::debug('Regenerate chart.account.account-balance-chart from scratch.');
 
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+
         $chartData = [];
         foreach ($accounts as $account) {
+            $currency     = $repository->find(intval($account->getMeta('currency_id')));
             $currentSet   = [
                 'label'           => $account->name,
+                'currency_symbol' => $currency->symbol,
                 'entries'         => [],
             ];
             $currentStart = clone $start;

app/Http/Controllers/Chart/BillController.php

@@ -60,7 +60,7 @@ class BillController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('chart.bill.frontpage');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $paid      = $repository->getBillsPaidInRange($start, $end); // will be a negative amount.
@@ -88,7 +88,7 @@ class BillController extends Controller
         $cache->addProperty('chart.bill.single');
         $cache->addProperty($bill->id);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $results   = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getJournals();

app/Http/Controllers/Chart/BudgetController.php

@@ -18,11 +18,14 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Navigation;
@@ -80,7 +83,7 @@ class BudgetController extends Controller
         $cache->addProperty('chart.budget.budget');
 
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $final = clone $last;
@@ -133,7 +136,7 @@ class BudgetController extends Controller
         $cache->addProperty($budgetLimit->id);
 
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $entries          = [];
@@ -153,6 +156,144 @@ class BudgetController extends Controller
         return Response::json($data);
     }
 
+    /**
+     * @param Budget           $budget
+     * @param BudgetLimit|null $budgetLimit
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function expenseAsset(Budget $budget, BudgetLimit $budgetLimit = null)
+    {
+        $cache = new CacheProperties;
+        $cache->addProperty($budget->id);
+        $cache->addProperty($budgetLimit->id ?? 0);
+        $cache->addProperty('chart.budget.expense-asset');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setTypes([TransactionType::WITHDRAWAL])->setBudget($budget);
+        if (!is_null($budgetLimit->id)) {
+            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
+        }
+
+        $transactions = $collector->getJournals();
+        $result       = [];
+        $chartData    = [];
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            $assetId          = intval($transaction->account_id);
+            $result[$assetId] = $result[$assetId] ?? '0';
+            $result[$assetId] = bcadd($transaction->transaction_amount, $result[$assetId]);
+        }
+
+        $names = $this->getAccountNames(array_keys($result));
+        foreach ($result as $assetId => $amount) {
+            $chartData[$names[$assetId]] = $amount;
+        }
+
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+
+    }
+
+    /**
+     * @param Budget           $budget
+     * @param BudgetLimit|null $budgetLimit
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function expenseCategory(Budget $budget, BudgetLimit $budgetLimit = null)
+    {
+        $cache = new CacheProperties;
+        $cache->addProperty($budget->id);
+        $cache->addProperty($budgetLimit->id ?? 0);
+        $cache->addProperty('chart.budget.expense-category');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setTypes([TransactionType::WITHDRAWAL])->setBudget($budget)->withCategoryInformation();
+        if (!is_null($budgetLimit->id)) {
+            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
+        }
+
+        $transactions = $collector->getJournals();
+        $result       = [];
+        $chartData    = [];
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            $jrnlCatId           = intval($transaction->transaction_journal_category_id);
+            $transCatId          = intval($transaction->transaction_category_id);
+            $categoryId          = max($jrnlCatId, $transCatId);
+            $result[$categoryId] = $result[$categoryId] ?? '0';
+            $result[$categoryId] = bcadd($transaction->transaction_amount, $result[$categoryId]);
+        }
+
+        $names = $this->getCategoryNames(array_keys($result));
+        foreach ($result as $categoryId => $amount) {
+            $chartData[$names[$categoryId]] = $amount;
+        }
+
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+
+    }
+
+    /**
+     * @param Budget           $budget
+     * @param BudgetLimit|null $budgetLimit
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function expenseExpense(Budget $budget, BudgetLimit $budgetLimit = null)
+    {
+        $cache = new CacheProperties;
+        $cache->addProperty($budget->id);
+        $cache->addProperty($budgetLimit->id ?? 0);
+        $cache->addProperty('chart.budget.expense-expense');
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setTypes([TransactionType::WITHDRAWAL])->setBudget($budget)->withOpposingAccount();
+        if (!is_null($budgetLimit->id)) {
+            $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
+        }
+
+        $transactions = $collector->getJournals();
+        $result       = [];
+        $chartData    = [];
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            $opposingId          = intval($transaction->opposing_account_id);
+            $result[$opposingId] = $result[$opposingId] ?? '0';
+            $result[$opposingId] = bcadd($transaction->transaction_amount, $result[$opposingId]);
+        }
+
+        $names = $this->getAccountNames(array_keys($result));
+        foreach ($result as $opposingId => $amount) {
+            $name             = $names[$opposingId] ?? 'no name';
+            $chartData[$name] = $amount;
+        }
+
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+
+    }
+
     /**
      * Shows a budget list with spent/left/overspent.
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's exactly five.
@@ -170,7 +311,7 @@ class BudgetController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('chart.budget.frontpage');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
         $budgets   = $this->repository->getActiveBudgets();
         $chartData = [
@@ -227,7 +368,7 @@ class BudgetController extends Controller
         $cache->addProperty($budget->id);
         $cache->addProperty('chart.budget.period');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
         $periods  = Navigation::listOfPeriods($start, $end);
         $entries  = $this->repository->getBudgetPeriodReport(new Collection([$budget]), $accounts, $start, $end); // get the expenses
@@ -268,7 +409,7 @@ class BudgetController extends Controller
         $cache->addProperty($accounts);
         $cache->addProperty('chart.budget.no-budget');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         // the expenses:
@@ -288,6 +429,28 @@ class BudgetController extends Controller
         return Response::json($data);
     }
 
+    /**
+     * @param array $accountIds
+     *
+     * @return array
+     */
+    private function getAccountNames(array $accountIds): array
+    {
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        $accounts   = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::EXPENSE]);
+        $grouped    = $accounts->groupBy('id')->toArray();
+        $return     = [];
+        foreach ($accountIds as $accountId) {
+            if (isset($grouped[$accountId])) {
+                $return[$accountId] = $grouped[$accountId][0]['name'];
+            }
+        }
+        $return[0] = '(no name)';
+
+        return $return;
+    }
+
     /**
      * @param Budget $budget
      * @param Carbon $start
@@ -314,6 +477,30 @@ class BudgetController extends Controller
         return $budgeted;
     }
 
+    /**
+     * Small helper function for some of the charts.
+     *
+     * @param array $categoryIds
+     *
+     * @return array
+     */
+    private function getCategoryNames(array $categoryIds): array
+    {
+        /** @var CategoryRepositoryInterface $repository */
+        $repository = app(CategoryRepositoryInterface::class);
+        $categories = $repository->getCategories();
+        $grouped    = $categories->groupBy('id')->toArray();
+        $return     = [];
+        foreach ($categoryIds as $categoryId) {
+            if (isset($grouped[$categoryId])) {
+                $return[$categoryId] = $grouped[$categoryId][0]['name'];
+            }
+        }
+        $return[0] = trans('firefly.noCategory');
+
+        return $return;
+    }
+
     /**
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's 6 but ok.
@@ -386,9 +573,14 @@ class BudgetController extends Controller
                         ]
                     );
             }
+            /*
+             * amount: amount of budget limit
+             * left: amount of budget limit min spent, or 0 when < 0.
+             * spent: spent, or amount of budget limit when > amount
+             */
             $amount        = $budgetLimit->amount;
             $left          = bccomp(bcadd($amount, $expenses), '0') < 1 ? '0' : bcadd($amount, $expenses);
-            $spent         = $expenses;
+            $spent         = bccomp($expenses, $amount) === 1 ? $expenses : bcmul($amount, '-1');
             $overspent     = bccomp(bcadd($amount, $expenses), '0') < 1 ? bcadd($amount, $expenses) : '0';
             $return[$name] = [
                 'left'      => $left,

app/Http/Controllers/Chart/BudgetReportController.php

@@ -16,15 +16,16 @@ namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
-use FireflyIII\Generator\Report\Category\MonthReportGenerator;
 use FireflyIII\Helpers\Chart\MetaPieChartInterface;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
@@ -41,8 +42,6 @@ use Response;
 class BudgetReportController extends Controller
 {
 
-    /** @var AccountRepositoryInterface */
-    private $accountRepository;
     /** @var BudgetRepositoryInterface */
     private $budgetRepository;
     /** @var  GeneratorInterface */
@@ -58,7 +57,6 @@ class BudgetReportController extends Controller
             function ($request, $next) {
                 $this->generator        = app(GeneratorInterface::class);
                 $this->budgetRepository = app(BudgetRepositoryInterface::class);
-                $this->accountRepository = app(AccountRepositoryInterface::class);
 
                 return $next($request);
             }
@@ -131,10 +129,8 @@ class BudgetReportController extends Controller
         $cache->addProperty($start);
         $cache->addProperty($end);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
-        /** @var BudgetRepositoryInterface $repository */
-        $repository   = app(BudgetRepositoryInterface::class);
         $format       = Navigation::preferredCarbonLocalizedFormat($start, $end);
         $function     = Navigation::preferredEndOfPeriod($start, $end);
         $chartData    = [];
@@ -163,7 +159,7 @@ class BudgetReportController extends Controller
                 'entries' => [],
             ];
         }
-        $allBudgetLimits = $repository->getAllBudgetLimits($start, $end);
+        $allBudgetLimits = $this->budgetRepository->getAllBudgetLimits($start, $end);
         $sumOfExpenses   = [];
         $leftOfLimits    = [];
         while ($currentStart < $end) {
@@ -203,6 +199,7 @@ class BudgetReportController extends Controller
      * Returns the budget limits belonging to the given budget and valid on the given day.
      *
      * @param Collection $budgetLimits
+     * @param Budget     $budget
      * @param Carbon     $start
      * @param Carbon     $end
      *
@@ -239,12 +236,15 @@ class BudgetReportController extends Controller
         /** @var JournalCollectorInterface $collector */
         $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
-                  ->setBudgets($budgets)->withOpposingAccount()->disableFilter();
+                  ->setBudgets($budgets)->withOpposingAccount();
-        $accountIds   = $accounts->pluck('id')->toArray();
+        $collector->removeFilter(TransferFilter::class);
-        $transactions = $collector->getJournals();
-        $set          = MonthReportGenerator::filterExpenses($transactions, $accountIds);
 
-        return $set;
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(PositiveAmountFilter::class);
+
+        $transactions = $collector->getJournals();
+
+        return $transactions;
     }
 
     /**
@@ -268,21 +268,4 @@ class BudgetReportController extends Controller
         return $grouped;
     }
 
-    /**
-     * @param Collection $set
-     *
-     * @return array
-     */
-    private function groupByOpposingAccount(Collection $set): array
-    {
-        $grouped = [];
-        /** @var Transaction $transaction */
-        foreach ($set as $transaction) {
-            $accountId           = $transaction->opposing_account_id;
-            $grouped[$accountId] = $grouped[$accountId] ?? '0';
-            $grouped[$accountId] = bcadd($transaction->transaction_amount, $grouped[$accountId]);
-        }
-
-        return $grouped;
-    }
 }

app/Http/Controllers/Chart/CategoryController.php

@@ -20,7 +20,7 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Category\CategoryRepositoryInterface as CRI;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Navigation;
@@ -50,19 +50,19 @@ class CategoryController extends Controller
     /**
      * Show an overview for a category for all time, per month/week/year.
      *
-     * @param CRI                        $repository
+     * @param CategoryRepositoryInterface $repository
      * @param AccountRepositoryInterface  $accountRepository
      * @param Category                    $category
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function all(CRI $repository, AccountRepositoryInterface $accountRepository, Category $category)
+    public function all(CategoryRepositoryInterface $repository, AccountRepositoryInterface $accountRepository, Category $category)
     {
         $cache = new CacheProperties;
         $cache->addProperty('chart.category.all');
         $cache->addProperty($category->id);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $start = $repository->firstUseDate($category);
@@ -86,15 +86,23 @@ class CategoryController extends Controller
                 'entries' => [],
                 'type'    => 'bar',
             ],
+            [
+                'label'   => strval(trans('firefly.sum')),
+                'entries' => [],
+                'type'    => 'line',
+                'fill'    => false,
+            ],
         ];
 
         while ($start <= $end) {
             $currentEnd                      = Navigation::endOfPeriod($start, $range);
             $spent                           = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $currentEnd);
             $earned                          = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $currentEnd);
+            $sum                             = bcadd($spent, $earned);
             $label                           = Navigation::periodShow($start, $range);
-            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
+            $chartData[0]['entries'][$label] = round(bcmul($spent, '-1'), 12);
-            $chartData[1]['entries'][$label] = $earned;
+            $chartData[1]['entries'][$label] = round($earned, 12);
+            $chartData[2]['entries'][$label] = round($sum, 12);
             $start                           = Navigation::addPeriod($start, $range, 0);
         }
 
@@ -106,27 +114,12 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param CRI      $repository
+     * @param CategoryRepositoryInterface $repository
-     * @param Category $category
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function currentPeriod(CRI $repository, Category $category)
-    {
-        $start = clone session('start', Carbon::now()->startOfMonth());
-        $end   = session('end', Carbon::now()->endOfMonth());
-        $data  = $this->makePeriodChart($repository, $category, $start, $end);
-
-        return Response::json($data);
-    }
-
-    /**
-     * @param CRI                        $repository
      * @param AccountRepositoryInterface  $accountRepository
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function frontpage(CRI $repository, AccountRepositoryInterface $accountRepository)
+    public function frontpage(CategoryRepositoryInterface $repository, AccountRepositoryInterface $accountRepository)
     {
         $start = session('start', Carbon::now()->startOfMonth());
         $end   = session('end', Carbon::now()->endOfMonth());
@@ -136,7 +129,7 @@ class CategoryController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('chart.category.frontpage');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
         $chartData  = [];
         $categories = $repository->getCategories();
@@ -161,7 +154,7 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param CRI        $repository
+     * @param CategoryRepositoryInterface $repository
      * @param Category                    $category
      * @param Collection                  $accounts
      * @param Carbon                      $start
@@ -169,7 +162,7 @@ class CategoryController extends Controller
      *
      * @return \Illuminate\Http\JsonResponse|mixed
      */
-    public function reportPeriod(CRI $repository, Category $category, Collection $accounts, Carbon $start, Carbon $end)
+    public function reportPeriod(CategoryRepositoryInterface $repository, Category $category, Collection $accounts, Carbon $start, Carbon $end)
     {
         $cache = new CacheProperties;
         $cache->addProperty($start);
@@ -178,7 +171,7 @@ class CategoryController extends Controller
         $cache->addProperty($accounts->pluck('id')->toArray());
         $cache->addProperty($category);
         if ($cache->has()) {
-            return $cache->get();
+            return $cache->get(); // @codeCoverageIgnore
         }
         $expenses  = $repository->periodExpenses(new Collection([$category]), $accounts, $start, $end);
         $income    = $repository->periodIncome(new Collection([$category]), $accounts, $start, $end);
@@ -194,13 +187,22 @@ class CategoryController extends Controller
                 'entries' => [],
                 'type'    => 'bar',
             ],
+            [
+                'label'   => strval(trans('firefly.sum')),
+                'entries' => [],
+                'type'    => 'line',
+                'fill'    => false,
+            ],
         ];
 
         foreach (array_keys($periods) as $period) {
             $label                           = $periods[$period];
             $spent                           = $expenses[$category->id]['entries'][$period] ?? '0';
-            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
+            $earned                          = $income[$category->id]['entries'][$period] ?? '0';
-            $chartData[1]['entries'][$label] = $income[$category->id]['entries'][$period] ?? '0';
+            $sum                             = bcadd($spent, $earned);
+            $chartData[0]['entries'][$label] = round(bcmul($spent, '-1'), 12);
+            $chartData[1]['entries'][$label] = round($earned, 12);
+            $chartData[2]['entries'][$label] = round($sum, 12);
         }
 
         $data = $this->generator->multiSet($chartData);
@@ -210,14 +212,14 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param CRI        $repository
+     * @param CategoryRepositoryInterface $repository
      * @param Collection                  $accounts
      * @param Carbon                      $start
      * @param Carbon                      $end
      *
      * @return \Illuminate\Http\JsonResponse|mixed
      */
-    public function reportPeriodNoCategory(CRI $repository, Collection $accounts, Carbon $start, Carbon $end)
+    public function reportPeriodNoCategory(CategoryRepositoryInterface $repository, Collection $accounts, Carbon $start, Carbon $end)
     {
         $cache = new CacheProperties;
         $cache->addProperty($start);
@@ -225,7 +227,7 @@ class CategoryController extends Controller
         $cache->addProperty('chart.category.period.no-cat');
         $cache->addProperty($accounts->pluck('id')->toArray());
         if ($cache->has()) {
-            return $cache->get();
+            return $cache->get(); // @codeCoverageIgnore
         }
         $expenses  = $repository->periodExpensesNoCategory($accounts, $start, $end);
         $income    = $repository->periodIncomeNoCategory($accounts, $start, $end);
@@ -241,13 +243,22 @@ class CategoryController extends Controller
                 'entries' => [],
                 'type'    => 'bar',
             ],
+            [
+                'label'   => strval(trans('firefly.sum')),
+                'entries' => [],
+                'type'    => 'line',
+                'fill'    => false,
+            ],
         ];
 
         foreach (array_keys($periods) as $period) {
             $label                           = $periods[$period];
             $spent                           = $expenses['entries'][$period] ?? '0';
+            $earned                          = $income['entries'][$period] ?? '0';
+            $sum                             = bcadd($spent, $earned);
             $chartData[0]['entries'][$label] = bcmul($spent, '-1');
-            $chartData[1]['entries'][$label] = $income['entries'][$period] ?? '0';
+            $chartData[1]['entries'][$label] = $earned;
+            $chartData[2]['entries'][$label] = $sum;
 
         }
         $data = $this->generator->multiSet($chartData);
@@ -257,19 +268,18 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param CRI                         $repository
+     * @param CategoryRepositoryInterface $repository
      * @param Category                    $category
      *
      * @param                             $date
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function specificPeriod(CRI $repository, Category $category, $date)
+    public function specificPeriod(CategoryRepositoryInterface $repository, Category $category, Carbon $date)
     {
-        $carbon = new Carbon($date);
         $range  = Preferences::get('viewRange', '1M')->data;
-        $start  = Navigation::startOfPeriod($carbon, $range);
+        $start  = Navigation::startOfPeriod($date, $range);
-        $end    = Navigation::endOfPeriod($carbon, $range);
+        $end    = Navigation::endOfPeriod($date, $range);
         $data   = $this->makePeriodChart($repository, $category, $start, $end);
 
         return Response::json($data);
@@ -277,14 +287,14 @@ class CategoryController extends Controller
 
 
     /**
-     * @param CRI      $repository
+     * @param CategoryRepositoryInterface $repository
      * @param Category                    $category
      * @param Carbon                      $start
      * @param Carbon                      $end
      *
      * @return array
      */
-    private function makePeriodChart(CRI $repository, Category $category, Carbon $start, Carbon $end)
+    private function makePeriodChart(CategoryRepositoryInterface $repository, Category $category, Carbon $start, Carbon $end)
     {
         $cache = new CacheProperties;
         $cache->addProperty($start);
@@ -297,7 +307,7 @@ class CategoryController extends Controller
         $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
 
         if ($cache->has()) {
-            return $cache->get();
+            return $cache->get(); // @codeCoverageIgnore
         }
 
         // chart data
@@ -312,15 +322,23 @@ class CategoryController extends Controller
                 'entries' => [],
                 'type'    => 'bar',
             ],
+            [
+                'label'   => strval(trans('firefly.sum')),
+                'entries' => [],
+                'type'    => 'line',
+                'fill'    => false,
+            ],
         ];
 
         while ($start <= $end) {
             $spent  = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $start);
             $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $start);
-            $label  = Navigation::periodShow($start, '1D');
+            $sum    = bcadd($spent, $earned);
+            $label  = trim(Navigation::periodShow($start, '1D'));
 
-            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
+            $chartData[0]['entries'][$label] = round(bcmul($spent, '-1'),12);
-            $chartData[1]['entries'][$label] = $earned;
+            $chartData[1]['entries'][$label] = round($earned,12);
+            $chartData[2]['entries'][$label] = round($sum,12);
 
 
             $start->addDay();

app/Http/Controllers/Chart/CategoryReportController.php

@@ -19,12 +19,14 @@ use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Generator\Report\Category\MonthReportGenerator;
 use FireflyIII\Helpers\Chart\MetaPieChartInterface;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
 use Navigation;
@@ -41,10 +43,6 @@ use Response;
 class CategoryReportController extends Controller
 {
 
-    /** @var AccountRepositoryInterface */
-    private $accountRepository;
-    /** @var CategoryRepositoryInterface */
-    private $categoryRepository;
     /** @var  GeneratorInterface */
     private $generator;
 
@@ -57,8 +55,6 @@ class CategoryReportController extends Controller
         $this->middleware(
             function ($request, $next) {
                 $this->generator = app(GeneratorInterface::class);
-                $this->categoryRepository = app(CategoryRepositoryInterface::class);
-                $this->accountRepository  = app(AccountRepositoryInterface::class);
 
                 return $next($request);
             }
@@ -78,11 +74,8 @@ class CategoryReportController extends Controller
     {
         /** @var MetaPieChartInterface $helper */
         $helper = app(MetaPieChartInterface::class);
-        $helper->setAccounts($accounts);
+        $helper->setAccounts($accounts)->setCategories($categories)->setStart($start)->setEnd($end)->setCollectOtherObjects(intval($others) === 1);
-        $helper->setCategories($categories);
+
-        $helper->setStart($start);
-        $helper->setEnd($end);
-        $helper->setCollectOtherObjects(intval($others) === 1);
         $chartData = $helper->generate('expense', 'account');
         $data      = $this->generator->pieChart($chartData);
 
@@ -179,7 +172,7 @@ class CategoryReportController extends Controller
         $cache->addProperty($start);
         $cache->addProperty($end);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $format       = Navigation::preferredCarbonLocalizedFormat($start, $end);
@@ -282,12 +275,15 @@ class CategoryReportController extends Controller
         /** @var JournalCollectorInterface $collector */
         $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
-                  ->setCategories($categories)->withOpposingAccount()->disableFilter();
+                  ->setCategories($categories)->withOpposingAccount();
-        $accountIds   = $accounts->pluck('id')->toArray();
+        $collector->removeFilter(TransferFilter::class);
-        $transactions = $collector->getJournals();
-        $set          = MonthReportGenerator::filterExpenses($transactions, $accountIds);
 
-        return $set;
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(PositiveAmountFilter::class);
+
+        $transactions = $collector->getJournals();
+
+        return $transactions;
     }
 
     /**
@@ -304,11 +300,13 @@ class CategoryReportController extends Controller
         $collector = app(JournalCollectorInterface::class);
         $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
                   ->setCategories($categories)->withOpposingAccount();
-        $accountIds   = $accounts->pluck('id')->toArray();
-        $transactions = $collector->getJournals();
-        $set          = MonthReportGenerator::filterIncome($transactions, $accountIds);
 
-        return $set;
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(NegativeAmountFilter::class);
+
+        $transactions = $collector->getJournals();
+
+        return $transactions;
     }
 
     /**
@@ -331,22 +329,4 @@ class CategoryReportController extends Controller
 
         return $grouped;
     }
-
-    /**
-     * @param Collection $set
-     *
-     * @return array
-     */
-    private function groupByOpposingAccount(Collection $set): array
-    {
-        $grouped = [];
-        /** @var Transaction $transaction */
-        foreach ($set as $transaction) {
-            $accountId           = $transaction->opposing_account_id;
-            $grouped[$accountId] = $grouped[$accountId] ?? '0';
-            $grouped[$accountId] = bcadd($transaction->transaction_amount, $grouped[$accountId]);
-        }
-
-        return $grouped;
-    }
 }

app/Http/Controllers/Chart/PiggyBankController.php

@@ -58,7 +58,7 @@ class PiggyBankController extends Controller
         $cache->addProperty('chart.piggy-bank.history');
         $cache->addProperty($piggyBank->id);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
         $set       = $repository->getEvents($piggyBank);

app/Http/Controllers/Chart/ReportController.php

@@ -20,6 +20,7 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Repositories\Account\AccountTaskerInterface;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
+use Log;
 use Navigation;
 use Response;
 use Steam;
@@ -64,7 +65,7 @@ class ReportController extends Controller
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
         $ids       = $accounts->pluck('id')->toArray();
         $current   = clone $start;
@@ -103,8 +104,9 @@ class ReportController extends Controller
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            //return Response::json($cache->get()); // @codeCoverageIgnore
         }
+        Log::debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray());
         $format    = Navigation::preferredCarbonLocalizedFormat($start, $end);
         $source    = $this->getChartData($accounts, $start, $end);
         $chartData = [
@@ -161,8 +163,10 @@ class ReportController extends Controller
         $cache->addProperty($end);
         $cache->addProperty($accounts);
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
+
+
         $source  = $this->getChartData($accounts, $start, $end);
         $numbers = [
             'sum_earned'   => '0',
@@ -246,19 +250,41 @@ class ReportController extends Controller
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
-            return $cache->get();
+            // return $cache->get(); // @codeCoverageIgnore
         }
 
-
-        $tasker       = app(AccountTaskerInterface::class);
         $currentStart = clone $start;
         $spentArray   = [];
         $earnedArray  = [];
+
+        /** @var AccountTaskerInterface $tasker */
+        $tasker = app(AccountTaskerInterface::class);
+
         while ($currentStart <= $end) {
+
             $currentEnd = Navigation::endOfPeriod($currentStart, '1M');
+            $earned     = strval(
+                array_sum(
+                    array_map(
+                        function ($item) {
+                            return $item['sum'];
+                        }, $tasker->getIncomeReport($currentStart, $currentEnd, $accounts)
+                    )
+                )
+            );
+
+            $spent = strval(
+                array_sum(
+                    array_map(
+                        function ($item) {
+                            return $item['sum'];
+                        }, $tasker->getExpenseReport($currentStart, $currentEnd, $accounts)
+                    )
+                )
+            );
+
+
             $label               = $currentStart->format('Y-m') . '-01';
-            $spent               = $tasker->amountOutInPeriod($accounts, $accounts, $currentStart, $currentEnd);
-            $earned              = $tasker->amountInInPeriod($accounts, $accounts, $currentStart, $currentEnd);
             $spentArray[$label]  = bcmul($spent, '-1');
             $earnedArray[$label] = $earned;
             $currentStart        = Navigation::addPeriod($currentStart, '1M', 0);

app/Http/Controllers/Chart/TagReportController.php

@@ -0,0 +1,367 @@
+<?php
+/**
+ * TagReportController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Chart;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
+use FireflyIII\Helpers\Chart\MetaPieChartInterface;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Filter\NegativeAmountFilter;
+use FireflyIII\Helpers\Filter\OpposingAccountFilter;
+use FireflyIII\Helpers\Filter\PositiveAmountFilter;
+use FireflyIII\Helpers\Filter\TransferFilter;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\CacheProperties;
+use Illuminate\Support\Collection;
+use Navigation;
+use Response;
+
+class TagReportController extends Controller
+{
+    /** @var GeneratorInterface */
+    protected $generator;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        // create chart generator:
+        $this->generator = app(GeneratorInterface::class);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param string     $others
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function accountExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others)
+    {
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setTags($tags);
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('expense', 'account');
+        $data      = $this->generator->pieChart($chartData);
+
+        return Response::json($data);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param string     $others
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function accountIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others)
+    {
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setTags($tags);
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('income', 'account');
+        $data      = $this->generator->pieChart($chartData);
+
+        return Response::json($data);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function budgetExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
+    {
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setTags($tags);
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(false);
+        $chartData = $helper->generate('expense', 'budget');
+        $data      = $this->generator->pieChart($chartData);
+
+        return Response::json($data);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function categoryExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
+    {
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setTags($tags);
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(false);
+        $chartData = $helper->generate('expense', 'category');
+        $data      = $this->generator->pieChart($chartData);
+
+        return Response::json($data);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function mainChart(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
+    {
+        $cache = new CacheProperties;
+        $cache->addProperty('chart.category.report.main');
+        $cache->addProperty($accounts);
+        $cache->addProperty($tags);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get()); // @codeCoverageIgnore
+        }
+
+        $format       = Navigation::preferredCarbonLocalizedFormat($start, $end);
+        $function     = Navigation::preferredEndOfPeriod($start, $end);
+        $chartData    = [];
+        $currentStart = clone $start;
+
+        // prep chart data:
+        foreach ($tags as $tag) {
+            $chartData[$tag->id . '-in']  = [
+                'label'   => $tag->tag . ' (' . strtolower(strval(trans('firefly.income'))) . ')',
+                'type'    => 'bar',
+                'yAxisID' => 'y-axis-0',
+                'entries' => [],
+            ];
+            $chartData[$tag->id . '-out'] = [
+                'label'   => $tag->tag . ' (' . strtolower(strval(trans('firefly.expenses'))) . ')',
+                'type'    => 'bar',
+                'yAxisID' => 'y-axis-0',
+                'entries' => [],
+            ];
+            // total in, total out:
+            $chartData[$tag->id . '-total-in']  = [
+                'label'   => $tag->tag . ' (' . strtolower(strval(trans('firefly.sum_of_income'))) . ')',
+                'type'    => 'line',
+                'fill'    => false,
+                'yAxisID' => 'y-axis-1',
+                'entries' => [],
+            ];
+            $chartData[$tag->id . '-total-out'] = [
+                'label'   => $tag->tag . ' (' . strtolower(strval(trans('firefly.sum_of_expenses'))) . ')',
+                'type'    => 'line',
+                'fill'    => false,
+                'yAxisID' => 'y-axis-1',
+                'entries' => [],
+            ];
+        }
+        $sumOfIncome  = [];
+        $sumOfExpense = [];
+
+        while ($currentStart < $end) {
+            $currentEnd = clone $currentStart;
+            $currentEnd = $currentEnd->$function();
+            $expenses   = $this->groupByTag($this->getExpenses($accounts, $tags, $currentStart, $currentEnd));
+            $income     = $this->groupByTag($this->getIncome($accounts, $tags, $currentStart, $currentEnd));
+            $label      = $currentStart->formatLocalized($format);
+
+            /** @var Tag $tag */
+            foreach ($tags as $tag) {
+                $labelIn        = $tag->id . '-in';
+                $labelOut       = $tag->id . '-out';
+                $labelSumIn     = $tag->id . '-total-in';
+                $labelSumOut    = $tag->id . '-total-out';
+                $currentIncome  = $income[$tag->id] ?? '0';
+                $currentExpense = $expenses[$tag->id] ?? '0';
+
+
+                // add to sum:
+                $sumOfIncome[$tag->id]  = $sumOfIncome[$tag->id] ?? '0';
+                $sumOfExpense[$tag->id] = $sumOfExpense[$tag->id] ?? '0';
+                $sumOfIncome[$tag->id]  = bcadd($sumOfIncome[$tag->id], $currentIncome);
+                $sumOfExpense[$tag->id] = bcadd($sumOfExpense[$tag->id], $currentExpense);
+
+                // add to chart:
+                $chartData[$labelIn]['entries'][$label]     = $currentIncome;
+                $chartData[$labelOut]['entries'][$label]    = $currentExpense;
+                $chartData[$labelSumIn]['entries'][$label]  = $sumOfIncome[$tag->id];
+                $chartData[$labelSumOut]['entries'][$label] = $sumOfExpense[$tag->id];
+            }
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay();
+        }
+        // remove all empty entries to prevent cluttering:
+        $newSet = [];
+        foreach ($chartData as $key => $entry) {
+            if (!array_sum($entry['entries']) == 0) {
+                $newSet[$key] = $chartData[$key];
+            }
+        }
+        if (count($newSet) === 0) {
+            $newSet = $chartData; // @codeCoverageIgnore
+        }
+        $data = $this->generator->multiSet($newSet);
+        $cache->store($data);
+
+        return Response::json($data);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param string     $others
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function tagExpense(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others)
+    {
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setTags($tags);
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('expense', 'tag');
+        $data      = $this->generator->pieChart($chartData);
+
+        return Response::json($data);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param string     $others
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function tagIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end, string $others)
+    {
+
+        /** @var MetaPieChartInterface $helper */
+        $helper = app(MetaPieChartInterface::class);
+        $helper->setAccounts($accounts);
+        $helper->setTags($tags);
+        $helper->setStart($start);
+        $helper->setEnd($end);
+        $helper->setCollectOtherObjects(intval($others) === 1);
+        $chartData = $helper->generate('income', 'tag');
+        $data      = $this->generator->pieChart($chartData);
+
+        return Response::json($data);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return Collection
+     */
+    private function getExpenses(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
+                  ->setTags($tags)->withOpposingAccount();
+        $collector->removeFilter(TransferFilter::class);
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(PositiveAmountFilter::class);
+
+        $transactions = $collector->getJournals();
+
+        return $transactions;
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $tags
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return Collection
+     */
+    private function getIncome(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection
+    {
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
+                  ->setTags($tags)->withOpposingAccount();
+
+        $collector->addFilter(OpposingAccountFilter::class);
+        $collector->addFilter(NegativeAmountFilter::class);
+
+        $transactions = $collector->getJournals();
+
+        return $transactions;
+    }
+
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    private function groupByTag(Collection $set): array
+    {
+        // group by category ID:
+        $grouped = [];
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $journal     = $transaction->transactionJournal;
+            $journalTags = $journal->tags;
+            /** @var Tag $journalTag */
+            foreach ($journalTags as $journalTag) {
+                $journalTagId           = $journalTag->id;
+                $grouped[$journalTagId] = $grouped[$journalTagId] ?? '0';
+                $grouped[$journalTagId] = bcadd($transaction->transaction_amount, $grouped[$journalTagId]);
+            }
+        }
+
+        return $grouped;
+    }
+
+}

app/Http/Controllers/Controller.php

@@ -100,7 +100,7 @@ class Controller extends BaseController
      */
     protected function isOpeningBalance(TransactionJournal $journal): bool
     {
-        return TransactionJournal::transactionTypeStr($journal) === TransactionType::OPENING_BALANCE;
+        return $journal->transactionTypeStr() === TransactionType::OPENING_BALANCE;
     }
 
     /**
@@ -120,9 +120,11 @@ class Controller extends BaseController
             }
 
         }
+        // @codeCoverageIgnoreStart
         Session::flash('error', strval(trans('firefly.cannot_redirect_to_account')));
 
         return redirect(route('index'));
+        // @codeCoverageIgnoreEnd
     }
 
     /**

app/Http/Controllers/CurrencyController.php

@@ -17,6 +17,7 @@ use Cache;
 use FireflyIII\Http\Requests\CurrencyFormRequest;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Http\Request;
 use Log;
 use Preferences;
@@ -30,6 +31,11 @@ use View;
 class CurrencyController extends Controller
 {
 
+    /** @var CurrencyRepositoryInterface */
+    protected $repository;
+
+    /** @var  UserRepositoryInterface */
+    protected $userRepository;
 
     /**
      *
@@ -43,6 +49,8 @@ class CurrencyController extends Controller
             function ($request, $next) {
                 View::share('title', trans('firefly.currencies'));
                 View::share('mainTitleIcon', 'fa-usd');
+                $this->repository     = app(CurrencyRepositoryInterface::class);
+                $this->userRepository = app(UserRepositoryInterface::class);
 
                 return $next($request);
             }
@@ -50,10 +58,18 @@ class CurrencyController extends Controller
     }
 
     /**
-     * @return View
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
     public function create(Request $request)
     {
+        if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
+            $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+
+            return redirect(route('currencies.index'));
+        }
+
         $subTitleIcon = 'fa-plus';
         $subTitle     = trans('firefly.create_currency');
 
@@ -90,14 +106,22 @@ class CurrencyController extends Controller
 
 
     /**
-     * @param CurrencyRepositoryInterface $repository
+     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
-    public function delete(Request $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
+    public function delete(Request $request, TransactionCurrency $currency)
     {
-        if (!$repository->canDeleteCurrency($currency)) {
+        if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
+            // @codeCoverageIgnoreStart
+            $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+
+            return redirect(route('currencies.index'));
+            // @codeCoverageIgnoreEnd
+        }
+
+        if (!$this->repository->canDeleteCurrency($currency)) {
             $request->session()->flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name]));
 
             return redirect(route('currencies.index'));
@@ -115,20 +139,28 @@ class CurrencyController extends Controller
     }
 
     /**
-     * @param CurrencyRepositoryInterface $repository
+     * @param Request             $request
      * @param TransactionCurrency $currency
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function destroy(Request $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
+    public function destroy(Request $request, TransactionCurrency $currency)
     {
-        if (!$repository->canDeleteCurrency($currency)) {
+        if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
+            // @codeCoverageIgnoreStart
+            $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+
+            return redirect(route('currencies.index'));
+            // @codeCoverageIgnoreEnd
+        }
+
+        if (!$this->repository->canDeleteCurrency($currency)) {
             $request->session()->flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name]));
 
             return redirect(route('currencies.index'));
         }
 
-        $repository->destroy($currency);
+        $this->repository->destroy($currency);
         $request->session()->flash('success', trans('firefly.deleted_currency', ['name' => $currency->name]));
 
         return redirect($this->getPreviousUri('currencies.delete.uri'));
@@ -138,10 +170,18 @@ class CurrencyController extends Controller
      * @param Request             $request
      * @param TransactionCurrency $currency
      *
-     * @return View
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
     public function edit(Request $request, TransactionCurrency $currency)
     {
+        if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
+            // @codeCoverageIgnoreStart
+            $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+
+            return redirect(route('currencies.index'));
+            // @codeCoverageIgnoreEnd
+        }
+
         $subTitleIcon     = 'fa-pencil';
         $subTitle         = trans('breadcrumbs.edit_currency', ['name' => $currency->name]);
         $currency->symbol = htmlentities($currency->symbol);
@@ -160,47 +200,45 @@ class CurrencyController extends Controller
 
     /**
      * @param Request $request
-     * @param CurrencyRepositoryInterface $repository
      *
      * @return View
      */
-    public function index(Request $request, CurrencyRepositoryInterface $repository)
+    public function index(Request $request)
     {
-        $currencies      = $repository->get();
+        $currencies      = $this->repository->get();
-        $defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR')));
+        $defaultCurrency = $this->repository->getCurrencyByPreference(Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR')));
-
+        if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
-
-        if (!auth()->user()->hasRole('owner')) {
             $request->session()->flash('info', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
         }
 
-
         return view('currencies.index', compact('currencies', 'defaultCurrency'));
     }
 
     /**
-     *
      * @param CurrencyFormRequest $request
-     * @param CurrencyRepositoryInterface $repository
      *
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function store(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository)
+    public function store(CurrencyFormRequest $request)
     {
-        if (!auth()->user()->hasRole('owner')) {
+        if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
+            // @codeCoverageIgnoreStart
             Log::error('User ' . auth()->user()->id . ' is not admin, but tried to store a currency.');
 
             return redirect($this->getPreviousUri('currencies.create.uri'));
+            // @codeCoverageIgnoreEnd
         }
 
         $data     = $request->getCurrencyData();
-        $currency = $repository->store($data);
+        $currency = $this->repository->store($data);
         $request->session()->flash('success', trans('firefly.created_currency', ['name' => $currency->name]));
 
         if (intval($request->get('create_another')) === 1) {
+            // @codeCoverageIgnoreStart
             $request->session()->put('currencies.create.fromStore', true);
 
             return redirect(route('currencies.create'))->withInput();
+            // @codeCoverageIgnoreEnd
         }
 
         return redirect($this->getPreviousUri('currencies.create.uri'));
@@ -208,25 +246,32 @@ class CurrencyController extends Controller
 
     /**
      * @param CurrencyFormRequest $request
-     * @param CurrencyRepositoryInterface $repository
      * @param TransactionCurrency $currency
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function update(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
+    public function update(CurrencyFormRequest $request, TransactionCurrency $currency)
     {
-        $data = $request->getCurrencyData();
+        if (!$this->userRepository->hasRole(auth()->user(), 'owner')) {
-        if (auth()->user()->hasRole('owner')) {
+            // @codeCoverageIgnoreStart
-            $currency = $repository->update($currency, $data);
+            $request->session()->flash('error', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+
+            return redirect(route('currencies.index'));
+            // @codeCoverageIgnoreEnd
         }
+
+        $data     = $request->getCurrencyData();
+        $currency = $this->repository->update($currency, $data);
         $request->session()->flash('success', trans('firefly.updated_currency', ['name' => $currency->name]));
         Preferences::mark();
 
 
         if (intval($request->get('return_to_edit')) === 1) {
+            // @codeCoverageIgnoreStart
             $request->session()->put('currencies.edit.fromUpdate', true);
 
             return redirect(route('currencies.edit', [$currency->id]));
+            // @codeCoverageIgnoreEnd
         }
 
         return redirect($this->getPreviousUri('currencies.edit.uri'));

app/Http/Controllers/ExportController.php

@@ -23,7 +23,6 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Models\ExportJob;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
-use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface as EJRI;
 use Illuminate\Http\Response as LaravelResponse;
 use Preferences;
 use Response;
@@ -55,9 +54,10 @@ class ExportController extends Controller
     }
 
     /**
+     * @param ExportJobRepositoryInterface $repository
      * @param ExportJob                    $job
      *
-     * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Contracts\Routing\ResponseFactory
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
      * @throws FireflyException
      */
     public function download(ExportJobRepositoryInterface $repository, ExportJob $job)
@@ -103,11 +103,11 @@ class ExportController extends Controller
 
     /**
      * @param AccountRepositoryInterface   $repository
-     * @param EJRI                       $jobs
+     * @param ExportJobRepositoryInterface $jobs
      *
      * @return View
      */
-    public function index(AccountRepositoryInterface $repository, EJRI $jobs)
+    public function index(AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs)
     {
         // create new export job.
         $job = $jobs->create();
@@ -130,11 +130,11 @@ class ExportController extends Controller
     /**
      * @param ExportFormRequest            $request
      * @param AccountRepositoryInterface   $repository
-     * @param EJRI                       $jobs
+     * @param ExportJobRepositoryInterface $jobs
      *
      * @return \Illuminate\Http\JsonResponse
      */
-    public function postIndex(ExportFormRequest $request, AccountRepositoryInterface $repository, EJRI $jobs)
+    public function postIndex(ExportFormRequest $request, AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs)
     {
         $job      = $jobs->findByKey($request->get('job'));
         $settings = [

app/Http/Controllers/HelpController.php

@@ -58,7 +58,7 @@ class HelpController extends Controller
             return Response::json($content);
         }
 
-        $content         = $help->getFromGithub($language, $route);
+        $content         = $help->getFromGithub($route, $language);
         $notYourLanguage = '<p><em>' . strval(trans('firefly.help_may_not_be_your_language')) . '</em></p>';
 
         // get backup language content (try English):
@@ -66,10 +66,10 @@ class HelpController extends Controller
             $language = 'en_US';
             if ($help->inCache($route, $language)) {
                 Log::debug(sprintf('Help text %s was in cache.', $language));
-                $content = $help->getFromCache($route, $language);
+                $content = $notYourLanguage . $help->getFromCache($route, $language);
             }
             if (!$help->inCache($route, $language)) {
-                $content = trim($notYourLanguage . $help->getFromGithub($language, $route));
+                $content = trim($notYourLanguage . $help->getFromGithub($route, $language));
             }
         }
 

app/Http/Controllers/HomeController.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Http\Controllers;
 
 use Artisan;
@@ -17,7 +18,7 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\AccountType;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
@@ -97,11 +98,11 @@ class HomeController extends Controller
     }
 
     /**
-     * @param ARI $repository
+     * @param AccountRepositoryInterface $repository
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
-    public function index(ARI $repository)
+    public function index(AccountRepositoryInterface $repository)
     {
         $types = config('firefly.accountTypesByIdentifier.asset');
         $count = $repository->count($types);

app/Http/Controllers/ImportController.php

@@ -20,6 +20,7 @@ use FireflyIII\Import\Setup\SetupInterface;
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response as LaravelResponse;
 use Log;
@@ -87,8 +88,6 @@ class ImportController extends Controller
     {
         Log::debug('Now at start of configure()');
         if (!$this->jobInCorrectStep($job, 'configure')) {
-            Log::debug('Job is not in correct state for configure()', ['status' => $job->status]);
-
             return $this->redirectToCorrectStep($job);
         }
 
@@ -100,8 +99,6 @@ class ImportController extends Controller
         $subTitleIcon = 'fa-wrench';
 
         return view('import.' . $job->file_type . '.configure', compact('data', 'job', 'subTitle', 'subTitleIcon'));
-
-
     }
 
     /**
@@ -145,8 +142,6 @@ class ImportController extends Controller
     public function finished(ImportJob $job)
     {
         if (!$this->jobInCorrectStep($job, 'finished')) {
-            Log::debug('Job is not in correct state for finished()', ['status' => $job->status]);
-
             return $this->redirectToCorrectStep($job);
         }
 
@@ -225,12 +220,12 @@ class ImportController extends Controller
      * Step 4. Save the configuration.
      *
      * @param Request                      $request
+     * @param ImportJobRepositoryInterface $repository
      * @param ImportJob                    $job
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws FireflyException
      */
-    public function postConfigure(Request $request, ImportJob $job)
+    public function postConfigure(Request $request, ImportJobRepositoryInterface $repository, ImportJob $job)
     {
         Log::debug('Now in postConfigure()', ['job' => $job->key]);
         if (!$this->jobInCorrectStep($job, 'process')) {
@@ -245,8 +240,7 @@ class ImportController extends Controller
         $importer->saveImportConfiguration($data, $files);
 
         // update job:
-        $job->status = 'import_configuration_saved';
+        $repository->updateStatus($job, 'import_configuration_saved');
-        $job->save();
 
         // return redirect to settings.
         // this could loop until the user is done.
@@ -280,17 +274,15 @@ class ImportController extends Controller
      * Step 5. Depending on the importer, this will show the user settings to
      * fill in.
      *
+     * @param ImportJobRepositoryInterface $repository
      * @param ImportJob                    $job
      *
      * @return View
-     * @throws FireflyException
      */
-    public function settings(ImportJob $job)
+    public function settings(ImportJobRepositoryInterface $repository, ImportJob $job)
     {
         Log::debug('Now in settings()', ['job' => $job->key]);
         if (!$this->jobInCorrectStep($job, 'settings')) {
-            Log::debug('Job should not be in settings()');
-
             return $this->redirectToCorrectStep($job);
         }
         Log::debug('Continue in settings()');
@@ -308,8 +300,7 @@ class ImportController extends Controller
         }
         Log::debug('Job does NOT require user config.');
 
-        $job->status = 'settings_complete';
+        $repository->updateStatus($job, 'settings_complete');
-        $job->save();
 
         // if no more settings, save job and continue to process thing.
         return redirect(route('import.complete', [$job->key]));
@@ -350,15 +341,17 @@ class ImportController extends Controller
         return view('import.status', compact('job', 'subTitle', 'subTitleIcon'));
     }
 
+
     /**
      * This is step 2. It creates an Import Job. Stores the import.
      *
      * @param ImportUploadRequest          $request
      * @param ImportJobRepositoryInterface $repository
+     * @param UserRepositoryInterface      $userRepository
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function upload(ImportUploadRequest $request, ImportJobRepositoryInterface $repository)
+    public function upload(ImportUploadRequest $request, ImportJobRepositoryInterface $repository, UserRepositoryInterface $userRepository)
     {
         Log::debug('Now in upload()');
         // create import job:
@@ -375,7 +368,7 @@ class ImportController extends Controller
         $disk             = Storage::disk('upload');
 
         // user is demo user, replace upload with prepared file.
-        if (auth()->user()->hasRole('demo')) {
+        if ($userRepository->hasRole(auth()->user(), 'demo')) {
             $stubsDisk        = Storage::disk('stubs');
             $content          = $stubsDisk->get('demo-import.csv');
             $contentEncrypted = Crypt::encrypt($content);
@@ -384,14 +377,13 @@ class ImportController extends Controller
 
             // also set up prepared configuration.
             $configuration = json_decode($stubsDisk->get('demo-configuration.json'), true);
-            $job->configuration = $configuration;
+            $repository->setConfiguration($job, $configuration);
-            $job->save();
             Log::debug('Set configuration for demo user', $configuration);
 
             // also flash info
             Session::flash('info', trans('demo.import-configure-security'));
         }
-        if (!auth()->user()->hasRole('demo')) {
+        if (!$userRepository->hasRole(auth()->user(), 'demo')) {
             // user is not demo, process original upload:
             $disk->put($newName, $contentEncrypted);
             Log::debug('Uploaded file', ['name' => $upload->getClientOriginalName(), 'size' => $upload->getSize(), 'mime' => $upload->getClientMimeType()]);
@@ -411,18 +403,15 @@ class ImportController extends Controller
             $configRaw        = $configFileObject->fread($configFileObject->getSize());
             $configuration    = json_decode($configRaw, true);
 
+            // @codeCoverageIgnoreStart
             if (!is_null($configuration) && is_array($configuration)) {
                 Log::debug('Found configuration', $configuration);
-                $job->configuration = $configuration;
+                $repository->setConfiguration($job, $configuration);
-                $job->save();
             }
+            // @codeCoverageIgnoreEnd
         }
 
-        // if user is demo user, replace config with prepared config:
-
-
         return redirect(route('import.configure', [$job->key]));
-
     }
 
     /**
@@ -440,6 +429,8 @@ class ImportController extends Controller
                 return $job->status === 'import_status_never_started';
             case 'settings':
             case 'store-settings':
+                Log::debug(sprintf('Job %d with key %s has status %s', $job->id, $job->key, $job->status));
+
                 return $job->status === 'import_configuration_saved';
             case 'finished':
                 return $job->status === 'import_complete';
@@ -449,7 +440,7 @@ class ImportController extends Controller
                 return ($job->status === 'settings_complete') || ($job->status === 'import_running');
         }
 
-        return false;
+        return false; // @codeCoverageIgnore
 
     }
 
@@ -475,7 +466,7 @@ class ImportController extends Controller
 
             return $importer;
         }
-        throw new FireflyException(sprintf('"%s" is not a valid file type', $type));
+        throw new FireflyException(sprintf('"%s" is not a valid file type', $type)); // @codeCoverageIgnore
 
     }
 
@@ -507,7 +498,7 @@ class ImportController extends Controller
                 return redirect(route('import.finished', [$job->key]));
         }
 
-        throw new FireflyException('Cannot redirect for job state ' . $job->status);
+        throw new FireflyException('Cannot redirect for job state ' . $job->status); // @codeCoverageIgnore
 
     }
 }

app/Http/Controllers/JavascriptController.php

@@ -13,6 +13,11 @@ namespace FireflyIII\Http\Controllers;
 
 use Amount;
 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 Illuminate\Http\Request;
 use Navigation;
 use Preferences;
@@ -25,9 +30,61 @@ use Session;
  */
 class JavascriptController extends Controller
 {
+    /**
+     * @param AccountRepositoryInterface  $repository
+     * @param CurrencyRepositoryInterface $currencyRepository
+     *
+     * @return $this
+     */
+    public function accounts(AccountRepositoryInterface $repository, CurrencyRepositoryInterface $currencyRepository)
+    {
+        $accounts   = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $preference = Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR'));
+        $default    = $currencyRepository->findByCode($preference->data);
+
+        $data = ['accounts' => [],];
+
+
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $accountId                    = $account->id;
+            $currency                     = intval($account->getMeta('currency_id'));
+            $currency                     = $currency === 0 ? $default->id : $currency;
+            $entry                        = ['preferredCurrency' => $currency, 'name' => $account->name];
+            $data['accounts'][$accountId] = $entry;
+        }
+
+
+        return response()
+            ->view('javascript.accounts', $data, 200)
+            ->header('Content-Type', 'text/javascript');
+    }
 
     /**
+     * @param CurrencyRepositoryInterface $repository
      *
+     * @return $this
+     */
+    public function currencies(CurrencyRepositoryInterface $repository)
+    {
+        $currencies = $repository->get();
+        $data       = ['currencies' => [],];
+        /** @var TransactionCurrency $currency */
+        foreach ($currencies as $currency) {
+            $currencyId                    = $currency->id;
+            $entry                         = ['name' => $currency->name, 'code' => $currency->code, 'symbol' => $currency->symbol];
+            $data['currencies'][$currencyId] = $entry;
+        }
+
+        return response()
+            ->view('javascript.currencies', $data, 200)
+            ->header('Content-Type', 'text/javascript');
+    }
+
+    /**
+     * @param Request $request
+     *
+     * @return \Illuminate\Http\Response
      */
     public function variables(Request $request)
     {
@@ -95,7 +152,7 @@ class JavascriptController extends Controller
 
         switch ($viewRange) {
             default:
-                throw new FireflyException('The date picker does not yet support "' . $viewRange . '".');
+                throw new FireflyException('The date picker does not yet support "' . $viewRange . '".'); // @codeCoverageIgnore
             case '1D':
             case 'custom':
                 $format = (string)trans('config.month_and_day');

app/Http/Controllers/Json/ExchangeController.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * ExchangeController.php
+ * Copyright (c) 2017 thegrumpydictator@gmail.com
+ * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Http\Controllers\Json;
+
+
+use Carbon\Carbon;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Services\Currency\ExchangeRateInterface;
+use Illuminate\Http\Request;
+use Log;
+use Response;
+
+/**
+ * Class ExchangeController
+ *
+ * @package FireflyIII\Http\Controllers\Json
+ */
+class ExchangeController extends Controller
+{
+    /**
+     * @param Request             $request
+     * @param TransactionCurrency $fromCurrency
+     * @param TransactionCurrency $toCurrency
+     * @param Carbon              $date
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function getRate(Request $request, TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date)
+    {
+        /** @var CurrencyRepositoryInterface $repository */
+        $repository = app(CurrencyRepositoryInterface::class);
+        $rate       = $repository->getExchangeRate($fromCurrency, $toCurrency, $date);
+        $amount     = null;
+        if (is_null($rate->id)) {
+            Log::debug(sprintf('No cached exchange rate in database for %s to %s on %s', $fromCurrency->code, $toCurrency->code, $date->format('Y-m-d')));
+            $preferred = env('EXCHANGE_RATE_SERVICE', config('firefly.preferred_exchange_service'));
+            $class     = config('firefly.currency_exchange_services.' . $preferred);
+            /** @var ExchangeRateInterface $object */
+            $object = app($class);
+            $object->setUser(auth()->user());
+            $rate = $object->getRate($fromCurrency, $toCurrency, $date);
+        }
+        $return           = $rate->toArray();
+        $return['amount'] = null;
+        if (!is_null($request->get('amount'))) {
+            // assume amount is in "from" currency:
+            $return['amount'] = bcmul($request->get('amount'), strval($rate->rate), 12);
+            // round to toCurrency decimal places:
+            $return['amount'] = round($return['amount'], $toCurrency->decimal_places);
+        }
+
+        return Response::json($return);
+    }
+
+}

app/Http/Controllers/JsonController.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Http\Controllers;
 
 use Amount;
@@ -17,6 +18,7 @@ use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Account\AccountTaskerInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -144,7 +146,7 @@ class JsonController extends Controller
      * @return \Illuminate\Http\JsonResponse
      *
      */
-    public function boxIn(AccountTaskerInterface $accountTasker, AccountRepositoryInterface $repository)
+    public function boxIn()
     {
         $start = session('start', Carbon::now()->startOfMonth());
         $end   = session('end', Carbon::now()->endOfMonth());
@@ -155,11 +157,17 @@ class JsonController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('box-in');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
-        $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
+
-        $assets   = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        // try a collector for income:
-        $amount   = $accountTasker->amountInInPeriod($accounts, $assets, $start, $end);
+        /** @var JournalCollectorInterface $collector */
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)
+                  ->setTypes([TransactionType::DEPOSIT])
+                  ->withOpposingAccount();
+
+        $amount = strval($collector->getJournals()->sum('transaction_amount'));
         $data   = ['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
         $cache->store($data);
 
@@ -172,7 +180,7 @@ class JsonController extends Controller
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function boxOut(AccountTaskerInterface $accountTasker, AccountRepositoryInterface $repository)
+    public function boxOut()
     {
         $start = session('start', Carbon::now()->startOfMonth());
         $end   = session('end', Carbon::now()->endOfMonth());
@@ -183,12 +191,16 @@ class JsonController extends Controller
         $cache->addProperty($end);
         $cache->addProperty('box-out');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
+        // try a collector for expenses:
-        $assets   = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        /** @var JournalCollectorInterface $collector */
-        $amount   = $accountTasker->amountOutInPeriod($accounts, $assets, $start, $end);
+        $collector = app(JournalCollectorInterface::class);
+        $collector->setAllAssetAccounts()->setRange($start, $end)
+                  ->setTypes([TransactionType::WITHDRAWAL])
+                  ->withOpposingAccount();
+        $amount = strval($collector->getJournals()->sum('transaction_amount'));
 
         $data = ['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount];
         $cache->store($data);
@@ -287,7 +299,7 @@ class JsonController extends Controller
     {
         $pref = Preferences::get('tour', true);
         if (!$pref) {
-            throw new FireflyException('Cannot find preference for tour. Exit.');
+            throw new FireflyException('Cannot find preference for tour. Exit.'); // @codeCoverageIgnore
         }
         $headers = ['main-content', 'sidebar-toggle', 'account-menu', 'budget-menu', 'report-menu', 'transaction-menu', 'option-menu', 'main-content-end'];
         $steps   = [];
@@ -329,7 +341,9 @@ class JsonController extends Controller
     }
 
     /**
+     * @param JournalRepositoryInterface $repository
      *
+     * @return \Illuminate\Http\JsonResponse
      */
     public function transactionTypes(JournalRepositoryInterface $repository)
     {

app/Http/Controllers/NewUserController.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
@@ -119,7 +120,7 @@ class NewUserController extends Controller
             'accountRole'        => 'defaultAsset',
             'openingBalance'     => round($request->input('bank_balance'), 12),
             'openingBalanceDate' => new Carbon,
-            'openingBalanceCurrency' => intval($request->input('amount_currency_id_bank_balance')),
+            'currency_id'        => intval($request->input('amount_currency_id_bank_balance')),
         ];
 
         $repository->store($assetAccount);
@@ -144,7 +145,7 @@ class NewUserController extends Controller
             'accountRole'        => 'savingAsset',
             'openingBalance'     => round($request->input('savings_balance'), 12),
             'openingBalanceDate' => new Carbon,
-            'openingBalanceCurrency' => intval($request->input('amount_currency_id_savings_balance')),
+            'currency_id'        => intval($request->input('amount_currency_id_savings_balance')),
         ];
         $repository->store($savingsAccount);
 

app/Http/Controllers/PiggyBankController.php

@@ -10,6 +10,7 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Http\Controllers;
 
 use Amount;
@@ -209,10 +210,11 @@ class PiggyBankController extends Controller
         $end = session('end', Carbon::now()->endOfMonth());
 
         $accounts = [];
+        Log::debug('Looping piggues');
         /** @var PiggyBank $piggyBank */
         foreach ($piggyBanks as $piggyBank) {
-            $piggyBank->savedSoFar = $piggyBank->currentRelevantRep()->currentamount;
+            $piggyBank->savedSoFar = $piggyBank->currentRelevantRep()->currentamount ?? '0';
-            $piggyBank->percentage = $piggyBank->savedSoFar != 0 ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0;
+            $piggyBank->percentage = bccomp('0', $piggyBank->savedSoFar) !== 0 ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0;
             $piggyBank->leftToSave = bcsub($piggyBank->targetamount, strval($piggyBank->savedSoFar));
             $piggyBank->percentage = $piggyBank->percentage > 100 ? 100 : $piggyBank->percentage;
 
@@ -220,7 +222,9 @@ class PiggyBankController extends Controller
              * Fill account information:
              */
             $account = $piggyBank->account;
+            $new     = false;
             if (!isset($accounts[$account->id])) {
+                $new                    = true;
                 $accounts[$account->id] = [
                     'name'              => $account->name,
                     'balance'           => Steam::balanceIgnoreVirtual($account, $end),
@@ -229,7 +233,8 @@ class PiggyBankController extends Controller
                     'sumOfTargets'      => $piggyBank->targetamount,
                     'leftToSave'        => $piggyBank->leftToSave,
                 ];
-            } else {
+            }
+            if (isset($accounts[$account->id]) && $new === false) {
                 $accounts[$account->id]['sumOfSaved']   = bcadd($accounts[$account->id]['sumOfSaved'], strval($piggyBank->savedSoFar));
                 $accounts[$account->id]['sumOfTargets'] = bcadd($accounts[$account->id]['sumOfTargets'], $piggyBank->targetamount);
                 $accounts[$account->id]['leftToSave']   = bcadd($accounts[$account->id]['leftToSave'], $piggyBank->leftToSave);
@@ -272,32 +277,16 @@ class PiggyBankController extends Controller
     public function postAdd(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
         $amount = $request->get('amount');
-        Log::debug(sprintf('Found amount is %s', $amount));
-        /** @var Carbon $date */
-        $date          = session('end', Carbon::now()->endOfMonth());
-        $leftOnAccount = $piggyBank->leftOnAccount($date);
-        $savedSoFar    = strval($piggyBank->currentRelevantRep()->currentamount);
-        $leftToSave    = bcsub($piggyBank->targetamount, $savedSoFar);
-        $maxAmount     = strval(min(round($leftOnAccount, 12), round($leftToSave, 12)));
 
-        if (bccomp($amount, $maxAmount) <= 0) {
+        if ($repository->canAddAmount($piggyBank, $amount)) {
-            $repetition                = $piggyBank->currentRelevantRep();
+            $repository->addAmount($piggyBank, $amount);
-            $currentAmount             = $repetition->currentamount ?? '0';
+            Session::flash('success', strval(trans('firefly.added_amount_to_piggy', ['amount' => Amount::format($amount, false), 'name' => $piggyBank->name])));
-            $repetition->currentamount = bcadd($currentAmount, $amount);
-            $repetition->save();
-
-            // create event
-            $repository->createEvent($piggyBank, $amount);
-
-            Session::flash(
-                'success', strval(trans('firefly.added_amount_to_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)]))
-            );
             Preferences::mark();
 
             return redirect(route('piggy-banks.index'));
         }
 
-        Log::error('Cannot add ' . $amount . ' because max amount is ' . $maxAmount . ' (left on account is ' . $leftOnAccount . ')');
+        Log::error('Cannot add ' . $amount . ' because canAddAmount returned false.');
         Session::flash('error', strval(trans('firefly.cannot_add_amount_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)])));
 
         return redirect(route('piggy-banks.index'));
@@ -312,26 +301,19 @@ class PiggyBankController extends Controller
      */
     public function postRemove(Request $request, PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
     {
-        $amount = strval(round($request->get('amount'), 12));
+        $amount = $request->get('amount');
-
+        if ($repository->canRemoveAmount($piggyBank, $amount)) {
-        $savedSoFar = $piggyBank->currentRelevantRep()->currentamount;
+            $repository->removeAmount($piggyBank, $amount);
-
-        if (bccomp($amount, $savedSoFar) <= 0) {
-            $repetition                = $piggyBank->currentRelevantRep();
-            $repetition->currentamount = bcsub($repetition->currentamount, $amount);
-            $repetition->save();
-
-            // create event
-            $repository->createEvent($piggyBank, bcmul($amount, '-1'));
-
             Session::flash(
-                'success', strval(trans('firefly.removed_amount_from_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)]))
+                'success', strval(trans('firefly.removed_amount_from_piggy', ['amount' => Amount::format($amount, false), 'name' => $piggyBank->name]))
             );
             Preferences::mark();
 
             return redirect(route('piggy-banks.index'));
         }
 
+        $amount = strval(round($request->get('amount'), 12));
+
         Session::flash('error', strval(trans('firefly.cannot_remove_from_piggy', ['amount' => Amount::format($amount, false), 'name' => e($piggyBank->name)])));
 
         return redirect(route('piggy-banks.index'));
@@ -391,9 +373,11 @@ class PiggyBankController extends Controller
         Preferences::mark();
 
         if (intval($request->get('create_another')) === 1) {
+            // @codeCoverageIgnoreStart
             Session::put('piggy-banks.create.fromStore', true);
 
             return redirect(route('piggy-banks.create'))->withInput();
+            // @codeCoverageIgnoreEnd
         }
 
         return redirect($this->getPreviousUri('piggy-banks.edit.uri'));
@@ -415,9 +399,11 @@ class PiggyBankController extends Controller
         Preferences::mark();
 
         if (intval($request->get('return_to_edit')) === 1) {
+            // @codeCoverageIgnoreStart
             Session::put('piggy-banks.edit.fromUpdate', true);
 
             return redirect(route('piggy-banks.edit', [$piggyBank->id]));
+            // @codeCoverageIgnoreEnd
         }
 
         return redirect($this->getPreviousUri('piggy-banks.edit.uri'));

app/Http/Controllers/Popup/ReportController.php

@@ -17,17 +17,13 @@ namespace FireflyIII\Http\Controllers\Popup;
 use Carbon\Carbon;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collection\BalanceLine;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Helpers\Report\PopupReportInterface;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 use FireflyIII\Support\Binder\AccountList;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 use InvalidArgumentException;
 use Response;
 use View;
@@ -40,6 +36,44 @@ use View;
 class ReportController extends Controller
 {
 
+    /** @var AccountRepositoryInterface */
+    private $accountRepository;
+    /** @var BudgetRepositoryInterface */
+    private $budgetRepository;
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+    /** @var PopupReportInterface */
+    private $popupHelper;
+
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+
+                /** @var AccountRepositoryInterface $repository */
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+
+                /** @var BudgetRepositoryInterface $repository */
+                $this->budgetRepository = app(BudgetRepositoryInterface::class);
+
+                /** @var CategoryRepositoryInterface categoryRepository */
+                $this->categoryRepository = app(CategoryRepositoryInterface::class);
+
+                /** @var PopupReportInterface popupHelper */
+                $this->popupHelper = app(PopupReportInterface::class);
+
+                return $next($request);
+            }
+        );
+
+    }
+
+
     /**
      * @param Request $request
      *
@@ -59,7 +93,6 @@ class ReportController extends Controller
                 throw new FireflyException('Firefly cannot handle "' . e($attributes['location']) . '" ');
             case 'budget-spent-amount':
                 $html = $this->budgetSpentAmount($attributes);
-
                 break;
             case 'expense-entry':
                 $html = $this->expenseEntry($attributes);
@@ -89,62 +122,25 @@ class ReportController extends Controller
     private function balanceAmount(array $attributes): string
     {
         $role    = intval($attributes['role']);
-
+        $budget  = $this->budgetRepository->find(intval($attributes['budgetId']));
-        /** @var BudgetRepositoryInterface $budgetRepository */
+        $account = $this->accountRepository->find(intval($attributes['accountId']));
-        $budgetRepository = app(BudgetRepositoryInterface::class);
-        $budget           = $budgetRepository->find(intval($attributes['budgetId']));
-
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app(AccountRepositoryInterface::class);
-
-        $account = $repository->find(intval($attributes['accountId']));
-        $types   = [TransactionType::WITHDRAWAL];
 
         switch (true) {
             case ($role === BalanceLine::ROLE_DEFAULTROLE && !is_null($budget->id)):
-                /** @var JournalCollectorInterface $collector */
+                // normal row with a budget:
-                $collector = app(JournalCollectorInterface::class);
+                $journals = $this->popupHelper->balanceForBudget($budget, $account, $attributes);
-                $collector
-                    ->setAccounts(new Collection([$account]))
-                    ->setRange($attributes['startDate'], $attributes['endDate'])
-                    ->setBudget($budget);
-                $journals = $collector->getJournals();
-
                 break;
             case ($role === BalanceLine::ROLE_DEFAULTROLE && is_null($budget->id)):
+                // normal row without a budget:
+                $journals     = $this->popupHelper->balanceForNoBudget($account, $attributes);
                 $budget->name = strval(trans('firefly.no_budget'));
-                /** @var JournalCollectorInterface $collector */
-                $collector = app(JournalCollectorInterface::class);
-                $collector
-                    ->setAccounts(new Collection([$account]))
-                    ->setTypes($types)
-                    ->setRange($attributes['startDate'], $attributes['endDate'])
-                    ->withoutBudget();
-                $journals = $collector->getJournals();
                 break;
             case ($role === BalanceLine::ROLE_DIFFROLE):
-                /** @var JournalCollectorInterface $collector */
+                $journals     = $this->popupHelper->balanceDifference($account, $attributes);
-                $collector = app(JournalCollectorInterface::class);
-                $collector
-                    ->setAccounts(new Collection([$account]))
-                    ->setTypes($types)
-                    ->setRange($attributes['startDate'], $attributes['endDate'])
-                    ->withoutBudget();
-                $journals = $collector->getJournals();
-
                 $budget->name = strval(trans('firefly.leftUnbalanced'));
-                $journals     = $journals->filter(
-                    function (Transaction $transaction) {
-                        $tags = $transaction->transactionJournal->tags()->where('tagMode', 'balancingAct')->count();
-                        if ($tags === 0) {
-                            return true;
-                        }
-
-                        return false;
-                    }
-                );
                 break;
             case ($role === BalanceLine::ROLE_TAGROLE):
+                // row with tag info.
                 throw new FireflyException('Firefly cannot handle this type of info-button (BalanceLine::TagRole)');
         }
         $view = view('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();
@@ -162,27 +158,8 @@ class ReportController extends Controller
      */
     private function budgetSpentAmount(array $attributes): string
     {
-        // need to find the budget
+        $budget   = $this->budgetRepository->find(intval($attributes['budgetId']));
-        // then search for expenses in the given period
+        $journals = $this->popupHelper->byBudget($budget, $attributes);
-        // list them in some table format.
-        /** @var BudgetRepositoryInterface $repository */
-        $repository = app(BudgetRepositoryInterface::class);
-        $budget     = $repository->find(intval($attributes['budgetId']));
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-
-        $collector
-            ->setAccounts($attributes['accounts'])
-            ->setRange($attributes['startDate'], $attributes['endDate']);
-
-        if (is_null($budget->id)) {
-            $collector->setTypes([TransactionType::WITHDRAWAL])->withoutBudget();
-        }
-        if (!is_null($budget->id)) {
-            // get all expenses in budget in period:
-            $collector->setBudget($budget);
-        }
-        $journals = $collector->getJournals();
         $view     = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
 
         return $view;
@@ -198,17 +175,8 @@ class ReportController extends Controller
      */
     private function categoryEntry(array $attributes): string
     {
-        /** @var CategoryRepositoryInterface $repository */
+        $category = $this->categoryRepository->find(intval($attributes['categoryId']));
-        $repository = app(CategoryRepositoryInterface::class);
+        $journals = $this->popupHelper->byCategory($category, $attributes);
-        $category   = $repository->find(intval($attributes['categoryId']));
-        $types      = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-        $collector->setAccounts($attributes['accounts'])->setTypes($types)
-                  ->setRange($attributes['startDate'], $attributes['endDate'])
-                  ->setCategory($category);
-        $journals = $collector->getJournals(); // 7193
-
         $view     = view('popup.report.category-entry', compact('journals', 'category'))->render();
 
         return $view;
@@ -224,28 +192,8 @@ class ReportController extends Controller
      */
     private function expenseEntry(array $attributes): string
     {
-        /** @var AccountRepositoryInterface $repository */
+        $account  = $this->accountRepository->find(intval($attributes['accountId']));
-        $repository = app(AccountRepositoryInterface::class);
+        $journals = $this->popupHelper->byExpenses($account, $attributes);
-
-        $account = $repository->find(intval($attributes['accountId']));
-        $types   = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-        $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types);
-        $journals = $collector->getJournals();
-        $report   = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report
-
-        // filter for transfers and withdrawals TO the given $account
-        $journals = $journals->filter(
-            function (Transaction $transaction) use ($report) {
-                // get the destinations:
-                $sources = TransactionJournal::sourceAccountList($transaction->transactionJournal)->pluck('id')->toArray();
-
-                // do these intersect with the current list?
-                return !empty(array_intersect($report, $sources));
-            }
-        );
-
         $view     = view('popup.report.expense-entry', compact('journals', 'account'))->render();
 
         return $view;
@@ -261,27 +209,8 @@ class ReportController extends Controller
      */
     private function incomeEntry(array $attributes): string
     {
-        /** @var AccountRepositoryInterface $repository */
+        $account  = $this->accountRepository->find(intval($attributes['accountId']));
-        $repository = app(AccountRepositoryInterface::class);
+        $journals = $this->popupHelper->byIncome($account, $attributes);
-        $account    = $repository->find(intval($attributes['accountId']));
-        $types      = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
-        /** @var JournalCollectorInterface $collector */
-        $collector = app(JournalCollectorInterface::class);
-        $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types);
-        $journals = $collector->getJournals();
-        $report   = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report
-
-        // filter the set so the destinations outside of $attributes['accounts'] are not included.
-        $journals = $journals->filter(
-            function (Transaction $transaction) use ($report) {
-                // get the destinations:
-                $destinations = TransactionJournal::destinationAccountList($transaction->transactionJournal)->pluck('id')->toArray();
-
-                // do these intersect with the current list?
-                return !empty(array_intersect($report, $destinations));
-            }
-        );
-
         $view     = view('popup.report.income-entry', compact('journals', 'account'))->render();
 
         return $view;

app/Http/Controllers/PreferencesController.php

@@ -10,11 +10,13 @@
  */
 
 declare(strict_types=1);
+
 namespace FireflyIII\Http\Controllers;
 
 use FireflyIII\Http\Requests\TokenFormRequest;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Illuminate\Http\Request;
 use PragmaRX\Google2FA\Contracts\Google2FA;
 use Preferences;
@@ -55,8 +57,7 @@ class PreferencesController extends Controller
     public function code(Google2FA $google2fa)
     {
         $domain = $this->getDomain();
-        /** @noinspection PhpMethodParametersCountMismatchInspection */
+        $secret = $google2fa->generateSecretKey(16);
-        $secret = $google2fa->generateSecretKey(32, auth()->user()->id);
         Session::flash('two-factor-secret', $secret);
         $image = $google2fa->getQRCodeInline('Firefly III at ' . $domain, auth()->user()->email, $secret, 150);
 
@@ -129,9 +130,11 @@ class PreferencesController extends Controller
     /**
      * @param Request                 $request
      *
+     * @param UserRepositoryInterface $repository
+     *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function postIndex(Request $request)
+    public function postIndex(Request $request, UserRepositoryInterface $repository)
     {
         // front page accounts
         $frontPageAccounts = [];
@@ -160,16 +163,15 @@ class PreferencesController extends Controller
         Preferences::set('showDepositsFrontpage', $showDepositsFrontpage);
 
         // save page size:
+        Preferences::set('transactionPageSize', 50);
         $transactionPageSize = intval($request->get('transactionPageSize'));
         if ($transactionPageSize > 0 && $transactionPageSize < 1337) {
             Preferences::set('transactionPageSize', $transactionPageSize);
-        } else {
-            Preferences::set('transactionPageSize', 50);
         }
 
         $twoFactorAuthEnabled   = false;
         $hasTwoFactorAuthSecret = false;
-        if (!auth()->user()->hasRole('demo')) {
+        if (!$repository->hasRole(auth()->user(), 'demo')) {
             // two factor auth
             $twoFactorAuthEnabled   = intval($request->get('twoFactorAuthEnabled'));
             $hasTwoFactorAuthSecret = !is_null(Preferences::get('twoFactorAuthSecret'));

app/Http/Controllers/ProfileController.php

@@ -14,9 +14,11 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Controllers;
 
 use FireflyIII\Exceptions\ValidationException;
+use FireflyIII\Http\Middleware\IsLimitedUser;
 use FireflyIII\Http\Requests\DeleteAccountFormRequest;
 use FireflyIII\Http\Requests\ProfileFormRequest;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
+use FireflyIII\User;
 use Hash;
 use Log;
 use Session;
@@ -45,6 +47,8 @@ class ProfileController extends Controller
                 return $next($request);
             }
         );
+        $this->middleware(IsLimitedUser::class);
+
     }
 
     /**
@@ -52,16 +56,6 @@ class ProfileController extends Controller
      */
     public function changePassword()
     {
-        if (intval(getenv('SANDSTORM')) === 1) {
-            return view('error')->with('message', strval(trans('firefly.sandstorm_not_available')));
-        }
-
-        if (auth()->user()->hasRole('demo')) {
-            Session::flash('info', strval(trans('firefly.cannot_change_demo')));
-
-            return redirect(route('profile.index'));
-        }
-
         $title        = auth()->user()->email;
         $subTitle     = strval(trans('firefly.change_your_password'));
         $subTitleIcon = 'fa-key';
@@ -74,16 +68,6 @@ class ProfileController extends Controller
      */
     public function deleteAccount()
     {
-        if (intval(getenv('SANDSTORM')) === 1) {
-            return view('error')->with('message', strval(trans('firefly.sandstorm_not_available')));
-        }
-
-        if (auth()->user()->hasRole('demo')) {
-            Session::flash('info', strval(trans('firefly.cannot_delete_demo')));
-
-            return redirect(route('profile.index'));
-        }
-
         $title        = auth()->user()->email;
         $subTitle     = strval(trans('firefly.delete_account'));
         $subTitleIcon = 'fa-trash';
@@ -111,32 +95,18 @@ class ProfileController extends Controller
      */
     public function postChangePassword(ProfileFormRequest $request, UserRepositoryInterface $repository)
     {
-        if (intval(getenv('SANDSTORM')) === 1) {
+        // the request has already validated both new passwords must be equal.
-            return view('error')->with('message', strval(trans('firefly.sandstorm_not_available')));
+        $current = $request->get('current_password');
-        }
+        $new     = $request->get('new_password');
-
-        if (auth()->user()->hasRole('demo')) {
-            Session::flash('info', strval(trans('firefly.cannot_change_demo')));
-
-            return redirect(route('profile.index'));
-        }
-
-        // old, new1, new2
-        if (!Hash::check($request->get('current_password'), auth()->user()->password)) {
-            Session::flash('error', strval(trans('firefly.invalid_current_password')));
-
-            return redirect(route('profile.change-password'));
-        }
 
         try {
-            $this->validatePassword($request->get('current_password'), $request->get('new_password'));
+            $this->validatePassword(auth()->user(), $current, $new);
         } catch (ValidationException $e) {
             Session::flash('error', $e->getMessage());
 
             return redirect(route('profile.change-password'));
         }
 
-        // update the user with the new password.
         $repository->changePassword(auth()->user(), $request->get('new_password'));
         Session::flash('success', strval(trans('firefly.password_changed')));
 
@@ -151,17 +121,6 @@ class ProfileController extends Controller
      */
     public function postDeleteAccount(UserRepositoryInterface $repository, DeleteAccountFormRequest $request)
     {
-        if (intval(getenv('SANDSTORM')) === 1) {
-            return view('error')->with('message', strval(trans('firefly.sandstorm_not_available')));
-        }
-
-        if (auth()->user()->hasRole('demo')) {
-            Session::flash('info', strval(trans('firefly.cannot_delete_demo')));
-
-            return redirect(route('profile.index'));
-        }
-
-        // old, new1, new2
         if (!Hash::check($request->get('password'), auth()->user()->password)) {
             Session::flash('error', strval(trans('firefly.invalid_password')));
 
@@ -181,16 +140,22 @@ class ProfileController extends Controller
         return redirect(route('index'));
     }
 
+
     /**
-     * @param string $old
+     * @param User   $user
+     * @param string $current
      * @param string $new
      *
      * @return bool
      * @throws ValidationException
      */
-    protected function validatePassword(string $old, string $new): bool
+    protected function validatePassword(User $user, string $current, string $new): bool
     {
-        if ($new === $old) {
+        if (!Hash::check($current, $user->password)) {
+            throw new ValidationException(strval(trans('firefly.invalid_current_password')));
+        }
+
+        if ($current === $new) {
             throw new ValidationException(strval(trans('firefly.should_change')));
         }
 

app/Http/Controllers/Report/AccountController.php

@@ -44,7 +44,7 @@ class AccountController extends Controller
         $cache->addProperty('account-report');
         $cache->addProperty($accounts->pluck('id')->toArray());
         if ($cache->has()) {
-            return $cache->get();
+            return $cache->get(); // @codeCoverageIgnore
         }
 
         /** @var AccountTaskerInterface $accountTasker */