From edb5b2ed5e4015f542f355b9679b806cbc4e559a Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 8 Dec 2016 21:50:20 +0100 Subject: [PATCH 001/223] Initial code for new budget report #426 --- .../Report/Audit/MonthReportGenerator.php | 10 +++ .../Report/Category/MonthReportGenerator.php | 11 +++- .../Report/ReportGeneratorInterface.php | 7 ++ .../Report/Standard/MonthReportGenerator.php | 10 +++ .../Standard/MultiYearReportGenerator.php | 10 +++ .../Report/Standard/YearReportGenerator.php | 10 +++ app/Http/Controllers/ReportController.php | 64 +++++++++++++++++++ app/Http/Requests/ReportFormRequest.php | 24 ++++++- public/js/ff/reports/index.js | 23 ++++++- resources/lang/en_US/firefly.php | 2 + resources/views/reports/index.twig | 1 + resources/views/reports/options/budget.twig | 8 +++ routes/web.php | 1 + 13 files changed, 177 insertions(+), 4 deletions(-) create mode 100644 resources/views/reports/options/budget.twig diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index 7caff56bb4..f5ab29a5bb 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -110,6 +110,16 @@ class MonthReportGenerator implements ReportGeneratorInterface return $this; } + /** + * @param Collection $budgets + * + * @return ReportGeneratorInterface + */ + public function setBudgets(Collection $budgets): ReportGeneratorInterface + { + return $this; + } + /** * @param Collection $categories * diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index a72eb65f68..cbac1ee2d9 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -15,7 +15,6 @@ namespace FireflyIII\Generator\Report\Category; use Carbon\Carbon; -use Crypt; use FireflyIII\Generator\Report\ReportGeneratorInterface; use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Models\Transaction; @@ -95,6 +94,16 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $this; } + /** + * @param Collection $budgets + * + * @return ReportGeneratorInterface + */ + public function setBudgets(Collection $budgets): ReportGeneratorInterface + { + return $this; + } + /** * @param Collection $categories * diff --git a/app/Generator/Report/ReportGeneratorInterface.php b/app/Generator/Report/ReportGeneratorInterface.php index e14ed4fb91..ad46c0646a 100644 --- a/app/Generator/Report/ReportGeneratorInterface.php +++ b/app/Generator/Report/ReportGeneratorInterface.php @@ -36,6 +36,13 @@ interface ReportGeneratorInterface */ public function setAccounts(Collection $accounts): ReportGeneratorInterface; + /** + * @param Collection $budgets + * + * @return ReportGeneratorInterface + */ + public function setBudgets(Collection $budgets): ReportGeneratorInterface; + /** * @param Collection $categories * diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php index bcffeedff2..5905e12815 100644 --- a/app/Generator/Report/Standard/MonthReportGenerator.php +++ b/app/Generator/Report/Standard/MonthReportGenerator.php @@ -63,6 +63,16 @@ class MonthReportGenerator implements ReportGeneratorInterface return $this; } + /** + * @param Collection $budgets + * + * @return ReportGeneratorInterface + */ + public function setBudgets(Collection $budgets): ReportGeneratorInterface + { + return $this; + } + /** * @param Collection $categories * diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php index 64f74f1295..3437283426 100644 --- a/app/Generator/Report/Standard/MultiYearReportGenerator.php +++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php @@ -60,6 +60,16 @@ class MultiYearReportGenerator implements ReportGeneratorInterface return $this; } + /** + * @param Collection $budgets + * + * @return ReportGeneratorInterface + */ + public function setBudgets(Collection $budgets): ReportGeneratorInterface + { + return $this; + } + /** * @param Collection $categories * diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php index 7536b4027f..545084909f 100644 --- a/app/Generator/Report/Standard/YearReportGenerator.php +++ b/app/Generator/Report/Standard/YearReportGenerator.php @@ -60,6 +60,16 @@ class YearReportGenerator implements ReportGeneratorInterface return $this; } + /** + * @param Collection $budgets + * + * @return ReportGeneratorInterface + */ + public function setBudgets(Collection $budgets): ReportGeneratorInterface + { + return $this; + } + /** * @param Collection $categories * diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 655c3b2a22..19468b77b1 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -20,6 +20,7 @@ use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Http\Requests\ReportFormRequest; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Http\RedirectResponse; use Illuminate\Support\Collection; @@ -95,6 +96,42 @@ class ReportController extends Controller } + /** + * @param Collection $accounts + * @param Collection $categories + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function budgetReport(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end) + { + if ($end < $start) { + return view('error')->with('message', trans('firefly.end_after_start_date')); + } + if ($start < session('first')) { + $start = session('first'); + } + + View::share( + 'subTitle', trans( + 'firefly.report_budget', + [ + 'start' => $start->formatLocalized($this->monthFormat), + 'end' => $end->formatLocalized($this->monthFormat), + ] + ) + ); + + $generator = ReportGeneratorFactory::reportGenerator('Budget', $start, $end); + $generator->setAccounts($accounts); + $generator->setBudgets($budgets); + $result = $generator->generate(); + + return $result; + + } + /** * @param Collection $accounts * @param Collection $categories @@ -198,6 +235,9 @@ class ReportController extends Controller case 'category': $result = $this->categoryReportOptions(); break; + case 'budget': + $result = $this->budgetReportOptions(); + break; } return Response::json(['html' => $result]); @@ -217,6 +257,7 @@ class ReportController extends Controller $end = $request->getEndDate()->format('Ymd'); $accounts = join(',', $request->getAccountList()->pluck('id')->toArray()); $categories = join(',', $request->getCategoryList()->pluck('id')->toArray()); + $budgets = join(',', $request->getBudgetList()->pluck('id')->toArray()); if ($request->getAccountList()->count() === 0) { Session::flash('error', trans('firefly.select_more_than_one_account')); @@ -230,6 +271,12 @@ class ReportController extends Controller return redirect(route('reports.index')); } + if ($request->getBudgetList()->count() === 0 && $reportType === 'budget') { + Session::flash('error', trans('firefly.select_more_than_one_budget')); + + return redirect(route('reports.index')); + } + if ($end < $start) { return view('error')->with('message', trans('firefly.end_after_start_date')); } @@ -251,11 +298,28 @@ class ReportController extends Controller case 'audit': $uri = route('reports.report.audit', [$accounts, $start, $end]); break; + case 'budget': + $uri = route('reports.report.budget', [$accounts, $budgets, $start, $end]); + break; } return redirect($uri); } + /** + * @return string + */ + private function budgetReportOptions(): string + { + /** @var BudgetRepositoryInterface $repository */ + $repository = app(BudgetRepositoryInterface::class); + $budgets = $repository->getBudgets(); + $result = view('reports.options.budget', compact('budgets'))->render(); + + return $result; + + } + /** * @return string */ diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index 7d97a37b76..fbb153bcb9 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -17,6 +17,7 @@ use Carbon\Carbon; use Exception; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; @@ -79,6 +80,27 @@ class ReportFormRequest extends Request return $collection; } + /** + * @return Collection + */ + public function getBudgetList(): Collection + { + /** @var BudgetRepositoryInterface $repository */ + $repository = app(BudgetRepositoryInterface::class); + $set = $this->get('budget'); + $collection = new Collection; + if (is_array($set)) { + foreach ($set as $budgetId) { + $budget = $repository->find(intval($budgetId)); + if (!is_null($budget->id)) { + $collection->push($budget); + } + } + } + + return $collection; + } + /** * @return Carbon * @throws FireflyException @@ -125,7 +147,7 @@ class ReportFormRequest extends Request public function rules(): array { return [ - 'report_type' => 'in:audit,default,category', + 'report_type' => 'in:audit,default,category,budget', ]; } diff --git a/public/js/ff/reports/index.js b/public/js/ff/reports/index.js index bd949eeac6..9de3f79b50 100644 --- a/public/js/ff/reports/index.js +++ b/public/js/ff/reports/index.js @@ -65,12 +65,22 @@ function getReportOptions() { } function setOptionalFromCookies() { + var arr; + // categories if ((readCookie('report-categories') !== null)) { - var arr = readCookie('report-categories').split(','); + arr = readCookie('report-categories').split(','); arr.forEach(function (val) { $('input[class="category-checkbox"][type="checkbox"][value="' + val + '"]').prop('checked', true); }); } + + // and budgets! + if ((readCookie('report-budgets') !== null)) { + arr = readCookie('report-budgets').split(','); + arr.forEach(function (val) { + $('input[class="budget-checkbox"][type="checkbox"][value="' + val + '"]').prop('checked', true); + }); + } } function catchSubmit() { @@ -90,7 +100,6 @@ function catchSubmit() { }); // all category ids: - //category-checkbox var categories = []; $.each($('.category-checkbox'), function (i, v) { var c = $(v); @@ -99,6 +108,15 @@ function catchSubmit() { } }); + // all budget ids: + var budgets = []; + $.each($('.budget-checkbox'), function (i, v) { + var c = $(v); + if (c.prop('checked')) { + budgets.push(c.val()); + } + }); + // remember all if (count > 0) { @@ -106,6 +124,7 @@ function catchSubmit() { createCookie('report-type', $('select[name="report_type"]').val(), 365); createCookie('report-accounts', accounts, 365); createCookie('report-categories', categories, 365); + createCookie('report-budgets', budgets, 365); createCookie('report-start', moment(picker.startDate).format("YYYYMMDD"), 365); createCookie('report-end', moment(picker.endDate).format("YYYYMMDD"), 365); } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 11d55a5cac..7372a2876a 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -679,6 +679,7 @@ return [ 'report_type_default' => 'Default financial report', 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', + 'report_type_budget' => 'Budget report', 'report_type_meta-history' => 'Categories, budgets and bills overview', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -698,6 +699,7 @@ return [ 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', 'select_category' => 'Select one or more categories.', + 'select_budget' => 'Select one or more budgets.', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'income_per_account' => 'Income per account', diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig index c889d0eee2..70d8fd86db 100644 --- a/resources/views/reports/index.twig +++ b/resources/views/reports/index.twig @@ -26,6 +26,7 @@ diff --git a/resources/views/reports/options/budget.twig b/resources/views/reports/options/budget.twig new file mode 100644 index 0000000000..b2e0e7862e --- /dev/null +++ b/resources/views/reports/options/budget.twig @@ -0,0 +1,8 @@ +

+ {{ 'select_budget'|_ }} +

+{% for budget in budgets %} + +{% endfor %} diff --git a/routes/web.php b/routes/web.php index 3d9221d2a7..04cacdad0c 100755 --- a/routes/web.php +++ b/routes/web.php @@ -456,6 +456,7 @@ Route::group( Route::get('default/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@defaultReport', 'as' => 'report.default']); Route::get('audit/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@auditReport', 'as' => 'report.audit']); Route::get('category/{accountList}/{categoryList}/{start_date}/{end_date}', ['uses' => 'ReportController@categoryReport', 'as' => 'report.category']); + Route::get('budget/{accountList}/{budgetList}/{start_date}/{end_date}', ['uses' => 'ReportController@budgetReport', 'as' => 'report.budget']); Route::post('', ['uses' => 'ReportController@postIndex', 'as' => 'index.post']); } From 0393fcd7049c5ec674dcdf82c66a0597624deeed Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 8 Dec 2016 21:51:30 +0100 Subject: [PATCH 002/223] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 133343784a..c8029e58b8 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -679,6 +679,7 @@ return [ 'report_type_default' => 'Standard financieel rapport', 'report_type_audit' => 'Transactiehistorie-overzicht (audit)', 'report_type_category' => 'Categorierapport', + 'report_type_budget' => 'Budget report', 'report_type_meta-history' => 'Overzicht van categorieën, budgetten en contracten', 'more_info_help' => 'Meer informatie over deze rapporten vind je in de hulppagina\'s. Klik daarvoor op het (?) icoontje rechtsboven.', 'report_included_accounts' => 'Accounts in rapport', @@ -698,6 +699,7 @@ return [ 'reports_submit' => 'Bekijk overzicht', 'end_after_start_date' => 'Einddatum moet na begindatum liggen.', 'select_category' => 'Selecteer minstens één categorie.', + 'select_budget' => 'Select one or more budgets.', 'income_per_category' => 'Inkomen per categorie', 'expense_per_category' => 'Uitgaven per categorie', 'income_per_account' => 'Inkomen per rekening', From 9d084e62f7d4d9ae5a52fe6a52a7c852e2e1843b Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 8 Dec 2016 21:51:53 +0100 Subject: [PATCH 003/223] New translations --- resources/lang/pt_BR/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 5368d3515d..48e430e551 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -679,6 +679,7 @@ return [ 'report_type_default' => 'Relatório financeiro padrão', 'report_type_audit' => 'Visão geral do histórico de transação (auditoria)', 'report_type_category' => 'Relatório por Categorias', + 'report_type_budget' => 'Budget report', 'report_type_meta-history' => 'Visão geral de categorias, orçamentos e faturas', 'more_info_help' => 'Mais informações sobre esses tipos de relatórios podem ser encontradas nas páginas de ajuda. Pressione o ícone (?) no canto superior direito.', 'report_included_accounts' => 'Contas incluídas', @@ -698,6 +699,7 @@ return [ 'reports_submit' => 'Visualizar relatório', 'end_after_start_date' => 'Data de término do relatório deve ser depois da data de início.', 'select_category' => 'Selecione uma ou mais categorias.', + 'select_budget' => 'Select one or more budgets.', 'income_per_category' => 'Receitas por categoria', 'expense_per_category' => 'Despesa por categoria', 'income_per_account' => 'Rendimento por conta', From a4d14f8259be4e1f3c28c83061a5e1094e8a058d Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 8 Dec 2016 21:52:01 +0100 Subject: [PATCH 004/223] New translations --- resources/lang/zh_HK/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 377f4c2ca3..fffc960684 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -679,6 +679,7 @@ return [ 'report_type_default' => 'Default financial report', 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', + 'report_type_budget' => 'Budget report', 'report_type_meta-history' => 'Categories, budgets and bills overview', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -698,6 +699,7 @@ return [ 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', 'select_category' => 'Select one or more categories.', + 'select_budget' => 'Select one or more budgets.', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'income_per_account' => 'Income per account', From 18a845ac5530a0d96e6af2705f4db3263ae545f2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 8 Dec 2016 21:52:06 +0100 Subject: [PATCH 005/223] New translations --- resources/lang/zh_TW/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 9ed680fc3c..19d705877a 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -679,6 +679,7 @@ return [ 'report_type_default' => 'Default financial report', 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', + 'report_type_budget' => 'Budget report', 'report_type_meta-history' => '類別、 預算與賬單的概覽', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -698,6 +699,7 @@ return [ 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', 'select_category' => 'Select one or more categories.', + 'select_budget' => 'Select one or more budgets.', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'income_per_account' => 'Income per account', From cabe2579fa2073abaf5bad5a0728fdbbe8552db1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 8 Dec 2016 21:52:16 +0100 Subject: [PATCH 006/223] New translations --- resources/lang/fr_FR/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index cc80087ff2..25d84256b1 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -679,6 +679,7 @@ return [ 'report_type_default' => 'Rapport financier par défaut', 'report_type_audit' => 'Historique des transactions', 'report_type_category' => 'Category report', + 'report_type_budget' => 'Budget report', 'report_type_meta-history' => 'Vue d’ensemble des budgets, des catégories et des factures', 'more_info_help' => 'Plus d’informations sur ces types de rapports se trouvent dans les pages d’aide. Appuyez sur l’icône ( ?) dans le coin supérieur droit.', 'report_included_accounts' => 'Comptes inclus', @@ -698,6 +699,7 @@ return [ 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', 'select_category' => 'Select one or more categories.', + 'select_budget' => 'Select one or more budgets.', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'income_per_account' => 'Income per account', From b2da38d40177c5f744cc2674151fbad1f45870d2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 8 Dec 2016 21:52:22 +0100 Subject: [PATCH 007/223] New translations --- resources/lang/de_DE/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 996258c4fe..a18cd68ea6 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -679,6 +679,7 @@ return [ 'report_type_default' => 'Default financial report', 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', + 'report_type_budget' => 'Budget report', 'report_type_meta-history' => 'Übersicht über Kategorien, Budgets und Rechnungen', 'more_info_help' => 'Weitere Informationen über diese Art von Berichten finden Sie in der Hilfe. Drücken Sie hierfür das (?)-Symbol in der oberen rechten Ecke.', 'report_included_accounts' => 'Eingezogene Konten', @@ -698,6 +699,7 @@ return [ 'reports_submit' => 'Zeige Bericht', 'end_after_start_date' => 'End date of report must be after start date.', 'select_category' => 'Select one or more categories.', + 'select_budget' => 'Select one or more budgets.', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'income_per_account' => 'Income per account', From b0e120abee2c539f0480ea1f5d461a10ffe49a4d Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 8 Dec 2016 21:52:28 +0100 Subject: [PATCH 008/223] New translations --- resources/lang/hr_HR/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 377f4c2ca3..fffc960684 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -679,6 +679,7 @@ return [ 'report_type_default' => 'Default financial report', 'report_type_audit' => 'Transaction history overview (audit)', 'report_type_category' => 'Category report', + 'report_type_budget' => 'Budget report', 'report_type_meta-history' => 'Categories, budgets and bills overview', 'more_info_help' => 'More information about these types of reports can be found in the help pages. Press the (?) icon in the top right corner.', 'report_included_accounts' => 'Included accounts', @@ -698,6 +699,7 @@ return [ 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', 'select_category' => 'Select one or more categories.', + 'select_budget' => 'Select one or more budgets.', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', 'income_per_account' => 'Income per account', From c73866f47c15984f055e4585ee14e70a133c472b Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Dec 2016 06:28:51 +0100 Subject: [PATCH 009/223] Fixed date [skip ci] --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4db7ca588f..e688d23b82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [4.2.1] - 2015-05-25 +## [4.2.1] - 2016-12-09 ### Added - BIC support (see #430) - New category report section and chart (see the general financial report) From 1fd028dfb8b50b6bfa05091349b9e57941cfb24e Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Dec 2016 07:07:53 +0100 Subject: [PATCH 010/223] First code for #426 --- .../Report/Audit/MonthReportGenerator.php | 2 +- .../Report/Budget/MonthReportGenerator.php | 329 ++++++++++++++++++ .../Budget/MultiYearReportGenerator.php | 27 ++ .../Report/Budget/YearReportGenerator.php | 28 ++ app/Http/Controllers/ReportController.php | 2 +- resources/views/reports/budget/month.twig | 262 ++++++++++++++ 6 files changed, 648 insertions(+), 2 deletions(-) create mode 100644 app/Generator/Report/Budget/MonthReportGenerator.php create mode 100644 app/Generator/Report/Budget/MultiYearReportGenerator.php create mode 100644 app/Generator/Report/Budget/YearReportGenerator.php create mode 100644 resources/views/reports/budget/month.twig diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index f5ab29a5bb..cc31219d9e 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -25,7 +25,7 @@ use Steam; /** * Class MonthReportGenerator * - * @package FireflyIII\Generator\Report\Standard + * @package FireflyIII\Generator\Report\Audit */ class MonthReportGenerator implements ReportGeneratorInterface { diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php new file mode 100644 index 0000000000..10b5c39afe --- /dev/null +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -0,0 +1,329 @@ +income = new Collection; + $this->expenses = new Collection; + } + + /** + * @return string + */ + public function generate(): string + { + $accountIds = join(',', $this->accounts->pluck('id')->toArray()); + $categoryIds = join(',', $this->budgets->pluck('id')->toArray()); + $reportType = 'budget'; + // $expenses = $this->getExpenses(); + // $income = $this->getIncome(); + // $accountSummary = $this->getObjectSummary($this->summarizeByAccount($expenses), $this->summarizeByAccount($income)); + // $categorySummary = $this->getObjectSummary($this->summarizeByCategory($expenses), $this->summarizeByCategory($income)); + // $averageExpenses = $this->getAverages($expenses, SORT_ASC); + // $averageIncome = $this->getAverages($income, SORT_DESC); + // $topExpenses = $this->getTopExpenses(); + // $topIncome = $this->getTopIncome(); + + + // render! + return view( + 'reports.budget.month', + compact( + 'accountIds', 'categoryIds', 'topIncome', 'reportType', 'accountSummary', 'categorySummary', 'averageExpenses', 'averageIncome', 'topExpenses' + ) + ) + ->with('start', $this->start)->with('end', $this->end) + ->with('budgets', $this->budgets) + ->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 + { + $this->budgets = $budgets; + + return $this; + } + + /** + * @param Collection $categories + * + * @return ReportGeneratorInterface + */ + public function setCategories(Collection $categories): ReportGeneratorInterface + { + $this->categories = $categories; + + 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 $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 + { + if ($this->expenses->count() > 0) { + Log::debug('Return previous set of expenses.'); + + return $this->expenses; + } + + $collector = new JournalCollector(auth()->user()); + $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) + ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) + ->setCategories($this->categories)->withOpposingAccount()->disableFilter(); + + $accountIds = $this->accounts->pluck('id')->toArray(); + $transactions = $collector->getJournals(); + $transactions = self::filterExpenses($transactions, $accountIds); + $this->expenses = $transactions; + + return $transactions; + } + + /** + * @return Collection + */ + private function getIncome(): Collection + { + if ($this->income->count() > 0) { + return $this->income; + } + + $collector = new JournalCollector(auth()->user()); + $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) + ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) + ->setCategories($this->categories)->withOpposingAccount(); + $accountIds = $this->accounts->pluck('id')->toArray(); + $transactions = $collector->getJournals(); + $transactions = self::filterIncome($transactions, $accountIds); + $this->income = $transactions; + + return $transactions; + } + + /** + * @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 + * + * @return array + */ + private function summarizeByCategory(Collection $collection): array + { + $result = []; + /** @var Transaction $transaction */ + foreach ($collection 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]); + } + + return $result; + } +} \ No newline at end of file diff --git a/app/Generator/Report/Budget/MultiYearReportGenerator.php b/app/Generator/Report/Budget/MultiYearReportGenerator.php new file mode 100644 index 0000000000..3d92def9f3 --- /dev/null +++ b/app/Generator/Report/Budget/MultiYearReportGenerator.php @@ -0,0 +1,27 @@ + +
+
+
+

{{ 'accounts'|_ }}

+
+
+ + + + + + + + + + {% for account in accounts %} + + + {% if accountSummary[account.id] %} + + {% else %} + + {% endif %} + {% if accountSummary[account.id] %} + + {% else %} + + {% endif %} + + {% endfor %} + +
{{ 'name'|_ }}{{ 'earned'|_ }}{{ 'spent'|_ }}
+ {{ account.name }} + {{ accountSummary[account.id].earned|formatAmount }}{{ 0|formatAmount }}{{ accountSummary[account.id].spent|formatAmount }}{{ 0|formatAmount }}
+
+
+ +
+
+

{{ 'budgets'|_ }}

+
+
+ + + + + + + + + {% for budget in budgets %} + + + {% if budgetSummary[budget.id] %} + + {% else %} + + {% endif %} + {% if budgetSummary[budget.id] %} + + {% else %} + + {% endif %} + + {% endfor %} + +
{{ 'name'|_ }}{{ 'spent'|_ }}
+ {{ budget.name }} + {{ budgetSummary[budget.id].earned|formatAmount }}{{ 0|formatAmount }}{{ budgetSummary[budget.id].spent|formatAmount }}{{ 0|formatAmount }}
+
+
+
+ {% if budgets.count > 1 %} +
+
+
+

{{ 'expense_per_budget'|_ }}

+
+
+ + +
+
+
+ {% endif %} + {% if accounts.count > 1 %} +
+
+
+

{{ 'expense_per_budget'|_ }}

+
+
+ + +
+
+
+ {% endif %} + + +
+
+
+
+

{{ 'income_and_expenses'|_ }}

+
+
+ +
+
+
+
+
+ {% if averageExpenses|length > 0 %} +
+
+
+

{{ 'average_spending_per_account'|_ }}

+
+
+ + + + + + + + + + + {% for row in averageExpenses %} + + + + + + + {% endfor %} + +
{{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
+ {{ row.name }} + + {{ row.average|formatAmount }} + + {{ row.sum|formatAmount }} + + {{ row.count }} +
+
+
+
+ {% endif %} + {% if topExpenses.count > 0 %} +
+ +
+
+

{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})

+
+
+ + + + + + + + + + + {% for row in topExpenses %} + {% if loop.index > listLength %} + + {% else %} + + {% endif %} + + + + + + {% endfor %} + + + {% if topExpenses.count > listLength %} + + + + {% endif %} + +
{{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'amount'|_ }}
+ + {% if row.transaction_description|length > 0 %} + {{ row.transaction_description }} ({{ row.description }}) + {% else %} + {{ row.description }} + {% endif %} + + + {{ row.date.formatLocalized(monthAndDayFormat) }} + + + {{ row.opposing_account_name }} + + + {{ row.transaction_amount|formatAmount }} +
+ {{ trans('firefly.show_full_list',{number:incomeTopLength}) }} +
+
+
+
+ {% endif %} +
+ +{% endblock %} + +{% block scripts %} + + + + + + + + + + + +{% endblock %} + +{% block styles %} + +{% endblock %} \ No newline at end of file From 97e6afe3dcd2b43b9d0fe8ec12916b6c6b907625 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Dec 2016 07:08:09 +0100 Subject: [PATCH 011/223] New text to be translated. --- resources/lang/en_US/firefly.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 7372a2876a..0ff5b24d81 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -525,6 +525,7 @@ return [ 'no_data_for_chart' => 'There is not enough information (yet) to generate this chart.', 'select_more_than_one_account' => 'Please select more than one account', 'select_more_than_one_category' => 'Please select more than one category', + 'select_more_than_one_budget' => 'Please select more than one budget', // categories: 'new_category' => 'New category', @@ -633,6 +634,7 @@ return [ 'report_default' => 'Default financial report for :start until :end', 'report_audit' => 'Transaction history overview for :start until :end', 'report_category' => 'Category report for :start until :end', + 'report_budget' => 'Budget report for :start until :end', 'quick_link_reports' => 'Quick links', 'quick_link_default_report' => 'Default financial report', 'quick_link_audit_report' => 'Transaction history overview', @@ -702,9 +704,11 @@ return [ 'select_budget' => 'Select one or more budgets.', 'income_per_category' => 'Income per category', 'expense_per_category' => 'Expense per category', + 'expense_per_budget' => 'Expense per budget', 'income_per_account' => 'Income per account', 'expense_per_account' => 'Expense per account', - 'include_not_in_category' => 'Include transactions not selected for this report', + 'include_not_in_category' => 'Include categories not selected for this report', + 'include_not_in_budget' => 'Include budgets not selected for this report', 'everything_else' => 'Everything else', 'income_and_expenses' => 'Income and expenses', 'spent_average' => 'Spent (average)', @@ -827,6 +831,7 @@ return [ 'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).', 'store_configuration' => 'Store configuration', 'single_user_administration' => 'User administration for :email', + 'edit_user' => 'Edit user :email', 'hidden_fields_preferences' => 'Not all fields are visible right now. You must enable them in your settings.', 'user_data_information' => 'User data', 'user_information' => 'User information', From 052957bbd0fb699a98ccf05091bf0e93cf510aed Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Dec 2016 07:08:20 +0100 Subject: [PATCH 012/223] New view for edit user --- app/Http/Controllers/Admin/UserController.php | 30 +++++++++++++++---- resources/views/admin/users/edit.twig | 14 +++++++++ 2 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 resources/views/admin/users/edit.twig diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index ac1f2866f0..cd41a758ba 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -19,6 +19,7 @@ use FireflyIII\Http\Controllers\Controller; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; use Preferences; +use View; /** * Class UserController @@ -27,28 +28,45 @@ use Preferences; */ class UserController extends Controller { + /** + * + */ + public function __construct() + { + parent::__construct(); + $this->middleware( + function ($request, $next) { + View::share('title', strval(trans('firefly.administration'))); + View::share('mainTitleIcon', 'fa-hand-spock-o'); + + return $next($request); + } + ); + } + /** * @param User $user * - * @return int + * @return View */ public function edit(User $user) { - return $user->id; + $subTitle = strval(trans('firefly.edit_user', ['email' => $user->email])); + $subTitleIcon = 'fa-user-o'; + + return view('admin.users.edit', compact('user', 'subTitle', 'subTitleIcon')); } /** * @param UserRepositoryInterface $repository * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + * @return View */ public function index(UserRepositoryInterface $repository) { - $title = strval(trans('firefly.administration')); - $mainTitleIcon = 'fa-hand-spock-o'; $subTitle = strval(trans('firefly.user_administration')); $subTitleIcon = 'fa-users'; $mustConfirmAccount = FireflyConfig::get('must_confirm_account', config('firefly.configuration.must_confirm_account'))->data; @@ -77,7 +95,7 @@ class UserController extends Controller ); - return view('admin.users.index', compact('title', 'mainTitleIcon', 'subTitle', 'subTitleIcon', 'users')); + return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users')); } diff --git a/resources/views/admin/users/edit.twig b/resources/views/admin/users/edit.twig new file mode 100644 index 0000000000..00536742a0 --- /dev/null +++ b/resources/views/admin/users/edit.twig @@ -0,0 +1,14 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, user) }} +{% endblock %} +{% block content %} +
+
+

+ This page is empty. +

+
+
+{% endblock %} From ac92939429e296582fe8a030148cb93c96ef471e Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Dec 2016 07:08:31 +0100 Subject: [PATCH 013/223] Test to see if bread crumb present. --- .../acceptance/Controllers/AccountControllerTest.php | 12 ++++++++++++ .../Admin/ConfigurationControllerTest.php | 3 +++ .../Controllers/Admin/DomainControllerTest.php | 2 ++ .../Controllers/Admin/HomeControllerTest.php | 2 ++ .../Controllers/Admin/UserControllerTest.php | 6 ++++++ 5 files changed, 25 insertions(+) diff --git a/tests/acceptance/Controllers/AccountControllerTest.php b/tests/acceptance/Controllers/AccountControllerTest.php index adf72e3645..f2ec4ffa53 100644 --- a/tests/acceptance/Controllers/AccountControllerTest.php +++ b/tests/acceptance/Controllers/AccountControllerTest.php @@ -34,6 +34,8 @@ class AccountControllerTest extends TestCase $this->be($this->user()); $this->call('GET', route('accounts.create', ['asset'])); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
    '); } /** @@ -44,6 +46,8 @@ class AccountControllerTest extends TestCase $this->be($this->user()); $this->call('GET', route('accounts.delete', [1])); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
      '); } /** @@ -65,6 +69,8 @@ class AccountControllerTest extends TestCase $this->be($this->user()); $this->call('GET', route('accounts.edit', [1])); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
        '); } /** @@ -79,6 +85,8 @@ class AccountControllerTest extends TestCase $this->changeDateRange($this->user(), $range); $this->call('GET', route('accounts.index', ['asset'])); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
          '); } /** @@ -98,6 +106,8 @@ class AccountControllerTest extends TestCase $this->changeDateRange($this->user(), $range); $this->call('GET', route('accounts.show', [1])); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
            '); } /** @@ -112,6 +122,8 @@ class AccountControllerTest extends TestCase $this->changeDateRange($this->user(), $range); $this->call('GET', route('accounts.show.date', [1, '2016-01-01'])); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
              '); } /** diff --git a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php index 85abca1373..0dae2ce618 100644 --- a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php +++ b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php @@ -53,6 +53,9 @@ class ConfigurationControllerTest extends TestCase $this->call('GET', route('admin.configuration.index')); $this->assertResponseStatus(200); + + // has bread crumb + $this->see('
                '); } /** diff --git a/tests/acceptance/Controllers/Admin/DomainControllerTest.php b/tests/acceptance/Controllers/Admin/DomainControllerTest.php index 80e36fb4ad..8617ca3815 100644 --- a/tests/acceptance/Controllers/Admin/DomainControllerTest.php +++ b/tests/acceptance/Controllers/Admin/DomainControllerTest.php @@ -40,6 +40,8 @@ class DomainControllerTest extends TestCase $this->call('GET', route('admin.users.domains')); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                  '); } /** diff --git a/tests/acceptance/Controllers/Admin/HomeControllerTest.php b/tests/acceptance/Controllers/Admin/HomeControllerTest.php index 260417cdb2..999e7e6554 100644 --- a/tests/acceptance/Controllers/Admin/HomeControllerTest.php +++ b/tests/acceptance/Controllers/Admin/HomeControllerTest.php @@ -38,6 +38,8 @@ class HomeControllerTest extends TestCase $this->be($this->user()); $this->call('GET', route('admin.index')); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                    '); } /** diff --git a/tests/acceptance/Controllers/Admin/UserControllerTest.php b/tests/acceptance/Controllers/Admin/UserControllerTest.php index 0058c92a0d..68e06fd69a 100644 --- a/tests/acceptance/Controllers/Admin/UserControllerTest.php +++ b/tests/acceptance/Controllers/Admin/UserControllerTest.php @@ -38,6 +38,8 @@ class UserControllerTest extends TestCase $this->be($this->user()); $this->call('GET', route('admin.users.edit', [1])); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                      '); } /** @@ -49,6 +51,8 @@ class UserControllerTest extends TestCase $this->be($this->user()); $this->call('GET', route('admin.users')); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                        '); } /** @@ -60,6 +64,8 @@ class UserControllerTest extends TestCase $this->be($this->user()); $this->call('GET', route('admin.users.edit', [1])); $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                          '); } /** From 72c6bfee7e0b5267458bb0270bc6e1fa6a4b399d Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Dec 2016 07:08:43 +0100 Subject: [PATCH 014/223] New bread crumb for user edit --- app/Http/breadcrumbs.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index abf249d27a..0b90f476f8 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -134,6 +134,12 @@ Breadcrumbs::register( $breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('admin.users.show', [$user->id])); } ); +Breadcrumbs::register( + 'admin.users.edit', function (BreadCrumbGenerator $breadcrumbs, User $user) { + $breadcrumbs->parent('admin.users'); + $breadcrumbs->push(trans('firefly.edit_user', ['email' => $user->email]), route('admin.users.edit', [$user->id])); +} +); Breadcrumbs::register( 'admin.users.domains', function (BreadCrumbGenerator $breadcrumbs) { From 653692ade0921a02e3d5870b5064ad37612aed03 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Dec 2016 07:20:48 +0100 Subject: [PATCH 015/223] Try to test for confirmation errors. --- app/Http/Middleware/IsNotConfirmed.php | 5 ++++ config/filesystems.php | 8 ++++--- database/seeds/TestDataSeeder.php | 2 +- .../seeds}/seed.bill-test.json | 0 .../seeds}/seed.import-test.json | 0 .../seeds}/seed.local.json | 0 .../seeds}/seed.split.json | 0 .../seeds}/seed.testing.json | 0 .../Auth/ConfirmationControllerTest.php | 24 +++++++++++++++---- 9 files changed, 31 insertions(+), 8 deletions(-) rename {storage/database => resources/seeds}/seed.bill-test.json (100%) rename {storage/database => resources/seeds}/seed.import-test.json (100%) rename {storage/database => resources/seeds}/seed.local.json (100%) rename {storage/database => resources/seeds}/seed.split.json (100%) rename {storage/database => resources/seeds}/seed.testing.json (100%) diff --git a/app/Http/Middleware/IsNotConfirmed.php b/app/Http/Middleware/IsNotConfirmed.php index 237f28c17a..0037c00e7a 100644 --- a/app/Http/Middleware/IsNotConfirmed.php +++ b/app/Http/Middleware/IsNotConfirmed.php @@ -17,6 +17,7 @@ use Closure; use FireflyConfig; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Log; use Preferences; /** @@ -47,9 +48,13 @@ class IsNotConfirmed } // must the user be confirmed in the first place? $mustConfirmAccount = FireflyConfig::get('must_confirm_account', config('firefly.configuration.must_confirm_account'))->data; + Log::debug(sprintf('mustConfirmAccount is %s', $mustConfirmAccount)); // user must be logged in, then continue: $isConfirmed = Preferences::get('user_confirmed', false)->data; + Log::debug(sprintf('isConfirmed is %s', $isConfirmed)); if ($isConfirmed || $mustConfirmAccount === false) { + Log::debug('User is confirmed or user does not have to confirm account. Redirect home.'); + // user account is confirmed, simply send them home. return redirect(route('home')); } diff --git a/config/filesystems.php b/config/filesystems.php index bd0b9738ac..cac819789e 100755 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -52,7 +52,7 @@ return [ 'disks' => [ - 'local' => [ + 'local' => [ 'driver' => 'local', 'root' => storage_path('app'), ], @@ -69,8 +69,10 @@ return [ 'driver' => 'local', 'root' => storage_path('database'), ], - - + 'seeds' => [ + 'driver' => 'local', + 'root' => base_path('resources/seeds'), + ], 'public' => [ 'driver' => 'local', 'root' => storage_path('app/public'), diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php index 334b4725dd..a5e814da50 100644 --- a/database/seeds/TestDataSeeder.php +++ b/database/seeds/TestDataSeeder.php @@ -33,7 +33,7 @@ class TestDataSeeder extends Seeder */ public function run() { - $disk = Storage::disk('database'); + $disk = Storage::disk('seeds'); $env = App::environment(); Log::debug('Environment is ' . $env); $fileName = 'seed.' . $env . '.json'; diff --git a/storage/database/seed.bill-test.json b/resources/seeds/seed.bill-test.json similarity index 100% rename from storage/database/seed.bill-test.json rename to resources/seeds/seed.bill-test.json diff --git a/storage/database/seed.import-test.json b/resources/seeds/seed.import-test.json similarity index 100% rename from storage/database/seed.import-test.json rename to resources/seeds/seed.import-test.json diff --git a/storage/database/seed.local.json b/resources/seeds/seed.local.json similarity index 100% rename from storage/database/seed.local.json rename to resources/seeds/seed.local.json diff --git a/storage/database/seed.split.json b/resources/seeds/seed.split.json similarity index 100% rename from storage/database/seed.split.json rename to resources/seeds/seed.split.json diff --git a/storage/database/seed.testing.json b/resources/seeds/seed.testing.json similarity index 100% rename from storage/database/seed.testing.json rename to resources/seeds/seed.testing.json diff --git a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php index 5039c4cd59..d93dc7a78b 100644 --- a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php +++ b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php @@ -11,6 +11,10 @@ namespace Auth; +use FireflyIII\Models\Configuration; +use FireflyIII\Models\Preference; +use FireflyIII\Support\Facades\FireflyConfig; +use FireflyIII\Support\Facades\Preferences; use TestCase; /** @@ -35,10 +39,22 @@ class ConfirmationControllerTest extends TestCase */ public function testConfirmationError() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + // need a user that is not activated. And site must require activated users. + $user = $this->user(); + $trueConfig = new Configuration; + $trueConfig->data = true; + + $falsePreference = new Preference; + $falsePreference->data = true; + + Preferences::shouldReceive('get')->withArgs(['user_confirmed',false])->andReturn($falsePreference); + + FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->once()->andReturn($trueConfig); + + $this->call('GET', route('confirmation_error')); + $this->assertResponseStatus(200); + $this->see('has been sent to the address you used during your registration'); + } /** From 108e775a15fde82d926098d0a1b3acf7fa0ed067 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Dec 2016 07:40:00 +0100 Subject: [PATCH 016/223] New routes --- app/Http/Controllers/HomeController.php | 48 +++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c41e03e366..550416f02a 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -166,9 +166,51 @@ class HomeController extends Controller public function routes() { // these routes are not relevant for the help pages: - $ignore = ['login', 'registe', 'logout', 'two-fac', 'lost-two', 'confirm', 'resend', 'do_confirm', 'testFla', 'json.', 'piggy-banks.add', - 'piggy-banks.remove', 'preferences.', 'rules.rule.up', 'rules.rule.down', 'rules.rule-group.up', 'rules.rule-group.down', 'popup.report', - 'admin.users.domains.block-', 'import.json', 'help.', + $ignore = [ + // login and two-factor routes: + 'login', + 'registe', + 'password.rese', + 'logout', + 'two-fac', + 'lost-two', + 'confirm', + 'resend', + 'do_confirm', + // test troutes + 'test-flash', + 'all-routes', + // json routes + 'json.', + // routes that point to modals or that redirect immediately. + 'piggy-banks.add', + 'piggy-banks.remove', + 'rules.rule.up', + 'attachments.download', + 'bills.rescan', + 'rules.rule.down', + 'rules.rule-group.up', + 'rules.rule-group.down', + 'popup.', + 'error', + 'flush', + //'preferences.', + 'admin.users.domains.block-', + 'help.', + // ajax routes: + 'import.json', + // charts: + 'chart.', + // report data: + 'report-data.', + + // others: + 'debugbar', + 'attachments.preview', + 'budgets.income', + 'currencies.default' + + ]; $routes = Route::getRoutes(); $return = '
                          ';

From 939b18b86ca093ab1b5a9502e7d0702d8b3e5328 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 07:41:31 +0100
Subject: [PATCH 017/223] New translations

---
 resources/lang/pt_BR/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 48e430e551..bd3e669bbd 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -525,6 +525,7 @@ return [
     'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
     'select_more_than_one_account'               => 'Por favor, selecione mais de uma conta',
     'select_more_than_one_category'              => 'Por favor, selecione mais de uma categoria',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
 
     // categories:
     'new_category'                               => 'Nova categoria',
@@ -633,6 +634,7 @@ return [
     'report_default'                             => 'Relatório financeiro padrão de :start até :end',
     'report_audit'                               => 'Visão geral do histórico de transação de :start até :end',
     'report_category'                            => 'Category report for :start until :end',
+    'report_budget'                              => 'Budget report for :start until :end',
     'quick_link_reports'                         => 'Ligações rápidas',
     'quick_link_default_report'                  => 'Relatório financeiro padrão',
     'quick_link_audit_report'                    => 'Visão geral do histórico de transação',
@@ -702,9 +704,11 @@ return [
     'select_budget'                              => 'Select one or more budgets.',
     'income_per_category'                        => 'Receitas por categoria',
     'expense_per_category'                       => 'Despesa por categoria',
+    'expense_per_budget'                         => 'Expense per budget',
     'income_per_account'                         => 'Rendimento por conta',
     'expense_per_account'                        => 'Por conta de despesas',
-    'include_not_in_category'                    => 'Incluir transações não selecionadas para este relatório',
+    'include_not_in_category'                    => 'Include categories not selected for this report',
+    'include_not_in_budget'                      => 'Include budgets not selected for this report',
     'everything_else'                            => 'Todo o resto',
     'income_and_expenses'                        => 'Receitas e despesas',
     'spent_average'                              => 'Gastos (média)',
@@ -827,6 +831,7 @@ return [
     'setting_single_user_mode_explain'     => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
     'store_configuration'                  => 'Configuração da Loja',
     'single_user_administration'           => 'User administration for :email',
+    'edit_user'                            => 'Edit user :email',
     'hidden_fields_preferences'            => 'Not all fields are visible right now. You must enable them in your settings.',
     'user_data_information'                => 'Dados de usuário',
     'user_information'                     => 'Informações do usuário',

From 9af89a19db8ee548dd170a0f31911256ec95f2dd Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 07:41:40 +0100
Subject: [PATCH 018/223] New translations

---
 resources/lang/zh_HK/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index fffc960684..33e11aaadd 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -525,6 +525,7 @@ return [
     'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
 
     // categories:
     'new_category'                               => 'New category',
@@ -633,6 +634,7 @@ return [
     'report_default'                             => 'Default financial report for :start until :end',
     'report_audit'                               => 'Transaction history overview for :start until :end',
     'report_category'                            => 'Category report for :start until :end',
+    'report_budget'                              => 'Budget report for :start until :end',
     'quick_link_reports'                         => 'Quick links',
     'quick_link_default_report'                  => 'Default financial report',
     'quick_link_audit_report'                    => 'Transaction history overview',
@@ -702,9 +704,11 @@ return [
     'select_budget'                              => 'Select one or more budgets.',
     'income_per_category'                        => 'Income per category',
     'expense_per_category'                       => 'Expense per category',
+    'expense_per_budget'                         => 'Expense per budget',
     'income_per_account'                         => 'Income per account',
     'expense_per_account'                        => 'Expense per account',
-    'include_not_in_category'                    => 'Include transactions not selected for this report',
+    'include_not_in_category'                    => 'Include categories not selected for this report',
+    'include_not_in_budget'                      => 'Include budgets not selected for this report',
     'everything_else'                            => 'Everything else',
     'income_and_expenses'                        => 'Income and expenses',
     'spent_average'                              => 'Spent (average)',
@@ -827,6 +831,7 @@ return [
     'setting_single_user_mode_explain'     => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
     'store_configuration'                  => 'Store configuration',
     'single_user_administration'           => 'User administration for :email',
+    'edit_user'                            => 'Edit user :email',
     'hidden_fields_preferences'            => 'Not all fields are visible right now. You must enable them in your settings.',
     'user_data_information'                => 'User data',
     'user_information'                     => 'User information',

From 8c518c8d583bdb7d3dfafae90e70b06e364025ac Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 07:41:44 +0100
Subject: [PATCH 019/223] New translations

---
 resources/lang/zh_TW/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 19d705877a..ec5d11c3d4 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -525,6 +525,7 @@ return [
     'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
 
     // categories:
     'new_category'                               => 'New category',
@@ -633,6 +634,7 @@ return [
     'report_default'                             => 'Default financial report for :start until :end',
     'report_audit'                               => 'Transaction history overview for :start until :end',
     'report_category'                            => 'Category report for :start until :end',
+    'report_budget'                              => 'Budget report for :start until :end',
     'quick_link_reports'                         => 'Quick links',
     'quick_link_default_report'                  => 'Default financial report',
     'quick_link_audit_report'                    => 'Transaction history overview',
@@ -702,9 +704,11 @@ return [
     'select_budget'                              => 'Select one or more budgets.',
     'income_per_category'                        => 'Income per category',
     'expense_per_category'                       => 'Expense per category',
+    'expense_per_budget'                         => 'Expense per budget',
     'income_per_account'                         => 'Income per account',
     'expense_per_account'                        => 'Expense per account',
-    'include_not_in_category'                    => 'Include transactions not selected for this report',
+    'include_not_in_category'                    => 'Include categories not selected for this report',
+    'include_not_in_budget'                      => 'Include budgets not selected for this report',
     'everything_else'                            => 'Everything else',
     'income_and_expenses'                        => 'Income and expenses',
     'spent_average'                              => 'Spent (average)',
@@ -827,6 +831,7 @@ return [
     'setting_single_user_mode_explain'     => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
     'store_configuration'                  => 'Store configuration',
     'single_user_administration'           => 'User administration for :email',
+    'edit_user'                            => 'Edit user :email',
     'hidden_fields_preferences'            => 'Not all fields are visible right now. You must enable them in your settings.',
     'user_data_information'                => 'User data',
     'user_information'                     => 'User information',

From 9aad3805184ab0bdc0c7746edcfe81bc89c3882b Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 07:41:51 +0100
Subject: [PATCH 020/223] New translations

---
 resources/lang/fr_FR/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 25d84256b1..a9756a12cb 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -525,6 +525,7 @@ return [
     'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
 
     // categories:
     'new_category'                               => 'Nouvelle catégorie',
@@ -633,6 +634,7 @@ return [
     'report_default'                             => 'Rapport financier par défaut du :start au :end',
     'report_audit'                               => 'Historique des transactions du :start au :end',
     'report_category'                            => 'Category report for :start until :end',
+    'report_budget'                              => 'Budget report for :start until :end',
     'quick_link_reports'                         => 'Liens rapides',
     'quick_link_default_report'                  => 'Rapport financier par défaut',
     'quick_link_audit_report'                    => 'Historique des transactions',
@@ -702,9 +704,11 @@ return [
     'select_budget'                              => 'Select one or more budgets.',
     'income_per_category'                        => 'Income per category',
     'expense_per_category'                       => 'Expense per category',
+    'expense_per_budget'                         => 'Expense per budget',
     'income_per_account'                         => 'Income per account',
     'expense_per_account'                        => 'Expense per account',
-    'include_not_in_category'                    => 'Include transactions not selected for this report',
+    'include_not_in_category'                    => 'Include categories not selected for this report',
+    'include_not_in_budget'                      => 'Include budgets not selected for this report',
     'everything_else'                            => 'Everything else',
     'income_and_expenses'                        => 'Income and expenses',
     'spent_average'                              => 'Spent (average)',
@@ -827,6 +831,7 @@ return [
     'setting_single_user_mode_explain'     => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
     'store_configuration'                  => 'Store configuration',
     'single_user_administration'           => 'User administration for :email',
+    'edit_user'                            => 'Edit user :email',
     'hidden_fields_preferences'            => 'Not all fields are visible right now. You must enable them in your settings.',
     'user_data_information'                => 'User data',
     'user_information'                     => 'User information',

From 693e1b08c7bb72fff2349fe2922b3f89d7c80c08 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 07:41:55 +0100
Subject: [PATCH 021/223] New translations

---
 resources/lang/de_DE/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index a18cd68ea6..d7a527bbaf 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -525,6 +525,7 @@ return [
     'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
 
     // categories:
     'new_category'                               => 'Neue Kategorie',
@@ -633,6 +634,7 @@ return [
     'report_default'                             => 'Standard Finanzbericht für :start bis :end',
     'report_audit'                               => 'Transaction history overview for :start until :end',
     'report_category'                            => 'Category report for :start until :end',
+    'report_budget'                              => 'Budget report for :start until :end',
     'quick_link_reports'                         => 'Schnellzugriff',
     'quick_link_default_report'                  => 'Standard Finanzbericht',
     'quick_link_audit_report'                    => 'Transaction history overview',
@@ -702,9 +704,11 @@ return [
     'select_budget'                              => 'Select one or more budgets.',
     'income_per_category'                        => 'Income per category',
     'expense_per_category'                       => 'Expense per category',
+    'expense_per_budget'                         => 'Expense per budget',
     'income_per_account'                         => 'Income per account',
     'expense_per_account'                        => 'Expense per account',
-    'include_not_in_category'                    => 'Include transactions not selected for this report',
+    'include_not_in_category'                    => 'Include categories not selected for this report',
+    'include_not_in_budget'                      => 'Include budgets not selected for this report',
     'everything_else'                            => 'Der Rest',
     'income_and_expenses'                        => 'Einkommen und Ausgaben',
     'spent_average'                              => 'Ausgaben (Durchschnitt)',
@@ -827,6 +831,7 @@ return [
     'setting_single_user_mode_explain'     => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
     'store_configuration'                  => 'Store configuration',
     'single_user_administration'           => 'User administration for :email',
+    'edit_user'                            => 'Edit user :email',
     'hidden_fields_preferences'            => 'Zur Zeit sind nicht alle Felder sichtbar. Sie müssen in den Einstellungen aktiviert werden.',
     'user_data_information'                => 'User data',
     'user_information'                     => 'User information',

From 19be8bb8914b6ba3d236c5811120a0d380377065 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 07:42:01 +0100
Subject: [PATCH 022/223] New translations

---
 resources/lang/hr_HR/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index fffc960684..33e11aaadd 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -525,6 +525,7 @@ return [
     'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
 
     // categories:
     'new_category'                               => 'New category',
@@ -633,6 +634,7 @@ return [
     'report_default'                             => 'Default financial report for :start until :end',
     'report_audit'                               => 'Transaction history overview for :start until :end',
     'report_category'                            => 'Category report for :start until :end',
+    'report_budget'                              => 'Budget report for :start until :end',
     'quick_link_reports'                         => 'Quick links',
     'quick_link_default_report'                  => 'Default financial report',
     'quick_link_audit_report'                    => 'Transaction history overview',
@@ -702,9 +704,11 @@ return [
     'select_budget'                              => 'Select one or more budgets.',
     'income_per_category'                        => 'Income per category',
     'expense_per_category'                       => 'Expense per category',
+    'expense_per_budget'                         => 'Expense per budget',
     'income_per_account'                         => 'Income per account',
     'expense_per_account'                        => 'Expense per account',
-    'include_not_in_category'                    => 'Include transactions not selected for this report',
+    'include_not_in_category'                    => 'Include categories not selected for this report',
+    'include_not_in_budget'                      => 'Include budgets not selected for this report',
     'everything_else'                            => 'Everything else',
     'income_and_expenses'                        => 'Income and expenses',
     'spent_average'                              => 'Spent (average)',
@@ -827,6 +831,7 @@ return [
     'setting_single_user_mode_explain'     => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
     'store_configuration'                  => 'Store configuration',
     'single_user_administration'           => 'User administration for :email',
+    'edit_user'                            => 'Edit user :email',
     'hidden_fields_preferences'            => 'Not all fields are visible right now. You must enable them in your settings.',
     'user_data_information'                => 'User data',
     'user_information'                     => 'User information',

From 4f752031f3b66cac90f0422d122b42274e7f2ab5 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 07:42:04 +0100
Subject: [PATCH 023/223] New translations

---
 resources/lang/nl_NL/firefly.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index c8029e58b8..c3d9b81a33 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -525,6 +525,7 @@ return [
     'no_data_for_chart'                          => 'Er is (nog) niet genoeg informatie om deze grafiek te tekenen.',
     'select_more_than_one_account'               => 'Selecteer meer dan één rekening',
     'select_more_than_one_category'              => 'Selecteer meer dan één categorie',
+    'select_more_than_one_budget'                => 'Please select more than one budget',
 
     // categories:
     'new_category'                               => 'Nieuwe categorie',
@@ -633,6 +634,7 @@ return [
     'report_default'                             => 'Standaard financieel rapport (:start tot :end)',
     'report_audit'                               => 'Transactiehistorie-overzicht van :start tot :end',
     'report_category'                            => 'Categorierapport van :start tot :end',
+    'report_budget'                              => 'Budget report for :start until :end',
     'quick_link_reports'                         => 'Snelle links',
     'quick_link_default_report'                  => 'Standaard financieel rapport',
     'quick_link_audit_report'                    => 'Transactiehistorie-overzicht',
@@ -702,9 +704,11 @@ return [
     'select_budget'                              => 'Select one or more budgets.',
     'income_per_category'                        => 'Inkomen per categorie',
     'expense_per_category'                       => 'Uitgaven per categorie',
+    'expense_per_budget'                         => 'Expense per budget',
     'income_per_account'                         => 'Inkomen per rekening',
     'expense_per_account'                        => 'Uitgaven per rekening',
-    'include_not_in_category'                    => 'Laat ook transacties buiten deze categorieën zien',
+    'include_not_in_category'                    => 'Include categories not selected for this report',
+    'include_not_in_budget'                      => 'Include budgets not selected for this report',
     'everything_else'                            => 'De rest',
     'income_and_expenses'                        => 'Inkomsten en uitgaven',
     'spent_average'                              => 'Uitgegeven (gemiddeld)',
@@ -827,6 +831,7 @@ return [
     'setting_single_user_mode_explain'     => 'Standaard accepteert Firefly III maar één (1) gebruiker: jijzelf. Dit is een veiligheidsmaatregel, zodat anderen niet zomaar jouw installatie kunnen gebruiken, tenzij je dit aanzet. Toekomstige registraties zijn nu geblokkeerd. Als je dit vinkje uitzet kunnen anderen jouw installatie ook gebruiken, gegeven dat ze er bij kunnen (je installatie hangt aan het internet).',
     'store_configuration'                  => 'Configuratie opslaan',
     'single_user_administration'           => 'Gebruikersadministratie voor :email',
+    'edit_user'                            => 'Edit user :email',
     'hidden_fields_preferences'            => 'Niet alle velden zijn zichtbaar. Zet ze aan in je instellingen.',
     'user_data_information'                => 'Gebruikersgegevens',
     'user_information'                     => 'Gebruikersinformatie',

From 9fcc5e7a678beb54b7d37a932fac0f84e510bebc Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 14:21:26 +0100
Subject: [PATCH 024/223] Fix decryption bug.

---
 app/Support/Twig/Transaction.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Support/Twig/Transaction.php b/app/Support/Twig/Transaction.php
index 8e1d1284f8..dbe41f19b7 100644
--- a/app/Support/Twig/Transaction.php
+++ b/app/Support/Twig/Transaction.php
@@ -266,8 +266,7 @@ class Transaction extends Twig_Extension
             // name is present in object, use that one:
             if (bccomp($transaction->transaction_amount, '0') === 1 && !is_null($transaction->opposing_account_id)) {
 
-                $name = intval($transaction->opposing_account_encrypted) === 1 ? Crypt::decrypt($transaction->opposing_account_name)
-                    : $transaction->opposing_account_name;
+                $name = $transaction->opposing_account_name;
                 $id   = intval($transaction->opposing_account_id);
                 $type = intval($transaction->opposing_account_type);
             }

From 122d988ed2a64f5648a7f93ba5faf0a4228256d3 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 14:42:14 +0100
Subject: [PATCH 025/223] Add some debug. [skip ci]

---
 app/Repositories/Tag/TagRepository.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 3740584f41..261980fed0 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -289,8 +289,8 @@ class TagRepository implements TagRepositoryInterface
      */
     private function matchAll(TransactionJournal $journal, Tag $tag): bool
     {
-        $journalSources      = join(',', TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray());
-        $journalDestinations = join(',', TransactionJournal::destinationAccountList($journal)->pluck('id')->toArray());
+        $journalSources      = join(',', array_unique(TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray()));
+        $journalDestinations = join(',', array_unique(TransactionJournal::destinationAccountList($journal)->pluck('id')->toArray()));
         $match               = true;
         $journals            = $tag->transactionJournals()->get(['transaction_journals.*']);
 
@@ -298,10 +298,11 @@ class TagRepository implements TagRepositoryInterface
 
         /** @var TransactionJournal $original */
         foreach ($journals as $original) {
+            Log::debug(sprintf('Now comparing new journal #%d to existing journal #%d', $journal->id, $original->id));
             // $checkAccount is the source_account for a withdrawal
             // $checkAccount is the destination_account for a deposit
-            $originalSources      = join(',', TransactionJournal::sourceAccountList($original)->pluck('id')->toArray());
-            $originalDestinations = join(',', TransactionJournal::destinationAccountList($original)->pluck('id')->toArray());
+            $originalSources      = join(',', array_unique(TransactionJournal::sourceAccountList($original)->pluck('id')->toArray()));
+            $originalDestinations = join(',', array_unique(TransactionJournal::destinationAccountList($original)->pluck('id')->toArray()));
 
             if ($original->isWithdrawal() && $originalSources !== $journalDestinations) {
                 Log::debug(sprintf('Original journal #%d is a withdrawal.', $original->id));

From 35d105588b68afbc5b2cecd17ccd08f9f2f8e9ca Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 14:50:28 +0100
Subject: [PATCH 026/223] Fix tag assignment for multiple deposits [skip ci]

---
 app/Repositories/Tag/TagRepository.php | 45 +++++++++++++++++++-------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php
index 261980fed0..dd6e341328 100644
--- a/app/Repositories/Tag/TagRepository.php
+++ b/app/Repositories/Tag/TagRepository.php
@@ -296,26 +296,47 @@ class TagRepository implements TagRepositoryInterface
 
         Log::debug(sprintf('Tag #%d has %d journals to verify:', $tag->id, $journals->count()));
 
-        /** @var TransactionJournal $original */
-        foreach ($journals as $original) {
-            Log::debug(sprintf('Now comparing new journal #%d to existing journal #%d', $journal->id, $original->id));
+        /** @var TransactionJournal $existing */
+        foreach ($journals as $existing) {
+            Log::debug(sprintf('Now existingcomparing new journal #%d to existing journal #%d', $journal->id, $existing->id));
             // $checkAccount is the source_account for a withdrawal
             // $checkAccount is the destination_account for a deposit
-            $originalSources      = join(',', array_unique(TransactionJournal::sourceAccountList($original)->pluck('id')->toArray()));
-            $originalDestinations = join(',', array_unique(TransactionJournal::destinationAccountList($original)->pluck('id')->toArray()));
+            $existingSources      = join(',', array_unique(TransactionJournal::sourceAccountList($existing)->pluck('id')->toArray()));
+            $existingDestinations = join(',', array_unique(TransactionJournal::destinationAccountList($existing)->pluck('id')->toArray()));
 
-            if ($original->isWithdrawal() && $originalSources !== $journalDestinations) {
-                Log::debug(sprintf('Original journal #%d is a withdrawal.', $original->id));
-                Log::debug(sprintf('Journal #%d must have these destination accounts: %s', $journal->id, $originalSources));
+            if ($existing->isWithdrawal() && $existingSources !== $journalDestinations) {
+                /*
+                 * There can only be one withdrawal. And the source account(s) of the withdrawal
+                 * must be the same as the destination of the deposit. Because any transaction that arrives
+                 * here ($journal) must be a deposit.
+                 */
+                Log::debug(sprintf('Existing journal #%d is a withdrawal.', $existing->id));
+                Log::debug(sprintf('New journal #%d must have these destination accounts: %s', $journal->id, $existingSources));
+                Log::debug(sprintf('New journal #%d actually these destination accounts: %s', $journal->id, $journalDestinations));
+                Log::debug('So match is FALSE');
+
+                $match = false;
+            }
+            if ($existing->isDeposit() && $journal->isDeposit() && $existingDestinations !== $journalDestinations) {
+                /*
+                 * There can be multiple deposits.
+                 * They must have the destination the same as the other deposits.
+                 */
+                Log::debug(sprintf('Existing journal #%d is a deposit.', $existing->id));
+                Log::debug(sprintf('Journal #%d must have these destination accounts: %s', $journal->id, $existingDestinations));
                 Log::debug(sprintf('Journal #%d actually these destination accounts: %s', $journal->id, $journalDestinations));
                 Log::debug('So match is FALSE');
 
                 $match = false;
             }
-            if ($original->isDeposit() && $originalDestinations !== $journalSources) {
-                Log::debug(sprintf('Original journal #%d is a deposit.', $original->id));
-                Log::debug(sprintf('Journal #%d must have these destination accounts: %s', $journal->id, $originalSources));
-                Log::debug(sprintf('Journal #%d actually these destination accounts: %s', $journal->id, $journalDestinations));
+
+            if ($existing->isDeposit() && $journal->isWithdrawal() && $existingDestinations !== $journalSources) {
+                /*
+                 * There can be one new withdrawal only. It must have the same source as the existing has destination.
+                 */
+                Log::debug(sprintf('Existing journal #%d is a deposit.', $existing->id));
+                Log::debug(sprintf('Journal #%d must have these source accounts: %s', $journal->id, $existingDestinations));
+                Log::debug(sprintf('Journal #%d actually these source accounts: %s', $journal->id, $journalSources));
                 Log::debug('So match is FALSE');
 
                 $match = false;

From 3f56a8ec538a9be17c98ce66d0917bd8c7d3fb2b Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 15:17:57 +0100
Subject: [PATCH 027/223] Expand test routines

---
 routes/web.php                                |  8 +--
 .../Auth/ConfirmationControllerTest.php       | 62 ++++++++++++++-----
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 04cacdad0c..33952a68c8 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -81,10 +81,10 @@ Route::group(
 Route::group(
     ['middleware' => ['user-full-auth']], function () {
     Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']);
-    Route::get('/flash', ['uses' => 'HomeController@testFlash', 'as' => 'testFlash']);
+    Route::get('/flash', ['uses' => 'HomeController@testFlash', 'as' => 'test-flash']);
     Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']);
     Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']);
-    Route::get('/routes', ['uses' => 'HomeController@routes', 'as' => 'allRoutes']);
+    Route::get('/routes', ['uses' => 'HomeController@routes', 'as' => 'all-routes']);
 }
 );
 
@@ -361,7 +361,7 @@ Route::group(
  * JSON Controller
  */
 Route::group(
-    ['middleware' => 'user-full-auth', 'prefix' => 'json', 'as' => 'admin.'], function () {
+    ['middleware' => 'user-full-auth', 'prefix' => 'json', 'as' => 'json.'], function () {
     Route::get('expense-accounts', ['uses' => 'JsonController@expenseAccounts', 'as' => 'expense-accounts']);
     Route::get('revenue-accounts', ['uses' => 'JsonController@revenueAccounts', 'as' => 'revenue-accounts']);
     Route::get('categories', ['uses' => 'JsonController@categories', 'as' => 'categories']);
@@ -371,7 +371,7 @@ Route::group(
     Route::get('box/out', ['uses' => 'JsonController@boxOut', 'as' => 'box.out']);
     Route::get('box/bills-unpaid', ['uses' => 'JsonController@boxBillsUnpaid', 'as' => 'box.paid']);
     Route::get('box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'box.unpaid']);
-    Route::get('transaction-journals/{what}', 'JsonController@transactionJournals');
+    Route::get('transaction-journals/{what}', ['uses' => 'JsonController@transactionJournals','as' => 'transaction-journals']);
     Route::get('trigger', ['uses' => 'JsonController@trigger', 'as' => 'trigger']);
     Route::get('action', ['uses' => 'JsonController@action', 'as' => 'action']);
 
diff --git a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
index d93dc7a78b..2e62488c0c 100644
--- a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
@@ -40,17 +40,17 @@ class ConfirmationControllerTest extends TestCase
     public function testConfirmationError()
     {
         // need a user that is not activated. And site must require activated users.
-        $user             = $this->user();
-        $trueConfig       = new Configuration;
-        $trueConfig->data = true;
+        $trueConfig            = new Configuration;
+        $trueConfig->data      = true;
+        $falsePreference       = new Preference;
+        $falsePreference->data = false;
 
-        $falsePreference = new Preference;
-        $falsePreference->data = true;
-
-        Preferences::shouldReceive('get')->withArgs(['user_confirmed',false])->andReturn($falsePreference);
+        Preferences::shouldReceive('get')->withArgs(['user_confirmed', false])->andReturn($falsePreference);
+        Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference);
+        Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn(null);
 
         FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->once()->andReturn($trueConfig);
-
+        $this->be($this->user());
         $this->call('GET', route('confirmation_error'));
         $this->assertResponseStatus(200);
         $this->see('has been sent to the address you used during your registration');
@@ -63,10 +63,23 @@ class ConfirmationControllerTest extends TestCase
      */
     public function testDoConfirmation()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $codePreference        = new Preference;
+        $codePreference->data  = 'abcde';
+        $timePreference        = new Preference;
+        $timePreference->data  = 0;
+        $falsePreference       = new Preference;
+        $falsePreference->data = false;
+
+        Preferences::shouldReceive('get')->withArgs(['user_confirmed_code'])->andReturn($codePreference);
+        Preferences::shouldReceive('get')->withArgs(['user_confirmed_last_mail', 0])->andReturn($timePreference);
+        Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference);
+        Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn(null);
+        Preferences::shouldReceive('get')->withArgs(['user_confirmed', false])->andReturn($falsePreference);
+
+        $this->be($this->user());
+        $this->call('GET', route('do_confirm_account', ['abcde']));
+        $this->assertResponseStatus(302);
+        $this->assertRedirectedToRoute('home');
     }
 
     /**
@@ -75,10 +88,27 @@ class ConfirmationControllerTest extends TestCase
      */
     public function testResendConfirmation()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $trueConfig            = new Configuration;
+        $trueConfig->data      = true;
+        $codePreference        = new Preference;
+        $codePreference->data  = 'abcde';
+        $timePreference        = new Preference;
+        $timePreference->data  = 0;
+        $falsePreference       = new Preference;
+        $falsePreference->data = false;
+
+        Preferences::shouldReceive('get')->withArgs(['user_confirmed_last_mail', 0])->andReturn($timePreference);
+        Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference);
+        Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn(null);
+        FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->once()->andReturn($trueConfig);
+        Preferences::shouldReceive('get')->withArgs(['user_confirmed', false])->andReturn($falsePreference);
+
+        // from event handler:
+        Preferences::shouldReceive('setForUser')->withAnyArgs()->once();
+
+        $this->be($this->user());
+        $this->call('GET', route('resend_confirmation'));
+        $this->assertResponseStatus(200);
     }
 
     /**

From cf34713518c9c34122d8ed9ec2dfe697eac0bf89 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 16:30:33 +0100
Subject: [PATCH 028/223] Fix some tests.

---
 app/Http/Controllers/Auth/LoginController.php |  8 +-
 test.sh                                       | 10 ++-
 .../Auth/ConfirmationControllerTest.php       |  6 +-
 .../Auth/ForgotPasswordControllerTest.php     | 75 -------------------
 .../Controllers/Auth/LoginControllerTest.php  | 48 +++---------
 .../Controllers/HomeControllerTest.php        |  8 +-
 6 files changed, 26 insertions(+), 129 deletions(-)
 delete mode 100644 tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index fd38a15187..afaa6b3b48 100755
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -49,7 +49,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
@@ -71,10 +71,6 @@ class LoginController extends Controller
     public function login(Request $request)
     {
         $this->validateLogin($request);
-
-        // If the class is using the ThrottlesLogins trait, we can automatically throttle
-        // the login attempts for this application. We'll key this by the username and
-        // the IP address of the client making these requests into this application.
         $lockedOut = $this->hasTooManyLoginAttempts($request);
         if ($lockedOut) {
             $this->fireLockoutEvent($request);
@@ -83,7 +79,7 @@ class LoginController extends Controller
         }
 
         $credentials            = $this->credentials($request);
-        $credentials['blocked'] = 0; // most not be blocked.
+        $credentials['blocked'] = 0; // must not be blocked.
 
         if ($this->guard()->attempt($credentials, $request->has('remember'))) {
             return $this->sendLoginResponse($request);
diff --git a/test.sh b/test.sh
index 53e5424121..b1e52c6932 100755
--- a/test.sh
+++ b/test.sh
@@ -11,8 +11,9 @@ resetestflag=''
 testflag=''
 coverageflag=''
 acceptancetestclass=''
+verbalflag=''
 
-while getopts 'crta:' flag; do
+while getopts 'vcrta:' flag; do
   case "${flag}" in
     r)
         resetestflag='true'
@@ -23,6 +24,9 @@ while getopts 'crta:' flag; do
     c)
         coverageflag='true'
     ;;
+    v)
+        verbalflag=' -v'
+    ;;
     a)
         acceptancetestclass=./tests/acceptance/$OPTARG
         echo "Will only run acceptance test $OPTARG"
@@ -82,10 +86,10 @@ else
     if [[ $coverageflag == "" ]]
     then
         echo "Must run PHPUnit without coverage"
-        phpunit $acceptancetestclass
+        phpunit --stop-on-error $verbalflag $acceptancetestclass
     else
         echo "Must run PHPUnit with coverage"
-        phpunit --configuration phpunit.coverage.xml $acceptancetestclass
+        phpunit --stop-on-error $verbalflag --configuration phpunit.coverage.xml $acceptancetestclass
     fi
 fi
 
diff --git a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
index 2e62488c0c..d8af8c900d 100644
--- a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
@@ -49,7 +49,7 @@ class ConfirmationControllerTest extends TestCase
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference);
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn(null);
 
-        FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->once()->andReturn($trueConfig);
+        FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->andReturn($trueConfig);
         $this->be($this->user());
         $this->call('GET', route('confirmation_error'));
         $this->assertResponseStatus(200);
@@ -100,11 +100,11 @@ class ConfirmationControllerTest extends TestCase
         Preferences::shouldReceive('get')->withArgs(['user_confirmed_last_mail', 0])->andReturn($timePreference);
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference);
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn(null);
-        FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->once()->andReturn($trueConfig);
+        FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->andReturn($trueConfig);
         Preferences::shouldReceive('get')->withArgs(['user_confirmed', false])->andReturn($falsePreference);
 
         // from event handler:
-        Preferences::shouldReceive('setForUser')->withAnyArgs()->once();
+        Preferences::shouldReceive('setForUser')->withAnyArgs();
 
         $this->be($this->user());
         $this->call('GET', route('resend_confirmation'));
diff --git a/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php b/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php
deleted file mode 100644
index 65ebc3186f..0000000000
--- a/tests/acceptance/Controllers/Auth/ForgotPasswordControllerTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Auth\ForgotPasswordController::sendResetLinkEmail
-     * Implement testSendResetLinkEmail().
-     */
-    public function testSendResetLinkEmail()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Auth\ForgotPasswordController::showLinkRequestForm
-     * Implement testShowLinkRequestForm().
-     */
-    public function testShowLinkRequestForm()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-}
diff --git a/tests/acceptance/Controllers/Auth/LoginControllerTest.php b/tests/acceptance/Controllers/Auth/LoginControllerTest.php
index 605c0eefda..750e8ba28f 100644
--- a/tests/acceptance/Controllers/Auth/LoginControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/LoginControllerTest.php
@@ -35,10 +35,12 @@ class LoginControllerTest extends TestCase
      */
     public function testLogin()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->visit('/login')
+             ->type('thegrumpydictator@gmail.com', 'email')
+             ->type('james', 'password')
+             ->press('Sign In')
+             ->seePageIs('/')
+             ->see('thegrumpydictator@gmail.com');
     }
 
     /**
@@ -47,22 +49,9 @@ class LoginControllerTest extends TestCase
      */
     public function testLogout()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Auth\LoginController::redirectPath
-     * Implement testRedirectPath().
-     */
-    public function testRedirectPath()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->visit('/logout')
+             ->seePageIs('/login')
+             ->see('Sign in to start your session');
     }
 
     /**
@@ -71,22 +60,9 @@ class LoginControllerTest extends TestCase
      */
     public function testShowLoginForm()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers \FireflyIII\Http\Controllers\Auth\LoginController::username
-     * Implement testUsername().
-     */
-    public function testUsername()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->visit('/')
+             ->seePageIs('/login')
+             ->see('Sign in to start your session');
     }
 
     /**
diff --git a/tests/acceptance/Controllers/HomeControllerTest.php b/tests/acceptance/Controllers/HomeControllerTest.php
index adeace0b8c..016a4762d6 100755
--- a/tests/acceptance/Controllers/HomeControllerTest.php
+++ b/tests/acceptance/Controllers/HomeControllerTest.php
@@ -11,10 +11,6 @@
  */
 class HomeControllerTest extends TestCase
 {
-    public function displayError()
-    {
-        $this->assertTrue(true);
-    }
 
     /**
      * @covers FireflyIII\Http\Controllers\HomeController::dateRange
@@ -80,7 +76,7 @@ class HomeControllerTest extends TestCase
     {
         $this->be($this->user());
         $this->changeDateRange($this->user(), $range);
-        $this->call('GET', route('allRoutes'));
+        $this->call('GET', route('all-routes'));
         $this->assertResponseStatus(200);
     }
 
@@ -90,7 +86,7 @@ class HomeControllerTest extends TestCase
     public function testTestFlash()
     {
         $this->be($this->user());
-        $this->call('GET', route('testFlash'));
+        $this->call('GET', route('test-flash'));
         $this->assertResponseStatus(302);
         $this->assertSessionHas('success');
         $this->assertSessionHas('info');

From 663be301177842c9d032b4191dc6d5021dcfa393 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 9 Dec 2016 18:52:27 +0100
Subject: [PATCH 029/223] Fixed the account overview chart

---
 .../Controllers/Chart/AccountController.php   |  2 +-
 public/js/ff/accounts/show-by-date.js         | 95 -------------------
 public/js/ff/accounts/show.js                 | 14 ++-
 resources/views/accounts/show-by-date.twig    |  6 +-
 resources/views/accounts/show.twig            |  2 +-
 5 files changed, 15 insertions(+), 104 deletions(-)
 delete mode 100644 public/js/ff/accounts/show-by-date.js

diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index fb586715de..df4557a824 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -360,7 +360,7 @@ class AccountController extends Controller
      * @return \Illuminate\Http\JsonResponse
      * @throws FireflyException
      */
-    public function specificPeriod(Account $account, string $date)
+    public function period(Account $account, string $date)
     {
         try {
             $start = new Carbon($date);
diff --git a/public/js/ff/accounts/show-by-date.js b/public/js/ff/accounts/show-by-date.js
deleted file mode 100644
index 4e1768daf4..0000000000
--- a/public/js/ff/accounts/show-by-date.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * show_with_date.js
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
-// Return a helper with preserved width of cells
-var fixHelper = function (e, tr) {
-    "use strict";
-    var $originals = tr.children();
-    var $helper = tr.clone();
-    $helper.children().each(function (index) {
-        // Set helper cell sizes to match the original sizes
-        $(this).width($originals.eq(index).width());
-    });
-    return $helper;
-};
-
-$(function () {
-    "use strict";
-
-    lineChart(periodUri, 'period-specific-account');
-
-    pieChart(incomeCategoryUri, 'account-cat-in');
-    pieChart(expenseCategoryUri, 'account-cat-out');
-    pieChart(expenseBudgetUri, 'account-budget-out');
-
-
-    // sortable!
-    if (typeof $(".sortable-table tbody").sortable !== "undefined") {
-        $(".sortable-table tbody").sortable(
-            {
-                helper: fixHelper,
-                items: 'tr:not(.ignore)',
-                stop: sortStop,
-                handle: '.handle',
-                start: function (event, ui) {
-                    // Build a placeholder cell that spans all the cells in the row
-                    var cellCount = 0;
-                    $('td, th', ui.helper).each(function () {
-                        // For each TD or TH try and get it's colspan attribute, and add that or 1 to the total
-                        var colspan = 1;
-                        var colspanAttr = $(this).attr('colspan');
-                        if (colspanAttr > 1) {
-                            colspan = colspanAttr;
-                        }
-                        cellCount += colspan;
-                    });
-
-                    // Add the placeholder UI - note that this is the item's content, so TD rather than TR
-                    ui.placeholder.html(' ');
-                }
-            }
-        ).disableSelection();
-    } else {
-        console.log('its null');
-    }
-
-});
-
-function sortStop(event, ui) {
-    "use strict";
-    var current = $(ui.item);
-    console.log('sort stop');
-    var thisDate = current.data('date');
-    var originalBG = current.css('backgroundColor');
-
-
-    if (current.prev().data('date') !== thisDate && current.next().data('date') !== thisDate) {
-        // animate something with color:
-        current.animate({backgroundColor: "#d9534f"}, 200, function () {
-            $(this).animate({backgroundColor: originalBG}, 200);
-        });
-
-        return false;
-    }
-
-    // do update
-    var list = $('tr[data-date="' + thisDate + '"]');
-    var submit = [];
-    $.each(list, function (i, v) {
-        var row = $(v);
-        var id = row.data('id');
-        submit.push(id);
-    });
-
-    // do extra animation when done?
-    $.post('transaction/reorder', {items: submit, date: thisDate, _token: token});
-
-    current.animate({backgroundColor: "#5cb85c"}, 200, function () {
-        $(this).animate({backgroundColor: originalBG}, 200);
-    });
-}
diff --git a/public/js/ff/accounts/show.js b/public/js/ff/accounts/show.js
index 5875c0da90..e981faeb55 100644
--- a/public/js/ff/accounts/show.js
+++ b/public/js/ff/accounts/show.js
@@ -1,7 +1,13 @@
-/* global $, lineChart, accountID, token, incomeByCategoryUri, expenseByCategoryUri, expenseByBudgetUri */
+/*
+ * show.js
+ * 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.
+ */
 
-
-// Return a helper with preserved width of cells
 var fixHelper = function (e, tr) {
     "use strict";
     var $originals = tr.children();
@@ -15,7 +21,7 @@ var fixHelper = function (e, tr) {
 
 $(function () {
     "use strict";
-    lineChart(singleUri, 'overview-chart');
+    lineChart(chartUri, 'overview-chart');
     pieChart(incomeCategoryUri, 'account-cat-in');
     pieChart(expenseCategoryUri, 'account-cat-out');
     pieChart(expenseBudgetUri, 'account-budget-out');
diff --git a/resources/views/accounts/show-by-date.twig b/resources/views/accounts/show-by-date.twig
index fbe746b110..e342b62344 100644
--- a/resources/views/accounts/show-by-date.twig
+++ b/resources/views/accounts/show-by-date.twig
@@ -26,7 +26,7 @@
 
                 
                 
                          
-                    
+                    
                 
                          
             
         
@@ -94,7 +94,7 @@
         var dateString = "{{ date|escape }}";
 
         // uri's for charts:
-        var periodUri = '{{ route('chart.account.single', [account.id, date]) }}';
+        var chartUri = '{{ route('chart.account.period', [account.id, date]) }}';
         var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
         var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
         var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
@@ -105,6 +105,6 @@
     
     
     
-    
+    
     
 {% endblock %}
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 9826d1f358..ddc6034b04 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -123,7 +123,7 @@
     
 
 

From e7845115f6fd562e2c96c992a11a86d215b975d9 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 10 Dec 2016 06:54:50 +0100
Subject: [PATCH 032/223] New tests

---
 .../Controllers/AttachmentControllerTest.php  |  2 +-
 .../Controllers/BillControllerTest.php        |  2 +-
 .../Controllers/BudgetControllerTest.php      |  2 +-
 .../Controllers/CategoryControllerTest.php    |  2 +-
 .../Controllers/Chart/BillControllerTest.php  |  2 +-
 .../Chart/BudgetControllerTest.php            |  2 +-
 .../Chart/CategoryControllerTest.php          |  2 +-
 .../Chart/CategoryReportControllerTest.php    |  2 +-
 .../Chart/PiggyBankControllerTest.php         |  2 +-
 .../Chart/ReportControllerTest.php            |  2 +-
 .../acceptance/Controllers/ControllerTest.php |  2 +-
 .../Controllers/CurrencyControllerTest.php    |  2 +-
 .../Controllers/ExportControllerTest.php      |  2 +-
 .../Controllers/HelpControllerTest.php        |  2 +-
 .../Controllers/ImportControllerTest.php      | 19 +++++------
 .../Controllers/JsonControllerTest.php        | 19 +++++------
 .../Controllers/NewUserControllerTest.php     | 19 +++++------
 .../Controllers/PiggyBankControllerTest.php   | 19 +++++------
 .../Popup/ReportControllerTest.php            | 20 +++++------
 .../Controllers/PreferencesControllerTest.php | 19 +++++------
 .../Controllers/ProfileControllerTest.php     | 19 +++++------
 .../Report/AccountControllerTest.php          | 20 +++++------
 .../Report/BalanceControllerTest.php          | 20 +++++------
 .../Report/BudgetControllerTest.php           | 20 +++++------
 .../Report/CategoryControllerTest.php         | 20 +++++------
 .../Report/OperationsControllerTest.php       | 34 +++++++++----------
 .../Controllers/ReportControllerTest.php      | 31 +++++++++++------
 .../Controllers/RuleControllerTest.php        | 19 +++++------
 .../Controllers/RuleGroupControllerTest.php   | 19 +++++------
 .../Controllers/SearchControllerTest.php      | 19 +++++------
 .../Controllers/TagControllerTest.php         | 19 +++++------
 .../Transaction/ConvertControllerTest.php     | 20 +++++------
 .../Transaction/MassControllerTest.php        | 20 +++++------
 .../Transaction/SingleControllerTest.php      | 20 +++++------
 .../Transaction/SplitControllerTest.php       | 20 +++++------
 .../Controllers/TransactionControllerTest.php | 19 +++++------
 36 files changed, 241 insertions(+), 241 deletions(-)

diff --git a/tests/acceptance/Controllers/AttachmentControllerTest.php b/tests/acceptance/Controllers/AttachmentControllerTest.php
index 3835e9a5bc..293b1d911b 100644
--- a/tests/acceptance/Controllers/AttachmentControllerTest.php
+++ b/tests/acceptance/Controllers/AttachmentControllerTest.php
@@ -11,7 +11,7 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:31.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:38.
  */
 class AttachmentControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/BillControllerTest.php b/tests/acceptance/Controllers/BillControllerTest.php
index fe4dda9450..1863596ee7 100644
--- a/tests/acceptance/Controllers/BillControllerTest.php
+++ b/tests/acceptance/Controllers/BillControllerTest.php
@@ -11,7 +11,7 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:32.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:40.
  */
 class BillControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/BudgetControllerTest.php b/tests/acceptance/Controllers/BudgetControllerTest.php
index dcbd2507d4..88c98a67d7 100644
--- a/tests/acceptance/Controllers/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/BudgetControllerTest.php
@@ -11,7 +11,7 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:32.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:40.
  */
 class BudgetControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/CategoryControllerTest.php b/tests/acceptance/Controllers/CategoryControllerTest.php
index a1412c141b..e2cfa86c66 100644
--- a/tests/acceptance/Controllers/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/CategoryControllerTest.php
@@ -11,7 +11,7 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:32.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:40.
  */
 class CategoryControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/Chart/BillControllerTest.php b/tests/acceptance/Controllers/Chart/BillControllerTest.php
index a97abe06ee..3869ef6d38 100644
--- a/tests/acceptance/Controllers/Chart/BillControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/BillControllerTest.php
@@ -14,7 +14,7 @@ namespace Chart;
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:33.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:40.
  */
 class BillControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
index 399f4e54ea..2fe93015c3 100644
--- a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
@@ -14,7 +14,7 @@ namespace Chart;
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:33.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:40.
  */
 class BudgetControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
index 29efb47f0a..75d710a023 100644
--- a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
@@ -14,7 +14,7 @@ namespace Chart;
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:33.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:40.
  */
 class CategoryControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php
index 4ebab07460..888880879a 100644
--- a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php
@@ -14,7 +14,7 @@ namespace Chart;
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:33.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:40.
  */
 class CategoryReportControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php b/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php
index 6ada0dc85e..ac393cf31d 100644
--- a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php
@@ -14,7 +14,7 @@ namespace Chart;
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:33.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:41.
  */
 class PiggyBankControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/Chart/ReportControllerTest.php b/tests/acceptance/Controllers/Chart/ReportControllerTest.php
index 793fcf463a..a0bb0dd30e 100644
--- a/tests/acceptance/Controllers/Chart/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/ReportControllerTest.php
@@ -14,7 +14,7 @@ namespace Chart;
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:33.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:41.
  */
 class ReportControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/ControllerTest.php b/tests/acceptance/Controllers/ControllerTest.php
index 19c2a69c98..1017bc102d 100644
--- a/tests/acceptance/Controllers/ControllerTest.php
+++ b/tests/acceptance/Controllers/ControllerTest.php
@@ -11,7 +11,7 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:34.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:41.
  */
 class ControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/CurrencyControllerTest.php b/tests/acceptance/Controllers/CurrencyControllerTest.php
index d9540a684e..f96404ff32 100644
--- a/tests/acceptance/Controllers/CurrencyControllerTest.php
+++ b/tests/acceptance/Controllers/CurrencyControllerTest.php
@@ -11,7 +11,7 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:34.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:41.
  */
 class CurrencyControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/ExportControllerTest.php b/tests/acceptance/Controllers/ExportControllerTest.php
index 04ef3c672e..ae8cc95e3f 100644
--- a/tests/acceptance/Controllers/ExportControllerTest.php
+++ b/tests/acceptance/Controllers/ExportControllerTest.php
@@ -11,7 +11,7 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:34.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:41.
  */
 class ExportControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/HelpControllerTest.php b/tests/acceptance/Controllers/HelpControllerTest.php
index d9d1d8c6f4..f005ea4ff6 100644
--- a/tests/acceptance/Controllers/HelpControllerTest.php
+++ b/tests/acceptance/Controllers/HelpControllerTest.php
@@ -11,7 +11,7 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:34.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:41.
  */
 class HelpControllerTest extends TestCase
 {
diff --git a/tests/acceptance/Controllers/ImportControllerTest.php b/tests/acceptance/Controllers/ImportControllerTest.php
index 4bd1581260..30fee63469 100644
--- a/tests/acceptance/Controllers/ImportControllerTest.php
+++ b/tests/acceptance/Controllers/ImportControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:35.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:41.
  */
 class ImportControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class ImportControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::complete
      * Implement testComplete().
@@ -178,4 +169,12 @@ class ImportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/JsonControllerTest.php b/tests/acceptance/Controllers/JsonControllerTest.php
index d7c57ced7f..43b8f164c6 100644
--- a/tests/acceptance/Controllers/JsonControllerTest.php
+++ b/tests/acceptance/Controllers/JsonControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:35.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:42.
  */
 class JsonControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class JsonControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::action
      * Implement testAction().
@@ -190,4 +181,12 @@ class JsonControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/NewUserControllerTest.php b/tests/acceptance/Controllers/NewUserControllerTest.php
index 2248ec46c4..04d9394c63 100644
--- a/tests/acceptance/Controllers/NewUserControllerTest.php
+++ b/tests/acceptance/Controllers/NewUserControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:36.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:42.
  */
 class NewUserControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class NewUserControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\NewUserController::index
      * Implement testIndex().
@@ -58,4 +49,12 @@ class NewUserControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/PiggyBankControllerTest.php b/tests/acceptance/Controllers/PiggyBankControllerTest.php
index a0e412ace3..769a7a6d5c 100644
--- a/tests/acceptance/Controllers/PiggyBankControllerTest.php
+++ b/tests/acceptance/Controllers/PiggyBankControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:36.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:42.
  */
 class PiggyBankControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class PiggyBankControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\PiggyBankController::add
      * Implement testAdd().
@@ -214,4 +205,12 @@ class PiggyBankControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Popup/ReportControllerTest.php b/tests/acceptance/Controllers/Popup/ReportControllerTest.php
index bd92078afe..f68c134da3 100644
--- a/tests/acceptance/Controllers/Popup/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/Popup/ReportControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Popup;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:36.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:42.
  */
 class ReportControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class ReportControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general
      * Implement testGeneral().
@@ -48,4 +40,12 @@ class ReportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/PreferencesControllerTest.php b/tests/acceptance/Controllers/PreferencesControllerTest.php
index 52eaf96de0..05405ae396 100644
--- a/tests/acceptance/Controllers/PreferencesControllerTest.php
+++ b/tests/acceptance/Controllers/PreferencesControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:37.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:42.
  */
 class PreferencesControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class PreferencesControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\PreferencesController::code
      * Implement testCode().
@@ -94,4 +85,12 @@ class PreferencesControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/ProfileControllerTest.php b/tests/acceptance/Controllers/ProfileControllerTest.php
index 6ddfc8d117..800490f612 100644
--- a/tests/acceptance/Controllers/ProfileControllerTest.php
+++ b/tests/acceptance/Controllers/ProfileControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:37.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:42.
  */
 class ProfileControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class ProfileControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\ProfileController::changePassword
      * Implement testChangePassword().
@@ -94,4 +85,12 @@ class ProfileControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/AccountControllerTest.php b/tests/acceptance/Controllers/Report/AccountControllerTest.php
index 06179d681b..6c0d6fe0cf 100644
--- a/tests/acceptance/Controllers/Report/AccountControllerTest.php
+++ b/tests/acceptance/Controllers/Report/AccountControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Report;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:37.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:42.
  */
 class AccountControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class AccountControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Report\AccountController::general
      * Implement testGeneral().
@@ -48,4 +40,12 @@ class AccountControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/BalanceControllerTest.php b/tests/acceptance/Controllers/Report/BalanceControllerTest.php
index 049227fb6a..e4bf4c5f97 100644
--- a/tests/acceptance/Controllers/Report/BalanceControllerTest.php
+++ b/tests/acceptance/Controllers/Report/BalanceControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Report;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:37.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:42.
  */
 class BalanceControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class BalanceControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Report\BalanceController::general
      * Implement testGeneral().
@@ -48,4 +40,12 @@ class BalanceControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/BudgetControllerTest.php b/tests/acceptance/Controllers/Report/BudgetControllerTest.php
index b1b88e675c..055ab950d6 100644
--- a/tests/acceptance/Controllers/Report/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/Report/BudgetControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Report;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:37.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:43.
  */
 class BudgetControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class BudgetControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Report\BudgetController::general
      * Implement testGeneral().
@@ -60,4 +52,12 @@ class BudgetControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/CategoryControllerTest.php b/tests/acceptance/Controllers/Report/CategoryControllerTest.php
index 51f3ca5cbf..50a24e15db 100644
--- a/tests/acceptance/Controllers/Report/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/Report/CategoryControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Report;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:37.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:43.
  */
 class CategoryControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class CategoryControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Report\CategoryController::expenses
      * Implement testExpenses().
@@ -72,4 +64,12 @@ class CategoryControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Report/OperationsControllerTest.php b/tests/acceptance/Controllers/Report/OperationsControllerTest.php
index 6a49770447..b37384af48 100644
--- a/tests/acceptance/Controllers/Report/OperationsControllerTest.php
+++ b/tests/acceptance/Controllers/Report/OperationsControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Report;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:37.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:43.
  */
 class OperationsControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class OperationsControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Report\OperationsController::expenses
      * Implement testExpenses().
@@ -49,6 +41,18 @@ class OperationsControllerTest extends TestCase
         );
     }
 
+    /**
+     * @covers \FireflyIII\Http\Controllers\Report\OperationsController::income
+     * Implement testIncome().
+     */
+    public function testIncome()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
+    }
+
     /**
      * @covers \FireflyIII\Http\Controllers\Report\OperationsController::operations
      * Implement testOperations().
@@ -62,14 +66,10 @@ class OperationsControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Report\OperationsController::income
-     * Implement testIncome().
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
      */
-    public function testIncome()
+    protected function tearDown()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
     }
 }
diff --git a/tests/acceptance/Controllers/ReportControllerTest.php b/tests/acceptance/Controllers/ReportControllerTest.php
index f5ded1797f..441fcc1651 100644
--- a/tests/acceptance/Controllers/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/ReportControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:38.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:43.
  */
 class ReportControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class ReportControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\ReportController::auditReport
      * Implement testAuditReport().
@@ -47,6 +38,18 @@ class ReportControllerTest extends TestCase
         );
     }
 
+    /**
+     * @covers \FireflyIII\Http\Controllers\ReportController::budgetReport
+     * Implement testBudgetReport().
+     */
+    public function testBudgetReport()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+            'This test has not been implemented yet.'
+        );
+    }
+
     /**
      * @covers \FireflyIII\Http\Controllers\ReportController::categoryReport
      * Implement testCategoryReport().
@@ -106,4 +109,12 @@ class ReportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/RuleControllerTest.php b/tests/acceptance/Controllers/RuleControllerTest.php
index 6aa0cfec16..ae36e1b5e3 100644
--- a/tests/acceptance/Controllers/RuleControllerTest.php
+++ b/tests/acceptance/Controllers/RuleControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:38.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:43.
  */
 class RuleControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class RuleControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\RuleController::create
      * Implement testCreate().
@@ -178,4 +169,12 @@ class RuleControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/RuleGroupControllerTest.php b/tests/acceptance/Controllers/RuleGroupControllerTest.php
index ad2e8e9bad..741c354a92 100644
--- a/tests/acceptance/Controllers/RuleGroupControllerTest.php
+++ b/tests/acceptance/Controllers/RuleGroupControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:38.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:43.
  */
 class RuleGroupControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class RuleGroupControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\RuleGroupController::create
      * Implement testCreate().
@@ -154,4 +145,12 @@ class RuleGroupControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/SearchControllerTest.php b/tests/acceptance/Controllers/SearchControllerTest.php
index de19e0f2aa..af47690eb9 100644
--- a/tests/acceptance/Controllers/SearchControllerTest.php
+++ b/tests/acceptance/Controllers/SearchControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:38.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:43.
  */
 class SearchControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class SearchControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\SearchController::index
      * Implement testIndex().
@@ -46,4 +37,12 @@ class SearchControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/TagControllerTest.php b/tests/acceptance/Controllers/TagControllerTest.php
index c255f2f49b..7449bad0d0 100644
--- a/tests/acceptance/Controllers/TagControllerTest.php
+++ b/tests/acceptance/Controllers/TagControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:38.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:43.
  */
 class TagControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class TagControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\TagController::create
      * Implement testCreate().
@@ -130,4 +121,12 @@ class TagControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
index 85c706f9fe..ca19665d35 100644
--- a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Transaction;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:38.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:43.
  */
 class ConvertControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class ConvertControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index
      * Implement testIndex().
@@ -60,4 +52,12 @@ class ConvertControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/MassControllerTest.php b/tests/acceptance/Controllers/Transaction/MassControllerTest.php
index c6475a6d6c..4e51159a00 100644
--- a/tests/acceptance/Controllers/Transaction/MassControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/MassControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Transaction;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:38.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:44.
  */
 class MassControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class MassControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\MassController::massDelete
      * Implement testMassDelete().
@@ -84,4 +76,12 @@ class MassControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php b/tests/acceptance/Controllers/Transaction/SingleControllerTest.php
index 334151be3a..b653368754 100644
--- a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/SingleControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Transaction;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:38.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:44.
  */
 class SingleControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class SingleControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::create
      * Implement testCreate().
@@ -108,4 +100,12 @@ class SingleControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
index c89b639d24..1771843c4c 100644
--- a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
@@ -10,15 +10,15 @@
  */
 
 namespace Transaction;
+
 use TestCase;
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:39.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:44.
  */
 class SplitControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -29,14 +29,6 @@ class SplitControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::edit
      * Implement testEdit().
@@ -60,4 +52,12 @@ class SplitControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }
diff --git a/tests/acceptance/Controllers/TransactionControllerTest.php b/tests/acceptance/Controllers/TransactionControllerTest.php
index 5eb222d758..9870f9a8b9 100644
--- a/tests/acceptance/Controllers/TransactionControllerTest.php
+++ b/tests/acceptance/Controllers/TransactionControllerTest.php
@@ -11,12 +11,11 @@
 
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2016-12-07 at 18:50:39.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:44.
  */
 class TransactionControllerTest extends TestCase
 {
 
-    
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -27,14 +26,6 @@ class TransactionControllerTest extends TestCase
         parent::setUp();
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-
     /**
      * @covers \FireflyIII\Http\Controllers\TransactionController::index
      * Implement testIndex().
@@ -94,4 +85,12 @@ class TransactionControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
 }

From 0fe0de1a7fbda084311ee0ea91290f15c2f089ef Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 10 Dec 2016 07:29:36 +0100
Subject: [PATCH 033/223] New tests

---
 app/Support/Navigation.php                    |  1 +
 routes/web.php                                | 28 +++----
 .../Admin/ConfigurationControllerTest.php     | 10 ---
 .../Admin/DomainControllerTest.php            | 10 ---
 .../Controllers/Admin/HomeControllerTest.php  |  8 --
 .../Controllers/Admin/UserControllerTest.php  | 10 ---
 .../Auth/ConfirmationControllerTest.php       | 10 ---
 .../Controllers/Auth/LoginControllerTest.php  | 11 ---
 .../Auth/TwoFactorControllerTest.php          |  9 ---
 .../Chart/AccountControllerTest.php           | 64 +++++++--------
 .../Controllers/Chart/BillControllerTest.php  | 27 +++----
 .../Chart/BudgetControllerTest.php            | 60 ++++++--------
 .../Chart/CategoryControllerTest.php          | 78 ++++++++-----------
 .../Chart/CategoryReportControllerTest.php    | 47 ++++-------
 .../Chart/PiggyBankControllerTest.php         | 16 +---
 .../Chart/ReportControllerTest.php            | 32 +++-----
 .../Controllers/HomeControllerTest.php        |  2 +-
 17 files changed, 141 insertions(+), 282 deletions(-)

diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index 48ff2724fb..f36d54e054 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -43,6 +43,7 @@ class Navigation
             '1M'      => 'addMonths', 'month' => 'addMonths', 'monthly' => 'addMonths', '3M' => 'addMonths',
             'quarter' => 'addMonths', 'quarterly' => 'addMonths', '6M' => 'addMonths', 'half-year' => 'addMonths',
             'year'    => 'addYears', 'yearly' => 'addYears', '1Y' => 'addYears',
+            'custom'  => 'addMonths', // custom? just add one month.
         ];
         $modifierMap = [
             'quarter'   => 3,
diff --git a/routes/web.php b/routes/web.php
index 33952a68c8..7a10a32aba 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -255,10 +255,9 @@ Route::group(
 Route::group(
     ['middleware' => 'user-full-auth', 'namespace' => 'Chart', 'prefix' => 'chart/budget', 'as' => 'chart.budget.'], function () {
 
-    Route::get('frontpage', ['uses' => 'BudgetController@frontpage']);
-
-    Route::get('period/0/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@periodNoBudget']);
-    Route::get('period/{budget}/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@period']);
+    Route::get('frontpage', ['uses' => 'BudgetController@frontpage', 'as' => 'frontpage']);
+    Route::get('period/0/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@periodNoBudget', 'as' => 'period.no-budget']);
+    Route::get('period/{budget}/{accountList}/{start_date}/{end_date}', ['uses' => 'BudgetController@period', 'as' => 'period']);
     Route::get('budget/{budget}/{limitrepetition}', ['uses' => 'BudgetController@budgetLimit', 'as' => 'budget-limit']);
     Route::get('budget/{budget}', ['uses' => 'BudgetController@budget', 'as' => 'budget']);
 
@@ -272,12 +271,11 @@ Route::group(
     ['middleware' => 'user-full-auth', 'namespace' => 'Chart', 'prefix' => 'chart/category', 'as' => 'chart.category.'], function () {
 
     Route::get('frontpage', ['uses' => 'CategoryController@frontpage']);
-
     Route::get('period/{category}', ['uses' => 'CategoryController@currentPeriod', 'as' => 'current']);
     Route::get('period/{category}/{date}', ['uses' => 'CategoryController@specificPeriod', 'as' => 'specific']);
     Route::get('all/{category}', ['uses' => 'CategoryController@all', 'as' => 'all']);
-    Route::get('report-period/0/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriodNoCategory']);
-    Route::get('report-period/{category}/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriod']);
+    Route::get('report-period/0/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriodNoCategory', 'as' => 'period.no-category']);
+    Route::get('report-period/{category}/{accountList}/{start_date}/{end_date}', ['uses' => 'CategoryController@reportPeriod', 'as' => 'period']);
 
     // these charts are used in reports (category reports):
     Route::get(
@@ -297,8 +295,10 @@ Route::group(
         ['uses' => 'CategoryReportController@accountExpense', 'as' => 'account-expense']
     );
 
-    Route::get('report-in-out/{accountList}/{categoryList}/{start_date}/{end_date}',
-               ['uses' => 'CategoryReportController@mainChart', 'as' => 'main']);
+    Route::get(
+        'report-in-out/{accountList}/{categoryList}/{start_date}/{end_date}',
+        ['uses' => 'CategoryReportController@mainChart', 'as' => 'main']
+    );
 
 }
 );
@@ -307,8 +307,8 @@ Route::group(
  * Chart\PiggyBank Controller
  */
 Route::group(
-    ['middleware' => 'user-full-auth', 'namespace' => 'Chart', 'prefix' => 'chart/piggy-bank'], function () {
-    Route::get('{piggyBank}', ['uses' => 'PiggyBankController@history']);
+    ['middleware' => 'user-full-auth', 'namespace' => 'Chart', 'prefix' => 'chart/piggy-bank','as'=> 'chart.piggy-bank.'], function () {
+    Route::get('{piggyBank}', ['uses' => 'PiggyBankController@history','as' => 'history']);
 }
 );
 
@@ -317,7 +317,7 @@ Route::group(
  */
 Route::group(
     ['middleware' => 'user-full-auth', 'namespace' => 'Chart', 'prefix' => 'chart/report', 'as' => 'chart.report.'], function () {
-    Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@operations' ,'as' => 'operations']);
+    Route::get('operations/{accountList}/{start_date}/{end_date}', ['uses' => 'ReportController@operations', 'as' => 'operations']);
     Route::get('operations-sum/{accountList}/{start_date}/{end_date}/', ['uses' => 'ReportController@sum', 'as' => 'sum']);
     Route::get('net-worth/{accountList}/{start_date}/{end_date}/', ['uses' => 'ReportController@netWorth', 'as' => 'net-worth']);
 
@@ -371,7 +371,7 @@ Route::group(
     Route::get('box/out', ['uses' => 'JsonController@boxOut', 'as' => 'box.out']);
     Route::get('box/bills-unpaid', ['uses' => 'JsonController@boxBillsUnpaid', 'as' => 'box.paid']);
     Route::get('box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'box.unpaid']);
-    Route::get('transaction-journals/{what}', ['uses' => 'JsonController@transactionJournals','as' => 'transaction-journals']);
+    Route::get('transaction-journals/{what}', ['uses' => 'JsonController@transactionJournals', 'as' => 'transaction-journals']);
     Route::get('trigger', ['uses' => 'JsonController@trigger', 'as' => 'trigger']);
     Route::get('action', ['uses' => 'JsonController@action', 'as' => 'action']);
 
@@ -531,7 +531,7 @@ Route::group(
     Route::get('delete/{rule}', ['uses' => 'RuleController@delete', 'as' => 'delete']);
     Route::get('test', ['uses' => 'RuleController@testTriggers', 'as' => 'test-triggers']);
 
-    Route::post('trigger/order/{rule}', ['uses' => 'RuleController@reorderRuleTriggers','as' => 'reorder-triggers']);
+    Route::post('trigger/order/{rule}', ['uses' => 'RuleController@reorderRuleTriggers', 'as' => 'reorder-triggers']);
     Route::post('action/order/{rule}', ['uses' => 'RuleController@reorderRuleActions', 'as' => 'reorder-actions']);
     Route::post('store/{ruleGroup}', ['uses' => 'RuleController@store', 'as' => 'store']);
     Route::post('update/{rule}', ['uses' => 'RuleController@update', 'as' => 'update']);
diff --git a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php
index 0dae2ce618..4e4e5982fc 100644
--- a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php
+++ b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php
@@ -35,7 +35,6 @@ class ConfigurationControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::index
-     * Implement testIndex().
      */
     public function testIndex()
     {
@@ -60,7 +59,6 @@ class ConfigurationControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::store
-     * Implement testStore().
      */
     public function testPostIndex()
     {
@@ -74,12 +72,4 @@ class ConfigurationControllerTest extends TestCase
         $this->assertSessionHas('success');
         $this->assertResponseStatus(302);
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Admin/DomainControllerTest.php b/tests/acceptance/Controllers/Admin/DomainControllerTest.php
index 8617ca3815..bba83a9265 100644
--- a/tests/acceptance/Controllers/Admin/DomainControllerTest.php
+++ b/tests/acceptance/Controllers/Admin/DomainControllerTest.php
@@ -31,7 +31,6 @@ class DomainControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\DomainController::domains
-     * Implement testDomains().
      */
     public function testDomains()
     {
@@ -46,7 +45,6 @@ class DomainControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\DomainController::manual
-     * Implement testManual().
      */
     public function testManual()
     {
@@ -58,7 +56,6 @@ class DomainControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\DomainController::toggleDomain
-     * Implement testToggleDomain().
      */
     public function testToggleDomain()
     {
@@ -68,11 +65,4 @@ class DomainControllerTest extends TestCase
         $this->assertResponseStatus(302);
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Admin/HomeControllerTest.php b/tests/acceptance/Controllers/Admin/HomeControllerTest.php
index 999e7e6554..8a2ccefb60 100644
--- a/tests/acceptance/Controllers/Admin/HomeControllerTest.php
+++ b/tests/acceptance/Controllers/Admin/HomeControllerTest.php
@@ -31,7 +31,6 @@ class HomeControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\HomeController::index
-     * Implement testIndex().
      */
     public function testIndex()
     {
@@ -42,11 +41,4 @@ class HomeControllerTest extends TestCase
         $this->see('
                            ');
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Admin/UserControllerTest.php b/tests/acceptance/Controllers/Admin/UserControllerTest.php
index 68e06fd69a..b5e246bc4d 100644
--- a/tests/acceptance/Controllers/Admin/UserControllerTest.php
+++ b/tests/acceptance/Controllers/Admin/UserControllerTest.php
@@ -31,7 +31,6 @@ class UserControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\UserController::edit
-     * Implement testEdit().
      */
     public function testEdit()
     {
@@ -44,7 +43,6 @@ class UserControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\UserController::index
-     * Implement testIndex().
      */
     public function testIndex()
     {
@@ -57,7 +55,6 @@ class UserControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Admin\UserController::show
-     * Implement testShow().
      */
     public function testShow()
     {
@@ -68,11 +65,4 @@ class UserControllerTest extends TestCase
         $this->see('
                              ');
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
index d8af8c900d..d4dd7aff33 100644
--- a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php
@@ -35,7 +35,6 @@ class ConfirmationControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Auth\ConfirmationController::confirmationError
-     * Implement testConfirmationError().
      */
     public function testConfirmationError()
     {
@@ -59,7 +58,6 @@ class ConfirmationControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Auth\ConfirmationController::doConfirmation
-     * Implement testDoConfirmation().
      */
     public function testDoConfirmation()
     {
@@ -84,7 +82,6 @@ class ConfirmationControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Auth\ConfirmationController::resendConfirmation
-     * Implement testResendConfirmation().
      */
     public function testResendConfirmation()
     {
@@ -111,11 +108,4 @@ class ConfirmationControllerTest extends TestCase
         $this->assertResponseStatus(200);
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Auth/LoginControllerTest.php b/tests/acceptance/Controllers/Auth/LoginControllerTest.php
index 750e8ba28f..5125dccb98 100644
--- a/tests/acceptance/Controllers/Auth/LoginControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/LoginControllerTest.php
@@ -31,7 +31,6 @@ class LoginControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Auth\LoginController::login
-     * Implement testLogin().
      */
     public function testLogin()
     {
@@ -45,7 +44,6 @@ class LoginControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Auth\LoginController::logout
-     * Implement testLogout().
      */
     public function testLogout()
     {
@@ -56,7 +54,6 @@ class LoginControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Auth\LoginController::showLoginForm
-     * Implement testShowLoginForm().
      */
     public function testShowLoginForm()
     {
@@ -64,12 +61,4 @@ class LoginControllerTest extends TestCase
              ->seePageIs('/login')
              ->see('Sign in to start your session');
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php b/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php
index a01fa4c750..d23aeb4928 100644
--- a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php
@@ -34,7 +34,6 @@ class TwoFactorControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Auth\TwoFactorController::index
-     * Implement testIndex().
      */
     public function testIndex()
     {
@@ -54,7 +53,6 @@ class TwoFactorControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Auth\TwoFactorController::lostTwoFactor
-     * Implement testLostTwoFactor().
      */
     public function testLostTwoFactor()
     {
@@ -72,11 +70,4 @@ class TwoFactorControllerTest extends TestCase
         $this->assertResponseStatus(200);
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Chart/AccountControllerTest.php b/tests/acceptance/Controllers/Chart/AccountControllerTest.php
index a113d151de..38ff8191bf 100644
--- a/tests/acceptance/Controllers/Chart/AccountControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/AccountControllerTest.php
@@ -30,74 +30,79 @@ class AccountControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseAccounts
-     * Implement testExpenseAccounts().
+     * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::expenseAccounts
+     * @dataProvider dateRangeProvider
      */
-    public function testExpenseAccounts()
+    public function testExpenseAccounts(string $range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('get', route('chart.account.expense'));
         $this->assertResponseStatus(200);
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseBudget
-     * Implement testExpenseBudget().
+     * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::expenseBudget
+     * @dataProvider dateRangeProvider
      */
-    public function testExpenseBudget()
+    public function testExpenseBudget(string $range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('get', route('chart.account.expense-budget', [1, '20120101', '20120131']));
         $this->assertResponseStatus(200);
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\AccountController::expenseCategory
-     * Implement testExpenseCategory().
+     * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::expenseCategory
+     * @dataProvider dateRangeProvider
      */
-    public function testExpenseCategory()
+    public function testExpenseCategory(string $range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('get', route('chart.account.expense-category', [1, '20120101', '20120131']));
         $this->assertResponseStatus(200);
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\AccountController::frontpage
-     * Implement testFrontpage().
+     * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::frontpage
+     * @dataProvider dateRangeProvider
      */
-    public function testFrontpage()
+    public function testFrontpage(string $range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('get', route('chart.account.frontpage'));
         $this->assertResponseStatus(200);
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\AccountController::incomeCategory
-     * Implement testIncomeCategory().
+     * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::incomeCategory
+     * @dataProvider dateRangeProvider
      */
-    public function testIncomeCategory()
+    public function testIncomeCategory(string $range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('get', route('chart.account.income-category', [1, '20120101', '20120131']));
         $this->assertResponseStatus(200);
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\AccountController::period
-     * Implement testSpecificPeriod().
+     * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::period
+     * @dataProvider dateRangeProvider
      */
-    public function testPeriod()
+    public function testPeriod(string $range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('get', route('chart.account.period', [1, '2012-01-01']));
         $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\AccountController::report
-     * Implement testReport().
      */
     public function testReport()
     {
@@ -107,32 +112,27 @@ class AccountControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\AccountController::revenueAccounts
-     * Implement testRevenueAccounts().
+     * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::revenueAccounts
+     * @dataProvider dateRangeProvider
      */
-    public function testRevenueAccounts()
+    public function testRevenueAccounts(string $range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('get', route('chart.account.revenue'));
         $this->assertResponseStatus(200);
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\AccountController::single
-     * Implement testSingle().
+     * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::single
+     * @dataProvider dateRangeProvider
      */
-    public function testSingle()
+    public function testSingle(string $range)
     {
         $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
         $this->call('get', route('chart.account.single', [1]));
         $this->assertResponseStatus(200);
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Chart/BillControllerTest.php b/tests/acceptance/Controllers/Chart/BillControllerTest.php
index 3869ef6d38..63b4644ee8 100644
--- a/tests/acceptance/Controllers/Chart/BillControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/BillControllerTest.php
@@ -31,33 +31,24 @@ class BillControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\BillController::frontpage
-     * Implement testFrontpage().
+     * @dataProvider dateRangeProvider
      */
-    public function testFrontpage()
+    public function testFrontpage(string $range)
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
+        $this->call('get', route('chart.bill.frontpage'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\BillController::single
-     * Implement testSingle().
      */
     public function testSingle()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.bill.single', [1]));
+        $this->assertResponseStatus(200);
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
index 2fe93015c3..49e1a45c1e 100644
--- a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
@@ -31,69 +31,57 @@ class BudgetControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::budget
-     * Implement testBudget().
+     * @dataProvider dateRangeProvider
      */
-    public function testBudget()
+    public function testBudget(string $range)
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
+        $this->call('get', route('chart.budget.budget', [1]));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::budgetLimit
-     * Implement testBudgetLimit().
+     * @dataProvider dateRangeProvider
      */
-    public function testBudgetLimit()
+    public function testBudgetLimit(string $range)
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
+        $this->call('get', route('chart.budget.budget', [1,1]));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::frontpage
-     * Implement testFrontpage().
+     * @dataProvider dateRangeProvider
      */
-    public function testFrontpage()
+    public function testFrontpage(string $range)
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
+        $this->call('get', route('chart.budget.frontpage'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::period
-     * Implement testPeriod().
      */
     public function testPeriod()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.budget.period', [1,'1','20120101','20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::periodNoBudget
-     * Implement testPeriodNoBudget().
      */
     public function testPeriodNoBudget()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
+        $this->be($this->user());
+        $this->call('get', route('chart.budget.period.no-budget', ['1','20120101','20120131']));
+        $this->assertResponseStatus(200);
     }
 }
diff --git a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
index 75d710a023..74b258349a 100644
--- a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
@@ -30,82 +30,70 @@ class CategoryControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::all
-     * Implement testAll().
+     * @covers       \FireflyIII\Http\Controllers\Chart\CategoryController::all
+     * @dataProvider dateRangeProvider
      */
-    public function testAll()
+    public function testAll(string $range)
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
+        $this->call('get', route('chart.category.all', [1]));
+        $this->assertResponseStatus(200);
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::currentPeriod
-     * Implement testCurrentPeriod().
+     * @covers       \FireflyIII\Http\Controllers\Chart\CategoryController::currentPeriod
+     * @dataProvider dateRangeProvider
      */
-    public function testCurrentPeriod()
+    public function testCurrentPeriod(string $range)
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
+        $this->call('get', route('chart.category.current', [1]));
+        $this->assertResponseStatus(200);
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::frontpage
-     * Implement testFrontpage().
+     * @covers       \FireflyIII\Http\Controllers\Chart\CategoryController::frontpage
+     * @dataProvider dateRangeProvider
      */
-    public function testFrontpage()
+    public function testFrontpage(string $range)
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
+        $this->call('get', route('chart.category.current', [1]));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::reportPeriod
-     * Implement testReportPeriod().
      */
     public function testReportPeriod()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.category.period', [1, '1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::reportPeriodNoCategory
-     * Implement testReportPeriodNoCategory().
      */
     public function testReportPeriodNoCategory()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.category.period.no-category', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::specificPeriod
-     * Implement testSpecificPeriod().
+     * @dataProvider dateRangeProvider
      */
-    public function testSpecificPeriod()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
+    public function testSpecificPeriod(string $range)
     {
+        $this->be($this->user());
+        $this->changeDateRange($this->user(), $range);
+        $this->call('get', route('chart.category.specific', ['1', '2012-01-01']));
+        $this->assertResponseStatus(200);
     }
 }
diff --git a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php
index 888880879a..ba948c67ae 100644
--- a/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/CategoryReportControllerTest.php
@@ -31,69 +31,52 @@ class CategoryReportControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::accountExpense
-     * Implement testAccountExpense().
      */
     public function testAccountExpense()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.category.account-expense', ['1', '1', '20120101', '20120131', 0]));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::accountIncome
-     * Implement testAccountIncome().
      */
     public function testAccountIncome()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.category.account-income', ['1', '1', '20120101', '20120131', 0]));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::categoryExpense
-     * Implement testCategoryExpense().
      */
     public function testCategoryExpense()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.category.category-expense', ['1', '1', '20120101', '20120131', 0]));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::categoryIncome
-     * Implement testCategoryIncome().
      */
     public function testCategoryIncome()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.category.category-income', ['1', '1', '20120101', '20120131', 0]));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::mainChart
-     * Implement testMainChart().
      */
     public function testMainChart()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.category.main', ['1', '1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php b/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php
index ac393cf31d..f368213e00 100644
--- a/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/PiggyBankControllerTest.php
@@ -31,21 +31,11 @@ class PiggyBankControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\PiggyBankController::history
-     * Implement testHistory().
      */
     public function testHistory()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
+        $this->be($this->user());
+        $this->call('get', route('chart.piggy-bank.history', [1]));
+        $this->assertResponseStatus(200);
     }
 }
diff --git a/tests/acceptance/Controllers/Chart/ReportControllerTest.php b/tests/acceptance/Controllers/Chart/ReportControllerTest.php
index a0bb0dd30e..7b782367bc 100644
--- a/tests/acceptance/Controllers/Chart/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/ReportControllerTest.php
@@ -31,45 +31,31 @@ class ReportControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\ReportController::netWorth
-     * Implement testNetWorth().
      */
     public function testNetWorth()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.report.net-worth', [1, '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\ReportController::operations
-     * Implement testOperations().
      */
     public function testOperations()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('chart.report.operations', [1, '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Chart\ReportController::sum
-     * Implement testSum().
      */
     public function testSum()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
+        $this->be($this->user());
+        $this->call('get', route('chart.report.sum', [1, '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 }
diff --git a/tests/acceptance/Controllers/HomeControllerTest.php b/tests/acceptance/Controllers/HomeControllerTest.php
index 016a4762d6..5babd78d5c 100755
--- a/tests/acceptance/Controllers/HomeControllerTest.php
+++ b/tests/acceptance/Controllers/HomeControllerTest.php
@@ -58,7 +58,7 @@ class HomeControllerTest extends TestCase
      *
      * @param $range
      */
-    public function testIndex($range)
+    public function testIndex(string $range)
     {
         $this->be($this->user());
         $this->changeDateRange($this->user(), $range);

From bae2161ee31f51fb36867131879193b4735f2965 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 10 Dec 2016 16:32:52 +0100
Subject: [PATCH 034/223] Expand tests.

---
 app/Models/TransactionType.php                |   2 +-
 .../Popup/ReportControllerTest.php            | 116 ++++++++++++++++--
 .../Report/AccountControllerTest.php          |  15 +--
 .../Report/BalanceControllerTest.php          |  16 +--
 .../Report/BudgetControllerTest.php           |  24 +---
 .../Report/CategoryControllerTest.php         |  32 ++---
 .../Report/OperationsControllerTest.php       |  31 ++---
 .../Transaction/ConvertControllerTest.php     |  84 ++++++++++---
 8 files changed, 203 insertions(+), 117 deletions(-)

diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php
index ff685856e7..d22d725a0e 100644
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@@ -43,7 +43,7 @@ class TransactionType extends Model
         if (!auth()->check()) {
             throw new NotFoundHttpException;
         }
-        $transactionType = self::where('type', $type)->first();
+        $transactionType = self::where('type', ucfirst($type))->first();
         if (!is_null($transactionType)) {
             return $transactionType;
         }
diff --git a/tests/acceptance/Controllers/Popup/ReportControllerTest.php b/tests/acceptance/Controllers/Popup/ReportControllerTest.php
index f68c134da3..e4efaa3933 100644
--- a/tests/acceptance/Controllers/Popup/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/Popup/ReportControllerTest.php
@@ -11,6 +11,7 @@
 
 namespace Popup;
 
+use Carbon\Carbon;
 use TestCase;
 
 /**
@@ -31,21 +32,118 @@ class ReportControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general
-     * Implement testGeneral().
      */
-    public function testGeneral()
+    public function testBalanceAmount()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+
+        $this->be($this->user());
+        $arguments = [
+            'attributes' => [
+                'location'   => 'balance-amount',
+                'startDate'  => Carbon::now()->startOfMonth()->format('Ymd'),
+                'endDate'    => Carbon::now()->endOfMonth()->format('Ymd'),
+                'accounts'   => 1,
+                'accountId'  => 1,
+                'categoryId' => 1,
+                'budgetId'   => 1,
+                'role'       => 1,
+            ],
+        ];
+        $uri       = route('popup.general') . '?' . http_build_query($arguments);
+        $this->call('get', $uri);
+        $this->assertResponseStatus(200);
     }
 
     /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
+     * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general
      */
-    protected function tearDown()
+    public function testBudgetSpentAmount()
     {
+
+        $this->be($this->user());
+        $arguments = [
+            'attributes' => [
+                'location'   => 'budget-spent-amount',
+                'startDate'  => Carbon::now()->startOfMonth()->format('Ymd'),
+                'endDate'    => Carbon::now()->endOfMonth()->format('Ymd'),
+                'accounts'   => 1,
+                'accountId'  => 1,
+                'categoryId' => 1,
+                'budgetId'   => 1,
+            ],
+        ];
+        $uri       = route('popup.general') . '?' . http_build_query($arguments);
+        $this->call('get', $uri);
+        $this->assertResponseStatus(200);
     }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general
+     */
+    public function testCategoryEntry()
+    {
+
+        $this->be($this->user());
+        $arguments = [
+            'attributes' => [
+                'location'   => 'category-entry',
+                'startDate'  => Carbon::now()->startOfMonth()->format('Ymd'),
+                'endDate'    => Carbon::now()->endOfMonth()->format('Ymd'),
+                'accounts'   => 1,
+                'accountId'  => 1,
+                'categoryId' => 1,
+                'budgetId'   => 1,
+            ],
+        ];
+        $uri       = route('popup.general') . '?' . http_build_query($arguments);
+        $this->call('get', $uri);
+        $this->assertResponseStatus(200);
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general
+     */
+    public function testExpenseEntry()
+    {
+
+        $this->be($this->user());
+        $arguments = [
+            'attributes' => [
+                'location'   => 'expense-entry',
+                'startDate'  => Carbon::now()->startOfMonth()->format('Ymd'),
+                'endDate'    => Carbon::now()->endOfMonth()->format('Ymd'),
+                'accounts'   => 1,
+                'accountId'  => 1,
+                'categoryId' => 1,
+                'budgetId'   => 1,
+            ],
+        ];
+        $uri       = route('popup.general') . '?' . http_build_query($arguments);
+        $this->call('get', $uri);
+        $this->assertResponseStatus(200);
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Popup\ReportController::general
+     */
+    public function testIncomeEntry()
+    {
+
+        $this->be($this->user());
+        $arguments = [
+            'attributes' => [
+                'location'   => 'income-entry',
+                'startDate'  => Carbon::now()->startOfMonth()->format('Ymd'),
+                'endDate'    => Carbon::now()->endOfMonth()->format('Ymd'),
+                'accounts'   => 1,
+                'accountId'  => 1,
+                'categoryId' => 1,
+                'budgetId'   => 1,
+            ],
+        ];
+        $uri       = route('popup.general') . '?' . http_build_query($arguments);
+        $this->call('get', $uri);
+        $this->assertResponseStatus(200);
+    }
+
 }
diff --git a/tests/acceptance/Controllers/Report/AccountControllerTest.php b/tests/acceptance/Controllers/Report/AccountControllerTest.php
index 6c0d6fe0cf..40a1968bcf 100644
--- a/tests/acceptance/Controllers/Report/AccountControllerTest.php
+++ b/tests/acceptance/Controllers/Report/AccountControllerTest.php
@@ -31,21 +31,12 @@ class AccountControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\AccountController::general
-     * Implement testGeneral().
      */
     public function testGeneral()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('report-data.account.general', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Report/BalanceControllerTest.php b/tests/acceptance/Controllers/Report/BalanceControllerTest.php
index e4bf4c5f97..aadfa39ec7 100644
--- a/tests/acceptance/Controllers/Report/BalanceControllerTest.php
+++ b/tests/acceptance/Controllers/Report/BalanceControllerTest.php
@@ -31,21 +31,11 @@ class BalanceControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\BalanceController::general
-     * Implement testGeneral().
      */
     public function testGeneral()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
+        $this->be($this->user());
+        $this->call('get', route('report-data.balance.general', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 }
diff --git a/tests/acceptance/Controllers/Report/BudgetControllerTest.php b/tests/acceptance/Controllers/Report/BudgetControllerTest.php
index 055ab950d6..e13c2bf47c 100644
--- a/tests/acceptance/Controllers/Report/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/Report/BudgetControllerTest.php
@@ -31,33 +31,21 @@ class BudgetControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\BudgetController::general
-     * Implement testGeneral().
      */
     public function testGeneral()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('report-data.budget.general', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\BudgetController::period
-     * Implement testPeriod().
      */
     public function testPeriod()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
+        $this->be($this->user());
+        $this->call('get', route('report-data.budget.period', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 }
diff --git a/tests/acceptance/Controllers/Report/CategoryControllerTest.php b/tests/acceptance/Controllers/Report/CategoryControllerTest.php
index 50a24e15db..44f12f599d 100644
--- a/tests/acceptance/Controllers/Report/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/Report/CategoryControllerTest.php
@@ -31,45 +31,31 @@ class CategoryControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\CategoryController::expenses
-     * Implement testExpenses().
      */
     public function testExpenses()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('report-data.category.expenses', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\CategoryController::income
-     * Implement testIncome().
      */
     public function testIncome()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('report-data.category.income', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\CategoryController::operations
-     * Implement testOperations().
      */
     public function testOperations()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
+        $this->be($this->user());
+        $this->call('get', route('report-data.category.operations', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 }
diff --git a/tests/acceptance/Controllers/Report/OperationsControllerTest.php b/tests/acceptance/Controllers/Report/OperationsControllerTest.php
index b37384af48..027bc2a0e9 100644
--- a/tests/acceptance/Controllers/Report/OperationsControllerTest.php
+++ b/tests/acceptance/Controllers/Report/OperationsControllerTest.php
@@ -31,45 +31,32 @@ class OperationsControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\OperationsController::expenses
-     * Implement testExpenses().
      */
     public function testExpenses()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('report-data.operations.expenses', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\OperationsController::income
-     * Implement testIncome().
      */
     public function testIncome()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('report-data.operations.income', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Report\OperationsController::operations
-     * Implement testOperations().
      */
     public function testOperations()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('report-data.operations.operations', ['1', '20120101', '20120131']));
+        $this->assertResponseStatus(200);
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
index ca19665d35..6925ac1c2c 100644
--- a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
@@ -31,33 +31,79 @@ class ConvertControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index
-     * Implement testIndex().
      */
-    public function testIndex()
+    public function testIndexDepositTransfer()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('transactions.convert.index', ['transfer', 683]));
+        $this->assertResponseStatus(200);
+        $this->see('Convert a deposit into a transfer');
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index
+     */
+    public function testIndexDepositWithdrawal()
+    {
+        $this->be($this->user());
+        $this->call('get', route('transactions.convert.index', ['withdrawal', 683]));
+        $this->assertResponseStatus(200);
+        $this->see('Convert a deposit into a withdrawal');
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index
+     */
+    public function testIndexTransferDeposit()
+    {
+        $this->be($this->user());
+        $this->call('get', route('transactions.convert.index', ['deposit', 684]));
+        $this->assertResponseStatus(200);
+        $this->see('Convert a transfer into a deposit');
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index
+     */
+    public function testIndexTransferWithdrawal()
+    {
+        $this->be($this->user());
+        $this->call('get', route('transactions.convert.index', ['withdrawal', 684]));
+        $this->assertResponseStatus(200);
+        $this->see('Convert a transfer into a withdrawal');
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index
+     */
+    public function testIndexWithdrawalDeposit()
+    {
+        $this->be($this->user());
+        $this->call('get', route('transactions.convert.index', ['deposit', 672]));
+        $this->assertResponseStatus(200);
+        $this->see('Convert a withdrawal into a deposit');
+    }
+
+    /**
+     * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index
+     */
+    public function testIndexWithdrawalTransfer()
+    {
+        $this->be($this->user());
+        $this->call('get', route('transactions.convert.index', ['transfer', 672]));
+        $this->assertResponseStatus(200);
+        $this->see('Convert a withdrawal into a transfer');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::postIndex
-     * Implement testPostIndex().
      */
     public function testPostIndex()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
+        //
+        $this->be($this->user());
+        $this->call('post', route('transactions.convert.index', ['transfer', 672]));
+        $this->assertResponseStatus(302);
+        $this->assertRedirectedToRoute('transactions.show', [672]);
     }
 }

From a2971314405a9aa60afccbcf0ae50bb9781a93e4 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 10 Dec 2016 17:46:19 +0100
Subject: [PATCH 035/223] Finished even more tests

---
 .../Controllers/Transaction/ConvertControllerTest.php      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
index 6925ac1c2c..2f26733e3a 100644
--- a/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/ConvertControllerTest.php
@@ -100,9 +100,12 @@ class ConvertControllerTest extends TestCase
      */
     public function testPostIndex()
     {
-        //
+        // convert a withdrawal to a transfer. Requires the ID of another asset account.
+        $data = [
+            'destination_account_asset' => 2,
+        ];
         $this->be($this->user());
-        $this->call('post', route('transactions.convert.index', ['transfer', 672]));
+        $this->call('post', route('transactions.convert.index', ['transfer', 672]), $data);
         $this->assertResponseStatus(302);
         $this->assertRedirectedToRoute('transactions.show', [672]);
     }

From bf99d5c299760fbfc0fb1285214f3c0da4878a62 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 10 Dec 2016 17:54:35 +0100
Subject: [PATCH 036/223] Fixed the account view, changed routes.

---
 app/Http/Controllers/AccountController.php  |  2 +-
 resources/views/reports/category/month.twig | 77 +++++++++++----------
 routes/web.php                              |  2 +-
 3 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 1d26e17f43..8add2bdce6 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -273,7 +273,7 @@ class AccountController extends Controller
         $start = $repository->oldestJournalDate($account);
         $end   = $repository->newestJournalDate($account);
 
-        return view('accounts.show_with_date', compact('account', 'journals', 'subTitle', 'start', 'end'));
+        return view('accounts.show-by-date', compact('account', 'journals', 'subTitle', 'start', 'end'));
     }
 
     /**
diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig
index 33f0d43ff9..cc393df917 100644
--- a/resources/views/reports/category/month.twig
+++ b/resources/views/reports/category/month.twig
@@ -155,45 +155,48 @@
         
     
     
                              
-        
                              
-            
                              
-                
                              
-                    
                              {{ 'average_spending_per_account'|_ }}
                              
-                
                              
-                
                              
-                    
-                        
-                        
-                            
-                            
-                            
-                            
-                        
-                        
-                        
-                        {% for row in averageExpenses %}
+        {% if averageExpenses|length > 0 %}
+            
                              
+                
                              
+                    
                              
+                        
                              {{ 'average_spending_per_account'|_ }}
                              
+                    
                              
+                    
                              
+                        
                              {{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
                              
+                            
-                                
-                                
-                                
-                                
+                                
+                                
+                                
+                                
-                        {% endfor %}
-                        
-                    
                              
                             
                              
-                                    {{ row.name }}
-                                
-                                    {{ row.average|formatAmount }}
-                                
-                                    {{ row.sum|formatAmount }}
-                                
-                                    {{ row.count }}
-                                {{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
                             
                              
+                            
+                            
+                            {% for row in averageExpenses %}
+                                
+                                    
+                                        {{ row.name }}
+                                    
+                                    
+                                        {{ row.average|formatAmount }}
+                                    
+                                    
+                                        {{ row.sum|formatAmount }}
+                                    
+                                    
+                                        {{ row.count }}
+                                    
+                                
+                            {% endfor %}
+                            
+                        
+                    
                              
                 
                              
             
                              
-        
                              
-        
                              
-            {% if topExpenses.count > 0 %}
+        {% endif %}
+        {% if topExpenses.count > 0 %}
+            
                              
+
                 
                              
                     
                              
                         
                              {{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})
                              
@@ -250,8 +253,8 @@
                         
                     
                              
                 
                              
-            {% endif %}
-        
                              
+            
                              
+        {% endif %}
     
     
                              
         {% if averageIncome|length > 0 %}
diff --git a/routes/web.php b/routes/web.php
index 7a10a32aba..e96979ecfe 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -619,7 +619,7 @@ Route::group(
  * Transaction Mass Controller
  */
 Route::group(
-    ['middleware' => 'user-full-auth', 'namespace' => 'Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass'], function () {
+    ['middleware' => 'user-full-auth', 'namespace' => 'Transaction', 'prefix' => 'transactions/mass', 'as' => 'transactions.mass.'], function () {
     Route::get('edit/{journalList}', ['uses' => 'MassController@edit', 'as' => 'edit']);
     Route::get('delete/{journalList}', ['uses' => 'MassController@delete', 'as' => 'delete']);
     Route::post('update', ['uses' => 'MassController@update', 'as' => 'update']);

From ec3b356f8685f4bf52a2e47b14809cca74c03dd8 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 10 Dec 2016 17:55:47 +0100
Subject: [PATCH 037/223] Fix mass edit and mass delete routes. [skip ci]

---
 public/js/ff/transactions/list.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/ff/transactions/list.js b/public/js/ff/transactions/list.js
index 22b4089ddf..42786654a3 100644
--- a/public/js/ff/transactions/list.js
+++ b/public/js/ff/transactions/list.js
@@ -31,7 +31,7 @@ function goToMassEdit() {
     var checkedArray = getCheckboxes();
 
     // go to specially crafted URL:
-    window.location.href = 'transactions/mass-edit/' + checkedArray;
+    window.location.href = 'transactions/mass/edit/' + checkedArray;
     return false;
 }
 
@@ -40,7 +40,7 @@ function goToMassDelete() {
     var checkedArray = getCheckboxes();
 
     // go to specially crafted URL:
-    window.location.href = 'transactions/mass-delete/' + checkedArray;
+    window.location.href = 'transactions/mass/delete/' + checkedArray;
     return false;
 }
 

From b4eac84097b230a1d117e145e5adf4159c275228 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 11 Dec 2016 10:38:06 +0100
Subject: [PATCH 038/223] Update tests, fixes some bugs.

---
 .../Transaction/MassController.php            |   8 +-
 app/Http/breadcrumbs.php                      |  24 ++++
 app/Repositories/Journal/JournalTasker.php    |   4 +-
 resources/views/transactions/mass-delete.twig |   4 +-
 resources/views/transactions/mass-edit.twig   |   4 +-
 routes/web.php                                |  14 ++-
 .../Transaction/MassControllerTest.php        |  93 ++++++++++------
 .../Transaction/SingleControllerTest.php      | 105 ++++++++++++------
 8 files changed, 169 insertions(+), 87 deletions(-)

diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php
index 54e886abab..8b234d3e36 100644
--- a/app/Http/Controllers/Transaction/MassController.php
+++ b/app/Http/Controllers/Transaction/MassController.php
@@ -58,7 +58,7 @@ class MassController extends Controller
      *
      * @return View
      */
-    public function massDelete(Collection $journals)
+    public function delete(Collection $journals)
     {
         $subTitle = trans('firefly.mass_delete_journals');
 
@@ -77,7 +77,7 @@ class MassController extends Controller
      *
      * @return mixed
      */
-    public function massDestroy(MassDeleteJournalRequest $request, JournalRepositoryInterface $repository)
+    public function destroy(MassDeleteJournalRequest $request, JournalRepositoryInterface $repository)
     {
         $ids = $request->get('confirm_mass_delete');
         $set = new Collection;
@@ -114,7 +114,7 @@ class MassController extends Controller
      *
      * @return View
      */
-    public function massEdit(Collection $journals)
+    public function edit(Collection $journals)
     {
         $subTitle = trans('firefly.mass_edit_journals');
 
@@ -187,7 +187,7 @@ class MassController extends Controller
      *
      * @return mixed
      */
-    public function massUpdate(MassEditJournalRequest $request, JournalRepositoryInterface $repository)
+    public function update(MassEditJournalRequest $request, JournalRepositoryInterface $repository)
     {
         $journalIds = $request->get('journals');
         $count      = 0;
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index 0b90f476f8..451777784c 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -27,6 +27,7 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\User;
+use Illuminate\Support\Collection;
 
 /**
  * HOME
@@ -652,6 +653,29 @@ Breadcrumbs::register(
 }
 );
 
+/**
+ * MASS TRANSACTION EDIT / DELETE
+ */
+Breadcrumbs::register(
+    'transactions.mass.edit', function (BreadCrumbGenerator $breadcrumbs, Collection $journals) {
+
+    $journalIds = $journals->pluck('id')->toArray();
+    $what = strtolower($journals->first()->transactionType->type);
+    $breadcrumbs->parent('transactions.index', $what);
+    $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds));
+}
+);
+
+Breadcrumbs::register(
+    'transactions.mass.delete', function (BreadCrumbGenerator $breadcrumbs, Collection $journals) {
+
+    $journalIds = $journals->pluck('id')->toArray();
+    $what = strtolower($journals->first()->transactionType->type);
+    $breadcrumbs->parent('transactions.index', $what);
+    $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.delete', $journalIds));
+}
+);
+
 
 /**
  * SPLIT
diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php
index 16cc5a5f3a..eb77c77e6f 100644
--- a/app/Repositories/Journal/JournalTasker.php
+++ b/app/Repositories/Journal/JournalTasker.php
@@ -113,8 +113,8 @@ class JournalTasker implements JournalTaskerInterface
 
         /** @var Transaction $entry */
         foreach ($set as $entry) {
-            $sourceBalance      = $this->getBalance($entry->id);
-            $destinationBalance = $this->getBalance($entry->destination_id);
+            $sourceBalance      = $this->getBalance(intval($entry->id));
+            $destinationBalance = $this->getBalance(intval($entry->destination_id));
             $budget             = $entry->budgets->first();
             $category           = $entry->categories->first();
             $transaction        = [
diff --git a/resources/views/transactions/mass-delete.twig b/resources/views/transactions/mass-delete.twig
index 6eec80dec5..f3525c1d6c 100644
--- a/resources/views/transactions/mass-delete.twig
+++ b/resources/views/transactions/mass-delete.twig
@@ -1,11 +1,11 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journals) }}
 {% endblock %}
 
 {% block content %}
-    
                              
+    
         
 
         
                              
diff --git a/resources/views/transactions/mass-edit.twig b/resources/views/transactions/mass-edit.twig
index 6489998547..1399aea9d4 100644
--- a/resources/views/transactions/mass-edit.twig
+++ b/resources/views/transactions/mass-edit.twig
@@ -1,11 +1,11 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journals) }}
 {% endblock %}
 
 {% block content %}
-    
+    
         
 
         
                              
diff --git a/routes/web.php b/routes/web.php
index e96979ecfe..f6dbed2f93 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -228,9 +228,11 @@ Route::group(
     Route::get('expense', ['uses' => 'AccountController@expenseAccounts', 'as' => 'expense']);
     Route::get('revenue', ['uses' => 'AccountController@revenueAccounts', 'as' => 'revenue']);
     Route::get('report/{accountList}/{start_date}/{end_date}', ['uses' => 'AccountController@report', 'as' => 'report']);
+    Route::get('all/{account}', ['uses' => 'AccountController@period', 'as' => 'all']); // TODO
     Route::get('single/{account}', ['uses' => 'AccountController@single', 'as' => 'single']);
     Route::get('period/{account}/{date}', ['uses' => 'AccountController@period', 'as' => 'period']);
 
+
     Route::get('income-category/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@incomeCategory', 'as' => 'income-category']);
     Route::get('expense-category/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@expenseCategory', 'as' => 'expense-category']);
     Route::get('expense-budget/{account}/{start_date}/{end_date}', ['uses' => 'AccountController@expenseBudget', 'as' => 'expense-budget']);
@@ -307,8 +309,8 @@ Route::group(
  * Chart\PiggyBank Controller
  */
 Route::group(
-    ['middleware' => 'user-full-auth', 'namespace' => 'Chart', 'prefix' => 'chart/piggy-bank','as'=> 'chart.piggy-bank.'], function () {
-    Route::get('{piggyBank}', ['uses' => 'PiggyBankController@history','as' => 'history']);
+    ['middleware' => 'user-full-auth', 'namespace' => 'Chart', 'prefix' => 'chart/piggy-bank', 'as' => 'chart.piggy-bank.'], function () {
+    Route::get('{piggyBank}', ['uses' => 'PiggyBankController@history', 'as' => 'history']);
 }
 );
 
@@ -593,9 +595,11 @@ Route::group(
  */
 Route::group(
     ['middleware' => 'user-full-auth', 'prefix' => 'transactions', 'as' => 'transactions.'], function () {
-    Route::get('{what}', ['uses' => 'TransactionController@index', 'as' => 'index'])->where(['what' => 'withdrawal|deposit|transfers']);
-    Route::get('{what}/all', ['uses' => 'TransactionController@indexAll', 'as' => 'index.all'])->where(['what' => 'withdrawal|deposit|transfers']);
-    Route::get('{what}/{date}', ['uses' => 'TransactionController@indexByDate', 'as' => 'index.date'])->where(['what' => 'withdrawal|deposit|transfers']);
+    Route::get('{what}', ['uses' => 'TransactionController@index', 'as' => 'index'])->where(['what' => 'withdrawal|deposit|transfers|transfer']);
+    Route::get('{what}/all', ['uses' => 'TransactionController@indexAll', 'as' => 'index.all'])->where(['what' => 'withdrawal|deposit|transfers|transfer']);
+    Route::get('{what}/{date}', ['uses' => 'TransactionController@indexByDate', 'as' => 'index.date'])->where(
+        ['what' => 'withdrawal|deposit|transfers|transfer']
+    );
     Route::get('show/{tj}', ['uses' => 'TransactionController@show', 'as' => 'show']);
     Route::post('reorder', ['uses' => 'TransactionController@reorder', 'as' => 'reorder']);
 }
diff --git a/tests/acceptance/Controllers/Transaction/MassControllerTest.php b/tests/acceptance/Controllers/Transaction/MassControllerTest.php
index 4e51159a00..f5278bd6da 100644
--- a/tests/acceptance/Controllers/Transaction/MassControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/MassControllerTest.php
@@ -30,58 +30,81 @@ class MassControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Transaction\MassController::massDelete
-     * Implement testMassDelete().
+     * @covers \FireflyIII\Http\Controllers\Transaction\MassController::delete
      */
-    public function testMassDelete()
+    public function testDelete()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('transactions.mass.delete', [561, 562]));
+        $this->assertResponseStatus(200);
+        $this->see('Delete a number of transactions');
+        // has bread crumb
+        $this->see('
                                ');
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Transaction\MassController::massDestroy
-     * Implement testMassDestroy().
+     * @covers \FireflyIII\Http\Controllers\Transaction\MassController::destroy
      */
-    public function testMassDestroy()
+    public function testDestroy()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->session(['transactions.mass-delete.url' => 'http://localhost']);
+
+        $data = [
+            'confirm_mass_delete' => [56, 37],
+        ];
+        $this->be($this->user());
+        $this->call('post', route('transactions.mass.destroy'), $data);
+        $this->assertSessionHas('success');
+        $this->assertResponseStatus(302);
+
+        // visit them should give 404.
+        $this->call('get', route('transactions.show', [56]));
+        $this->assertResponseStatus(404);
+
+
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Transaction\MassController::massEdit
-     * Implement testMassEdit().
+     * @covers \FireflyIII\Http\Controllers\Transaction\MassController::edit
      */
-    public function testMassEdit()
+    public function testEdit()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('transactions.mass.delete', [132, 113]));
+        $this->assertResponseStatus(200);
+        $this->see('Edit a number of transactions');
+        // has bread crumb
+        $this->see('
                                  ');
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Transaction\MassController::massUpdate
-     * Implement testMassUpdate().
+     * @covers \FireflyIII\Http\Controllers\Transaction\MassController::update
      */
-    public function testMassUpdate()
+    public function testUpdate()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+
+        $this->session(['transactions.mass-edit.url' => 'http://localhost']);
+
+        $data = [
+            'journals'                      => [132],
+            'description'                   => [132 => 'Updated salary thing'],
+            'amount'                        => [132 => 1600],
+            'amount_currency_id_amount_132' => 1,
+            'date'                          => [132 => '2014-07-24'],
+            'source_account_name'           => [132 => 'Job'],
+            'destination_account_id'        => [132 => 1],
+            'category'                      => [132 => 'Salary'],
+        ];
+
+        $this->be($this->user());
+        $this->call('post', route('transactions.mass.update', [132]), $data);
+        $this->assertSessionHas('success');
+        $this->assertResponseStatus(302);
+
+        // visit them should show updated content
+        $this->call('get', route('transactions.show', [132]));
+        $this->assertResponseStatus(200);
+        $this->see('Updated salary thing');
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php b/tests/acceptance/Controllers/Transaction/SingleControllerTest.php
index b653368754..172aa7d0d4 100644
--- a/tests/acceptance/Controllers/Transaction/SingleControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/SingleControllerTest.php
@@ -11,6 +11,8 @@
 
 namespace Transaction;
 
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use TestCase;
 
 /**
@@ -31,81 +33,110 @@ class SingleControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::create
-     * Implement testCreate().
      */
     public function testCreate()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('transactions.create', ['withdrawal']));
+        $this->assertResponseStatus(200);
+        // has bread crumb
+        $this->see('
                                    ');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::delete
-     * Implement testDelete().
      */
     public function testDelete()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('transactions.delete', [12]));
+        $this->assertResponseStatus(200);
+        // has bread crumb
+        $this->see('
                                      ');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::destroy
-     * Implement testDestroy().
      */
     public function testDestroy()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->session(['transactions.delete.url' => 'http://localhost']);
+        $this->be($this->user());
+
+        $repository = $this->mock(JournalRepositoryInterface::class);
+        $repository->shouldReceive('first')->once()->andReturn(new TransactionJournal);
+        $repository->shouldReceive('delete')->once();
+
+        $this->call('post', route('transactions.destroy', [13]));
+        $this->assertResponseStatus(302);
+        $this->assertSessionHas('success');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit
-     * Implement testEdit().
      */
     public function testEdit()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('transactions.edit', [13]));
+        $this->assertResponseStatus(200);
+        // has bread crumb
+        $this->see('
                                        ');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store
-     * Implement testStore().
      */
     public function testStore()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->session(['transactions.create.url' => 'http://localhost']);
+        $this->be($this->user());
+
+        $data = [
+            'what'                      => 'withdrawal',
+            'amount'                    => 10,
+            'amount_currency_id_amount' => 1,
+            'source_account_id'         => 1,
+            'destination_account_name'  => 'Some destination',
+            'date'                      => '2016-01-01',
+            'description'               => 'Some description',
+        ];
+        $this->call('post', route('transactions.store', ['withdrawal']), $data);
+        $this->assertResponseStatus(302);
+        $this->assertSessionHas('success');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::update
-     * Implement testUpdate().
      */
     public function testUpdate()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->session(['transactions.edit.url' => 'http://localhost']);
+        $this->be($this->user());
+        $data = [
+            'id'                        => 123,
+            'what'                      => 'withdrawal',
+            'description'               => 'Updated groceries',
+            'source_account_id'         => 1,
+            'destination_account_name'  => 'PLUS',
+            'amount'                    => 123,
+            'amount_currency_id_amount' => 1,
+            'budget_id'                 => 1,
+            'category'                  => 'Daily groceries',
+            'tags'                      => '',
+            'date'                      => '2016-01-01',
+        ];
+
+        $this->call('post', route('transactions.update', [123]), $data);
+        $this->assertResponseStatus(302);
+        $this->assertSessionHas('success');
+
+        $this->call('get', route('transactions.show', [123]));
+        $this->assertResponseStatus(200);
+        $this->see('Updated groceries');
+        // has bread crumb
+        $this->see('
                                          ');
+
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }

From 5c02eaa66c6b20a1e32c33e204ad770a9d4746fd Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 11 Dec 2016 11:04:53 +0100
Subject: [PATCH 039/223] Split controller tests.

---
 .../Transaction/SplitController.php           |  1 +
 app/Http/breadcrumbs.php                      | 11 +---
 .../Transaction/SplitControllerTest.php       | 51 +++++++++++++------
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php
index 595fb2ddbe..eb061a862f 100644
--- a/app/Http/Controllers/Transaction/SplitController.php
+++ b/app/Http/Controllers/Transaction/SplitController.php
@@ -131,6 +131,7 @@ class SplitController extends Controller
      */
     public function update(Request $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
     {
+
         if ($this->isOpeningBalance($journal)) {
             return $this->redirectToAccount($journal);
         }
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index 451777784c..a16717d6c3 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -681,15 +681,8 @@ Breadcrumbs::register(
  * SPLIT
  */
 Breadcrumbs::register(
-    'transactions.edit-split', function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) {
+    'transactions.split.edit', function (BreadCrumbGenerator $breadcrumbs, TransactionJournal $journal) {
     $breadcrumbs->parent('transactions.show', $journal);
-    $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit-split', [$journal->id]));
-}
-);
-
-Breadcrumbs::register(
-    'split.journal.create', function (BreadCrumbGenerator $breadcrumbs, string $what) {
-    $breadcrumbs->parent('transactions.index', $what);
-    $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('split.journal.create', [$what]));
+    $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.split.edit', [$journal->id]));
 }
 );
diff --git a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
index 1771843c4c..68b777dd1c 100644
--- a/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
+++ b/tests/acceptance/Controllers/Transaction/SplitControllerTest.php
@@ -35,10 +35,11 @@ class SplitControllerTest extends TestCase
      */
     public function testEdit()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('transactions.split.edit', [18]));
+        $this->assertResponseStatus(200);
+        // has bread crumb
+        $this->see('
                                            ');
     }
 
     /**
@@ -47,17 +48,37 @@ class SplitControllerTest extends TestCase
      */
     public function testUpdate()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->session(['transactions.edit-split.url' => 'http://localhost']);
+
+        $data = [
+            'id'                             => 18,
+            'what'                           => 'deposit',
+            'journal_description'            => 'Updated salary',
+            'currency_id'                    => 1,
+            'journal_destination_account_id' => 1,
+            'journal_amount'                 => 1591,
+            'date'                           => '2014-01-24',
+            'tags'                           => '',
+            'transactions'                   => [
+                [
+                    'description'         => 'Split #1',
+                    'source_account_name' => 'Job',
+                    'amount'              => 1591,
+                    'category'            => '',
+                ],
+            ],
+        ];
+        $this->be($this->user());
+        $this->call('post', route('transactions.split.update', [18]), $data);
+        $this->assertResponseStatus(302);
+        $this->assertSessionHas('success');
+
+        // journal is updated?
+        $this->call('get', route('transactions.show', [18]));
+        $this->assertResponseStatus(200);
+        $this->see('Updated salary');
+        // has bread crumb
+        $this->see('
                                              ');
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }

From 43f59a1135aa65b046f512fa7fa47a3d23d8e412 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 11 Dec 2016 11:15:19 +0100
Subject: [PATCH 040/223] Fixed missing chart.

---
 app/Http/Controllers/AccountController.php    |  10 +-
 .../Controllers/Chart/AccountController.php   | 149 ++++++++++++------
 resources/views/accounts/show-by-date.twig    |   2 +-
 resources/views/accounts/show.twig            |   2 +-
 routes/web.php                                |   2 +-
 .../Controllers/AccountControllerTest.php     |   8 -
 6 files changed, 106 insertions(+), 67 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 8add2bdce6..9fc18dc35d 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -239,7 +239,7 @@ class AccountController extends Controller
         $end          = session('end', Navigation::endOfPeriod(new Carbon, $range));
         $page         = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
         $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
-
+        $chartUri     = route('chart.account.single', [$account->id]);
         // grab those journals:
         $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page);
         $journals = $collector->getPaginatedJournals();
@@ -248,7 +248,7 @@ class AccountController extends Controller
         // generate entries for each period (and cache those)
         $entries = $this->periodEntries($account);
 
-        return view('accounts.show', compact('account', 'what', 'entries', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end'));
+        return view('accounts.show', compact('account', 'what', 'entries', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
     }
 
     /**
@@ -262,6 +262,7 @@ class AccountController extends Controller
         $subTitle = sprintf('%s (%s)', $account->name, strtolower(trans('firefly.everything')));
         $page     = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
         $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
+        $chartUri = route('chart.account.all', [$account->id]);
 
         // replace with journal collector:
         $collector = new JournalCollector(auth()->user());
@@ -273,7 +274,7 @@ class AccountController extends Controller
         $start = $repository->oldestJournalDate($account);
         $end   = $repository->newestJournalDate($account);
 
-        return view('accounts.show-by-date', compact('account', 'journals', 'subTitle', 'start', 'end'));
+        return view('accounts.show-by-date', compact('account', 'journals', 'subTitle', 'start', 'end','chartUri'));
     }
 
     /**
@@ -291,6 +292,7 @@ class AccountController extends Controller
         $subTitle = $account->name . ' (' . Navigation::periodShow($start, $range) . ')';
         $page     = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
         $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
+        $chartUri = route('chart.account.period', [$account->id, $carbon->format('Y-m-d')]);
 
         // replace with journal collector:
         $collector = new JournalCollector(auth()->user());
@@ -298,7 +300,7 @@ class AccountController extends Controller
         $journals = $collector->getPaginatedJournals();
         $journals->setPath('accounts/show/' . $account->id . '/' . $date);
 
-        return view('accounts.show-by-date', compact('category', 'date', 'account', 'journals', 'subTitle', 'carbon', 'start', 'end'));
+        return view('accounts.show-by-date', compact('category', 'date', 'account', 'journals', 'subTitle', 'carbon', 'start', 'end','chartUri'));
     }
 
     /**
diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index df4557a824..b8f1ad5a7d 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -55,6 +55,51 @@ class AccountController extends Controller
         $this->generator = app(AccountChartGeneratorInterface::class);
     }
 
+    /**
+     * @param Account $account
+     * @param string  $date
+     *
+     * @return \Illuminate\Http\JsonResponse
+     * @throws FireflyException
+     */
+    public function all(Account $account)
+    {
+        $cache = new CacheProperties();
+        $cache->addProperty('account-all-chart');
+        $cache->addProperty($account->id);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
+
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        $start      = $repository->oldestJournalDate($account);
+        $end        = new Carbon;
+
+        $format    = (string)trans('config.month_and_day');
+        $range     = Steam::balanceInRange($account, $start, $end);
+        $current   = clone $start;
+        $previous  = array_values($range)[0];
+        $labels    = [];
+        $chartData = [];
+
+        while ($end >= $current) {
+            $theDate = $current->format('Y-m-d');
+            $balance = $range[$theDate] ?? $previous;
+
+            $labels[]    = $current->formatLocalized($format);
+            $chartData[] = $balance;
+            $previous    = $balance;
+            $current->addDay();
+        }
+
+
+        $data = $this->generator->single($account, $labels, $chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+    }
+
     /**
      * Shows the balances for all the user's expense accounts.
      *
@@ -242,6 +287,58 @@ class AccountController extends Controller
 
     }
 
+    /**
+     * @param Account $account
+     * @param string  $date
+     *
+     * @return \Illuminate\Http\JsonResponse
+     * @throws FireflyException
+     */
+    public function period(Account $account, string $date)
+    {
+        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);
+        // chart properties for cache:
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('frontpage');
+        $cache->addProperty('specificPeriod');
+        $cache->addProperty($account->id);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
+
+        $format    = (string)trans('config.month_and_day');
+        $range     = Steam::balanceInRange($account, $start, $end);
+        $current   = clone $start;
+        $previous  = array_values($range)[0];
+        $labels    = [];
+        $chartData = [];
+
+        while ($end >= $current) {
+            $theDate = $current->format('Y-m-d');
+            $balance = $range[$theDate] ?? $previous;
+
+            $labels[]    = $current->formatLocalized($format);
+            $chartData[] = $balance;
+            $previous    = $balance;
+            $current->addDay();
+        }
+
+
+        $data = $this->generator->single($account, $labels, $chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+    }
+
     /**
      * Shows the balances for a given set of dates and accounts.
      *
@@ -353,58 +450,6 @@ class AccountController extends Controller
         return Response::json($data);
     }
 
-    /**
-     * @param Account $account
-     * @param string  $date
-     *
-     * @return \Illuminate\Http\JsonResponse
-     * @throws FireflyException
-     */
-    public function period(Account $account, string $date)
-    {
-        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);
-        // chart properties for cache:
-        $cache = new CacheProperties();
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('frontpage');
-        $cache->addProperty('specificPeriod');
-        $cache->addProperty($account->id);
-        if ($cache->has()) {
-            return Response::json($cache->get());
-        }
-
-        $format    = (string)trans('config.month_and_day');
-        $range     = Steam::balanceInRange($account, $start, $end);
-        $current   = clone $start;
-        $previous  = array_values($range)[0];
-        $labels    = [];
-        $chartData = [];
-
-        while ($end >= $current) {
-            $theDate = $current->format('Y-m-d');
-            $balance = $range[$theDate] ?? $previous;
-
-            $labels[]    = $current->formatLocalized($format);
-            $chartData[] = $balance;
-            $previous    = $balance;
-            $current->addDay();
-        }
-
-
-        $data = $this->generator->single($account, $labels, $chartData);
-        $cache->store($data);
-
-        return Response::json($data);
-    }
-
     /**
      * @param Collection $accounts
      * @param Carbon     $start
diff --git a/resources/views/accounts/show-by-date.twig b/resources/views/accounts/show-by-date.twig
index e342b62344..bc298b3be1 100644
--- a/resources/views/accounts/show-by-date.twig
+++ b/resources/views/accounts/show-by-date.twig
@@ -94,7 +94,7 @@
         var dateString = "{{ date|escape }}";
 
         // uri's for charts:
-        var chartUri = '{{ route('chart.account.period', [account.id, date]) }}';
+        var chartUri = '{{ chartUri }}';
         var incomeCategoryUri = '{{ route('chart.account.income-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
         var expenseCategoryUri = '{{ route('chart.account.expense-category', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
         var expenseBudgetUri = '{{ route('chart.account.expense-budget', [account.id, start.format('Ymd'), end.format('Ymd')]) }}';
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index ddc6034b04..6b37740fe5 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -123,7 +123,7 @@
     
-    
-    
-    
-    
-    
-    
-    
-{% endblock %}
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 6b37740fe5..42068245e4 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -1,7 +1,7 @@
 {% extends "./layout/default" %}
 
 {% block breadcrumbs %}
-    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account) }}
+    {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account, start, end) }}
 {% endblock %}
 
 {% block content %}
@@ -9,7 +9,8 @@
         
                                              
             
                                              
                 
                                              
-                    
                                              {{ account.name }}
                                              
+                    
                                              {{ account.name }}
+                        ({{ trans('firefly.from_to', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }})
                                              
 
                     
                     
                                              
@@ -68,7 +69,7 @@
     
                                              
 
     
                                              
-        
                                              
+        
                                              
             
                                              
                 
                                              
                     
                                              {{ 'transactions'|_ }}
                                              
@@ -84,35 +85,37 @@
                 
                                              
             
                                              
         
                                              
-        
                                              
-            {% for entry in entries %}
-                {% if entry[2] != 0 or entry[3] != 0 %}
-                    
                                              
-                        
                                              
-                            
                                              {{ entry[1] }}
-                            
                                              
+        {% if entries %}
+            
                                              
+                {% for entry in entries %}
+                    {% if entry[2] != 0 or entry[3] != 0 %}
+                        
                                              
+                            
                                              
+                                
                                              {{ entry[1] }}
+                                
                                              
+                            
                                              
+                            
                                              
+                                
+                                    {% if entry[2] != 0 %}
+                                        
+                                            
+                                            
+                                        
+                                    {% endif %}
+                                    {% if entry[3] != 0 %}
+                                        
+                                            
+                                            
+                                        
+                                    {% endif %}
+                                
                                              {{ 'spent'|_ }}{{ entry[2]|formatAmount }}
                                              {{ 'earned'|_ }}{{ entry[3]|formatAmount }}
                                              
+                            
                                              
                         
                                              
-                        
                                              
-                            
-                                {% if entry[2] != 0 %}
-                                    
-                                        
-                                        
-                                    
-                                {% endif %}
-                                {% if entry[3] != 0 %}
-                                    
-                                        
-                                        
-                                    
-                                {% endif %}
-                            
                                              {{ 'spent'|_ }}{{ entry[2]|formatAmount }}
                                              {{ 'earned'|_ }}{{ entry[3]|formatAmount }}
                                              
-                        
                                              
-                    
                                              
-                {% endif %}
+                    {% endif %}
 
-            {% endfor %}
-        
                                              
+                {% endfor %}
+            
                                              
+        {% endif %}
     
                                              
 
 
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 9ff1006823..92e130e683 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -9,7 +9,7 @@
         
                                              
             
                                              
                 
                                              
-                    
                                              {{ 'overview'|_ }} (month)
                                              
+                    
                                              {{ 'overview'|_ }} ({{ 'month'|_ }})
                                              
                 
                                              
                 
                                              
                     
@@ -19,7 +19,7 @@
         
                                              
             
                                              
                 
                                              
-                    
                                              {{ 'overview'|_ }} (all)
                                              
+                    
                                              {{ 'overview'|_ }} ({{ 'all'|_ }})
                                              
                 
                                              
                 
                                              
                     
diff --git a/resources/views/search/partials/tags.twig b/resources/views/search/partials/tags.twig
index 919fa19daf..fd4342c67b 100644
--- a/resources/views/search/partials/tags.twig
+++ b/resources/views/search/partials/tags.twig
@@ -16,8 +16,8 @@
                 
                                              
             
             
-                {{ tag.tag }}<
-                /td>
+                {{ tag.tag }}
+            
             {{ ('tag'~tag.tagMode)|_ }}
         
     {% endfor %}

From f1230e47f7b905f004db09ae8db810370bc3bdeb Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Mon, 12 Dec 2016 20:11:52 +0100
Subject: [PATCH 077/223] New translations

---
 resources/lang/pt_BR/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 8f16c150fa..d90404dacb 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -526,6 +526,7 @@ return [
     'select_more_than_one_account'               => 'Por favor, selecione mais de uma conta',
     'select_more_than_one_category'              => 'Por favor, selecione mais de uma categoria',
     'select_more_than_one_budget'                => 'Please select more than one budget',
+    'from_to'                                    => 'From :start to :end',
 
     // categories:
     'new_category'                               => 'Nova categoria',

From 6f456091618909f335157d1383f1502c410c29f6 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Mon, 12 Dec 2016 20:12:20 +0100
Subject: [PATCH 078/223] New translations

---
 resources/lang/zh_HK/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index 455f5ce514..6362b7ec9e 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -526,6 +526,7 @@ return [
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
+    'from_to'                                    => 'From :start to :end',
 
     // categories:
     'new_category'                               => 'New category',

From 445ae7e10eae244bec375b5c2c05aba3830e6a18 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Mon, 12 Dec 2016 20:12:25 +0100
Subject: [PATCH 079/223] New translations

---
 resources/lang/zh_TW/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 78f436b340..7fd5fc32fa 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -526,6 +526,7 @@ return [
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
+    'from_to'                                    => 'From :start to :end',
 
     // categories:
     'new_category'                               => 'New category',

From ed6d25067c179284a59aa58bd874c0b426300040 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Mon, 12 Dec 2016 20:12:32 +0100
Subject: [PATCH 080/223] New translations

---
 resources/lang/fr_FR/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index b7571efbc8..2ba27cee2f 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -526,6 +526,7 @@ return [
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
+    'from_to'                                    => 'From :start to :end',
 
     // categories:
     'new_category'                               => 'Nouvelle catégorie',

From 4a30d9f6bb109d8234f90321e6d6650b3350226b Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Mon, 12 Dec 2016 20:12:37 +0100
Subject: [PATCH 081/223] New translations

---
 resources/lang/de_DE/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 0f42972c56..b894e7ecb6 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -526,6 +526,7 @@ return [
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
+    'from_to'                                    => 'From :start to :end',
 
     // categories:
     'new_category'                               => 'Neue Kategorie',

From 494d1743a2a8e19554905064de42eee1661cf7fa Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Mon, 12 Dec 2016 20:12:43 +0100
Subject: [PATCH 082/223] New translations

---
 resources/lang/hr_HR/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index 455f5ce514..6362b7ec9e 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -526,6 +526,7 @@ return [
     'select_more_than_one_account'               => 'Please select more than one account',
     'select_more_than_one_category'              => 'Please select more than one category',
     'select_more_than_one_budget'                => 'Please select more than one budget',
+    'from_to'                                    => 'From :start to :end',
 
     // categories:
     'new_category'                               => 'New category',

From 8c24f14ee53511b1e5fea22597ad302bd86cab4c Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Mon, 12 Dec 2016 20:12:47 +0100
Subject: [PATCH 083/223] New translations

---
 resources/lang/nl_NL/firefly.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 7f017381e4..93db966162 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -526,6 +526,7 @@ return [
     'select_more_than_one_account'               => 'Selecteer meer dan één rekening',
     'select_more_than_one_category'              => 'Selecteer meer dan één categorie',
     'select_more_than_one_budget'                => 'Please select more than one budget',
+    'from_to'                                    => 'From :start to :end',
 
     // categories:
     'new_category'                               => 'Nieuwe categorie',

From 4068df5e506a9d19b5ecdbabd2de0a9e44ec31dd Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Mon, 12 Dec 2016 20:21:33 +0100
Subject: [PATCH 084/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 93db966162..94e685da7d 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -525,8 +525,8 @@ return [
     'no_data_for_chart'                          => 'Er is (nog) niet genoeg informatie om deze grafiek te tekenen.',
     'select_more_than_one_account'               => 'Selecteer meer dan één rekening',
     'select_more_than_one_category'              => 'Selecteer meer dan één categorie',
-    'select_more_than_one_budget'                => 'Please select more than one budget',
-    'from_to'                                    => 'From :start to :end',
+    'select_more_than_one_budget'                => 'Selecteer meer dan één budget',
+    'from_to'                                    => 'Van :start tot en met :end',
 
     // categories:
     'new_category'                               => 'Nieuwe categorie',
@@ -635,7 +635,7 @@ return [
     'report_default'                             => 'Standaard financieel rapport (:start tot :end)',
     'report_audit'                               => 'Transactiehistorie-overzicht van :start tot :end',
     'report_category'                            => 'Categorierapport van :start tot :end',
-    'report_budget'                              => 'Budget report for :start until :end',
+    'report_budget'                              => 'Budgetrapport van :start tot en met :end',
     'quick_link_reports'                         => 'Snelle links',
     'quick_link_default_report'                  => 'Standaard financieel rapport',
     'quick_link_audit_report'                    => 'Transactiehistorie-overzicht',
@@ -682,7 +682,7 @@ return [
     'report_type_default'                        => 'Standard financieel rapport',
     'report_type_audit'                          => 'Transactiehistorie-overzicht (audit)',
     'report_type_category'                       => 'Categorierapport',
-    'report_type_budget'                         => 'Budget report',
+    'report_type_budget'                         => 'Budgetrapport',
     'report_type_meta-history'                   => 'Overzicht van categorieën, budgetten en contracten',
     'more_info_help'                             => 'Meer informatie over deze rapporten vind je in de hulppagina\'s. Klik daarvoor op het (?) icoontje rechtsboven.',
     'report_included_accounts'                   => 'Accounts in rapport',
@@ -702,14 +702,14 @@ return [
     'reports_submit'                             => 'Bekijk overzicht',
     'end_after_start_date'                       => 'Einddatum moet na begindatum liggen.',
     'select_category'                            => 'Selecteer minstens één categorie.',
-    'select_budget'                              => 'Select one or more budgets.',
+    'select_budget'                              => 'Selecteer minstens één budget.',
     'income_per_category'                        => 'Inkomen per categorie',
     'expense_per_category'                       => 'Uitgaven per categorie',
-    'expense_per_budget'                         => 'Expense per budget',
+    'expense_per_budget'                         => 'Uitgaven per budget',
     'income_per_account'                         => 'Inkomen per rekening',
     'expense_per_account'                        => 'Uitgaven per rekening',
-    'include_not_in_category'                    => 'Include categories not selected for this report',
-    'include_not_in_budget'                      => 'Include budgets not selected for this report',
+    'include_not_in_category'                    => 'Laat ook categoriën zien van buiten dit rapport',
+    'include_not_in_budget'                      => 'Laat ook budgetten zien van buiten dit rapport',
     'everything_else'                            => 'De rest',
     'income_and_expenses'                        => 'Inkomsten en uitgaven',
     'spent_average'                              => 'Uitgegeven (gemiddeld)',
@@ -731,9 +731,9 @@ return [
     'overspent'                                  => 'Teveel uitgegeven',
     'left'                                       => 'Over',
     'no_budget'                                  => '(geen budget)',
-    'max-amount'                                 => 'Maximum amount',
-    'min-amount'                                 => 'Minumum amount',
-    'journal-amount'                             => 'Current bill entry',
+    'max-amount'                                 => 'Maximumbedrag',
+    'min-amount'                                 => 'Minimumbedrag',
+    'journal-amount'                             => 'Bedrag voor dit contract',
     'name'                                       => 'Naam',
     'date'                                       => 'Datum',
     'paid'                                       => 'Betaald',
@@ -832,7 +832,7 @@ return [
     'setting_single_user_mode_explain'     => 'Standaard accepteert Firefly III maar één (1) gebruiker: jijzelf. Dit is een veiligheidsmaatregel, zodat anderen niet zomaar jouw installatie kunnen gebruiken, tenzij je dit aanzet. Toekomstige registraties zijn nu geblokkeerd. Als je dit vinkje uitzet kunnen anderen jouw installatie ook gebruiken, gegeven dat ze er bij kunnen (je installatie hangt aan het internet).',
     'store_configuration'                  => 'Configuratie opslaan',
     'single_user_administration'           => 'Gebruikersadministratie voor :email',
-    'edit_user'                            => 'Edit user :email',
+    'edit_user'                            => 'Wijzig gebruiker :email',
     'hidden_fields_preferences'            => 'Niet alle velden zijn zichtbaar. Zet ze aan in je instellingen.',
     'user_data_information'                => 'Gebruikersgegevens',
     'user_information'                     => 'Gebruikersinformatie',

From b9688895526cdcd6870aa6beb7e70158eba4df7b Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Mon, 12 Dec 2016 20:21:52 +0100
Subject: [PATCH 085/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/validation.php b/resources/lang/nl_NL/validation.php
index eb70e6f6d6..2aa1a9ab5f 100644
--- a/resources/lang/nl_NL/validation.php
+++ b/resources/lang/nl_NL/validation.php
@@ -12,7 +12,7 @@
 return [
     'iban'                           => 'Dit is niet een geldige IBAN.',
     'unique_account_number_for_user' => 'Het lijkt erop dat dit rekeningnummer al in gebruik is.',
-    'deleted_user'                   => 'Due to security constraints, you cannot register using this email address.',
+    'deleted_user'                   => 'Je kan je niet registreren met dit e-mailadres.',
     'rule_trigger_value'             => 'Deze waarde is niet geldig voor de geselecteerde trigger.',
     'rule_action_value'              => 'Deze waarde is niet geldig voor de geselecteerde actie.',
     'invalid_domain'                 => 'Kan niet registereren vanaf dit domein.',

From a9e57e1c34f703f5c1b8a9cc7c39505b1b17be34 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 17:21:28 +0100
Subject: [PATCH 086/223] First set of code for #461

---
 app/Events/BlockedBadLogin.php                |  41 +++++++
 app/Events/BlockedUserLogin.php               |  42 +++++++
 app/Events/LockedOutUser.php                  |  41 +++++++
 app/Handlers/Events/UserEventHandler.php      | 106 ++++++++++++++++++
 .../Admin/ConfigurationController.php         |  18 ++-
 app/Http/Controllers/Auth/LoginController.php |  46 ++------
 app/Http/Requests/ConfigurationRequest.php    |  22 +++-
 app/Providers/EventServiceProvider.php        |  13 +++
 config/firefly.php                            |  11 +-
 .../views/admin/configuration/index.twig      |  21 ++++
 .../views/emails/blocked-bad-creds-html.twig  |   5 +
 .../views/emails/blocked-bad-creds-text.twig  |   3 +
 resources/views/emails/locked-out-html.twig   |   5 +
 resources/views/emails/locked-out-text.twig   |   3 +
 14 files changed, 331 insertions(+), 46 deletions(-)
 create mode 100644 app/Events/BlockedBadLogin.php
 create mode 100644 app/Events/BlockedUserLogin.php
 create mode 100644 app/Events/LockedOutUser.php
 create mode 100644 resources/views/emails/blocked-bad-creds-html.twig
 create mode 100644 resources/views/emails/blocked-bad-creds-text.twig
 create mode 100644 resources/views/emails/locked-out-html.twig
 create mode 100644 resources/views/emails/locked-out-text.twig

diff --git a/app/Events/BlockedBadLogin.php b/app/Events/BlockedBadLogin.php
new file mode 100644
index 0000000000..fb984abd04
--- /dev/null
+++ b/app/Events/BlockedBadLogin.php
@@ -0,0 +1,41 @@
+email     = $email;
+        $this->ipAddress = $ipAddress;
+    }
+}
diff --git a/app/Events/BlockedUserLogin.php b/app/Events/BlockedUserLogin.php
new file mode 100644
index 0000000000..fd12fb8a36
--- /dev/null
+++ b/app/Events/BlockedUserLogin.php
@@ -0,0 +1,42 @@
+user      = $user;
+        $this->ipAddress = $ipAddress;
+    }
+}
diff --git a/app/Events/LockedOutUser.php b/app/Events/LockedOutUser.php
new file mode 100644
index 0000000000..c498ad1ed7
--- /dev/null
+++ b/app/Events/LockedOutUser.php
@@ -0,0 +1,41 @@
+email     = $email;
+        $this->ipAddress = $ipAddress;
+    }
+}
diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index 7b1f655458..b414cfeaf3 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -15,8 +15,11 @@ namespace FireflyIII\Handlers\Events;
 
 use Exception;
 use FireflyConfig;
+use FireflyIII\Events\BlockedBadLogin;
+use FireflyIII\Events\BlockedUserLogin;
 use FireflyIII\Events\ConfirmedUser;
 use FireflyIII\Events\DeletedUser;
+use FireflyIII\Events\LockedOutUser;
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
 use FireflyIII\Events\ResentConfirmation;
@@ -77,6 +80,109 @@ class UserEventHandler
         return true;
     }
 
+    /**
+     * @param BlockedBadLogin $event
+     *
+     * @return bool
+     */
+    public function respondToBlockedBadLogin(BlockedBadLogin $event)
+    {
+        $email     = $event->email;
+        $ipAddress = $event->ipAddress;
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_bad_login', config('firefly.configuration.mail_for_bad_login'));
+        Log::debug(sprintf('Now in respondToBlockedBadLogin for email address %s', $email));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+            Log::error(sprintf('User %s tried to login with bad credentials.', $email));
+
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Blocked login attempt with bad credentials');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param BlockedUserLogin $event
+     *
+     * @return bool
+     */
+    public function respondToBlockedUserLogin(BlockedUserLogin $event): bool
+    {
+        $user      = $event->user;
+        $email     = $user->email;
+        $ipAddress = $event->ipAddress;
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_blocked_login', config('firefly.configuration.mail_for_blocked_login'));
+        Log::debug(sprintf('Now in respondToBlockedUserLogin for email address %s', $email));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+            Log::error(sprintf('User #%d (%s) has their accout blocked (blocked_code is "%s") but tried to login.', $user->id, $email, $user->blocked_code));
+
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['emails.blocked-login-html', 'emails.blocked-login-text'],
+                [
+                    'user_id'      => $user->id,
+                    'user_address' => $email,
+                    'ip'           => $ipAddress,
+                    'code'         => $user->blocked_code,
+                ], function (Message $message) use ($email, $user) {
+                $message->to($email, $email)->subject('Blocked login attempt of blocked user');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param LockedOutUser $event
+     *
+     * @return bool
+     */
+    public function respondToLockout(LockedOutUser $event): bool
+    {
+        $email     = $event->email;
+        $ipAddress = $event->ipAddress;
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_lockout', config('firefly.configuration.mail_for_lockout'));
+        Log::debug(sprintf('Now in respondToLockout for email address %s', $email));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+            Log::error(sprintf('User %s was locked out after too many invalid login attempts.', $email));
+
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['emails.locked-out-html', 'emails.locked-out-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('User was locked out');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
     /**
      * @param DeletedUser $event
      *
diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php
index 62e5c1298a..4672c71476 100644
--- a/app/Http/Controllers/Admin/ConfigurationController.php
+++ b/app/Http/Controllers/Admin/ConfigurationController.php
@@ -62,7 +62,16 @@ class ConfigurationController extends Controller
         $mustConfirmAccount = FireflyConfig::get('must_confirm_account', config('firefly.configuration.must_confirm_account'))->data;
         $isDemoSite         = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
 
-        return view('admin.configuration.index', compact('subTitle', 'subTitleIcon', 'singleUserMode', 'mustConfirmAccount', 'isDemoSite'));
+        // email settings:
+        $sendErrorMessage = [
+            'mail_for_lockout'        => FireflyConfig::get('mail_for_lockout', config('firefly.configuration.mail_for_lockout'))->data,
+            'mail_for_blocked_domain' => FireflyConfig::get('mail_for_blocked_domain', config('firefly.configuration.mail_for_blocked_domain'))->data,
+            'mail_for_blocked_email'  => FireflyConfig::get('mail_for_blocked_email', config('firefly.configuration.mail_for_blocked_email'))->data,
+            'mail_for_bad_login'      => FireflyConfig::get('mail_for_bad_login', config('firefly.configuration.mail_for_bad_login'))->data,
+            'mail_for_blocked_login'  => FireflyConfig::get('mail_for_blocked_login', config('firefly.configuration.mail_for_blocked_login'))->data,
+        ];
+
+        return view('admin.configuration.index', compact('subTitle', 'subTitleIcon', 'singleUserMode', 'mustConfirmAccount', 'isDemoSite', 'sendErrorMessage'));
 
     }
 
@@ -81,6 +90,13 @@ class ConfigurationController extends Controller
         FireflyConfig::set('must_confirm_account', $data['must_confirm_account']);
         FireflyConfig::set('is_demo_site', $data['is_demo_site']);
 
+        // email settings
+        FireflyConfig::set('mail_for_lockout', $data['mail_for_lockout']);
+        FireflyConfig::set('mail_for_blocked_domain', $data['mail_for_blocked_domain']);
+        FireflyConfig::set('mail_for_blocked_email', $data['mail_for_blocked_email']);
+        FireflyConfig::set('mail_for_bad_login', $data['mail_for_bad_login']);
+        FireflyConfig::set('mail_for_blocked_login', $data['mail_for_blocked_login']);
+
         // flash message
         Session::flash('success', strval(trans('firefly.configuration_updated')));
         Preferences::mark();
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index afaa6b3b48..0e787b4fde 100755
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -14,15 +14,14 @@ namespace FireflyIII\Http\Controllers\Auth;
 
 use Config;
 use FireflyConfig;
+use FireflyIII\Events\BlockedBadLogin;
+use FireflyIII\Events\BlockedUserLogin;
+use FireflyIII\Events\LockedOutUser;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\User;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
-use Illuminate\Mail\Message;
 use Lang;
-use Log;
-use Mail;
-use Swift_TransportException;
 
 /**
  * Class LoginController
@@ -75,6 +74,8 @@ class LoginController extends Controller
         if ($lockedOut) {
             $this->fireLockoutEvent($request);
 
+            event(new LockedOutUser($request->get('email'), $request->ip()));
+
             return $this->sendLockoutResponse($request);
         }
 
@@ -90,10 +91,13 @@ class LoginController extends Controller
         /** @var User $foundUser */
         $foundUser = User::where('email', $credentials['email'])->where('blocked', 1)->first();
         if (!is_null($foundUser)) {
-            // if it exists, show message:
+            // user exists, but is blocked:
             $code         = strlen(strval($foundUser->blocked_code)) > 0 ? $foundUser->blocked_code : 'general_blocked';
             $errorMessage = strval(trans('firefly.' . $code . '_error', ['email' => $credentials['email']]));
-            $this->reportBlockedUserLoginAttempt($foundUser, $code, $request->ip());
+            event(new BlockedUserLogin($foundUser, $request->ip()));
+        }
+        if (is_null($foundUser)) {
+            event(new BlockedBadLogin($credentials['email'], $request->ip()));
         }
 
         // If the login attempt was unsuccessful we will increment the number of attempts
@@ -163,34 +167,4 @@ class LoginController extends Controller
                              ]
                          );
     }
-
-    /**
-     * Send a message home about the  blocked attempt to login.
-     * Perhaps in a later stage, simply log these messages.
-     *
-     * @param User   $user
-     * @param string $code
-     * @param string $ipAddress
-     */
-    private function reportBlockedUserLoginAttempt(User $user, string $code, string $ipAddress)
-    {
-
-        try {
-            $email  = env('SITE_OWNER', false);
-            $fields = [
-                'user_id'      => $user->id,
-                'user_address' => $user->email,
-                'code'         => $code,
-                'ip'           => $ipAddress,
-            ];
-
-            Mail::send(
-                ['emails.blocked-login-html', 'emails.blocked-login-text'], $fields, function (Message $message) use ($email, $user) {
-                $message->to($email, $email)->subject('Blocked a login attempt from ' . trim($user->email) . '.');
-            }
-            );
-        } catch (Swift_TransportException $e) {
-            Log::error($e->getMessage());
-        }
-    }
 }
diff --git a/app/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.php
index c2f2d3becd..1647835a3b 100644
--- a/app/Http/Requests/ConfigurationRequest.php
+++ b/app/Http/Requests/ConfigurationRequest.php
@@ -36,9 +36,14 @@ class ConfigurationRequest extends Request
     public function getConfigurationData(): array
     {
         return [
-            'single_user_mode'     => intval($this->get('single_user_mode')) === 1,
-            'must_confirm_account' => intval($this->get('must_confirm_account')) === 1,
-            'is_demo_site'         => intval($this->get('is_demo_site')) === 1,
+            'single_user_mode'        => intval($this->get('single_user_mode')) === 1,
+            'must_confirm_account'    => intval($this->get('must_confirm_account')) === 1,
+            'is_demo_site'            => intval($this->get('is_demo_site')) === 1,
+            'mail_for_lockout'        => intval($this->get('mail_for_lockout')) === 1,
+            'mail_for_blocked_domain' => intval($this->get('mail_for_blocked_domain')) === 1,
+            'mail_for_blocked_email'  => intval($this->get('mail_for_blocked_email')) === 1,
+            'mail_for_bad_login'      => intval($this->get('mail_for_bad_login')) === 1,
+            'mail_for_blocked_login'  => intval($this->get('mail_for_blocked_login')) === 1,
         ];
     }
 
@@ -48,9 +53,14 @@ class ConfigurationRequest extends Request
     public function rules()
     {
         $rules = [
-            'single_user_mode'     => 'between:0,1|numeric',
-            'must_confirm_account' => 'between:0,1|numeric',
-            'is_demo_site'         => 'between:0,1|numeric',
+            'single_user_mode'        => 'between:0,1|numeric',
+            'must_confirm_account'    => 'between:0,1|numeric',
+            'is_demo_site'            => 'between:0,1|numeric',
+            'mail_for_lockout'        => 'between:0,1|numeric',
+            'mail_for_blocked_domain' => 'between:0,1|numeric',
+            'mail_for_blocked_email'  => 'between:0,1|numeric',
+            'mail_for_bad_login'      => 'between:0,1|numeric',
+            'mail_for_blocked_login'  => 'between:0,1|numeric',
         ];
 
         return $rules;
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 8af4b0348c..0b04eaf9af 100755
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -41,10 +41,23 @@ class EventServiceProvider extends ServiceProvider
                 [
                     'FireflyIII\Handlers\Events\UserEventHandler@storeConfirmationIpAddress',
                 ],
+
             'FireflyIII\Events\DeletedUser'          => // is a User related event.
                 [
                     'FireflyIII\Handlers\Events\UserEventHandler@saveEmailAddress',
                 ],
+            'FireflyIII\Events\LockedOutUser'          => // is a User related event.
+                [
+                    'FireflyIII\Handlers\Events\UserEventHandler@respondToLockout',
+                ],
+            'FireflyIII\Events\BlockedUserLogin'          => // is a User related event.
+                [
+                    'FireflyIII\Handlers\Events\UserEventHandler@respondToBlockedUserLogin',
+                ],
+            'FireflyIII\Events\BlockedBadLogin'          => // is a User related event.
+                [
+                    'FireflyIII\Handlers\Events\UserEventHandler@respondToBlockedBadLogin',
+                ],
             'FireflyIII\Events\RegisteredUser'       => // is a User related event.
                 [
                     'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail',
diff --git a/config/firefly.php b/config/firefly.php
index f9e2710a74..07fdd04ee1 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -19,9 +19,14 @@ declare(strict_types = 1);
 
 return [
     'configuration'       => [
-        'single_user_mode'     => true,
-        'is_demo_site'         => false,
-        'must_confirm_account' => false,
+        'single_user_mode'        => true,
+        'is_demo_site'            => false,
+        'must_confirm_account'    => false,
+        'mail_for_lockout'        => false,
+        'mail_for_blocked_domain' => false,
+        'mail_for_blocked_email'  => false,
+        'mail_for_bad_login'      => false,
+        'mail_for_blocked_login'  => false,
     ],
     'chart'               => 'chartjs',
     'version'             => '4.2.1',
diff --git a/resources/views/admin/configuration/index.twig b/resources/views/admin/configuration/index.twig
index e4d193315f..9174c6fbc9 100644
--- a/resources/views/admin/configuration/index.twig
+++ b/resources/views/admin/configuration/index.twig
@@ -53,6 +53,7 @@
                     
                                              
                 
                                              
             
                                              
+            {# send email messages #}
 
             
             
         
                                              
+        
                                              
+            {# send email messages about stuff: #}
+            
                                              
+                
                                              
+                    
                                              
+                        
                                              {{ 'setting_send_email_notifications'|_ }}
                                              
+                    
                                              
+                    
                                              
+                        
                                              
+                            {{ 'setting_send_email_explain'|_ }}
+                        
                                              
+                        {{ ExpandedForm.checkbox('mail_for_lockout','1', sendErrorMessage.mail_for_lockout) }}
+                        {{ ExpandedForm.checkbox('mail_for_blocked_domain','1', sendErrorMessage.mail_for_blocked_domain) }}
+                        {{ ExpandedForm.checkbox('mail_for_blocked_email','1', sendErrorMessage.mail_for_blocked_email) }}
+                        {{ ExpandedForm.checkbox('mail_for_bad_login','1', sendErrorMessage.mail_for_bad_login) }}
+                        {{ ExpandedForm.checkbox('mail_for_blocked_login','1', sendErrorMessage.mail_for_blocked_login) }}
+                    
                                              
+                
                                              
+            
                                              
+        
                                              
 
         
                                              
             
                                              
diff --git a/resources/views/emails/blocked-bad-creds-html.twig b/resources/views/emails/blocked-bad-creds-html.twig
new file mode 100644
index 0000000000..4485093a9b
--- /dev/null
+++ b/resources/views/emails/blocked-bad-creds-html.twig
@@ -0,0 +1,5 @@
+{% include 'emails.header-html' %}
+
                                              
+    Firefly III has just blocked a login from user with email "{{ email }}" because they supplied bad credentials.
+
                                              
+{% include 'emails.footer-html' %}
diff --git a/resources/views/emails/blocked-bad-creds-text.twig b/resources/views/emails/blocked-bad-creds-text.twig
new file mode 100644
index 0000000000..e0de014cff
--- /dev/null
+++ b/resources/views/emails/blocked-bad-creds-text.twig
@@ -0,0 +1,3 @@
+{% include 'emails.header-text' %}
+Firefly III has just blocked a login from user with email "{{ email }}" because they supplied bad credentials.
+{% include 'emails.footer-text' %}
diff --git a/resources/views/emails/locked-out-html.twig b/resources/views/emails/locked-out-html.twig
new file mode 100644
index 0000000000..8f4386dacc
--- /dev/null
+++ b/resources/views/emails/locked-out-html.twig
@@ -0,0 +1,5 @@
+{% include 'emails.header-html' %}
+
                                              
+    Firefly III has just locked out somebody trying to login with email address {{ email }}.
+
                                              
+{% include 'emails.footer-html' %}
diff --git a/resources/views/emails/locked-out-text.twig b/resources/views/emails/locked-out-text.twig
new file mode 100644
index 0000000000..6d5b1bc41c
--- /dev/null
+++ b/resources/views/emails/locked-out-text.twig
@@ -0,0 +1,3 @@
+{% include 'emails.header-text' %}
+Firefly III has just locked out somebody trying to login with email address {{ email }}.
+{% include 'emails.footer-text' %}
\ No newline at end of file

From 0335a64a21b6cd5cd948b15dd9800773c61b58a9 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 20:37:38 +0100
Subject: [PATCH 087/223] Code for #461

---
 app/Events/BlockedUseOfDomain.php             | 42 ++++++++
 app/Events/BlockedUseOfEmail.php              | 42 ++++++++
 app/Handlers/Events/UserEventHandler.php      | 99 ++++++++++++++++---
 app/Http/Controllers/Auth/LoginController.php |  2 +
 .../Controllers/Auth/RegisterController.php   | 12 ++-
 app/Providers/EventServiceProvider.php        | 27 +++--
 6 files changed, 198 insertions(+), 26 deletions(-)
 create mode 100644 app/Events/BlockedUseOfDomain.php
 create mode 100644 app/Events/BlockedUseOfEmail.php

diff --git a/app/Events/BlockedUseOfDomain.php b/app/Events/BlockedUseOfDomain.php
new file mode 100644
index 0000000000..0ccacea749
--- /dev/null
+++ b/app/Events/BlockedUseOfDomain.php
@@ -0,0 +1,42 @@
+email     = $email;
+        $this->ipAddress = $ipAddress;
+    }
+}
diff --git a/app/Events/BlockedUseOfEmail.php b/app/Events/BlockedUseOfEmail.php
new file mode 100644
index 0000000000..8b9d7cbed5
--- /dev/null
+++ b/app/Events/BlockedUseOfEmail.php
@@ -0,0 +1,42 @@
+email     = $email;
+        $this->ipAddress = $ipAddress;
+    }
+}
diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index b414cfeaf3..502add60c4 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -16,6 +16,8 @@ namespace FireflyIII\Handlers\Events;
 use Exception;
 use FireflyConfig;
 use FireflyIII\Events\BlockedBadLogin;
+use FireflyIII\Events\BlockedUseOfDomain;
+use FireflyIII\Events\BlockedUseOfEmail;
 use FireflyIII\Events\BlockedUserLogin;
 use FireflyIII\Events\ConfirmedUser;
 use FireflyIII\Events\DeletedUser;
@@ -85,25 +87,25 @@ class UserEventHandler
      *
      * @return bool
      */
-    public function respondToBlockedBadLogin(BlockedBadLogin $event)
+    public function reportBadLogin(BlockedBadLogin $event)
     {
         $email     = $event->email;
         $ipAddress = $event->ipAddress;
         /** @var Configuration $sendmail */
         $sendmail = FireflyConfig::get('mail_for_bad_login', config('firefly.configuration.mail_for_bad_login'));
-        Log::debug(sprintf('Now in respondToBlockedBadLogin for email address %s', $email));
+        Log::debug(sprintf('Now in reportBadLogin for email address %s', $email));
+        Log::error(sprintf('User %s tried to login with bad credentials.', $email));
         if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
-            Log::error(sprintf('User %s tried to login with bad credentials.', $email));
 
             return true;
         }
 
-        // send email message:
         try {
             Mail::send(
-                ['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('Blocked login attempt with bad credentials');
-            }
+                ['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress],
+                function (Message $message) use ($email) {
+                    $message->to($email, $email)->subject('Blocked login attempt with bad credentials');
+                }
             );
         } catch (Swift_TransportException $e) {
             Log::error($e->getMessage());
@@ -117,17 +119,16 @@ class UserEventHandler
      *
      * @return bool
      */
-    public function respondToBlockedUserLogin(BlockedUserLogin $event): bool
+    public function reportBlockedUser(BlockedUserLogin $event): bool
     {
         $user      = $event->user;
         $email     = $user->email;
         $ipAddress = $event->ipAddress;
         /** @var Configuration $sendmail */
         $sendmail = FireflyConfig::get('mail_for_blocked_login', config('firefly.configuration.mail_for_blocked_login'));
-        Log::debug(sprintf('Now in respondToBlockedUserLogin for email address %s', $email));
+        Log::debug(sprintf('Now in reportBlockedUser for email address %s', $email));
+        Log::error(sprintf('User #%d (%s) has their accout blocked (blocked_code is "%s") but tried to login.', $user->id, $email, $user->blocked_code));
         if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
-            Log::error(sprintf('User #%d (%s) has their accout blocked (blocked_code is "%s") but tried to login.', $user->id, $email, $user->blocked_code));
-
             return true;
         }
 
@@ -156,16 +157,15 @@ class UserEventHandler
      *
      * @return bool
      */
-    public function respondToLockout(LockedOutUser $event): bool
+    public function reportLockout(LockedOutUser $event): bool
     {
         $email     = $event->email;
         $ipAddress = $event->ipAddress;
         /** @var Configuration $sendmail */
         $sendmail = FireflyConfig::get('mail_for_lockout', config('firefly.configuration.mail_for_lockout'));
         Log::debug(sprintf('Now in respondToLockout for email address %s', $email));
+        Log::error(sprintf('User %s was locked out after too many invalid login attempts.', $email));
         if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
-            Log::error(sprintf('User %s was locked out after too many invalid login attempts.', $email));
-
             return true;
         }
 
@@ -183,6 +183,77 @@ class UserEventHandler
         return true;
     }
 
+    /**
+     * @param BlockedUseOfDomain $event
+     *
+     * @return bool
+     */
+    public function reportUseBlockedDomain(BlockedUseOfDomain $event): bool
+    {
+        $email     = $event->email;
+        $ipAddress = $event->ipAddress;
+        $parts     = explode('@', $email);
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_blocked_domain', config('firefly.configuration.mail_for_blocked_domain'));
+        Log::debug(sprintf('Now in reportUseBlockedDomain for email address %s', $email));
+        Log::error(sprintf('Somebody tried to register using an email address (%s) connected to a banned domain (%s).', $email, $parts[1]));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['emails.blocked-domain-html', 'emails.blocked-domain-text'],
+                [
+                    'user_address' => $email,
+                    'ip'           => $ipAddress,
+                ], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Blocked registration attempt with blocked email address');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param BlockedUseOfEmail $event
+     *
+     * @return bool
+     */
+    public function reportUseOfBlockedEmail(BlockedUseOfEmail $event): bool
+    {
+        $email     = $event->email;
+        $ipAddress = $event->ipAddress;
+        /** @var Configuration $sendmail */
+        $sendmail = FireflyConfig::get('mail_for_blocked_email', config('firefly.configuration.mail_for_blocked_email'));
+        Log::debug(sprintf('Now in reportUseOfBlockedEmail for email address %s', $email));
+        Log::error(sprintf('Somebody tried to register using email address %s which is blocked (SHA2 hash).', $email));
+        if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) {
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['emails.blocked-email-html', 'emails.blocked-email-text'],
+                [
+                    'user_address' => $email,
+                    'ip'           => $ipAddress,
+                ], function (Message $message) use ($email) {
+                $message->to($email, $email)->subject('Blocked registration attempt with blocked email address');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
     /**
      * @param DeletedUser $event
      *
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 0e787b4fde..6378a341e6 100755
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -96,6 +96,8 @@ class LoginController extends Controller
             $errorMessage = strval(trans('firefly.' . $code . '_error', ['email' => $credentials['email']]));
             event(new BlockedUserLogin($foundUser, $request->ip()));
         }
+
+        // simply a bad login.
         if (is_null($foundUser)) {
             event(new BlockedBadLogin($credentials['email'], $request->ip()));
         }
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 1f3a820676..511dc41deb 100755
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -14,9 +14,11 @@ namespace FireflyIII\Http\Controllers\Auth;
 
 use Auth;
 use Config;
+use FireflyIII\Events\BlockedUseOfDomain;
+use FireflyIII\Events\BlockedUseOfEmail;
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Support\Facades\FireflyConfig;
+use FireflyConfig;
 use FireflyIII\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
@@ -92,7 +94,9 @@ class RegisterController extends Controller
         // is user email domain blocked?
         if ($this->isBlockedDomain($data['email'])) {
             $validator->getMessageBag()->add('email', (string)trans('validation.invalid_domain'));
-            $this->reportBlockedDomainRegistrationAttempt($data['email'], $request->ip());
+
+            event(new BlockedUseOfDomain($data['email'], $request->ip()));
+            // $this->reportBlockedDomainRegistrationAttempt($data['email'], $request->ip());
             $this->throwValidationException($request, $validator);
         }
 
@@ -103,9 +107,9 @@ class RegisterController extends Controller
         Log::debug(sprintf('Hash of email is %s', $hash));
         Log::debug('Hashes of deleted users: ', $set);
         if (in_array($hash, $set)) {
-            // user already deleted, cannot re-register :(
             $validator->getMessageBag()->add('email', (string)trans('validation.deleted_user'));
-            $this->reportBlockedDomainRegistrationAttempt($data['email'], $request->ip());
+            event(new BlockedUseOfEmail($data['email'], $request->ip()));
+            //$this->reportBlockedDomainRegistrationAttempt($data['email'], $request->ip());
             $this->throwValidationException($request, $validator);
         }
 
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 0b04eaf9af..e9c971f2b2 100755
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -37,26 +37,37 @@ class EventServiceProvider extends ServiceProvider
     protected $listen
         = [
             // new event handlers:
-            'FireflyIII\Events\ConfirmedUser'        => // is a User related event.
+            'FireflyIII\Events\ConfirmedUser' => // is a User related event.
                 [
                     'FireflyIII\Handlers\Events\UserEventHandler@storeConfirmationIpAddress',
                 ],
 
-            'FireflyIII\Events\DeletedUser'          => // is a User related event.
+            'FireflyIII\Events\DeletedUser'      => // is a User related event.
                 [
                     'FireflyIII\Handlers\Events\UserEventHandler@saveEmailAddress',
                 ],
-            'FireflyIII\Events\LockedOutUser'          => // is a User related event.
+            'FireflyIII\Events\LockedOutUser'    => // is a User related event.
                 [
-                    'FireflyIII\Handlers\Events\UserEventHandler@respondToLockout',
+                    'FireflyIII\Handlers\Events\UserEventHandler@reportLockout',
                 ],
-            'FireflyIII\Events\BlockedUserLogin'          => // is a User related event.
+            'FireflyIII\Events\BlockedUserLogin' => // is a User related event.
                 [
-                    'FireflyIII\Handlers\Events\UserEventHandler@respondToBlockedUserLogin',
+                    'FireflyIII\Handlers\Events\UserEventHandler@reportBlockedUser',
                 ],
-            'FireflyIII\Events\BlockedBadLogin'          => // is a User related event.
+
+            'FireflyIII\Events\BlockedUseOfEmail' => // is a User related event.
                 [
-                    'FireflyIII\Handlers\Events\UserEventHandler@respondToBlockedBadLogin',
+                    'FireflyIII\Handlers\Events\UserEventHandler@reportUseOfBlockedEmail',
+                ],
+
+            'FireflyIII\Events\BlockedUseOfDomain' => // is a User related event.
+                [
+                    'FireflyIII\Handlers\Events\UserEventHandler@reportUseBlockedDomain',
+                ],
+
+            'FireflyIII\Events\BlockedBadLogin'      => // is a User related event.
+                [
+                    'FireflyIII\Handlers\Events\UserEventHandler@reportBadLogin',
                 ],
             'FireflyIII\Events\RegisteredUser'       => // is a User related event.
                 [

From 947e82fa0fffcf05593e618773c7b2864f6cf61f Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 20:51:10 +0100
Subject: [PATCH 088/223] Fixed final mails for #461

---
 app/Handlers/Events/UserEventHandler.php      | 34 +++++++++++--------
 .../views/emails/blocked-email-html.twig      |  5 +++
 .../views/emails/blocked-email-text.twig      |  3 ++
 3 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 resources/views/emails/blocked-email-html.twig
 create mode 100644 resources/views/emails/blocked-email-text.twig

diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php
index 502add60c4..0481dd516f 100644
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@@ -90,6 +90,7 @@ class UserEventHandler
     public function reportBadLogin(BlockedBadLogin $event)
     {
         $email     = $event->email;
+        $owner     = env('SITE_OWNER');
         $ipAddress = $event->ipAddress;
         /** @var Configuration $sendmail */
         $sendmail = FireflyConfig::get('mail_for_bad_login', config('firefly.configuration.mail_for_bad_login'));
@@ -103,8 +104,8 @@ class UserEventHandler
         try {
             Mail::send(
                 ['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress],
-                function (Message $message) use ($email) {
-                    $message->to($email, $email)->subject('Blocked login attempt with bad credentials');
+                function (Message $message) use ($owner) {
+                    $message->to($owner, $owner)->subject('Blocked login attempt with bad credentials');
                 }
             );
         } catch (Swift_TransportException $e) {
@@ -122,6 +123,7 @@ class UserEventHandler
     public function reportBlockedUser(BlockedUserLogin $event): bool
     {
         $user      = $event->user;
+        $owner     = env('SITE_OWNER');
         $email     = $user->email;
         $ipAddress = $event->ipAddress;
         /** @var Configuration $sendmail */
@@ -141,8 +143,8 @@ class UserEventHandler
                     'user_address' => $email,
                     'ip'           => $ipAddress,
                     'code'         => $user->blocked_code,
-                ], function (Message $message) use ($email, $user) {
-                $message->to($email, $email)->subject('Blocked login attempt of blocked user');
+                ], function (Message $message) use ($owner, $user) {
+                $message->to($owner, $owner)->subject('Blocked login attempt of blocked user');
             }
             );
         } catch (Swift_TransportException $e) {
@@ -160,6 +162,7 @@ class UserEventHandler
     public function reportLockout(LockedOutUser $event): bool
     {
         $email     = $event->email;
+        $owner     = env('SITE_OWNER');
         $ipAddress = $event->ipAddress;
         /** @var Configuration $sendmail */
         $sendmail = FireflyConfig::get('mail_for_lockout', config('firefly.configuration.mail_for_lockout'));
@@ -172,8 +175,8 @@ class UserEventHandler
         // send email message:
         try {
             Mail::send(
-                ['emails.locked-out-html', 'emails.locked-out-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('User was locked out');
+                ['emails.locked-out-html', 'emails.locked-out-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($owner) {
+                $message->to($owner, $owner)->subject('User was locked out');
             }
             );
         } catch (Swift_TransportException $e) {
@@ -191,6 +194,7 @@ class UserEventHandler
     public function reportUseBlockedDomain(BlockedUseOfDomain $event): bool
     {
         $email     = $event->email;
+        $owner     = env('SITE_OWNER');
         $ipAddress = $event->ipAddress;
         $parts     = explode('@', $email);
         /** @var Configuration $sendmail */
@@ -204,12 +208,13 @@ class UserEventHandler
         // send email message:
         try {
             Mail::send(
-                ['emails.blocked-domain-html', 'emails.blocked-domain-text'],
+                ['emails.blocked-registration-html', 'emails.blocked-registration-text'],
                 [
-                    'user_address' => $email,
-                    'ip'           => $ipAddress,
-                ], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('Blocked registration attempt with blocked email address');
+                    'email_address'  => $email,
+                    'blocked_domain' => $parts[1],
+                    'ip'             => $ipAddress,
+                ], function (Message $message) use ($owner) {
+                $message->to($owner, $owner)->subject('Blocked registration attempt with blocked domain');
             }
             );
         } catch (Swift_TransportException $e) {
@@ -227,6 +232,7 @@ class UserEventHandler
     public function reportUseOfBlockedEmail(BlockedUseOfEmail $event): bool
     {
         $email     = $event->email;
+        $owner     = env('SITE_OWNER');
         $ipAddress = $event->ipAddress;
         /** @var Configuration $sendmail */
         $sendmail = FireflyConfig::get('mail_for_blocked_email', config('firefly.configuration.mail_for_blocked_email'));
@@ -243,8 +249,8 @@ class UserEventHandler
                 [
                     'user_address' => $email,
                     'ip'           => $ipAddress,
-                ], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('Blocked registration attempt with blocked email address');
+                ], function (Message $message) use ($owner) {
+                $message->to($owner, $owner)->subject('Blocked registration attempt with blocked email address');
             }
             );
         } catch (Swift_TransportException $e) {
@@ -357,7 +363,7 @@ class UserEventHandler
         try {
             Mail::send(
                 ['emails.registered-html', 'emails.registered-text'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) {
-                $message->to($email, $email)->subject('Welcome to Firefly III! ');
+                $message->to($email, $email)->subject('Welcome to Firefly III!');
             }
             );
         } catch (Swift_TransportException $e) {
diff --git a/resources/views/emails/blocked-email-html.twig b/resources/views/emails/blocked-email-html.twig
new file mode 100644
index 0000000000..a7f67fdd0a
--- /dev/null
+++ b/resources/views/emails/blocked-email-html.twig
@@ -0,0 +1,5 @@
+{% include 'emails.header-html' %}
+
                                              
+    Firefly III has just blocked a registration for email addres "{{ email_address }}". It was used before.
+
                                              
+{% include 'emails.footer-html' %}
diff --git a/resources/views/emails/blocked-email-text.twig b/resources/views/emails/blocked-email-text.twig
new file mode 100644
index 0000000000..7bfdf9c032
--- /dev/null
+++ b/resources/views/emails/blocked-email-text.twig
@@ -0,0 +1,3 @@
+{% include 'emails.header-text' %}
+Firefly III has just blocked a registration for email addres "{{ user_address }}". It was used before.
+{% include 'emails.footer-text' %}

From 39866be3f17258ddb3facbd77eefd4ec9a13620c Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 20:57:10 +0100
Subject: [PATCH 089/223] Translations. #461

---
 resources/lang/en_US/firefly.php               |  8 ++++++++
 resources/lang/en_US/form.php                  |  6 ++++++
 resources/views/admin/configuration/index.twig | 10 +++++-----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index cec77e6586..1da98a14ce 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -846,6 +846,14 @@ return [
     'configuration_updated'                => 'The configuration has been updated',
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'setting_send_email_notifications'     => 'Send email notifications',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'mail_for_lockout_help'                => 'When a user is locked out',
+    'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
+    'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
+    'mail_for_bad_login_help'              => 'When a user fails to login',
+    'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+
 
     // split a transaction:
     'transaction_meta_data'                => 'Transaction meta-data',
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index a417f504a9..7ad4babc53 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -155,6 +155,12 @@ return [
     'single_user_mode'           => 'Single user mode',
     'must_confirm_account'       => 'New users must activate account',
     'is_demo_site'               => 'Is demo site',
+    'mail_for_lockout'           => 'Locked out',
+    'mail_for_blocked_domain'    => 'Blocked domain',
+    'mail_for_blocked_email'     => 'Blocked email address',
+    'mail_for_bad_login'         => 'Login failure',
+    'mail_for_blocked_login'     => 'Blocked user',
+
 
     // import
     'import_file'                => 'Import file',
diff --git a/resources/views/admin/configuration/index.twig b/resources/views/admin/configuration/index.twig
index 9174c6fbc9..6ef18d5419 100644
--- a/resources/views/admin/configuration/index.twig
+++ b/resources/views/admin/configuration/index.twig
@@ -82,11 +82,11 @@
                         
                                              
                             {{ 'setting_send_email_explain'|_ }}
                         
                                              
-                        {{ ExpandedForm.checkbox('mail_for_lockout','1', sendErrorMessage.mail_for_lockout) }}
-                        {{ ExpandedForm.checkbox('mail_for_blocked_domain','1', sendErrorMessage.mail_for_blocked_domain) }}
-                        {{ ExpandedForm.checkbox('mail_for_blocked_email','1', sendErrorMessage.mail_for_blocked_email) }}
-                        {{ ExpandedForm.checkbox('mail_for_bad_login','1', sendErrorMessage.mail_for_bad_login) }}
-                        {{ ExpandedForm.checkbox('mail_for_blocked_login','1', sendErrorMessage.mail_for_blocked_login) }}
+                        {{ ExpandedForm.checkbox('mail_for_lockout','1', sendErrorMessage.mail_for_lockout, {helpText: trans('firefly.mail_for_lockout_help')}) }}
+                        {{ ExpandedForm.checkbox('mail_for_blocked_domain','1', sendErrorMessage.mail_for_blocked_domain, {helpText: trans('firefly.mail_for_blocked_domain_help')}) }}
+                        {{ ExpandedForm.checkbox('mail_for_blocked_email','1', sendErrorMessage.mail_for_blocked_email, {helpText: trans('firefly.mail_for_blocked_email_help')}) }}
+                        {{ ExpandedForm.checkbox('mail_for_bad_login','1', sendErrorMessage.mail_for_bad_login, {helpText: trans('firefly.mail_for_bad_login_help')}) }}
+                        {{ ExpandedForm.checkbox('mail_for_blocked_login','1', sendErrorMessage.mail_for_blocked_login, {helpText: trans('firefly.mail_for_blocked_help')}) }}
                     
                                              
                 
                                              
             
                                              

From 0c8a1682b6c2531de030974a898e930763f32732 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 20:58:51 +0100
Subject: [PATCH 090/223] Wrong reference #461 [skip ci]

---
 resources/views/admin/configuration/index.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/admin/configuration/index.twig b/resources/views/admin/configuration/index.twig
index 6ef18d5419..1ef1f45c89 100644
--- a/resources/views/admin/configuration/index.twig
+++ b/resources/views/admin/configuration/index.twig
@@ -86,7 +86,7 @@
                         {{ ExpandedForm.checkbox('mail_for_blocked_domain','1', sendErrorMessage.mail_for_blocked_domain, {helpText: trans('firefly.mail_for_blocked_domain_help')}) }}
                         {{ ExpandedForm.checkbox('mail_for_blocked_email','1', sendErrorMessage.mail_for_blocked_email, {helpText: trans('firefly.mail_for_blocked_email_help')}) }}
                         {{ ExpandedForm.checkbox('mail_for_bad_login','1', sendErrorMessage.mail_for_bad_login, {helpText: trans('firefly.mail_for_bad_login_help')}) }}
-                        {{ ExpandedForm.checkbox('mail_for_blocked_login','1', sendErrorMessage.mail_for_blocked_login, {helpText: trans('firefly.mail_for_blocked_help')}) }}
+                        {{ ExpandedForm.checkbox('mail_for_blocked_login','1', sendErrorMessage.mail_for_blocked_login, {helpText: trans('firefly.mail_for_blocked_login_help')}) }}
                     
                                              
                 
                                              
             
                                              

From f344d0319ced8bc80aa80a794e127d5c8596dfc8 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:01:50 +0100
Subject: [PATCH 091/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 94e685da7d..e6e3f0ebd8 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -846,6 +846,14 @@ return [
     'configuration_updated'                => 'De configuratie is bijgewerkt',
     'setting_is_demo_site'                 => 'Demo website',
     'setting_is_demo_site_explain'         => 'Als je dit aanzet doet jouw installatie alsof het een demo-site is, en dat kan problemen opleveren.',
+    'setting_send_email_notifications'     => 'Send email notifications',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'mail_for_lockout_help'                => 'When a user is locked out',
+    'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
+    'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
+    'mail_for_bad_login_help'              => 'When a user fails to login',
+    'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+
 
     // split a transaction:
     'transaction_meta_data'                => 'Transactie meta-data',

From b7b2206262bde1904ddc00709d414d8ef3183c88 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:01 +0100
Subject: [PATCH 092/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index f2ec1de019..098e6654ed 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -155,6 +155,12 @@ return [
     'single_user_mode'           => 'Enkele gebruiker-modus',
     'must_confirm_account'       => 'Nieuwe gebruikers moeten hun account activeren',
     'is_demo_site'               => 'Is demo website',
+    'mail_for_lockout'           => 'Locked out',
+    'mail_for_blocked_domain'    => 'Blocked domain',
+    'mail_for_blocked_email'     => 'Blocked email address',
+    'mail_for_bad_login'         => 'Login failure',
+    'mail_for_blocked_login'     => 'Blocked user',
+
 
     // import
     'import_file'                => 'Importbestand',

From 91e40c14f9743e62dedd7c394bfa33db35c36229 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:09 +0100
Subject: [PATCH 093/223] Translated

---
 resources/lang/pt_BR/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index 1b24d4419f..9745c121c8 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -155,6 +155,12 @@ return [
     'single_user_mode'           => 'Modo de usuário único',
     'must_confirm_account'       => 'Novos usuários devem ativar a conta',
     'is_demo_site'               => 'É o site de demonstração',
+    'mail_for_lockout'           => 'Locked out',
+    'mail_for_blocked_domain'    => 'Blocked domain',
+    'mail_for_blocked_email'     => 'Blocked email address',
+    'mail_for_bad_login'         => 'Login failure',
+    'mail_for_blocked_login'     => 'Blocked user',
+
 
     // import
     'import_file'                => 'Importar arquivo',

From d14889bd27ad01cce97b266991c1cddca3fc1e55 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:11 +0100
Subject: [PATCH 094/223] Translated

---
 resources/lang/de_DE/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index 1c7253ad19..7ee04add23 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -155,6 +155,12 @@ return [
     'single_user_mode'           => 'Einzelnutzermodus',
     'must_confirm_account'       => 'Erstanwender müssen ihr Konto aktivieren',
     'is_demo_site'               => 'Ist eine Demonstrationsseite',
+    'mail_for_lockout'           => 'Locked out',
+    'mail_for_blocked_domain'    => 'Blocked domain',
+    'mail_for_blocked_email'     => 'Blocked email address',
+    'mail_for_bad_login'         => 'Login failure',
+    'mail_for_blocked_login'     => 'Blocked user',
+
 
     // import
     'import_file'                => 'Datei importieren',

From 07f68d2b1447efcd54eac5ab1368ea6efee63a41 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:22 +0100
Subject: [PATCH 095/223] New translations

---
 resources/lang/pt_BR/firefly.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index d90404dacb..d10918dd27 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -846,6 +846,14 @@ return [
     'configuration_updated'                => 'A configuração foi atualizada',
     'setting_is_demo_site'                 => 'Site demo',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'setting_send_email_notifications'     => 'Send email notifications',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'mail_for_lockout_help'                => 'When a user is locked out',
+    'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
+    'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
+    'mail_for_bad_login_help'              => 'When a user fails to login',
+    'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+
 
     // split a transaction:
     'transaction_meta_data'                => 'Dados de transação',

From befd79cf148e80e1392b3b54d1c0dee657070932 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:26 +0100
Subject: [PATCH 096/223] New translations

---
 resources/lang/zh_HK/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/zh_HK/form.php b/resources/lang/zh_HK/form.php
index 9e644c52f6..bcb6e0c3b2 100644
--- a/resources/lang/zh_HK/form.php
+++ b/resources/lang/zh_HK/form.php
@@ -155,6 +155,12 @@ return [
     'single_user_mode'           => 'Single user mode',
     'must_confirm_account'       => 'New users must activate account',
     'is_demo_site'               => 'Is demo site',
+    'mail_for_lockout'           => 'Locked out',
+    'mail_for_blocked_domain'    => 'Blocked domain',
+    'mail_for_blocked_email'     => 'Blocked email address',
+    'mail_for_bad_login'         => 'Login failure',
+    'mail_for_blocked_login'     => 'Blocked user',
+
 
     // import
     'import_file'                => 'Import file',

From b075d6db5e6aec060ea1a90c5e30cb4ccfc69ebe Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:32 +0100
Subject: [PATCH 097/223] New translations

---
 resources/lang/zh_HK/firefly.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index 6362b7ec9e..f2af2c70e5 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -846,6 +846,14 @@ return [
     'configuration_updated'                => 'The configuration has been updated',
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'setting_send_email_notifications'     => 'Send email notifications',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'mail_for_lockout_help'                => 'When a user is locked out',
+    'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
+    'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
+    'mail_for_bad_login_help'              => 'When a user fails to login',
+    'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+
 
     // split a transaction:
     'transaction_meta_data'                => 'Transaction meta-data',

From bd9e0ac281d3c1e2fa60b0f94086a73ad883d014 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:34 +0100
Subject: [PATCH 098/223] New translations

---
 resources/lang/zh_TW/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php
index 7c3b46d8db..8cba160c13 100644
--- a/resources/lang/zh_TW/form.php
+++ b/resources/lang/zh_TW/form.php
@@ -155,6 +155,12 @@ return [
     'single_user_mode'           => 'Single user mode',
     'must_confirm_account'       => 'New users must activate account',
     'is_demo_site'               => 'Is demo site',
+    'mail_for_lockout'           => 'Locked out',
+    'mail_for_blocked_domain'    => 'Blocked domain',
+    'mail_for_blocked_email'     => 'Blocked email address',
+    'mail_for_bad_login'         => 'Login failure',
+    'mail_for_blocked_login'     => 'Blocked user',
+
 
     // import
     'import_file'                => '匯入檔案',

From 40862579838f704ccc17f2d419e97643b6eebed1 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:37 +0100
Subject: [PATCH 099/223] New translations

---
 resources/lang/zh_TW/firefly.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 7fd5fc32fa..e5208ade7e 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -846,6 +846,14 @@ return [
     'configuration_updated'                => 'The configuration has been updated',
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'setting_send_email_notifications'     => 'Send email notifications',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'mail_for_lockout_help'                => 'When a user is locked out',
+    'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
+    'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
+    'mail_for_bad_login_help'              => 'When a user fails to login',
+    'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+
 
     // split a transaction:
     'transaction_meta_data'                => 'Transaction meta-data',

From fff17ac6c1e76b380499538af45718cc3a51ecfd Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:44 +0100
Subject: [PATCH 100/223] New translations

---
 resources/lang/fr_FR/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index b0d37f901b..da3a9b3a66 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -155,6 +155,12 @@ return [
     'single_user_mode'           => 'Mode utilisateur unique',
     'must_confirm_account'       => 'New users must activate account',
     'is_demo_site'               => 'Is demo site',
+    'mail_for_lockout'           => 'Locked out',
+    'mail_for_blocked_domain'    => 'Blocked domain',
+    'mail_for_blocked_email'     => 'Blocked email address',
+    'mail_for_bad_login'         => 'Login failure',
+    'mail_for_blocked_login'     => 'Blocked user',
+
 
     // import
     'import_file'                => 'Fichier à importer',

From b99982d02bfe895924d73d57da1ab8798a50b81b Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:48 +0100
Subject: [PATCH 101/223] New translations

---
 resources/lang/fr_FR/firefly.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 2ba27cee2f..9f5dce0533 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -846,6 +846,14 @@ return [
     'configuration_updated'                => 'The configuration has been updated',
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'setting_send_email_notifications'     => 'Send email notifications',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'mail_for_lockout_help'                => 'When a user is locked out',
+    'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
+    'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
+    'mail_for_bad_login_help'              => 'When a user fails to login',
+    'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+
 
     // split a transaction:
     'transaction_meta_data'                => 'Transaction meta-data',

From 1dab45d493084f95cf8aea2f0d4967c133a7b5d0 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:54 +0100
Subject: [PATCH 102/223] New translations

---
 resources/lang/de_DE/firefly.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index b894e7ecb6..f2e88b023d 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -846,6 +846,14 @@ return [
     'configuration_updated'                => 'Die Konfiguration wurde aktualisiert',
     'setting_is_demo_site'                 => 'Demonstrationsseite',
     'setting_is_demo_site_explain'         => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungwollte Auswirkungen haben kann.',
+    'setting_send_email_notifications'     => 'Send email notifications',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'mail_for_lockout_help'                => 'When a user is locked out',
+    'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
+    'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
+    'mail_for_bad_login_help'              => 'When a user fails to login',
+    'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+
 
     // split a transaction:
     'transaction_meta_data'                => 'Transaktions Metadaten',

From d752edd6251ec4d9a4e68496a6802844c33a0698 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:02:58 +0100
Subject: [PATCH 103/223] New translations

---
 resources/lang/hr_HR/form.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/lang/hr_HR/form.php b/resources/lang/hr_HR/form.php
index 9e644c52f6..bcb6e0c3b2 100644
--- a/resources/lang/hr_HR/form.php
+++ b/resources/lang/hr_HR/form.php
@@ -155,6 +155,12 @@ return [
     'single_user_mode'           => 'Single user mode',
     'must_confirm_account'       => 'New users must activate account',
     'is_demo_site'               => 'Is demo site',
+    'mail_for_lockout'           => 'Locked out',
+    'mail_for_blocked_domain'    => 'Blocked domain',
+    'mail_for_blocked_email'     => 'Blocked email address',
+    'mail_for_bad_login'         => 'Login failure',
+    'mail_for_blocked_login'     => 'Blocked user',
+
 
     // import
     'import_file'                => 'Import file',

From 28ebd683e49bf6ce1e8a578487ebc9530b98f791 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:03:02 +0100
Subject: [PATCH 104/223] New translations

---
 resources/lang/hr_HR/firefly.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index 6362b7ec9e..f2af2c70e5 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -846,6 +846,14 @@ return [
     'configuration_updated'                => 'The configuration has been updated',
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
+    'setting_send_email_notifications'     => 'Send email notifications',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'mail_for_lockout_help'                => 'When a user is locked out',
+    'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
+    'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
+    'mail_for_bad_login_help'              => 'When a user fails to login',
+    'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+
 
     // split a transaction:
     'transaction_meta_data'                => 'Transaction meta-data',

From 69c5c93353f442c8d852818977dad5b38ce65ce5 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Tue, 13 Dec 2016 21:09:04 +0100
Subject: [PATCH 105/223] This fixes the tests.

---
 .../Admin/ConfigurationControllerTest.php            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php
index 4e4e5982fc..0555d656bd 100644
--- a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php
+++ b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php
@@ -50,6 +50,13 @@ class ConfigurationControllerTest extends TestCase
         FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->once()->andReturn($falseConfig);
         FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig);
 
+        // new settings:
+        FireflyConfig::shouldReceive('get')->withArgs(['mail_for_lockout', false])->once()->andReturn($falseConfig);
+        FireflyConfig::shouldReceive('get')->withArgs(['mail_for_blocked_domain', false])->once()->andReturn($falseConfig);
+        FireflyConfig::shouldReceive('get')->withArgs(['mail_for_blocked_email', false])->once()->andReturn($falseConfig);
+        FireflyConfig::shouldReceive('get')->withArgs(['mail_for_bad_login', false])->once()->andReturn($falseConfig);
+        FireflyConfig::shouldReceive('get')->withArgs(['mail_for_blocked_login', false])->once()->andReturn($falseConfig);
+
         $this->call('GET', route('admin.configuration.index'));
         $this->assertResponseStatus(200);
 
@@ -66,6 +73,11 @@ class ConfigurationControllerTest extends TestCase
         FireflyConfig::shouldReceive('set')->withArgs(['single_user_mode', false])->once();
         FireflyConfig::shouldReceive('set')->withArgs(['must_confirm_account', false])->once();
         FireflyConfig::shouldReceive('set')->withArgs(['is_demo_site', false])->once();
+        FireflyConfig::shouldReceive('set')->withArgs(['mail_for_lockout', false])->once();
+        FireflyConfig::shouldReceive('set')->withArgs(['mail_for_blocked_domain', false])->once();
+        FireflyConfig::shouldReceive('set')->withArgs(['mail_for_blocked_email', false])->once();
+        FireflyConfig::shouldReceive('set')->withArgs(['mail_for_bad_login', false])->once();
+        FireflyConfig::shouldReceive('set')->withArgs(['mail_for_blocked_login', false])->once();
 
         $this->be($this->user());
         $this->call('POST', route('admin.configuration.index.post'));

From c79baf98cf4d64c8d385dd33236f835f48363656 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 12:21:22 +0100
Subject: [PATCH 106/223] New translations

---
 resources/lang/de_DE/firefly.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index f2e88b023d..4190fb4533 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -63,15 +63,15 @@ return [
     'two_factor_lost_header'                     => 'Haben Sie ihre Zwei-Faktor-Authentifizierung verloren?',
     'two_factor_lost_intro'                      => 'Leider ist dieses etwas, dass sie nicht über die Weboberfläche zurücksetzen können. Sie haben zwei Möglichkeiten.',
     'two_factor_lost_fix_self'                   => 'Wenn Sie Ihre eigene Instanz von Firefly III betreiben, überprüfen Sie die Logdatei unter storage/logs für weitere Anweisungen.',
-    'two_factor_lost_fix_owner'                  => 'Otherwise, email the site owner, :site_owner and ask them to reset your two factor authentication.',
+    'two_factor_lost_fix_owner'                  => 'Ansonsten, mailen Sie dem Inhaber der Website, :site_owner und bitten Sie ihn, Ihre Zwei-Faktor Authentifizierung zurückzusetzen.',
     'warning_much_data'                          => ':days Tage an Daten können eine Weile dauern zu laden.',
     'registered'                                 => 'Sie haben sich erfolgreich registriert!',
     'search'                                     => 'Suche',
-    'search_found_accounts'                      => 'Found :count account(s) for your query.',
-    'search_found_categories'                    => 'Found :count category(ies) for your query.',
-    'search_found_budgets'                       => 'Found :count budget(s) for your query.',
-    'search_found_tags'                          => 'Found :count tag(s) for your query.',
-    'search_found_transactions'                  => 'Found :count transaction(s) for your query.',
+    'search_found_accounts'                      => ':count Account(s) für Ihre Suche gefunden.',
+    'search_found_categories'                    => ':count Kategorie(n) für Ihre Suche gefunden.',
+    'search_found_budgets'                       => ':count Budget(s) für Ihre Suche gefunden.',
+    'search_found_tags'                          => ':count Tag(s) für Ihre Suche gefunden.',
+    'search_found_transactions'                  => ':count Überweisung(en) für Ihre Suche gefunden.',
     'results_limited'                            => 'Es werden maximal :count Ergebnisse angezeigt.',
     'tagbalancingAct'                            => 'Balancing act',
     'tagadvancePayment'                          => 'Vorauszahlung',

From 56d8dce622487d827d9450ca2dc6024a263a3ec8 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 12:31:07 +0100
Subject: [PATCH 107/223] New translations

---
 resources/lang/de_DE/firefly.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 4190fb4533..6697ed258c 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -71,9 +71,9 @@ return [
     'search_found_categories'                    => ':count Kategorie(n) für Ihre Suche gefunden.',
     'search_found_budgets'                       => ':count Budget(s) für Ihre Suche gefunden.',
     'search_found_tags'                          => ':count Tag(s) für Ihre Suche gefunden.',
-    'search_found_transactions'                  => ':count Überweisung(en) für Ihre Suche gefunden.',
+    'search_found_transactions'                  => ':count Transaktion(en) für Ihre Suche gefunden.',
     'results_limited'                            => 'Es werden maximal :count Ergebnisse angezeigt.',
-    'tagbalancingAct'                            => 'Balancing act',
+    'tagbalancingAct'                            => 'Ausgleich',
     'tagadvancePayment'                          => 'Vorauszahlung',
     'tagnothing'                                 => '',
     'Default asset account'                      => 'Standard-Anlagekonto',
@@ -83,14 +83,14 @@ return [
     'source_accounts'                            => 'Herkunftskonto',
     'destination_accounts'                       => 'Zielkonto',
     'user_id_is'                                 => 'Ihre Benutzerkennung ist :user',
-    'field_supports_markdown'                    => 'This field supports Markdown.',
-    'need_more_help'                             => 'If you need more help using Firefly III, please open a ticket on Github.',
-    'nothing_to_display'                         => 'There are no transactions to show you',
-    'show_all_no_filter'                         => 'Show all transactions without grouping them by date.',
+    'field_supports_markdown'                    => 'Diese Feld unterstützt  Abschlag .',
+    'need_more_help'                             => 'Wenn Sie weitere Hilfe für das Verwenden von Firefly III benötigen, öffnen Sie ein Ticket auf Github.',
+    'nothing_to_display'                         => 'Es gibt keine Transaktionen zum Anzeigen',
+    'show_all_no_filter'                         => 'Alle Transaktionen anzeigen, ohne diese nach Datum zu gruppieren.',
     'expenses_by_category'                       => 'Ausgaben nach Kategorie',
     'expenses_by_budget'                         => 'Ausgaben nach Budget',
     'income_by_category'                         => 'Einkommen nach Kategorie',
-    'cannot_redirect_to_account'                 => 'Firefly III cannot redirect you to the correct page. Apologies.',
+    'cannot_redirect_to_account'                 => 'Entschuldigung. Firefly III kann Sie nicht zur richtigen Seite weiterleiten.',
     // repeat frequencies:
     'repeat_freq_yearly'                         => 'Jährlich',
     'repeat_freq_monthly'                        => 'monatlich',
@@ -101,7 +101,7 @@ return [
     // account confirmation:
     'confirm_account_header'                     => 'Bitte bestätigen Sie Ihr Konto',
     'confirm_account_intro'                      => 'Eine E-Mail wurde an die Adresse gesendet, welche bei der Registrierung angegeben wurde. Bitte lese die Mail für weitere Anweisungen. Wenn Sie die Mail nicht erhalten haben, kann Firefly Sie erneut senden.',
-    'confirm_account_resend_email'               => 'Send me the confirmation message I need to activate my account.',
+    'confirm_account_resend_email'               => 'Senden Sie mir die Bestätigung, ich möchte meinen Account aktivieren.',
     'account_is_confirmed'                       => 'Ihr Benutzerkonto wurde bestätigt!',
     'invalid_activation_code'                    => 'Es scheint der genutzte Code ist ungültig oder ist abgelaufen.',
     'confirm_account_is_resent_header'           => 'Die Bestätigung wurde erneut gesendet',

From ccaa42ad744d924ae7366fb04566b735fd658d44 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 12:41:14 +0100
Subject: [PATCH 108/223] New translations

---
 resources/lang/de_DE/firefly.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 6697ed258c..cb1025e212 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -108,7 +108,7 @@ return [
     'confirm_account_is_resent_text'             => 'Die Bestätigungsmail wurde erneut gesendet. Wenn Sie die Bestätigungsmail weiterhin nicht erhalten wenden Sie sich bitte an den Seitenbetreiber unter Seitenbetreiber> oder überprüfen Sie das Fehlerprotokoll.',
     'confirm_account_is_resent_go_home'          => 'Zur Hauptseite von Firefly wechseln',
     'confirm_account_not_resent_header'          => 'Etwas ist schief gelaufen :(',
-    'confirm_account_not_resent_intro'           => 'The confirmation message has been not resent. If you still did not receive the confirmation message, please contact the site owner at :owner instead. Possibly, you have tried to resend the activation message too often. You can have Firefly III try to resend the confirmation message every hour.',
+    'confirm_account_not_resent_intro'           => 'Die Bestätigung wurde nicht erneut versendet. Wenn Sie immer noch keine Bestätigung erhalten haben, wenden Sie sich stattdessen bitte an den Inhaber der Webseite :owner. Möglicherweise haben Sie zu oft versucht die Bestätigung zu senden. Sie können die Bestätigung nur einmal pro Stunde durch Firefly III erneut senden lassen.',
     'confirm_account_not_resent_go_home'         => 'Zur Hauptseite von Firefly wechseln',
 
     // export data:
@@ -160,11 +160,11 @@ return [
     'deleted_rule_group'                         => 'Regelgruppe ":title" gelöscht',
     'update_rule_group'                          => 'Aktualisiere neue Regelgruppe',
     'no_rules_in_group'                          => 'Die Gruppe enthält keine Regeln',
-    'move_rule_group_up'                         => 'Move rule group up',
-    'move_rule_group_down'                       => 'Move rule group down',
+    'move_rule_group_up'                         => 'Regelgruppe nach oben verschieben',
+    'move_rule_group_down'                       => 'Regelgruppe nach unten verschieben',
     'save_rules_by_moving'                       => 'Speichern Sie diese Regel(n), indem Sie sie in eine andere Gruppe verschieben:',
     'make_new_rule'                              => 'Erstelle neue Regel in der Regelgruppe ":title"',
-    'rule_help_stop_processing'                  => 'When you check this box, later rules in this group will not be executed.',
+    'rule_help_stop_processing'                  => 'Wenn Sie dieses Kontrollkästchen aktivieren, werden spätere Regeln in dieser Gruppe nicht ausgeführt.',
     'rule_help_active'                           => 'Inaktive Regeln werden nie ausgeführt.',
     'stored_new_rule'                            => 'Speichere neue Regel mit Titel ":title"',
     'deleted_rule'                               => 'Lösche Regel mit Titel ":title"',
@@ -174,17 +174,17 @@ return [
     'default_rule_group_description'             => 'Alle Ihre Regeln ohne eine bestimmte Gruppe.',
     'default_rule_name'                          => 'Ihre erste Standardregel',
     'default_rule_description'                   => 'Diese Regel ist ein Beispiel. Sie können sie problemlos löschen.',
-    'default_rule_trigger_description'           => 'The Man Who Sold the World',
+    'default_rule_trigger_description'           => 'Der Mann der die Welt verkaufte',
     'default_rule_trigger_from_account'          => 'David Bowie',
-    'default_rule_action_prepend'                => 'Bought the world from ',
+    'default_rule_action_prepend'                => 'Kaufte die Welt von ',
     'default_rule_action_set_category'           => 'Große Ausgaben',
     'trigger'                                    => 'Trigger',
     'trigger_value'                              => 'Auslösen bei Wert',
-    'stop_processing_other_triggers'             => 'Stop processing other triggers',
+    'stop_processing_other_triggers'             => 'Keine weiteren Auslöser verarbeiten',
     'add_rule_trigger'                           => 'Neue Trigger hinzufügen',
     'action'                                     => 'Aktion',
     'action_value'                               => 'Aktionswert',
-    'stop_executing_other_actions'               => 'Stop executing other actions',
+    'stop_executing_other_actions'               => 'Keine weiteren Aktionen durchführen',
     'add_rule_action'                            => 'Neue Aktion hinzufügen',
     'edit_rule'                                  => 'Bearbeite Regel ":title"',
     'delete_rule'                                => 'Lösche Regel ":title"',
@@ -210,8 +210,8 @@ return [
     'rule_trigger_to_account_starts'             => 'Das Zielkonto startet mit ":trigger_value"',
     'rule_trigger_to_account_ends'               => 'Das Zielkonto endet mit ":trigger_value"',
     'rule_trigger_to_account_is'                 => 'Das Zielkonto ist ":trigger_value"',
-    'rule_trigger_to_account_contains'           => 'Destination account contains ":trigger_value"',
-    'rule_trigger_transaction_type'              => 'Transaction is of type ":trigger_value"',
+    'rule_trigger_to_account_contains'           => 'Zielkonto enthält ":trigger_value"',
+    'rule_trigger_transaction_type'              => 'Transaktion ist vom Typ ": Trigger_value"',
     'rule_trigger_amount_less'                   => 'Betrag ist kleiner als :trigger_value',
     'rule_trigger_amount_exactly'                => 'Betrag ist :trigger_value',
     'rule_trigger_amount_more'                   => 'Betrag ist größer als :trigger_value',
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'Beschreibung endet mit..',
     'rule_trigger_description_contains_choice'   => 'Beschreibung enthält..',
     'rule_trigger_description_is_choice'         => 'Beschreibung ist..',
-    'rule_trigger_store_journal'                 => 'When a journal is created',
-    'rule_trigger_update_journal'                => 'When a journal is updated',
+    'rule_trigger_store_journal'                 => 'Wenn ein Protokoll erstellt wird',
+    'rule_trigger_update_journal'                => 'Wenn ein Protokoll aktualisiert wird',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Bereinige Kategorie',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',

From d89e75cbe86bf765b003343e5e493a25cfb296eb Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 12:51:23 +0100
Subject: [PATCH 109/223] New translations

---
 resources/lang/de_DE/firefly.php | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index cb1025e212..4ead2cd857 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -237,28 +237,28 @@ return [
     'rule_trigger_description_is_choice'         => 'Beschreibung ist..',
     'rule_trigger_store_journal'                 => 'Wenn ein Protokoll erstellt wird',
     'rule_trigger_update_journal'                => 'Wenn ein Protokoll aktualisiert wird',
-    'rule_action_set_category'                   => 'Set category to ":action_value"',
+    'rule_action_set_category'                   => 'Kategorie zu ":action_value" festlegen',
     'rule_action_clear_category'                 => 'Bereinige Kategorie',
-    'rule_action_set_budget'                     => 'Set budget to ":action_value"',
+    'rule_action_set_budget'                     => 'Budget zu ":action_value" festlegen',
     'rule_action_clear_budget'                   => 'Lösche Budget',
-    'rule_action_add_tag'                        => 'Add tag ":action_value"',
-    'rule_action_remove_tag'                     => 'Remove tag ":action_value"',
+    'rule_action_add_tag'                        => 'Tag ":action_value" hinzufügen',
+    'rule_action_remove_tag'                     => 'Tag ":action_value" entfernen',
     'rule_action_remove_all_tags'                => 'Alle Tags entfernen',
     'rule_action_set_description'                => 'Set description to ":action_value"',
     'rule_action_append_description'             => 'Append description with ":action_value"',
     'rule_action_prepend_description'            => 'Prepend description with ":action_value"',
     'rule_action_set_category_choice'            => 'Set category to..',
-    'rule_action_clear_category_choice'          => 'Clear any category',
+    'rule_action_clear_category_choice'          => 'Bereinige jede Kategorie',
     'rule_action_set_budget_choice'              => 'Set budget to..',
-    'rule_action_clear_budget_choice'            => 'Clear any budget',
+    'rule_action_clear_budget_choice'            => 'Lösche jedes Budget',
     'rule_action_add_tag_choice'                 => 'Füge Tag hinzu..',
     'rule_action_remove_tag_choice'              => 'Entferne Tag..',
     'rule_action_remove_all_tags_choice'         => 'Entferne alle Tags',
     'rule_action_set_description_choice'         => 'Set description to..',
     'rule_action_append_description_choice'      => 'Append description with..',
     'rule_action_prepend_description_choice'     => 'Prepend description with..',
-    'rule_action_set_source_account_choice'      => 'Set source account to...',
-    'rule_action_set_source_account'             => 'Set source account to :action_value',
+    'rule_action_set_source_account_choice'      => 'Lege Quellkonto fest...',
+    'rule_action_set_source_account'             => 'Lege Quellkonto als :action_value fest',
     'rule_action_set_destination_account_choice' => 'Set destination account to...',
     'rule_action_set_destination_account'        => 'Set destination account to :action_value',
 
@@ -302,10 +302,10 @@ return [
     'preferences_frontpage'                      => 'Startbildschirm',
     'preferences_security'                       => 'Sicherheit',
     'preferences_layout'                         => 'Layout',
-    'pref_home_show_deposits'                    => 'Show deposits on the home screen',
+    'pref_home_show_deposits'                    => 'Einnahmen auf dem Startbildschirm anzeigen',
     'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
     'pref_home_do_show_deposits'                 => 'Ja, zeige sie an',
-    'successful_count'                           => 'of which :count successful',
+    'successful_count'                           => 'davon :count erfolgreich',
     'transaction_page_size_title'                => 'Seitengröße',
     'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
     'transaction_page_size_label'                => 'Seitengröße',
@@ -313,8 +313,8 @@ return [
     'pref_optional_fields_transaction'           => 'Optionale Felder für Überweisungen',
     'pref_optional_fields_transaction_help'      => 'Standardmäßig sind nicht alle Felder aktiviert, wenn eine neue Überweisung erstellt wird (wegen der Übersicht). Unten können Sie diese Felder aktivieren, wenn Sie glauben, dass Sie nützlich für Sie sind. Alle Felder die deaktiviert sind, aber bereits ausgefüllt sind, werden unabhängig von ihren Einstellung sichtbar sein.',
     'optional_tj_date_fields'                    => 'Datumsfeld',
-    'optional_tj_business_fields'                => 'Business fields',
-    'optional_tj_attachment_fields'              => 'Attachment fields',
+    'optional_tj_business_fields'                => 'Geschäftsfelder',
+    'optional_tj_attachment_fields'              => 'Anlage-Felder',
     'pref_optional_tj_interest_date'             => 'Zinstermin',
     'pref_optional_tj_book_date'                 => 'Buchungstermin',
     'pref_optional_tj_process_date'              => 'Bearbeitungsdatum',
@@ -344,7 +344,7 @@ return [
     'delete_account_button'                      => 'LÖSCHEN Sie ihr Benutzerkonto',
     'invalid_current_password'                   => 'Aktuelles Passwort ist ungültig!',
     'password_changed'                           => 'Passwort geändert!',
-    'should_change'                              => 'The idea is to change your password.',
+    'should_change'                              => 'Ziel ist es, ihr Passwort zu ändern.',
     'invalid_password'                           => 'Ungültiges Passwort!',
 
 
@@ -472,21 +472,21 @@ return [
     'connected_journals'                         => 'Vernüpfte Überweisungen',
     'auto_match_on'                              => 'Automatically matched by Firefly',
     'auto_match_off'                             => 'Not automatically matched by Firefly',
-    'next_expected_match'                        => 'Next expected match',
+    'next_expected_match'                        => 'Nächste erwartete Übereinstimmung',
     'delete_bill'                                => 'Rechnung ":name" löschen',
     'deleted_bill'                               => 'Rechnung ":name" gelöscht',
     'edit_bill'                                  => 'Rechnung ":name" bearbeiten',
     'more'                                       => 'Weitere',
-    'rescan_old'                                 => 'Rescan old transactions',
+    'rescan_old'                                 => 'Ältere Transaktionen Scannen',
     'update_bill'                                => 'Aktualisieren Sie eine Rechnung',
     'updated_bill'                               => 'Rechnung ":name" aktualisiert',
     'store_new_bill'                             => 'Neue Rechnung speichern',
     'stored_new_bill'                            => 'Neue Rechung ":name" gespeichert',
-    'cannot_scan_inactive_bill'                  => 'Inactive bills cannot be scanned.',
-    'rescanned_bill'                             => 'Rescanned everything.',
+    'cannot_scan_inactive_bill'                  => 'Inaktive Rechnungen können nicht gesacannt werden.',
+    'rescanned_bill'                             => 'Alles gescannt.',
     'average_bill_amount_year'                   => 'Durchschnittliche Rechnungssumme (:year)',
     'average_bill_amount_overall'                => 'Durchschnittliche Rechnungssumme (gesamt)',
-    'not_or_not_yet'                             => 'Not (yet)',
+    'not_or_not_yet'                             => '(noch) nicht',
     'not_expected_period'                        => 'Not expected this period',
     // accounts:
     'details_for_asset'                          => 'Details für Girokonto ":name"',

From fbcf0929d8236a6494a874c0ca9a0b8edf855c49 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 13:01:30 +0100
Subject: [PATCH 110/223] New translations

---
 resources/lang/de_DE/firefly.php | 52 ++++++++++++++++----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 4ead2cd857..f7491afbcf 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -487,11 +487,11 @@ return [
     'average_bill_amount_year'                   => 'Durchschnittliche Rechnungssumme (:year)',
     'average_bill_amount_overall'                => 'Durchschnittliche Rechnungssumme (gesamt)',
     'not_or_not_yet'                             => '(noch) nicht',
-    'not_expected_period'                        => 'Not expected this period',
+    'not_expected_period'                        => 'Diesen Zeitraum nicht erwartet',
     // accounts:
     'details_for_asset'                          => 'Details für Girokonto ":name"',
-    'details_for_expense'                        => 'Details for expense account ":name"',
-    'details_for_revenue'                        => 'Details for revenue account ":name"',
+    'details_for_expense'                        => 'Details für Debitor ":name"',
+    'details_for_revenue'                        => 'Details für Schuldner ":name"',
     'details_for_cash'                           => 'Details for cash account ":name"',
     'store_new_asset_account'                    => 'Speichere neues Girokonto',
     'store_new_expense_account'                  => 'Store new expense account',
@@ -532,7 +532,7 @@ return [
     'new_category'                               => 'Neue Kategorie',
     'create_new_category'                        => 'Eine neue Kategorie herstellen',
     'without_category'                           => 'Ohne Kategorie',
-    'update_category'                            => 'Update category',
+    'update_category'                            => 'Kategorie aktualisieren',
     'updated_category'                           => 'Kategorie ":name" aktualisiert',
     'categories'                                 => 'Kategorien',
     'edit_category'                              => 'Kategorie ":name" bearbeiten',
@@ -600,8 +600,8 @@ return [
     'Asset account'                              => 'Girokonto',
     'Default account'                            => 'Girokonto',
     'Expense account'                            => 'Debitor (Ausgabe)',
-    'Revenue account'                            => 'Revenue account',
-    'Initial balance account'                    => 'Initial balance account',
+    'Revenue account'                            => 'Kreditor Einnahme',
+    'Initial balance account'                    => 'Eröffnungssaldo',
     'budgets'                                    => 'Budgets',
     'tags'                                       => 'Tags',
     'reports'                                    => 'Berichte',
@@ -624,7 +624,7 @@ return [
     'no'                                         => 'Nein',
     'amount'                                     => 'Betrag',
     'overview'                                   => 'Übersicht',
-    'saveOnAccount'                              => 'Save on account',
+    'saveOnAccount'                              => 'Rücklagen für Konto',
     'unknown'                                    => 'Unbekannt',
     'daily'                                      => 'Täglich',
     'monthly'                                    => 'Monatlich',
@@ -645,7 +645,7 @@ return [
     'report_all_time_quick'                      => 'Gesamte Zeit, alle Konten',
     'reports_can_bookmark'                       => 'Berichte können als Lesezeichen gespeichert werden.',
     'incomeVsExpenses'                           => 'Einkommen vs Ausgaben',
-    'accountBalances'                            => 'Account balances',
+    'accountBalances'                            => 'Kontostände',
     'balanceStartOfYear'                         => 'Bilanz zum Jahresbeginn',
     'balanceEndOfYear'                           => 'Bilanz zum Jahresende',
     'balanceStartOfMonth'                        => 'Bilanz zum Monatsbeginn',
@@ -654,12 +654,12 @@ return [
     'balanceEnd'                                 => 'Bilanz zum Ende der Periode',
     'reportsOwnAccounts'                         => 'Berichte für Ihren eigenen Konten',
     'reportsOwnAccountsAndShared'                => 'Reports for your own accounts and shared accounts',
-    'splitByAccount'                             => 'Split by account',
-    'balancedByTransfersAndTags'                 => 'Balanced by transfers and tags',
-    'coveredWithTags'                            => 'Covered with tags',
+    'splitByAccount'                             => 'Nach Konto aufteilen',
+    'balancedByTransfersAndTags'                 => 'Ausgeglichen durch Überweisungen und Tags',
+    'coveredWithTags'                            => 'Abgedeckt durch Tags',
     'leftUnbalanced'                             => 'Left unbalanced',
-    'expectedBalance'                            => 'Expected balance',
-    'outsideOfBudgets'                           => 'Outside of budgets',
+    'expectedBalance'                            => 'Erwarteter Kontostand',
+    'outsideOfBudgets'                           => 'Ausserhalb von Budgets',
     'leftInBudget'                               => 'Left in budget',
     'sumOfSums'                                  => 'Summe der Summen',
     'noCategory'                                 => '(keine Kategorie)',
@@ -703,13 +703,13 @@ return [
     'end_after_start_date'                       => 'End date of report must be after start date.',
     'select_category'                            => 'Select one or more categories.',
     'select_budget'                              => 'Select one or more budgets.',
-    'income_per_category'                        => 'Income per category',
-    'expense_per_category'                       => 'Expense per category',
-    'expense_per_budget'                         => 'Expense per budget',
-    'income_per_account'                         => 'Income per account',
-    'expense_per_account'                        => 'Expense per account',
-    'include_not_in_category'                    => 'Include categories not selected for this report',
-    'include_not_in_budget'                      => 'Include budgets not selected for this report',
+    'income_per_category'                        => 'Einnahmen pro Kategorie',
+    'expense_per_category'                       => 'Ausgaben pro Kategorie',
+    'expense_per_budget'                         => 'Ausgaben pro Budget',
+    'income_per_account'                         => 'Einnahmen pro Konto',
+    'expense_per_account'                        => 'Ausgaben pro Konto',
+    'include_not_in_category'                    => 'Kategorien einbeziehen, die nicht für diesen Report ausgewählt wurden',
+    'include_not_in_budget'                      => 'Budgets einbeziehen, die nicht für diesen Report ausgewählt wurden',
     'everything_else'                            => 'Der Rest',
     'income_and_expenses'                        => 'Einkommen und Ausgaben',
     'spent_average'                              => 'Ausgaben (Durchschnitt)',
@@ -731,8 +731,8 @@ return [
     'overspent'                                  => 'Zuviel ausgegeben',
     'left'                                       => 'Übrig',
     'no_budget'                                  => '(kein Budget)',
-    'max-amount'                                 => 'Maximum amount',
-    'min-amount'                                 => 'Minumum amount',
+    'max-amount'                                 => 'Höchstbetrag',
+    'min-amount'                                 => 'Mindestbetrag',
     'journal-amount'                             => 'Current bill entry',
     'name'                                       => 'Name',
     'date'                                       => 'Datum',
@@ -754,12 +754,12 @@ return [
     'store_piggy_bank'                           => 'Speichere neues Sparschwein',
     'stored_piggy_bank'                          => 'Speichere neues Sparschwein ":name"',
     'account_status'                             => 'Kontostatus',
-    'left_for_piggy_banks'                       => 'Left for piggy banks',
-    'sum_of_piggy_banks'                         => 'Sum of piggy banks',
+    'left_for_piggy_banks'                       => 'Übrig für Sparschweine',
+    'sum_of_piggy_banks'                         => 'Summe der Sparschweine',
     'saved_so_far'                               => 'Gespart',
     'left_to_save'                               => 'Zu Sparen',
-    'add_money_to_piggy_title'                   => 'Add money to piggy bank ":name"',
-    'remove_money_from_piggy_title'              => 'Remove money from piggy bank ":name"',
+    'add_money_to_piggy_title'                   => 'Geld dem Sparschwein ":name" hinzufügen',
+    'remove_money_from_piggy_title'              => 'Geld dem Sparschwein ":name" entnehmen',
     'add'                                        => 'Hinzufügen',
 
     'remove'                     => 'Entfernen',

From f855011d349135487aea39e27e20fc5fd51fab4a Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 13:12:00 +0100
Subject: [PATCH 111/223] Translated

---
 resources/lang/de_DE/form.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index 7ee04add23..056c7b8f5e 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -155,11 +155,11 @@ return [
     'single_user_mode'           => 'Einzelnutzermodus',
     'must_confirm_account'       => 'Erstanwender müssen ihr Konto aktivieren',
     'is_demo_site'               => 'Ist eine Demonstrationsseite',
-    'mail_for_lockout'           => 'Locked out',
-    'mail_for_blocked_domain'    => 'Blocked domain',
-    'mail_for_blocked_email'     => 'Blocked email address',
-    'mail_for_bad_login'         => 'Login failure',
-    'mail_for_blocked_login'     => 'Blocked user',
+    'mail_for_lockout'           => 'Ausgesperrt',
+    'mail_for_blocked_domain'    => 'Gesperrte Domain',
+    'mail_for_blocked_email'     => 'Gesperrte Email-Adresse',
+    'mail_for_bad_login'         => 'Anmeldung fehlgeschlagen',
+    'mail_for_blocked_login'     => 'Gesperrter Benutzer',
 
 
     // import

From c975ef15f1fbdf29fb085c19c6b4aea5bf075a81 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 13:12:03 +0100
Subject: [PATCH 112/223] Translated

---
 resources/lang/de_DE/validation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php
index a37dd35597..5420eda870 100644
--- a/resources/lang/de_DE/validation.php
+++ b/resources/lang/de_DE/validation.php
@@ -12,7 +12,7 @@
 return [
     'iban'                           => 'Dies ist keine gültige IBAN.',
     'unique_account_number_for_user' => 'Es sieht so aus, als ob diese Kontonummer bereits verwendet würde.',
-    'deleted_user'                   => 'Due to security constraints, you cannot register using this email address.',
+    'deleted_user'                   => 'Aufgrund von Sicherheitsbeschränkungen ist eine Registrierung dieser Email-Adresse nicht zugelassen.',
     'rule_trigger_value'             => 'Dieser Wert ist für den ausgewählten Trigger ungültig.',
     'rule_action_value'              => 'Dieser Wert ist für die gewählte Aktion ungültig.',
     'invalid_domain'                 => 'Aufgrund von Sicherheitsbeschränkungen ist eine Registrierung von dieser Domain nicht zugelassen.',

From 7d31071ff8f263d899ed6e701ac40ead6850eb18 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 13:12:12 +0100
Subject: [PATCH 113/223] New translations

---
 resources/lang/de_DE/firefly.php | 48 ++++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index f7491afbcf..9ce74725fb 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -763,8 +763,8 @@ return [
     'add'                                        => 'Hinzufügen',
 
     'remove'                     => 'Entfernen',
-    'max_amount_add'             => 'The maximum amount you can add is',
-    'max_amount_remove'          => 'The maximum amount you can remove is',
+    'max_amount_add'             => 'Der maximale Betrag, den Sie hinzufügen können ist',
+    'max_amount_remove'          => 'Der maximale Betrag, den Sie entnehmen können ist',
     'update_piggy_button'        => 'Sparschwein aktualisieren',
     'update_piggy_title'         => 'Sparschwein ":name" aktualisieren',
     'updated_piggy_bank'         => 'Sparschwein ":name" aktualisiert',
@@ -778,7 +778,7 @@ return [
     'table'                      => 'Tabelle',
     'piggy_bank_not_exists'      => 'Dieses Sparschwein existiert nicht mehr.',
     'add_any_amount_to_piggy'    => 'Fügen sie Geld ihrem Sparschein hinzu, um ihr Ziel von :amount zu erreichen.',
-    'add_set_amount_to_piggy'    => 'Add :amount to fill this piggy bank on :date',
+    'add_set_amount_to_piggy'    => ':amount einzahlen um Sparschwein bis :date zu füllen',
     'delete_piggy_bank'          => 'Sparschwein ":name" löschen',
     'cannot_add_amount_piggy'    => ':amount konnte nicht zu ":name" hinzugefügt werden.',
     'deleted_piggy_bank'         => 'Sparschwein ":name" gelöscht',
@@ -787,25 +787,25 @@ return [
     'cannot_remove_amount_piggy' => 'Konnten :amount nicht von ":name" entfernen.',
 
     // tags
-    'regular_tag'                => 'Just a regular tag.',
+    'regular_tag'                => 'Nur ein normaler Tag.',
     'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
     'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
-    'delete_tag'                 => 'Delete tag ":tag"',
+    'delete_tag'                 => 'Tag ":tag" entfernen',
     'deleted_tag'                => 'Deleted tag ":tag"',
-    'new_tag'                    => 'Make new tag',
-    'edit_tag'                   => 'Edit tag ":tag"',
-    'updated_tag'                => 'Updated tag ":tag"',
-    'created_tag'                => 'Tag ":tag" has been created!',
+    'new_tag'                    => 'Neuen Tag erstellen',
+    'edit_tag'                   => 'Tag ":tag" bearbeiten',
+    'updated_tag'                => 'Aktualisierter Tag ":tag"',
+    'created_tag'                => 'Tag ":tag" wurde erstellt!',
     'no_year'                    => 'Kein Jahr angegeben',
     'no_month'                   => 'Kein Monat angegeben',
-    'tag_title_nothing'          => 'Default tags',
-    'tag_title_balancingAct'     => 'Balancing act tags',
-    'tag_title_advancePayment'   => 'Advance payment tags',
+    'tag_title_nothing'          => 'Standard-Tags',
+    'tag_title_balancingAct'     => 'Ausgleich Tags',
+    'tag_title_advancePayment'   => 'Vorauszahlung Tags',
     'tags_introduction'          => 'In der Regel sind Tags einzelne Worte, erdacht um Einträge mit Begriffen wie Ausgaben, Rechnungen oder Partyvorbereitung schnell zusammenzufassen. In Firefly III können Tags weitere Eigenschaften wie ein Datum, eine Beschreibung und einen Ort enthalten. Dieses erlaubt es Ihnen Transaktionen in sinnvoller Weise miteinander zu verknüpfen. Zum Beispiel können Sie einen Tag mit dem Titel  Weihnachtsessen mit Freunden erstellen und Informationen über das Restaurant hinzufügen. Solche Tags sind "einzigartig", sie werden nur für einen Anlass genutzt, enthalten aber eventuell mehrere Transaktionen.',
     'tags_group'                 => 'Tags group transactions together, which makes it possible to store reimbursements (in case you front money for others) and other "balancing acts" where expenses are summed up (the payments on your new TV) or where expenses and deposits are cancelling each other out (buying something with saved money). It\'s all up to you. Using tags the old-fashioned way is of course always possible.',
     'tags_start'                 => 'Create a tag to get started or enter tags when creating new transactions.',
 
-    'transaction_journal_information'      => 'Transaction information',
+    'transaction_journal_information'      => 'Transaktionsinformationen',
     'transaction_journal_meta'             => 'Metainformationen',
     'total_amount'                         => 'Gesamtbetrag',
 
@@ -819,7 +819,7 @@ return [
     'no_domains_banned'                    => 'Keine blockierten Domains',
     'all_user_domains'                     => 'All user email address domains',
     'all_domains_is_filtered'              => 'This list does not include already blocked domains.',
-    'domain_now_blocked'                   => 'Domain :domain is now blocked',
+    'domain_now_blocked'                   => 'Domain :domain ist jetzt gesperrt',
     'domain_now_unblocked'                 => 'Domain :domain is now unblocked',
     'manual_block_domain'                  => 'Block a domain by hand',
     'block_domain'                         => 'Block domain',
@@ -866,8 +866,8 @@ return [
     'split_table_intro_withdrawal'         => 'Split your withdrawal in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
     'store_splitted_withdrawal'            => 'Store splitted withdrawal',
     'update_splitted_withdrawal'           => 'Update splitted withdrawal',
-    'split_title_deposit'                  => 'Split your new deposit',
-    'split_intro_one_deposit'              => 'Firefly supports the "splitting" of a deposit.',
+    'split_title_deposit'                  => 'Neue Einnahme aufteilen',
+    'split_intro_one_deposit'              => 'Firefly untestützt das "Aufteilen" von Einnahmen.',
     'split_intro_two_deposit'              => 'It means that the amount of money you\'ve earned is divided between several source revenue accounts or categories.',
     'split_intro_three_deposit'            => 'For example: you could split your :total salary so you get :split_one as your base salary and :split_two as a reimbursment for expenses made.',
     'split_table_intro_deposit'            => 'Split your deposit in as many things as you want. By default the transaction will not split, there is just one entry. Add as many splits as you want to, below. Remember that you should not deviate from your total amount. If you do, Firefly will warn you but not correct you.',
@@ -907,16 +907,16 @@ return [
     'import_data'                          => 'Daten importieren',
     'import_data_full'                     => 'Importieren Sie Daten in Firefly III',
     'import'                               => 'Import',
-    'import_file_help'                     => 'Select your file',
-    'import_status_settings_complete'      => 'The import is ready to start.',
-    'import_status_import_complete'        => 'The import has completed.',
+    'import_file_help'                     => 'Datei auswählen',
+    'import_status_settings_complete'      => 'Der Import is startbereit.',
+    'import_status_import_complete'        => 'Import vollständig.',
     'import_status_import_running'         => 'The import is currently running. Please be patient.',
-    'import_status_header'                 => 'Import status and progress',
-    'import_status_errors'                 => 'Import errors',
-    'import_status_report'                 => 'Import report',
+    'import_status_header'                 => 'Importstatus und Fortschritt',
+    'import_status_errors'                 => 'Importfehler',
+    'import_status_report'                 => 'Import-Bericht',
     'import_finished'                      => 'Der Importierungsvorgang ist beendet',
-    'import_error_single'                  => 'An error has occured during the import.',
-    'import_error_multi'                   => 'Some errors occured during the import.',
+    'import_error_single'                  => 'Beim Importieren ist ein Fehler aufgetreten.',
+    'import_error_multi'                   => 'Beim Importieren sind Fehler aufgetreten.',
     'import_error_fatal'                   => 'There was an error during the import routine. Please check the log files. The error seems to be:',
     'import_error_timeout'                 => 'Der Import scheint ein Zeitlimit überschritten zu haben. Wenn dieser Fehler weiterhin auftritt importieren Sie die Daten bitte über die Kommandozeile.',
     'import_double'                        => 'Row #:row: This row has been imported before, and is stored in :description.',

From c8ad83cc910fd9079fa565bc53c48ef54fbf8125 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 13:21:56 +0100
Subject: [PATCH 114/223] New translations

---
 resources/lang/de_DE/firefly.php | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 9ce74725fb..5ca53992b9 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -820,24 +820,24 @@ return [
     'all_user_domains'                     => 'All user email address domains',
     'all_domains_is_filtered'              => 'This list does not include already blocked domains.',
     'domain_now_blocked'                   => 'Domain :domain ist jetzt gesperrt',
-    'domain_now_unblocked'                 => 'Domain :domain is now unblocked',
-    'manual_block_domain'                  => 'Block a domain by hand',
-    'block_domain'                         => 'Block domain',
-    'no_domain_filled_in'                  => 'No domain filled in',
-    'domain_already_blocked'               => 'Domain :domain is already blocked',
-    'domain_is_now_blocked'                => 'Domain :domain is now blocked',
-    'instance_configuration'               => 'Configuration',
-    'firefly_instance_configuration'       => 'Configuration options for Firefly III',
-    'setting_single_user_mode'             => 'Single user mode',
-    'setting_single_user_mode_explain'     => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
-    'store_configuration'                  => 'Store configuration',
-    'single_user_administration'           => 'User administration for :email',
-    'edit_user'                            => 'Edit user :email',
+    'domain_now_unblocked'                 => 'Domain :domain ist wieder freigegeben',
+    'manual_block_domain'                  => 'Domain von Hand sperren',
+    'block_domain'                         => 'Domain sperren',
+    'no_domain_filled_in'                  => 'Keine domain angegeben',
+    'domain_already_blocked'               => 'Domain :domain ist bereits gesperrt',
+    'domain_is_now_blocked'                => 'Domain :domain ist jetzt gesperrt',
+    'instance_configuration'               => 'Konfiguration',
+    'firefly_instance_configuration'       => 'Konfigurationsoptionen für Firefly III',
+    'setting_single_user_mode'             => 'Einzelnutzermodus',
+    'setting_single_user_mode_explain'     => 'Standardmäßig aktzeptiert Firefly III nur eine Registration: Sie. Diese Sicherheitsmaßnahme verhindert das Benutzen Ihrer Instanz durch andere, außer Sie erlauben es. Zukünftige Registrationen sind gesperrt. Wenn Sie dieses Kontrollkästchen deaktivieren können andere ihre Instanz ebenfalls benutzen, vorausgesetzt sie ist erreichbar (mit dem Internet verbunden).',
+    'store_configuration'                  => 'Konfiguration speichern',
+    'single_user_administration'           => 'Benutzerverwaltung für :email',
+    'edit_user'                            => 'Benutzer :email bearbeiten',
     'hidden_fields_preferences'            => 'Zur Zeit sind nicht alle Felder sichtbar. Sie müssen in den Einstellungen aktiviert werden.',
-    'user_data_information'                => 'User data',
-    'user_information'                     => 'User information',
-    'total_size'                           => 'total size',
-    'budget_or_budgets'                    => 'budget(s)',
+    'user_data_information'                => 'Nutzerdaten',
+    'user_information'                     => 'Benutzerinformationen',
+    'total_size'                           => 'Gesamtgröße',
+    'budget_or_budgets'                    => 'Budget(s)',
     'budgets_with_limits'                  => 'budget(s) with configured amount',
     'rule_or_rules'                        => 'Regel(n)',
     'rulegroup_or_groups'                  => 'rule group(s)',

From 6092d206b692318c0529375f29b32de6ab506894 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 17:22:30 +0100
Subject: [PATCH 115/223] New translations

---
 resources/lang/de_DE/firefly.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 5ca53992b9..ad1b75afb4 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -244,23 +244,23 @@ return [
     'rule_action_add_tag'                        => 'Tag ":action_value" hinzufügen',
     'rule_action_remove_tag'                     => 'Tag ":action_value" entfernen',
     'rule_action_remove_all_tags'                => 'Alle Tags entfernen',
-    'rule_action_set_description'                => 'Set description to ":action_value"',
+    'rule_action_set_description'                => 'Beschreibung setzen für ":action_value"',
     'rule_action_append_description'             => 'Append description with ":action_value"',
     'rule_action_prepend_description'            => 'Prepend description with ":action_value"',
-    'rule_action_set_category_choice'            => 'Set category to..',
+    'rule_action_set_category_choice'            => 'Kategorie festlegen..',
     'rule_action_clear_category_choice'          => 'Bereinige jede Kategorie',
-    'rule_action_set_budget_choice'              => 'Set budget to..',
+    'rule_action_set_budget_choice'              => 'Budget festlegen..',
     'rule_action_clear_budget_choice'            => 'Lösche jedes Budget',
     'rule_action_add_tag_choice'                 => 'Füge Tag hinzu..',
     'rule_action_remove_tag_choice'              => 'Entferne Tag..',
     'rule_action_remove_all_tags_choice'         => 'Entferne alle Tags',
-    'rule_action_set_description_choice'         => 'Set description to..',
-    'rule_action_append_description_choice'      => 'Append description with..',
+    'rule_action_set_description_choice'         => 'Beschreibung festlegen..',
+    'rule_action_append_description_choice'      => 'An Beschreibung anhängen..',
     'rule_action_prepend_description_choice'     => 'Prepend description with..',
     'rule_action_set_source_account_choice'      => 'Lege Quellkonto fest...',
     'rule_action_set_source_account'             => 'Lege Quellkonto als :action_value fest',
-    'rule_action_set_destination_account_choice' => 'Set destination account to...',
-    'rule_action_set_destination_account'        => 'Set destination account to :action_value',
+    'rule_action_set_destination_account_choice' => 'Zielkonto festlegen...',
+    'rule_action_set_destination_account'        => 'Lege Zielkonto als :action_value fest',
 
     // tags
     'store_new_tag'                              => 'Neuen Tag speichern',
@@ -303,11 +303,12 @@ return [
     'preferences_security'                       => 'Sicherheit',
     'preferences_layout'                         => 'Layout',
     'pref_home_show_deposits'                    => 'Einnahmen auf dem Startbildschirm anzeigen',
-    'pref_home_show_deposits_info'               => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
+    'pref_home_show_deposits_info'               => 'Der Startbildschirm zeigt schon Ihre Ausgabenkonten an. 
+Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'pref_home_do_show_deposits'                 => 'Ja, zeige sie an',
     'successful_count'                           => 'davon :count erfolgreich',
     'transaction_page_size_title'                => 'Seitengröße',
-    'transaction_page_size_help'                 => 'Any list of transactions shows at most this many transactions',
+    'transaction_page_size_help'                 => 'Jede Liste von Transaktionen zeigt maximal folgende Anzahl an Transaktionen',
     'transaction_page_size_label'                => 'Seitengröße',
     'between_dates'                              => '(:start und :end)',
     'pref_optional_fields_transaction'           => 'Optionale Felder für Überweisungen',
@@ -373,9 +374,9 @@ return [
     'title_transfers'                            => 'Überweisungen',
 
     // convert stuff:
-    'convert_is_already_type_Withdrawal'         => 'This transaction is already a withdrawal',
-    'convert_is_already_type_Deposit'            => 'This transaction is already a deposit',
-    'convert_is_already_type_Transfer'           => 'This transaction is already a transfer',
+    'convert_is_already_type_Withdrawal'         => 'Diese Transaktion ist bereits eine Ausgabe',
+    'convert_is_already_type_Deposit'            => 'Diese Transaktion ist bereits eine Einzahlung',
+    'convert_is_already_type_Transfer'           => 'Diese Transaktion ist bereits eine Überweisung',
     'convert_to_Withdrawal'                      => 'Convert ":description" to a withdrawal',
     'convert_to_Deposit'                         => 'Convert ":description" to a deposit',
     'convert_to_Transfer'                        => 'Convert ":description" to a transfer',

From d4f6cce56e459b08b0c470f340ec76e54f19bd92 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 17:32:30 +0100
Subject: [PATCH 116/223] New translations

---
 resources/lang/de_DE/firefly.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index ad1b75afb4..8982a5540f 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -393,7 +393,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'convert_Deposit_to_transfer'                => 'Convert this deposit to a transfer',
     'convert_Transfer_to_deposit'                => 'Convert this transfer to a deposit',
     'convert_Transfer_to_withdrawal'             => 'Convert this transfer to a withdrawal',
-    'convert_please_set_revenue_source'          => 'Please pick the revenue account where the money will come from.',
+    'convert_please_set_revenue_source'          => 'Bitte ein Eingangskonto wählen, woher das Geld kommen wird.',
     'convert_please_set_asset_destination'       => 'Please pick the asset account where the money will go to.',
     'convert_please_set_expense_destination'     => 'Please pick the expense account where the money will go to.',
     'convert_please_set_asset_source'            => 'Please pick the asset account where the money will come from.',
@@ -414,7 +414,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'create_new_transfer'                        => 'Eine neue Überweisung erstellen',
     'create_new_asset'                           => 'Erstellen Sie ein neuen Girokonto',
     'create_new_expense'                         => 'Neuen Debitor (Ausgabe) erstellen',
-    'create_new_revenue'                         => 'Create new revenue account',
+    'create_new_revenue'                         => 'Neuen Schuldner erstellen',
     'create_new_piggy_bank'                      => 'Ein neues Sparschwein erstellen',
     'create_new_bill'                            => 'Eine neue Rechnung erstellen',
 
@@ -467,11 +467,11 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'update_budget_amount_range'                 => 'Update (expected) available amount between :start and :end',
 
     // bills:
-    'matching_on'                                => 'Matching on',
+    'matching_on'                                => 'Reagiert auf',
     'between_amounts'                            => 'zwischen :low und :high.',
     'repeats'                                    => 'Wiederholungen',
     'connected_journals'                         => 'Vernüpfte Überweisungen',
-    'auto_match_on'                              => 'Automatically matched by Firefly',
+    'auto_match_on'                              => 'Automatisch von Firefly abgestimmt',
     'auto_match_off'                             => 'Not automatically matched by Firefly',
     'next_expected_match'                        => 'Nächste erwartete Übereinstimmung',
     'delete_bill'                                => 'Rechnung ":name" löschen',
@@ -524,10 +524,10 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'credit_card_options'                        => 'Kreditkartenoptionen',
     'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
     'no_data_for_chart'                          => 'There is not enough information (yet) to generate this chart.',
-    'select_more_than_one_account'               => 'Please select more than one account',
-    'select_more_than_one_category'              => 'Please select more than one category',
-    'select_more_than_one_budget'                => 'Please select more than one budget',
-    'from_to'                                    => 'From :start to :end',
+    'select_more_than_one_account'               => 'Bitte mehr als ein Konto wählen',
+    'select_more_than_one_category'              => 'Bitte mehr als eine Kategorie wählen',
+    'select_more_than_one_budget'                => 'Bitte mehr als ein Budget wählen',
+    'from_to'                                    => 'Von :start bis :end',
 
     // categories:
     'new_category'                               => 'Neue Kategorie',
@@ -639,7 +639,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'report_budget'                              => 'Budget report for :start until :end',
     'quick_link_reports'                         => 'Schnellzugriff',
     'quick_link_default_report'                  => 'Standard Finanzbericht',
-    'quick_link_audit_report'                    => 'Transaction history overview',
+    'quick_link_audit_report'                    => 'Transaktionshistorie',
     'report_this_month_quick'                    => 'Aktueller Monat, alle Konten',
     'report_this_year_quick'                     => 'Aktuelles Jahr, alle Konten',
     'report_this_fiscal_year_quick'              => 'Aktuelles Geschäftsjahr, alle Konten',

From b2743825ca39d94fe6a6556935f0e46b3033c210 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:44:56 +0100
Subject: [PATCH 117/223] Sort account list by name [skip ci]

---
 app/Support/Binder/AccountList.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php
index 1512f0bbfa..da684a089f 100644
--- a/app/Support/Binder/AccountList.php
+++ b/app/Support/Binder/AccountList.php
@@ -47,6 +47,12 @@ class AccountList implements BinderInterface
                              ->where('user_id', auth()->user()->id)
                              ->get(['accounts.*']);
             if ($object->count() > 0) {
+                $object = $object->sortBy(
+                    function (Account $account) {
+                        return $account->name;
+                    }
+                );
+
                 return $object;
             }
         }

From f19b99194c22f8ed2b9bd5637c62e00d1b46d7d6 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:47:32 +0100
Subject: [PATCH 118/223] Wording

---
 resources/lang/en_US/firefly.php | 4 ++--
 resources/lang/en_US/list.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 1da98a14ce..f32edddf7c 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'Description ends with..',
     'rule_trigger_description_contains_choice'   => 'Description contains..',
     'rule_trigger_description_is_choice'         => 'Description is..',
-    'rule_trigger_store_journal'                 => 'When a journal is created',
-    'rule_trigger_update_journal'                => 'When a journal is updated',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',
diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php
index a4ec03ab72..fa8d71969e 100644
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Destination account',
 
     'accounts_count'        => 'Number of accounts',
-    'journals_count'        => 'Number of journals',
+    'journals_count'        => 'Number of transactions',
     'attachments_count'     => 'Number of attachments',
     'bills_count'           => 'Number of bills',
     'categories_count'      => 'Number of categories',

From e0cdbcb28cceef7250ceeaba769803c3764eaa06 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:52:35 +0100
Subject: [PATCH 119/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php
index ced437cc40..8628dd2e11 100644
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Doelrekening',
 
     'accounts_count'        => 'Aantal rekeningen',
-    'journals_count'        => 'Aantal transacties',
+    'journals_count'        => 'Number of transactions',
     'attachments_count'     => 'Aantal bijlagen',
     'bills_count'           => 'Aantal contracten',
     'categories_count'      => 'Aantal categorieën',

From 6f0366e146c77e280d054e0fc2715acbedd0afcb Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:52:38 +0100
Subject: [PATCH 120/223] Translated

---
 resources/lang/de_DE/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index db48fdd75d..7d75a5317a 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Zielkonto',
 
     'accounts_count'        => 'Anzahl Konten',
-    'journals_count'        => 'Anzahl Transaktionen',
+    'journals_count'        => 'Number of transactions',
     'attachments_count'     => 'Anzahl Anhänge',
     'bills_count'           => 'Anzahl Rechnungen',
     'categories_count'      => 'Anzahl Kategorien',

From d0864e06b54c4fb8a1450a87b129f10e75d27bbd Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:52:41 +0100
Subject: [PATCH 121/223] Translated

---
 resources/lang/pt_BR/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index 5b31acdaaa..6a994e6ba4 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Conta de destino',
 
     'accounts_count'        => 'Número de Contas',
-    'journals_count'        => 'Número de período',
+    'journals_count'        => 'Number of transactions',
     'attachments_count'     => 'Número de anexos',
     'bills_count'           => 'Número de contas',
     'categories_count'      => 'Número de categorias',

From af41985a6422714c6c0c5f32df6de52d02d90b06 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:52:55 +0100
Subject: [PATCH 122/223] New translations

---
 resources/lang/pt_BR/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index d10918dd27..3de214d7d3 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'Descrição termina com..',
     'rule_trigger_description_contains_choice'   => 'Descrição contém..',
     'rule_trigger_description_is_choice'         => 'Descrição é..',
-    'rule_trigger_store_journal'                 => 'Quando um período é criado',
-    'rule_trigger_update_journal'                => 'Quando um período é atualizado',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_action_set_category'                   => 'Definir categoria para ":action_value"',
     'rule_action_clear_category'                 => 'Limpar categoria',
     'rule_action_set_budget'                     => 'Definir orçamento para ":action_value"',

From 4f611ad810472c8a50cdf3166108227204d9e31a Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:52:57 +0100
Subject: [PATCH 123/223] New translations

---
 resources/lang/zh_HK/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/zh_HK/list.php b/resources/lang/zh_HK/list.php
index 953f3f1838..cdebfbd8db 100644
--- a/resources/lang/zh_HK/list.php
+++ b/resources/lang/zh_HK/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Destination account',
 
     'accounts_count'        => 'Number of accounts',
-    'journals_count'        => 'Number of journals',
+    'journals_count'        => 'Number of transactions',
     'attachments_count'     => 'Number of attachments',
     'bills_count'           => 'Number of bills',
     'categories_count'      => 'Number of categories',

From 46528dd29ded3b483aea875f478c65cc8ea36156 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:53:08 +0100
Subject: [PATCH 124/223] New translations

---
 resources/lang/zh_HK/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index f2af2c70e5..04c11ceee4 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'Description ends with..',
     'rule_trigger_description_contains_choice'   => 'Description contains..',
     'rule_trigger_description_is_choice'         => 'Description is..',
-    'rule_trigger_store_journal'                 => 'When a journal is created',
-    'rule_trigger_update_journal'                => 'When a journal is updated',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',

From e13ccff056abcdecfe964fe9179473376aaa7e8d Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:53:14 +0100
Subject: [PATCH 125/223] New translations

---
 resources/lang/zh_TW/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index e5208ade7e..e23f595db3 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => '描述以…結尾',
     'rule_trigger_description_contains_choice'   => '描述包含…',
     'rule_trigger_description_is_choice'         => '描述是…',
-    'rule_trigger_store_journal'                 => 'When a journal is created',
-    'rule_trigger_update_journal'                => 'When a journal is updated',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',

From 99dba92bd3b9a7802f12ab2e6762658bce26d668 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:53:17 +0100
Subject: [PATCH 126/223] New translations

---
 resources/lang/zh_TW/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/zh_TW/list.php b/resources/lang/zh_TW/list.php
index 104a8cba1c..f8633af468 100644
--- a/resources/lang/zh_TW/list.php
+++ b/resources/lang/zh_TW/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Destination account',
 
     'accounts_count'        => 'Number of accounts',
-    'journals_count'        => 'Number of journals',
+    'journals_count'        => 'Number of transactions',
     'attachments_count'     => 'Number of attachments',
     'bills_count'           => 'Number of bills',
     'categories_count'      => 'Number of categories',

From 1b177723aeb54fbb6780dbe246829441346021fd Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:53:25 +0100
Subject: [PATCH 127/223] New translations

---
 resources/lang/fr_FR/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 9f5dce0533..5f8d175aaf 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'La description se termine par..',
     'rule_trigger_description_contains_choice'   => 'La description contient..',
     'rule_trigger_description_is_choice'         => 'La description est..',
-    'rule_trigger_store_journal'                 => 'Lorsqu’un journal est créé',
-    'rule_trigger_update_journal'                => 'Lorsqu’un journal est mis à jour',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_action_set_category'                   => 'Définir la catégorie à ":action_value"',
     'rule_action_clear_category'                 => 'Supprimer la catégorie',
     'rule_action_set_budget'                     => 'Définir le budget à ":action_value"',

From aad4e47b6ad67f2d5fa148b9fd8b59460a7688ee Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:53:32 +0100
Subject: [PATCH 128/223] New translations

---
 resources/lang/de_DE/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 8982a5540f..4c57556ae8 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'Beschreibung endet mit..',
     'rule_trigger_description_contains_choice'   => 'Beschreibung enthält..',
     'rule_trigger_description_is_choice'         => 'Beschreibung ist..',
-    'rule_trigger_store_journal'                 => 'Wenn ein Protokoll erstellt wird',
-    'rule_trigger_update_journal'                => 'Wenn ein Protokoll aktualisiert wird',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_action_set_category'                   => 'Kategorie zu ":action_value" festlegen',
     'rule_action_clear_category'                 => 'Bereinige Kategorie',
     'rule_action_set_budget'                     => 'Budget zu ":action_value" festlegen',

From a35557eb62864720530b960bb5128bd2be7c37a7 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:53:34 +0100
Subject: [PATCH 129/223] New translations

---
 resources/lang/fr_FR/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index 18a99031d3..3d09d60ae9 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Destination account',
 
     'accounts_count'        => 'Number of accounts',
-    'journals_count'        => 'Number of journals',
+    'journals_count'        => 'Number of transactions',
     'attachments_count'     => 'Number of attachments',
     'bills_count'           => 'Number of bills',
     'categories_count'      => 'Number of categories',

From 91cfa963b292de273d3899f63bde1b9cfb17a1a6 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:53:42 +0100
Subject: [PATCH 130/223] New translations

---
 resources/lang/hr_HR/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index f2af2c70e5..04c11ceee4 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'Description ends with..',
     'rule_trigger_description_contains_choice'   => 'Description contains..',
     'rule_trigger_description_is_choice'         => 'Description is..',
-    'rule_trigger_store_journal'                 => 'When a journal is created',
-    'rule_trigger_update_journal'                => 'When a journal is updated',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_action_set_category'                   => 'Set category to ":action_value"',
     'rule_action_clear_category'                 => 'Clear category',
     'rule_action_set_budget'                     => 'Set budget to ":action_value"',

From a16a4f813dd0b70d8e45120bbf1d10d780d3da9b Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:53:44 +0100
Subject: [PATCH 131/223] New translations

---
 resources/lang/hr_HR/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/hr_HR/list.php b/resources/lang/hr_HR/list.php
index 953f3f1838..cdebfbd8db 100644
--- a/resources/lang/hr_HR/list.php
+++ b/resources/lang/hr_HR/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Destination account',
 
     'accounts_count'        => 'Number of accounts',
-    'journals_count'        => 'Number of journals',
+    'journals_count'        => 'Number of transactions',
     'attachments_count'     => 'Number of attachments',
     'bills_count'           => 'Number of bills',
     'categories_count'      => 'Number of categories',

From 1bbd10b909a3b84e9fc89219fbf497d56bba8481 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:53:48 +0100
Subject: [PATCH 132/223] New translations

---
 resources/lang/nl_NL/firefly.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index e6e3f0ebd8..8c5ea49f08 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'Omschrijving eindigt op..',
     'rule_trigger_description_contains_choice'   => 'Omschrijving bevat..',
     'rule_trigger_description_is_choice'         => 'Omschrijving is..',
-    'rule_trigger_store_journal'                 => 'Als een transactie wordt gemaakt',
-    'rule_trigger_update_journal'                => 'Als een transactie wordt bewerkt',
+    'rule_trigger_store_journal'                 => 'When a transaction is created',
+    'rule_trigger_update_journal'                => 'When a transaction is updated',
     'rule_action_set_category'                   => 'Verander categorie naar ":action_value"',
     'rule_action_clear_category'                 => 'Maak categorie-veld leeg',
     'rule_action_set_budget'                     => 'Sla op onder budget ":action_value"',

From 848cfabcba28168b42e50e25488b51b877e1829d Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 18:59:12 +0100
Subject: [PATCH 133/223] Rearrange code [skip ci]

---
 app/Console/Commands/CreateImport.php         |   2 +-
 app/Console/Commands/UpgradeDatabase.php      |  14 +-
 app/Console/Commands/VerifyDatabase.php       | 127 +++++++++---------
 .../Collector/JournalExportCollector.php      |  94 ++++++-------
 app/Export/Collector/UploadCollector.php      |   2 +-
 .../Chart/Basic/GeneratorInterface.php        |  22 +--
 .../ChartJsCategoryChartGenerator.php         |  58 ++++----
 .../Report/ChartJsReportChartGenerator.php    |   2 +-
 .../Report/ReportChartGeneratorInterface.php  |   2 +-
 app/Handlers/Events/BudgetEventHandler.php    |   4 +-
 .../Events/UpdatedJournalEventHandler.php     |   2 +-
 app/Helpers/Collection/BillLine.php           |  32 ++---
 app/Helpers/Help/Help.php                     |   4 +-
 app/Helpers/Help/HelpInterface.php            |   2 +-
 .../Admin/ConfigurationController.php         |   6 +-
 .../Controllers/Auth/RegisterController.php   |   3 +-
 .../Controllers/Chart/AccountController.php   |   2 +-
 app/Http/Controllers/Chart/BillController.php |   4 +-
 .../Controllers/Chart/BudgetController.php    |   8 +-
 .../Controllers/Chart/ReportController.php    |   6 +-
 app/Http/Controllers/CurrencyController.php   |   4 +-
 app/Http/Controllers/ExportController.php     |   1 -
 app/Http/Controllers/HomeController.php       |   2 +-
 .../Controllers/PreferencesController.php     |   2 +-
 .../Controllers/Report/BalanceController.php  |   2 +-
 .../Report/OperationsController.php           |  55 ++++----
 app/Http/Requests/AccountFormRequest.php      |   2 +-
 app/Http/Requests/JournalFormRequest.php      |   1 +
 app/Http/Requests/ReportFormRequest.php       |  44 +++---
 app/Http/Requests/TagFormRequest.php          |   2 +-
 app/Http/breadcrumbs.php                      |   2 +-
 app/Import/Converter/BasicConverter.php       |   2 +-
 app/Import/Setup/CsvSetup.php                 |   2 +-
 app/Models/Account.php                        |  16 +--
 app/Models/Transaction.php                    |   2 +-
 app/Models/TransactionJournal.php             |   8 +-
 app/Repositories/Account/AccountTasker.php    |   4 -
 .../Models/TransactionJournalSupport.php      |   2 +-
 app/Support/Preferences.php                   |   4 +-
 app/Support/Twig/General.php                  |  30 ++---
 app/Support/Twig/Transaction.php              |  22 +--
 app/User.php                                  |  27 ++--
 resources/lang/en_US/firefly.php              |   2 +-
 resources/lang/nl_NL/firefly.php              |   2 +-
 .../views/admin/configuration/index.twig      |   4 +-
 45 files changed, 321 insertions(+), 319 deletions(-)

diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php
index 830ce56903..89767b2240 100644
--- a/app/Console/Commands/CreateImport.php
+++ b/app/Console/Commands/CreateImport.php
@@ -50,7 +50,7 @@ class CreateImport extends Command
     }
 
     /**
-     * 
+     *
      */
     public function handle()
     {
diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index 2b21ed83fc..07cebe2fdf 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -73,10 +73,10 @@ class UpgradeDatabase extends Command
 
 
         $subQuery = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->whereNull('transaction_journals.deleted_at')
-            ->whereNull('transactions.deleted_at')
-            ->groupBy(['transaction_journals.id'])
-            ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
+                                      ->whereNull('transaction_journals.deleted_at')
+                                      ->whereNull('transactions.deleted_at')
+                                      ->groupBy(['transaction_journals.id'])
+                                      ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
 
         $result     = DB::table(DB::raw('(' . $subQuery->toSql() . ') AS derived'))
                         ->mergeBindings($subQuery->getQuery())
@@ -98,9 +98,9 @@ class UpgradeDatabase extends Command
                 try {
                     /** @var Transaction $opposing */
                     $opposing = Transaction::where('transaction_journal_id', $journalId)
-                        ->where('amount', $amount)->where('identifier', '=', 0)
-                        ->whereNotIn('id', $processed)
-                        ->first();
+                                           ->where('amount', $amount)->where('identifier', '=', 0)
+                                           ->whereNotIn('id', $processed)
+                                           ->first();
                 } catch (QueryException $e) {
                     Log::error($e->getMessage());
                     $this->error('Firefly III could not find the "identifier" field in the "transactions" table.');
diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php
index 7159976171..1d295abf0f 100644
--- a/app/Console/Commands/VerifyDatabase.php
+++ b/app/Console/Commands/VerifyDatabase.php
@@ -17,8 +17,6 @@ use Crypt;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Budget;
-use FireflyIII\Models\Category;
-use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
@@ -103,12 +101,12 @@ class VerifyDatabase extends Command
     private function reportAccounts()
     {
         $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
-            ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
-            ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
-            ->whereNull('transactions.account_id')
-            ->get(
-                ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
-            );
+                      ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
+                      ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
+                      ->whereNull('transactions.account_id')
+                      ->get(
+                          ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
+                      );
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -125,10 +123,10 @@ class VerifyDatabase extends Command
     private function reportBudgetLimits()
     {
         $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
-            ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
-            ->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email'])
-            ->whereNull('budget_limits.id')
-            ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']);
+                     ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
+                     ->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email'])
+                     ->whereNull('budget_limits.id')
+                     ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']);
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -147,20 +145,20 @@ class VerifyDatabase extends Command
     private function reportDeletedAccounts()
     {
         $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
-            ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-            ->whereNotNull('accounts.deleted_at')
-            ->whereNotNull('transactions.id')
-            ->where(
-                function (Builder $q) {
-                    $q->whereNull('transactions.deleted_at');
-                    $q->orWhereNull('transaction_journals.deleted_at');
-                }
-            )
-            ->get(
-                ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
-                 'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
-                 'transaction_journals.deleted_at as journal_deleted_at']
-            );
+                      ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+                      ->whereNotNull('accounts.deleted_at')
+                      ->whereNotNull('transactions.id')
+                      ->where(
+                          function (Builder $q) {
+                              $q->whereNull('transactions.deleted_at');
+                              $q->orWhereNull('transaction_journals.deleted_at');
+                          }
+                      )
+                      ->get(
+                          ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
+                           'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
+                           'transaction_journals.deleted_at as journal_deleted_at']
+                      );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $date = is_null($entry->transaction_deleted_at) ? $entry->journal_deleted_at : $entry->transaction_deleted_at;
@@ -185,14 +183,17 @@ class VerifyDatabase extends Command
         ];
         foreach ($configuration as $transactionType => $accountTypes) {
             $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
-                ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
-                ->where('transaction_types.type', $transactionType)
-                ->whereIn('account_types.type', $accountTypes)
-                ->whereNull('transaction_journals.deleted_at')
-                ->get(['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type', 'transaction_types.type']);
+                                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                     ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
+                                     ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
+                                     ->where('transaction_types.type', $transactionType)
+                                     ->whereIn('account_types.type', $accountTypes)
+                                     ->whereNull('transaction_journals.deleted_at')
+                                     ->get(
+                                         ['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type',
+                                          'transaction_types.type']
+                                     );
             foreach ($set as $entry) {
                 $this->error(
                     sprintf(
@@ -215,17 +216,17 @@ class VerifyDatabase extends Command
     private function reportJournals()
     {
         $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->whereNotNull('transaction_journals.deleted_at')// USE THIS
-            ->whereNull('transactions.deleted_at')
-            ->whereNotNull('transactions.id')
-            ->get(
-                [
-                    'transaction_journals.id as journal_id',
-                    'transaction_journals.description',
-                    'transaction_journals.deleted_at as journal_deleted',
-                    'transactions.id as transaction_id',
-                    'transactions.deleted_at as transaction_deleted_at']
-            );
+                                 ->whereNotNull('transaction_journals.deleted_at')// USE THIS
+                                 ->whereNull('transactions.deleted_at')
+                                 ->whereNotNull('transactions.id')
+                                 ->get(
+                                     [
+                                         'transaction_journals.id as journal_id',
+                                         'transaction_journals.description',
+                                         'transaction_journals.deleted_at as journal_deleted',
+                                         'transactions.id as transaction_id',
+                                         'transactions.deleted_at as transaction_deleted_at']
+                                 );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $this->error(
@@ -241,9 +242,9 @@ class VerifyDatabase extends Command
     private function reportNoTransactions()
     {
         $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->groupBy('transaction_journals.id')
-            ->whereNull('transactions.transaction_journal_id')
-            ->get(['transaction_journals.id']);
+                                 ->groupBy('transaction_journals.id')
+                                 ->whereNull('transactions.transaction_journal_id')
+                                 ->get(['transaction_journals.id']);
 
         foreach ($set as $entry) {
             $this->error(
@@ -262,11 +263,11 @@ class VerifyDatabase extends Command
         $class  = sprintf('FireflyIII\Models\%s', ucfirst($name));
         $field  = $name == 'tag' ? 'tag' : 'name';
         $set    = $class::leftJoin($name . '_transaction_journal', $plural . '.id', '=', $name . '_transaction_journal.' . $name . '_id')
-            ->leftJoin('users', $plural . '.user_id', '=', 'users.id')
-            ->distinct()
-            ->whereNull($name . '_transaction_journal.' . $name . '_id')
-            ->whereNull($plural . '.deleted_at')
-            ->get([$plural . '.id', $plural . '.' . $field . ' as name', $plural . '.user_id', 'users.email']);
+                        ->leftJoin('users', $plural . '.user_id', '=', 'users.id')
+                        ->distinct()
+                        ->whereNull($name . '_transaction_journal.' . $name . '_id')
+                        ->whereNull($plural . '.deleted_at')
+                        ->get([$plural . '.id', $plural . '.' . $field . ' as name', $plural . '.user_id', 'users.email']);
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -309,12 +310,12 @@ class VerifyDatabase extends Command
     private function reportTransactions()
     {
         $set = Transaction::leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->whereNotNull('transactions.deleted_at')
-            ->whereNull('transaction_journals.deleted_at')
-            ->get(
-                ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
-                 'transaction_journals.deleted_at']
-            );
+                          ->whereNotNull('transactions.deleted_at')
+                          ->whereNull('transaction_journals.deleted_at')
+                          ->get(
+                              ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
+                               'transaction_journals.deleted_at']
+                          );
         /** @var stdClass $entry */
         foreach ($set as $entry) {
             $this->error(
@@ -330,10 +331,10 @@ class VerifyDatabase extends Command
     private function reportTransfersBudgets()
     {
         $set = TransactionJournal::distinct()
-            ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-            ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
-            ->where('transaction_types.type', TransactionType::TRANSFER)
-            ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
+                                 ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                 ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
+                                 ->where('transaction_types.type', TransactionType::TRANSFER)
+                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
 
         /** @var TransactionJournal $entry */
         foreach ($set as $entry) {
diff --git a/app/Export/Collector/JournalExportCollector.php b/app/Export/Collector/JournalExportCollector.php
index a3e97c957f..57d65fc4e7 100644
--- a/app/Export/Collector/JournalExportCollector.php
+++ b/app/Export/Collector/JournalExportCollector.php
@@ -293,55 +293,55 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac
     {
         $accountIds    = $this->accounts->pluck('id')->toArray();
         $this->workSet = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-            ->leftJoin(
-                'transactions AS opposing', function (JoinClause $join) {
-                $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
-                     ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'))
-                     ->where('transactions.identifier', '=', DB::raw('opposing.identifier'));
-            }
-            )
-            ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
-            ->leftJoin('accounts AS opposing_accounts', 'opposing.account_id', '=', 'opposing_accounts.id')
-            ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', 'transaction_types.id')
-            ->leftJoin('transaction_currencies', 'transaction_journals.transaction_currency_id', '=', 'transaction_currencies.id')
-            ->whereIn('transactions.account_id', $accountIds)
-            ->where('transaction_journals.user_id', $this->job->user_id)
-            ->where('transaction_journals.date', '>=', $this->start->format('Y-m-d'))
-            ->where('transaction_journals.date', '<=', $this->end->format('Y-m-d'))
-            ->where('transaction_journals.completed', 1)
-            ->whereNull('transaction_journals.deleted_at')
-            ->whereNull('transactions.deleted_at')
-            ->whereNull('opposing.deleted_at')
-            ->orderBy('transaction_journals.date', 'DESC')
-            ->orderBy('transactions.identifier', 'ASC')
-            ->get(
-                [
-                    'transactions.id',
-                    'transactions.amount',
-                    'transactions.description',
-                    'transactions.account_id',
-                    'accounts.name as account_name',
-                    'accounts.encrypted as account_name_encrypted',
-                    'transactions.identifier',
+                                    ->leftJoin(
+                                        'transactions AS opposing', function (JoinClause $join) {
+                                        $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
+                                             ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'))
+                                             ->where('transactions.identifier', '=', DB::raw('opposing.identifier'));
+                                    }
+                                    )
+                                    ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
+                                    ->leftJoin('accounts AS opposing_accounts', 'opposing.account_id', '=', 'opposing_accounts.id')
+                                    ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', 'transaction_types.id')
+                                    ->leftJoin('transaction_currencies', 'transaction_journals.transaction_currency_id', '=', 'transaction_currencies.id')
+                                    ->whereIn('transactions.account_id', $accountIds)
+                                    ->where('transaction_journals.user_id', $this->job->user_id)
+                                    ->where('transaction_journals.date', '>=', $this->start->format('Y-m-d'))
+                                    ->where('transaction_journals.date', '<=', $this->end->format('Y-m-d'))
+                                    ->where('transaction_journals.completed', 1)
+                                    ->whereNull('transaction_journals.deleted_at')
+                                    ->whereNull('transactions.deleted_at')
+                                    ->whereNull('opposing.deleted_at')
+                                    ->orderBy('transaction_journals.date', 'DESC')
+                                    ->orderBy('transactions.identifier', 'ASC')
+                                    ->get(
+                                        [
+                                            'transactions.id',
+                                            'transactions.amount',
+                                            'transactions.description',
+                                            'transactions.account_id',
+                                            'accounts.name as account_name',
+                                            'accounts.encrypted as account_name_encrypted',
+                                            'transactions.identifier',
 
-                    'opposing.id as opposing_id',
-                    'opposing.amount AS opposing_amount',
-                    'opposing.description as opposing_description',
-                    'opposing.account_id as opposing_account_id',
-                    'opposing_accounts.name as opposing_account_name',
-                    'opposing_accounts.encrypted as opposing_account_encrypted',
-                    'opposing.identifier as opposing_identifier',
+                                            'opposing.id as opposing_id',
+                                            'opposing.amount AS opposing_amount',
+                                            'opposing.description as opposing_description',
+                                            'opposing.account_id as opposing_account_id',
+                                            'opposing_accounts.name as opposing_account_name',
+                                            'opposing_accounts.encrypted as opposing_account_encrypted',
+                                            'opposing.identifier as opposing_identifier',
 
-                    'transaction_journals.id as transaction_journal_id',
-                    'transaction_journals.date',
-                    'transaction_journals.description as journal_description',
-                    'transaction_journals.encrypted as journal_encrypted',
-                    'transaction_journals.transaction_type_id',
-                    'transaction_types.type as transaction_type',
-                    'transaction_journals.transaction_currency_id',
-                    'transaction_currencies.code AS transaction_currency_code',
+                                            'transaction_journals.id as transaction_journal_id',
+                                            'transaction_journals.date',
+                                            'transaction_journals.description as journal_description',
+                                            'transaction_journals.encrypted as journal_encrypted',
+                                            'transaction_journals.transaction_type_id',
+                                            'transaction_types.type as transaction_type',
+                                            'transaction_journals.transaction_currency_id',
+                                            'transaction_currencies.code AS transaction_currency_code',
 
-                ]
-            );
+                                        ]
+                                    );
     }
 }
diff --git a/app/Export/Collector/UploadCollector.php b/app/Export/Collector/UploadCollector.php
index c4d030a10c..1895cb8a5e 100644
--- a/app/Export/Collector/UploadCollector.php
+++ b/app/Export/Collector/UploadCollector.php
@@ -94,7 +94,7 @@ class UploadCollector extends BasicCollector implements CollectorInterface
      *
      * @return bool
      */
-    private function collectVintageUploads():bool
+    private function collectVintageUploads(): bool
     {
         // grab upload directory.
         $files = $this->uploadDisk->files();
diff --git a/app/Generator/Chart/Basic/GeneratorInterface.php b/app/Generator/Chart/Basic/GeneratorInterface.php
index 75b0bb708e..8299851822 100644
--- a/app/Generator/Chart/Basic/GeneratorInterface.php
+++ b/app/Generator/Chart/Basic/GeneratorInterface.php
@@ -21,17 +21,6 @@ namespace FireflyIII\Generator\Chart\Basic;
 interface GeneratorInterface
 {
 
-    /**
-     * Expects data as:
-     *
-     * key => value
-     *
-     * @param array $data
-     *
-     * @return array
-     */
-    public function pieChart(array $data): array;
-
     /**
      * Will generate a (ChartJS) compatible array from the given input. Expects this format:
      *
@@ -57,6 +46,17 @@ interface GeneratorInterface
      */
     public function multiSet(array $data): array;
 
+    /**
+     * Expects data as:
+     *
+     * key => value
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function pieChart(array $data): array;
+
     /**
      * Will generate a (ChartJS) compatible array from the given input. Expects this format:
      *
diff --git a/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php b/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
index b667811753..d693f1a14a 100644
--- a/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
+++ b/app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php
@@ -142,6 +142,35 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
 
     }
 
+    /**
+     * @param array $entries
+     *
+     * @return array
+     */
+    public function pieChart(array $entries): array
+    {
+        $data  = [
+            'datasets' => [
+                0 => [],
+            ],
+            'labels'   => [],
+        ];
+        $index = 0;
+        foreach ($entries as $entry) {
+
+            if (bccomp($entry['amount'], '0') === -1) {
+                $entry['amount'] = bcmul($entry['amount'], '-1');
+            }
+
+            $data['datasets'][0]['data'][]            = round($entry['amount'], 2);
+            $data['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
+            $data['labels'][]                         = $entry['name'];
+            $index++;
+        }
+
+        return $data;
+    }
+
     /**
      * @param array $entries
      *
@@ -177,33 +206,4 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
 
     }
 
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function pieChart(array $entries): array
-    {
-        $data  = [
-            'datasets' => [
-                0 => [],
-            ],
-            'labels'   => [],
-        ];
-        $index = 0;
-        foreach ($entries as $entry) {
-
-            if (bccomp($entry['amount'], '0') === -1) {
-                $entry['amount'] = bcmul($entry['amount'], '-1');
-            }
-
-            $data['datasets'][0]['data'][]            = round($entry['amount'], 2);
-            $data['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
-            $data['labels'][]                         = $entry['name'];
-            $index++;
-        }
-
-        return $data;
-    }
-
 }
diff --git a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php
index 207062464a..d36c68815c 100644
--- a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php
+++ b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php
@@ -91,7 +91,7 @@ class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
      *
      * @return array
      */
-    public function netWorth(Collection $entries) : array
+    public function netWorth(Collection $entries): array
     {
         $format = (string)trans('config.month_and_day');
         $data   = [
diff --git a/app/Generator/Chart/Report/ReportChartGeneratorInterface.php b/app/Generator/Chart/Report/ReportChartGeneratorInterface.php
index 97bcc6f944..745756c825 100644
--- a/app/Generator/Chart/Report/ReportChartGeneratorInterface.php
+++ b/app/Generator/Chart/Report/ReportChartGeneratorInterface.php
@@ -44,7 +44,7 @@ interface ReportChartGeneratorInterface
      *
      * @return array
      */
-    public function netWorth(Collection $entries) : array;
+    public function netWorth(Collection $entries): array;
 
     /**
      * @param Collection $entries
diff --git a/app/Handlers/Events/BudgetEventHandler.php b/app/Handlers/Events/BudgetEventHandler.php
index 441049526d..2acc5a29d9 100644
--- a/app/Handlers/Events/BudgetEventHandler.php
+++ b/app/Handlers/Events/BudgetEventHandler.php
@@ -38,7 +38,7 @@ class BudgetEventHandler
      *
      * @return bool
      */
-    public function storeRepetition(StoredBudgetLimit $budgetLimitEvent):bool
+    public function storeRepetition(StoredBudgetLimit $budgetLimitEvent): bool
     {
         return $this->processRepetitionChange($budgetLimitEvent->budgetLimit, $budgetLimitEvent->end);
     }
@@ -61,7 +61,7 @@ class BudgetEventHandler
      *
      * @return bool
      */
-    private function processRepetitionChange(BudgetLimit $budgetLimit, Carbon $date):bool
+    private function processRepetitionChange(BudgetLimit $budgetLimit, Carbon $date): bool
     {
         $set = $budgetLimit->limitrepetitions()
                            ->where('startdate', $budgetLimit->startdate->format('Y-m-d 00:00:00'))
diff --git a/app/Handlers/Events/UpdatedJournalEventHandler.php b/app/Handlers/Events/UpdatedJournalEventHandler.php
index 4528ccf910..0deea00280 100644
--- a/app/Handlers/Events/UpdatedJournalEventHandler.php
+++ b/app/Handlers/Events/UpdatedJournalEventHandler.php
@@ -35,7 +35,7 @@ class UpdatedJournalEventHandler
      *
      * @return bool
      */
-    public function processRules(UpdatedTransactionJournal $updatedJournalEvent):bool
+    public function processRules(UpdatedTransactionJournal $updatedJournalEvent): bool
     {
         // get all the user's rule groups, with the rules, order by 'order'.
         $journal = $updatedJournalEvent->journal;
diff --git a/app/Helpers/Collection/BillLine.php b/app/Helpers/Collection/BillLine.php
index fb28afed18..3b7bd692b6 100644
--- a/app/Helpers/Collection/BillLine.php
+++ b/app/Helpers/Collection/BillLine.php
@@ -79,6 +79,22 @@ class BillLine
         $this->bill = $bill;
     }
 
+    /**
+     * @return Carbon
+     */
+    public function getLastHitDate(): Carbon
+    {
+        return $this->lastHitDate;
+    }
+
+    /**
+     * @param Carbon $lastHitDate
+     */
+    public function setLastHitDate(Carbon $lastHitDate)
+    {
+        $this->lastHitDate = $lastHitDate;
+    }
+
     /**
      * @return string
      */
@@ -151,21 +167,5 @@ class BillLine
         $this->hit = $hit;
     }
 
-    /**
-     * @param Carbon $lastHitDate
-     */
-    public function setLastHitDate(Carbon $lastHitDate)
-    {
-        $this->lastHitDate = $lastHitDate;
-    }
-
-    /**
-     * @return Carbon
-     */
-    public function getLastHitDate(): Carbon
-    {
-        return $this->lastHitDate;
-    }
-
 
 }
diff --git a/app/Helpers/Help/Help.php b/app/Helpers/Help/Help.php
index 2167b9ad43..0d290955ca 100644
--- a/app/Helpers/Help/Help.php
+++ b/app/Helpers/Help/Help.php
@@ -88,7 +88,7 @@ class Help implements HelpInterface
      *
      * @return bool
      */
-    public function hasRoute(string $route):bool
+    public function hasRoute(string $route): bool
     {
         return Route::has($route);
     }
@@ -99,7 +99,7 @@ class Help implements HelpInterface
      *
      * @return bool
      */
-    public function inCache(string $route, string $language):bool
+    public function inCache(string $route, string $language): bool
     {
         $line   = sprintf('help.%s.%s', $route, $language);
         $result = Cache::has($line);
diff --git a/app/Helpers/Help/HelpInterface.php b/app/Helpers/Help/HelpInterface.php
index 4187ddf1ce..d642f68294 100644
--- a/app/Helpers/Help/HelpInterface.php
+++ b/app/Helpers/Help/HelpInterface.php
@@ -34,7 +34,7 @@ interface HelpInterface
      *
      * @return string
      */
-    public function getFromGithub(string $language, string $route):string;
+    public function getFromGithub(string $language, string $route): string;
 
     /**
      * @param string $route
diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php
index 4672c71476..7d3a8bd3b0 100644
--- a/app/Http/Controllers/Admin/ConfigurationController.php
+++ b/app/Http/Controllers/Admin/ConfigurationController.php
@@ -61,6 +61,7 @@ class ConfigurationController extends Controller
         $singleUserMode     = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $mustConfirmAccount = FireflyConfig::get('must_confirm_account', config('firefly.configuration.must_confirm_account'))->data;
         $isDemoSite         = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
+        $siteOwner          = env('SITE_OWNER');
 
         // email settings:
         $sendErrorMessage = [
@@ -71,7 +72,10 @@ class ConfigurationController extends Controller
             'mail_for_blocked_login'  => FireflyConfig::get('mail_for_blocked_login', config('firefly.configuration.mail_for_blocked_login'))->data,
         ];
 
-        return view('admin.configuration.index', compact('subTitle', 'subTitleIcon', 'singleUserMode', 'mustConfirmAccount', 'isDemoSite', 'sendErrorMessage'));
+        return view(
+            'admin.configuration.index',
+            compact('subTitle', 'subTitleIcon', 'singleUserMode', 'mustConfirmAccount', 'isDemoSite', 'sendErrorMessage', 'siteOwner')
+        );
 
     }
 
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 511dc41deb..189fc1f174 100755
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -14,11 +14,11 @@ namespace FireflyIII\Http\Controllers\Auth;
 
 use Auth;
 use Config;
+use FireflyConfig;
 use FireflyIII\Events\BlockedUseOfDomain;
 use FireflyIII\Events\BlockedUseOfEmail;
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyConfig;
 use FireflyIII\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
@@ -114,7 +114,6 @@ class RegisterController extends Controller
         }
 
 
-
         $user = $this->create($request->all());
 
         // trigger user registration event:
diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 2ce65161b6..3cd14bbfe5 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -238,7 +238,7 @@ class AccountController extends Controller
         $end        = clone session('end', Carbon::now()->endOfMonth());
         $defaultSet = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray();
         Log::debug('Default set is ', $defaultSet);
-        $frontPage  = Preferences::get('frontPageAccounts', $defaultSet);
+        $frontPage = Preferences::get('frontPageAccounts', $defaultSet);
         Log::debug('Frontpage preference set is ', $frontPage->data);
         if (count($frontPage->data) === 0) {
             $frontPage->data = $defaultSet;
diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php
index f6aa7e35a1..26ae9963c5 100644
--- a/app/Http/Controllers/Chart/BillController.php
+++ b/app/Http/Controllers/Chart/BillController.php
@@ -70,7 +70,7 @@ class BillController extends Controller
             strval(trans('firefly.paid'))   => $paid,
         ];
 
-        $data      = $this->generator->pieChart($chartData);
+        $data = $this->generator->pieChart($chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -127,7 +127,7 @@ class BillController extends Controller
             $chartData[2]['entries'][$date] = bcmul($entry->transaction_amount, '-1');
         }
 
-        $data      = $this->generator->multiSet($chartData);
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 3764d04423..67606ec75e 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -204,7 +204,7 @@ class BudgetController extends Controller
         $cache->addProperty('budget');
         $cache->addProperty('period');
         if ($cache->has()) {
-             return Response::json($cache->get());
+            return Response::json($cache->get());
         }
 
         // the expenses:
@@ -274,15 +274,15 @@ class BudgetController extends Controller
         }
 
         // the expenses:
-        $periods  = Navigation::listOfPeriods($start, $end);
-        $entries  = $repository->getNoBudgetPeriodReport($accounts, $start, $end);
+        $periods = Navigation::listOfPeriods($start, $end);
+        $entries = $repository->getNoBudgetPeriodReport($accounts, $start, $end);
 
         // join them:
         $result = [];
         foreach (array_keys($periods) as $period) {
             $nice          = $periods[$period];
             $result[$nice] = [
-                'spent'    => isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0',
+                'spent' => isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0',
             ];
         }
 
diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php
index d490481db2..b747c0dc01 100644
--- a/app/Http/Controllers/Chart/ReportController.php
+++ b/app/Http/Controllers/Chart/ReportController.php
@@ -50,8 +50,9 @@ class ReportController extends Controller
      * which means that giving it a 2 week "period" should be enough granularity.
      *
      * @param Collection $accounts
-     * @param Carbon $start
+     * @param Carbon     $start
      * @param Carbon     $end
+     *
      * @return \Illuminate\Http\JsonResponse
      */
     public function netWorth(Collection $accounts, Carbon $start, Carbon $end)
@@ -131,6 +132,7 @@ class ReportController extends Controller
 
     /**
      * Shows sum income and expense, debet/credit: operations
+     *
      * @param Carbon     $start
      * @param Carbon     $end
      * @param Collection $accounts
@@ -301,7 +303,7 @@ class ReportController extends Controller
      *
      * @return string
      */
-    private function arraySum($array) : string
+    private function arraySum($array): string
     {
         $sum = '0';
         foreach ($array as $entry) {
diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php
index 6917d5ca6a..c57e86b7ea 100644
--- a/app/Http/Controllers/CurrencyController.php
+++ b/app/Http/Controllers/CurrencyController.php
@@ -121,7 +121,7 @@ class CurrencyController extends Controller
      *
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function destroy(CurrencyRepositoryInterface $repository,  TransactionCurrency $currency)
+    public function destroy(CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
         if (!$repository->canDeleteCurrency($currency)) {
             Session::flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name]));
@@ -170,7 +170,7 @@ class CurrencyController extends Controller
 
 
         if (!auth()->user()->hasRole('owner')) {
-            Session::flash('warning', trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
+            Session::flash('warning', trans('firefly.ask_site_owner', ['site_owner' => env('SITE_OWNER')]));
         }
 
 
diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php
index dc3240b982..ef293cf7b7 100644
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -17,7 +17,6 @@ namespace FireflyIII\Http\Controllers;
 use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Export\Processor;
 use FireflyIII\Export\ProcessorInterface;
 use FireflyIII\Http\Requests\ExportFormRequest;
 use FireflyIII\Models\AccountType;
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 550416f02a..6882a0f14a 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -208,7 +208,7 @@ class HomeController extends Controller
             'debugbar',
             'attachments.preview',
             'budgets.income',
-            'currencies.default'
+            'currencies.default',
 
 
         ];
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index fd9622228d..e8ddd70eb3 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -212,7 +212,7 @@ class PreferencesController extends Controller
     /**
      * @return string
      */
-    private function getDomain() : string
+    private function getDomain(): string
     {
         $url   = url()->to('/');
         $parts = parse_url($url);
diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php
index 905aa429c4..664217472a 100644
--- a/app/Http/Controllers/Report/BalanceController.php
+++ b/app/Http/Controllers/Report/BalanceController.php
@@ -36,7 +36,7 @@ class BalanceController extends Controller
      *
      * @return mixed|string
      */
-    public function general(BalanceReportHelperInterface $helper,Collection $accounts, Carbon $start, Carbon $end)
+    public function general(BalanceReportHelperInterface $helper, Collection $accounts, Carbon $start, Carbon $end)
     {
 
 
diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php
index 7fb7084906..5241e5f12a 100644
--- a/app/Http/Controllers/Report/OperationsController.php
+++ b/app/Http/Controllers/Report/OperationsController.php
@@ -16,7 +16,6 @@ namespace FireflyIII\Http\Controllers\Report;
 
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
-use FireflyIII\Helpers\Report\ReportHelperInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
@@ -57,6 +56,33 @@ class OperationsController extends Controller
 
     }
 
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return string
+     */
+    public function income(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        // chart properties for cache:
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('income-report');
+        $cache->addProperty($accounts->pluck('id')->toArray());
+        if ($cache->has()) {
+            //return $cache->get();
+        }
+        $income = $this->getIncomeReport($start, $end, $accounts);
+
+        $result = view('reports.partials.income', compact('income'))->render();
+        $cache->store($result);
+
+        return $result;
+
+    }
+
     /**
      * @param Collection $accounts
      * @param Carbon     $start
@@ -101,33 +127,6 @@ class OperationsController extends Controller
 
     }
 
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return string
-     */
-    public function income(Collection $accounts, Carbon $start, Carbon $end)
-    {
-        // chart properties for cache:
-        $cache = new CacheProperties;
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('income-report');
-        $cache->addProperty($accounts->pluck('id')->toArray());
-        if ($cache->has()) {
-            //return $cache->get();
-        }
-        $income = $this->getIncomeReport($start, $end, $accounts);
-
-        $result = view('reports.partials.income', compact('income'))->render();
-        $cache->store($result);
-
-        return $result;
-
-    }
-
     /**
      * @param Carbon     $start
      * @param Carbon     $end
diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php
index 34f276999f..1e219707ee 100644
--- a/app/Http/Requests/AccountFormRequest.php
+++ b/app/Http/Requests/AccountFormRequest.php
@@ -80,7 +80,7 @@ class AccountFormRequest extends Request
             'name'                              => $nameRule,
             'openingBalance'                    => 'numeric',
             'iban'                              => 'iban',
-            'BIC'                              => 'bic',
+            'BIC'                               => 'bic',
             'virtualBalance'                    => 'numeric',
             'openingBalanceDate'                => 'date',
             'currency_id'                       => 'exists:transaction_currencies,id',
diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php
index eb1f2f1ed6..7f582042a7 100644
--- a/app/Http/Requests/JournalFormRequest.php
+++ b/app/Http/Requests/JournalFormRequest.php
@@ -161,6 +161,7 @@ class JournalFormRequest extends Request
     private function getFieldOrEmptyString(string $field): string
     {
         $string = $this->get($field) ?? '';
+
         return trim($string);
     }
 }
diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php
index fbb153bcb9..763af9dd6a 100644
--- a/app/Http/Requests/ReportFormRequest.php
+++ b/app/Http/Requests/ReportFormRequest.php
@@ -41,7 +41,7 @@ class ReportFormRequest extends Request
     /**
      * @return Collection
      */
-    public function getAccountList():Collection
+    public function getAccountList(): Collection
     {
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
@@ -59,27 +59,6 @@ class ReportFormRequest extends Request
         return $collection;
     }
 
-    /**
-     * @return Collection
-     */
-    public function getCategoryList(): Collection
-    {
-        /** @var CategoryRepositoryInterface $repository */
-        $repository = app(CategoryRepositoryInterface::class);
-        $set        = $this->get('category');
-        $collection = new Collection;
-        if (is_array($set)) {
-            foreach ($set as $categoryId) {
-                $category = $repository->find(intval($categoryId));
-                if (!is_null($category->id)) {
-                    $collection->push($category);
-                }
-            }
-        }
-
-        return $collection;
-    }
-
     /**
      * @return Collection
      */
@@ -101,6 +80,27 @@ class ReportFormRequest extends Request
         return $collection;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getCategoryList(): Collection
+    {
+        /** @var CategoryRepositoryInterface $repository */
+        $repository = app(CategoryRepositoryInterface::class);
+        $set        = $this->get('category');
+        $collection = new Collection;
+        if (is_array($set)) {
+            foreach ($set as $categoryId) {
+                $category = $repository->find(intval($categoryId));
+                if (!is_null($category->id)) {
+                    $collection->push($category);
+                }
+            }
+        }
+
+        return $collection;
+    }
+
     /**
      * @return Carbon
      * @throws FireflyException
diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php
index c0501c1798..d7bdb63f54 100644
--- a/app/Http/Requests/TagFormRequest.php
+++ b/app/Http/Requests/TagFormRequest.php
@@ -35,7 +35,7 @@ class TagFormRequest extends Request
     /**
      * @return array
      */
-    public function collectTagData() :array
+    public function collectTagData(): array
     {
         if ($this->get('setTag') == 'true') {
             $latitude  = $this->get('latitude');
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index 0e960d730d..5edec159df 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -67,7 +67,7 @@ Breadcrumbs::register(
 
 Breadcrumbs::register(
     'accounts.show', function (BreadCrumbGenerator $breadcrumbs, Account $account) {
-    $what  = config('firefly.shortNamesByFullName.' . $account->accountType->type);
+    $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
 
     $breadcrumbs->parent('accounts.index', $what);
     $breadcrumbs->push($account->name, route('accounts.show', [$account->id]));
diff --git a/app/Import/Converter/BasicConverter.php b/app/Import/Converter/BasicConverter.php
index bce8b5e46b..91183ba936 100644
--- a/app/Import/Converter/BasicConverter.php
+++ b/app/Import/Converter/BasicConverter.php
@@ -37,7 +37,7 @@ class BasicConverter
     /**
      * @return int
      */
-    public function getCertainty():int
+    public function getCertainty(): int
     {
         return $this->certainty;
     }
diff --git a/app/Import/Setup/CsvSetup.php b/app/Import/Setup/CsvSetup.php
index 782dba86dd..20c938bda3 100644
--- a/app/Import/Setup/CsvSetup.php
+++ b/app/Import/Setup/CsvSetup.php
@@ -433,7 +433,7 @@ class CsvSetup implements SetupInterface
      *
      * @return array
      */
-    private function getDataForColumnRoles():array
+    private function getDataForColumnRoles(): array
     {
         Log::debug('Now in getDataForColumnRoles()');
         $config = $this->job->configuration;
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 580ace8509..c62c558e8e 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -200,10 +200,10 @@ class Account extends Model
     public function getOpeningBalanceAmount(): string
     {
         $journal = TransactionJournal::sortCorrectly()
-            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->where('transactions.account_id', $this->id)
-            ->transactionTypes([TransactionType::OPENING_BALANCE])
-            ->first(['transaction_journals.*']);
+                                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                     ->where('transactions.account_id', $this->id)
+                                     ->transactionTypes([TransactionType::OPENING_BALANCE])
+                                     ->first(['transaction_journals.*']);
         if (is_null($journal)) {
             return '0';
         }
@@ -230,10 +230,10 @@ class Account extends Model
     {
         $date    = new Carbon('1900-01-01');
         $journal = TransactionJournal::sortCorrectly()
-            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->where('transactions.account_id', $this->id)
-            ->transactionTypes([TransactionType::OPENING_BALANCE])
-            ->first(['transaction_journals.*']);
+                                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                     ->where('transactions.account_id', $this->id)
+                                     ->transactionTypes([TransactionType::OPENING_BALANCE])
+                                     ->first(['transaction_journals.*']);
         if (is_null($journal)) {
             return $date;
         }
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index f54d613a29..6a93196cfb 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -46,7 +46,7 @@ class Transaction extends Model
      *
      * @return bool
      */
-    public static function isJoined(Builder $query, string $table):bool
+    public static function isJoined(Builder $query, string $table): bool
     {
         $joins = $query->getQuery()->joins;
         if (is_null($joins)) {
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index f9a8c206e9..d46f7349e5 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -65,9 +65,9 @@ class TransactionJournal extends TransactionJournalSupport
     {
         if (auth()->check()) {
             $object = TransactionJournal::where('transaction_journals.id', $value)
-                ->with('transactionType')
-                ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                ->where('user_id', auth()->user()->id)->first(['transaction_journals.*']);
+                                        ->with('transactionType')
+                                        ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                        ->where('user_id', auth()->user()->id)->first(['transaction_journals.*']);
             if (!is_null($object)) {
                 return $object;
             }
@@ -113,7 +113,7 @@ class TransactionJournal extends TransactionJournalSupport
      *
      * @return bool
      */
-    public function deleteMeta(string $name):bool
+    public function deleteMeta(string $name): bool
     {
         $this->transactionJournalMeta()->where('name', $name)->delete();
 
diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php
index 0a892dd5b2..5a85a93201 100644
--- a/app/Repositories/Account/AccountTasker.php
+++ b/app/Repositories/Account/AccountTasker.php
@@ -14,17 +14,13 @@ declare(strict_types = 1);
 namespace FireflyIII\Repositories\Account;
 
 use Carbon\Carbon;
-use Crypt;
-use DB;
 use FireflyIII\Helpers\Collection\Account as AccountCollection;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\User;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Collection;
 use Log;
-use stdClass;
 use Steam;
 
 /**
diff --git a/app/Support/Models/TransactionJournalSupport.php b/app/Support/Models/TransactionJournalSupport.php
index 49901f7119..513fec2623 100644
--- a/app/Support/Models/TransactionJournalSupport.php
+++ b/app/Support/Models/TransactionJournalSupport.php
@@ -200,7 +200,7 @@ class TransactionJournalSupport extends Model
      *
      * @return bool
      */
-    public static function isJoined(Builder $query, string $table):bool
+    public static function isJoined(Builder $query, string $table): bool
     {
         $joins = $query->getQuery()->joins;
         if (is_null($joins)) {
diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php
index 30f258a569..8507f3d806 100644
--- a/app/Support/Preferences.php
+++ b/app/Support/Preferences.php
@@ -59,8 +59,8 @@ class Preferences
     }
 
     /**
-     * @param \FireflyIII\User  $user
-     * @param array $list
+     * @param \FireflyIII\User $user
+     * @param array            $list
      *
      * @return array
      */
diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php
index a13a62faab..04336c3163 100644
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -84,7 +84,7 @@ class General extends Twig_Extension
     protected function activeRoutePartial(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'activeRoutePartial', function () : string {
+            'activeRoutePartial', function (): string {
             $args  = func_get_args();
             $route = $args[0]; // name of the route.
             $name  = Route::getCurrentRoute()->getName() ?? '';
@@ -106,7 +106,7 @@ class General extends Twig_Extension
     protected function activeRoutePartialWhat(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'activeRoutePartialWhat', function ($context) : string {
+            'activeRoutePartialWhat', function ($context): string {
             $args       = func_get_args();
             $route      = $args[1]; // name of the route.
             $what       = $args[2]; // name of the route.
@@ -130,7 +130,7 @@ class General extends Twig_Extension
     protected function activeRouteStrict(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'activeRouteStrict', function () : string {
+            'activeRouteStrict', function (): string {
             $args  = func_get_args();
             $route = $args[0]; // name of the route.
 
@@ -149,7 +149,7 @@ class General extends Twig_Extension
     protected function balance(): Twig_SimpleFilter
     {
         return new Twig_SimpleFilter(
-            'balance', function (Account $account = null) : string {
+            'balance', function (Account $account = null): string {
             if (is_null($account)) {
                 return 'NULL';
             }
@@ -166,7 +166,7 @@ class General extends Twig_Extension
     protected function env(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'env', function (string $name, string $default) : string {
+            'env', function (string $name, string $default): string {
             return env($name, $default);
         }
         );
@@ -179,7 +179,7 @@ class General extends Twig_Extension
     protected function formatAmount(): Twig_SimpleFilter
     {
         return new Twig_SimpleFilter(
-            'formatAmount', function (string $string) : string {
+            'formatAmount', function (string $string): string {
 
             return app('amount')->format($string);
         }, ['is_safe' => ['html']]
@@ -192,7 +192,7 @@ class General extends Twig_Extension
     protected function formatAmountPlain(): Twig_SimpleFilter
     {
         return new Twig_SimpleFilter(
-            'formatAmountPlain', function (string $string) : string {
+            'formatAmountPlain', function (string $string): string {
 
             return app('amount')->format($string, false);
         }, ['is_safe' => ['html']]
@@ -205,7 +205,7 @@ class General extends Twig_Extension
     protected function formatFilesize(): Twig_SimpleFilter
     {
         return new Twig_SimpleFilter(
-            'filesize', function (int $size) : string {
+            'filesize', function (int $size): string {
 
             // less than one GB, more than one MB
             if ($size < (1024 * 1024 * 2014) && $size >= (1024 * 1024)) {
@@ -228,7 +228,7 @@ class General extends Twig_Extension
     protected function formatJournal(): Twig_SimpleFilter
     {
         return new Twig_SimpleFilter(
-            'formatJournal', function (TransactionJournal $journal) : string {
+            'formatJournal', function (TransactionJournal $journal): string {
             return app('amount')->formatJournal($journal);
         }, ['is_safe' => ['html']]
         );
@@ -240,7 +240,7 @@ class General extends Twig_Extension
     protected function getAccountRole(): Twig_SimpleFilter
     {
         return new Twig_SimpleFilter(
-            'getAccountRole', function (string $name) : string {
+            'getAccountRole', function (string $name): string {
             return Config::get('firefly.accountRoles.' . $name);
         }
         );
@@ -252,7 +252,7 @@ class General extends Twig_Extension
     protected function getCurrencyCode(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'getCurrencyCode', function () : string {
+            'getCurrencyCode', function (): string {
             return app('amount')->getCurrencyCode();
         }
         );
@@ -264,7 +264,7 @@ class General extends Twig_Extension
     protected function getCurrencySymbol(): Twig_SimpleFunction
     {
         return new Twig_SimpleFunction(
-            'getCurrencySymbol', function () : string {
+            'getCurrencySymbol', function (): string {
             return app('amount')->getCurrencySymbol();
         }
         );
@@ -276,7 +276,7 @@ class General extends Twig_Extension
     protected function mimeIcon(): Twig_SimpleFilter
     {
         return new Twig_SimpleFilter(
-            'mimeIcon', function (string $string) : string {
+            'mimeIcon', function (string $string): string {
             switch ($string) {
                 default:
                     return 'fa-file-o';
@@ -296,7 +296,7 @@ class General extends Twig_Extension
     protected function phpdate()
     {
         return new Twig_SimpleFunction(
-            'phpdate', function (string $str) : string {
+            'phpdate', function (string $str): string {
             return date($str);
         }
         );
@@ -308,7 +308,7 @@ class General extends Twig_Extension
     private function getAmountFromJournal()
     {
         return new Twig_SimpleFunction(
-            'getAmount', function (TransactionJournal $journal) : string {
+            'getAmount', function (TransactionJournal $journal): string {
             return TransactionJournal::amount($journal);
         }
         );
diff --git a/app/Support/Twig/Transaction.php b/app/Support/Twig/Transaction.php
index dbe41f19b7..0e9d851c40 100644
--- a/app/Support/Twig/Transaction.php
+++ b/app/Support/Twig/Transaction.php
@@ -110,9 +110,9 @@ class Transaction extends Twig_Extension
 
             $amount = strval(
                 TransactionModel::where('transaction_journal_id', $journalId)
-                    ->whereNull('deleted_at')
-                    ->where('amount', '<', 0)
-                    ->sum('amount')
+                                ->whereNull('deleted_at')
+                                ->where('amount', '<', 0)
+                                ->sum('amount')
             );
 
             if ($type === TransactionType::DEPOSIT || $type === TransactionType::TRANSFER) {
@@ -203,10 +203,10 @@ class Transaction extends Twig_Extension
                 $journalId = $transaction->journal_id;
                 /** @var TransactionModel $other */
                 $other = TransactionModel::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
-                    ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier)
-                    ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                    ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
-                    ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']);
+                                         ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier)
+                                         ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                         ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+                                         ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']);
                 $name  = intval($other->encrypted) === 1 ? Crypt::decrypt($other->name) : $other->name;
                 $id    = $other->account_id;
                 $type  = $other->type;
@@ -275,10 +275,10 @@ class Transaction extends Twig_Extension
                 $journalId = $transaction->journal_id;
                 /** @var TransactionModel $other */
                 $other = TransactionModel::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
-                    ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier)
-                    ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                    ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
-                    ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']);
+                                         ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier)
+                                         ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                         ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
+                                         ->first(['transactions.account_id', 'accounts.encrypted', 'accounts.name', 'account_types.type']);
                 $name  = intval($other->encrypted) === 1 ? Crypt::decrypt($other->name) : $other->name;
                 $id    = $other->account_id;
                 $type  = $other->type;
diff --git a/app/User.php b/app/User.php
index 35d9914236..ba57a8ce47 100755
--- a/app/User.php
+++ b/app/User.php
@@ -188,6 +188,20 @@ class User extends Authenticatable
         return $this->hasMany('FireflyIII\Models\Rule');
     }
 
+    /**
+     * Send the password reset notification.
+     *
+     * @param  string $token
+     *
+     * @return void
+     */
+    public function sendPasswordResetNotification($token)
+    {
+        $ip = Request::ip();
+
+        event(new RequestedNewPassword($this, $token, $ip));
+    }
+
     /**
      * @return HasMany
      */
@@ -212,18 +226,5 @@ class User extends Authenticatable
         return $this->hasManyThrough('FireflyIII\Models\Transaction', 'FireflyIII\Models\TransactionJournal');
     }
 
-    /**
-     * Send the password reset notification.
-     *
-     * @param  string  $token
-     * @return void
-     */
-    public function sendPasswordResetNotification($token)
-    {
-        $ip = Request::ip();
-
-        event(new RequestedNewPassword($this, $token, $ip));
-    }
-
 
 }
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index f32edddf7c..8dd00ccdcf 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -847,7 +847,7 @@ return [
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
     'setting_send_email_notifications'     => 'Send email notifications',
-    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
     'mail_for_lockout_help'                => 'When a user is locked out',
     'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index e6e3f0ebd8..bae8f0da00 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -426,7 +426,7 @@ return [
     'deleted_currency'                           => 'Valuta :name verwijderd',
     'created_currency'                           => 'Nieuwe valuta :name opgeslagen',
     'updated_currency'                           => 'Valuta :name bijgewerkt',
-    'ask_site_owner'                             => 'Vraag :owner of deze valuta wilt toevoegen, verwijderen of wijzigen.',
+    'ask_site_owner'                             => 'Vraag :site_owner of deze valuta wilt toevoegen, verwijderen of wijzigen.',
     'currencies_intro'                           => 'Firefly III ondersteunt diverse valuta die je hier kan instellen en bewerken.',
     'make_default_currency'                      => 'maak standaard',
     'default_currency'                           => 'standaard',
diff --git a/resources/views/admin/configuration/index.twig b/resources/views/admin/configuration/index.twig
index 1ef1f45c89..020f7b42aa 100644
--- a/resources/views/admin/configuration/index.twig
+++ b/resources/views/admin/configuration/index.twig
@@ -76,11 +76,11 @@
             
                                              
                 
                                              
                     
                                              
-                        
                                              {{ 'setting_send_email_notifications'|_ }}
                                              
+                        
                                              {{ trans('firefly.setting_send_email_notifications') }}
                                              
                     
                                              
                     
                                              
                         
                                              
-                            {{ 'setting_send_email_explain'|_ }}
+                            {{ trans('firefly.setting_send_email_explain',{site_owner: siteOwner})|raw }}
                         
                                              
                         {{ ExpandedForm.checkbox('mail_for_lockout','1', sendErrorMessage.mail_for_lockout, {helpText: trans('firefly.mail_for_lockout_help')}) }}
                         {{ ExpandedForm.checkbox('mail_for_blocked_domain','1', sendErrorMessage.mail_for_blocked_domain, {helpText: trans('firefly.mail_for_blocked_domain_help')}) }}

From dd1ba30c480e2cad0325b3ee59f9da1d0b6f7c5e Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 19:12:18 +0100
Subject: [PATCH 134/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 8c5ea49f08..a9851fbba8 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'Omschrijving eindigt op..',
     'rule_trigger_description_contains_choice'   => 'Omschrijving bevat..',
     'rule_trigger_description_is_choice'         => 'Omschrijving is..',
-    'rule_trigger_store_journal'                 => 'When a transaction is created',
-    'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_trigger_store_journal'                 => 'Als een transactie wordt gemaakt',
+    'rule_trigger_update_journal'                => 'Als een transactie wordt bijgewerkt',
     'rule_action_set_category'                   => 'Verander categorie naar ":action_value"',
     'rule_action_clear_category'                 => 'Maak categorie-veld leeg',
     'rule_action_set_budget'                     => 'Sla op onder budget ":action_value"',
@@ -846,13 +846,13 @@ return [
     'configuration_updated'                => 'De configuratie is bijgewerkt',
     'setting_is_demo_site'                 => 'Demo website',
     'setting_is_demo_site_explain'         => 'Als je dit aanzet doet jouw installatie alsof het een demo-site is, en dat kan problemen opleveren.',
-    'setting_send_email_notifications'     => 'Send email notifications',
-    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
-    'mail_for_lockout_help'                => 'When a user is locked out',
-    'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
-    'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
-    'mail_for_bad_login_help'              => 'When a user fails to login',
-    'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+    'setting_send_email_notifications'     => 'Stuur e-mail notificaties',
+    'setting_send_email_explain'           => 'Firefly III kan je email notificaties sturen over allerhande zaken. Deze worden gestuurd naar : site_owner. Dat e-mailadres kan je instellen in het .env-bestand.',
+    'mail_for_lockout_help'                => 'Als een user tijdelijk niet mag inloggen',
+    'mail_for_blocked_domain_help'         => 'Als een gebruiker wil registreren met een geblokkeerd domein',
+    'mail_for_blocked_email_help'          => 'Als een gebruiker wil registreren met een geblokkeerd e-mailadres',
+    'mail_for_bad_login_help'              => 'Als een user met de verkeerde gegevens probeert in te loggen',
+    'mail_for_blocked_login_help'          => 'Als een geblokkeerde gebruiker probeert in te loggen',
 
 
     // split a transaction:

From 4b2e4afca53d7d3f9412699050a739a1aeed7335 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 19:12:27 +0100
Subject: [PATCH 135/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/form.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index 098e6654ed..a976726e74 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -155,11 +155,11 @@ return [
     'single_user_mode'           => 'Enkele gebruiker-modus',
     'must_confirm_account'       => 'Nieuwe gebruikers moeten hun account activeren',
     'is_demo_site'               => 'Is demo website',
-    'mail_for_lockout'           => 'Locked out',
-    'mail_for_blocked_domain'    => 'Blocked domain',
-    'mail_for_blocked_email'     => 'Blocked email address',
-    'mail_for_bad_login'         => 'Login failure',
-    'mail_for_blocked_login'     => 'Blocked user',
+    'mail_for_lockout'           => 'Tijdelijk niet inloggen',
+    'mail_for_blocked_domain'    => 'Geblokkeerd domein',
+    'mail_for_blocked_email'     => 'Geblokkeerd e-mailadres',
+    'mail_for_bad_login'         => 'Mislukte login',
+    'mail_for_blocked_login'     => 'Geblokkeerde gebruiker',
 
 
     // import

From f4d9b5788793b41ae31301bf84414d14b2ab15a7 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 19:12:39 +0100
Subject: [PATCH 136/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php
index 8628dd2e11..ced437cc40 100644
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Doelrekening',
 
     'accounts_count'        => 'Aantal rekeningen',
-    'journals_count'        => 'Number of transactions',
+    'journals_count'        => 'Aantal transacties',
     'attachments_count'     => 'Aantal bijlagen',
     'bills_count'           => 'Aantal contracten',
     'categories_count'      => 'Aantal categorieën',

From 89cbd91204e4bdb46e313878512c1a981de0f049 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 19:12:46 +0100
Subject: [PATCH 137/223] New translations

---
 resources/lang/pt_BR/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 3de214d7d3..d3a27c9068 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -847,7 +847,7 @@ return [
     'setting_is_demo_site'                 => 'Site demo',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
     'setting_send_email_notifications'     => 'Send email notifications',
-    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
     'mail_for_lockout_help'                => 'When a user is locked out',
     'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',

From 0d2f9864e2b504908b0bb30174a953cae74c3061 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 19:12:59 +0100
Subject: [PATCH 138/223] New translations

---
 resources/lang/zh_HK/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index 04c11ceee4..080a5b33ba 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -847,7 +847,7 @@ return [
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
     'setting_send_email_notifications'     => 'Send email notifications',
-    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
     'mail_for_lockout_help'                => 'When a user is locked out',
     'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',

From 17fa8fcb2c1a2a61347247c3c5eb7b1cd87296a2 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 19:13:06 +0100
Subject: [PATCH 139/223] New translations

---
 resources/lang/zh_TW/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index e23f595db3..2d58c97ccd 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -847,7 +847,7 @@ return [
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
     'setting_send_email_notifications'     => 'Send email notifications',
-    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
     'mail_for_lockout_help'                => 'When a user is locked out',
     'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',

From cf2842840dc234f64288063eb411ac4aa5ecc375 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 19:13:18 +0100
Subject: [PATCH 140/223] New translations

---
 resources/lang/fr_FR/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 5f8d175aaf..b4197eef0b 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -847,7 +847,7 @@ return [
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
     'setting_send_email_notifications'     => 'Send email notifications',
-    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
     'mail_for_lockout_help'                => 'When a user is locked out',
     'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',

From e40260bd9cfaeaeb38dc4b8ff00c42d9549a3e55 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 19:13:25 +0100
Subject: [PATCH 141/223] New translations

---
 resources/lang/de_DE/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 4c57556ae8..031a67dede 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -848,7 +848,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'setting_is_demo_site'                 => 'Demonstrationsseite',
     'setting_is_demo_site_explain'         => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungwollte Auswirkungen haben kann.',
     'setting_send_email_notifications'     => 'Send email notifications',
-    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
     'mail_for_lockout_help'                => 'When a user is locked out',
     'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',

From 0b513665267840ec536252ea2afd2659a50710d2 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Wed, 14 Dec 2016 19:13:32 +0100
Subject: [PATCH 142/223] New translations

---
 resources/lang/hr_HR/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index 04c11ceee4..080a5b33ba 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -847,7 +847,7 @@ return [
     'setting_is_demo_site'                 => 'Demo site',
     'setting_is_demo_site_explain'         => 'If you check this box, this installation will behave as if it is the demo site, which can have weird side effects.',
     'setting_send_email_notifications'     => 'Send email notifications',
-    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :email. This email address can be set in the .env file.',
+    'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
     'mail_for_lockout_help'                => 'When a user is locked out',
     'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',

From 9059f0fee660c296ec2c0a5a5680210673622406 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 07:51:13 +0100
Subject: [PATCH 143/223] Translated

---
 resources/lang/de_DE/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index 7d75a5317a..0e08e2ee69 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -76,7 +76,7 @@ return [
     'destination_account'   => 'Zielkonto',
 
     'accounts_count'        => 'Anzahl Konten',
-    'journals_count'        => 'Number of transactions',
+    'journals_count'        => 'Anzahl der Zahlungsvorgänge',
     'attachments_count'     => 'Anzahl Anhänge',
     'bills_count'           => 'Anzahl Rechnungen',
     'categories_count'      => 'Anzahl Kategorien',

From 7586d4b494b70ff8e53ddb8d49e0de0632b6f4fd Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 08:01:18 +0100
Subject: [PATCH 144/223] New translations

---
 resources/lang/de_DE/firefly.php | 46 ++++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 031a67dede..ab796481eb 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -235,8 +235,8 @@ return [
     'rule_trigger_description_ends_choice'       => 'Beschreibung endet mit..',
     'rule_trigger_description_contains_choice'   => 'Beschreibung enthält..',
     'rule_trigger_description_is_choice'         => 'Beschreibung ist..',
-    'rule_trigger_store_journal'                 => 'When a transaction is created',
-    'rule_trigger_update_journal'                => 'When a transaction is updated',
+    'rule_trigger_store_journal'                 => 'Wenn eine Transaktion erstellt wird',
+    'rule_trigger_update_journal'                => 'Wenn eine Transaktion aktualisiert wird',
     'rule_action_set_category'                   => 'Kategorie zu ":action_value" festlegen',
     'rule_action_clear_category'                 => 'Bereinige Kategorie',
     'rule_action_set_budget'                     => 'Budget zu ":action_value" festlegen',
@@ -256,7 +256,7 @@ return [
     'rule_action_remove_all_tags_choice'         => 'Entferne alle Tags',
     'rule_action_set_description_choice'         => 'Beschreibung festlegen..',
     'rule_action_append_description_choice'      => 'An Beschreibung anhängen..',
-    'rule_action_prepend_description_choice'     => 'Prepend description with..',
+    'rule_action_prepend_description_choice'     => 'An Beschreibung voranstellen..',
     'rule_action_set_source_account_choice'      => 'Lege Quellkonto fest...',
     'rule_action_set_source_account'             => 'Lege Quellkonto als :action_value fest',
     'rule_action_set_destination_account_choice' => 'Zielkonto festlegen...',
@@ -495,31 +495,31 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'details_for_revenue'                        => 'Details für Schuldner ":name"',
     'details_for_cash'                           => 'Details for cash account ":name"',
     'store_new_asset_account'                    => 'Speichere neues Girokonto',
-    'store_new_expense_account'                  => 'Store new expense account',
-    'store_new_revenue_account'                  => 'Store new revenue account',
+    'store_new_expense_account'                  => 'Speichere neuen Debitor (Ausgabe)',
+    'store_new_revenue_account'                  => 'Speichere neuen Schuldner',
     'edit_asset_account'                         => 'Bearbeite Girokonto ":name"',
-    'edit_expense_account'                       => 'Edit expense account ":name"',
-    'edit_revenue_account'                       => 'Edit revenue account ":name"',
+    'edit_expense_account'                       => 'Debitor (Ausgabe) ":name" bearbeiten',
+    'edit_revenue_account'                       => 'Schuldner ":name" bearbeiten',
     'delete_asset_account'                       => 'Lösche Girokonto ":name"',
-    'delete_expense_account'                     => 'Delete expense account ":name"',
-    'delete_revenue_account'                     => 'Delete revenue account ":name"',
+    'delete_expense_account'                     => 'Debitor (Ausgabe) ":name" löschen',
+    'delete_revenue_account'                     => 'Schuldner ":name" löschen',
     'asset_deleted'                              => 'Girokonto ":name" wurde erfolgreich gelöscht',
-    'expense_deleted'                            => 'Successfully deleted expense account ":name"',
-    'revenue_deleted'                            => 'Successfully deleted revenue account ":name"',
+    'expense_deleted'                            => 'Debitor (Ausgabe) ":name" erfolgreich gelöscht',
+    'revenue_deleted'                            => 'Schuldner ":name" erfolgreich gelöscht',
     'update_asset_account'                       => 'Girokonto aktualisieren',
-    'update_expense_account'                     => 'Update expense account',
-    'update_revenue_account'                     => 'Update revenue account',
+    'update_expense_account'                     => 'Debitor (Ausgabe) bearbeiten',
+    'update_revenue_account'                     => 'Schuldner bearbeiten',
     'make_new_asset_account'                     => 'Erstellen Sie ein neuen Girokonto',
-    'make_new_expense_account'                   => 'Create a new expense account',
-    'make_new_revenue_account'                   => 'Create a new revenue account',
+    'make_new_expense_account'                   => 'Neuen Debitor (Ausgabe) erstellen',
+    'make_new_revenue_account'                   => 'Neuen Schuldner erstellen',
     'asset_accounts'                             => 'Girokonten',
     'expense_accounts'                           => 'Debitoren (Ausgaben)',
     'revenue_accounts'                           => 'Schuldner',
     'cash_accounts'                              => 'Bargeldkonten',
     'Cash account'                               => 'Bargeldkonto',
     'account_type'                               => 'Kontotyp',
-    'save_transactions_by_moving'                => 'Save these transaction(s) by moving them to another account:',
-    'stored_new_account'                         => 'New account ":name" stored!',
+    'save_transactions_by_moving'                => 'Speichern Sie diese Transaktion(en), indem Sie sie auf ein anderes Konto verschieben:',
+    'stored_new_account'                         => 'Neues Konto ":name" gespeichert!',
     'updated_account'                            => 'Updated account ":name"',
     'credit_card_options'                        => 'Kreditkartenoptionen',
     'no_transactions_account'                    => 'There are no transactions (in this period) for asset account ":name".',
@@ -697,13 +697,13 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'budget_spent_amount'                        => 'Expenses in budget ":budget" between :start and :end',
     'balance_amount'                             => 'Expenses in budget ":budget" paid from account ":account" between :start and :end',
     'no_audit_activity'                          => 'No activity was recorded on account :account_name between :start and :end.',
-    'audit_end_balance'                          => 'Account balance of :account_name at the end of :end was: :balance',
-    'reports_extra_options'                      => 'Extra options',
-    'report_has_no_extra_options'                => 'This report has no extra options',
+    'audit_end_balance'                          => 'Kontostand von :account_name Ende war: :balance',
+    'reports_extra_options'                      => 'Zusatzoptionen',
+    'report_has_no_extra_options'                => 'Dieser Bericht hat keine zusätzliche Optionen',
     'reports_submit'                             => 'Zeige Bericht',
-    'end_after_start_date'                       => 'End date of report must be after start date.',
-    'select_category'                            => 'Select one or more categories.',
-    'select_budget'                              => 'Select one or more budgets.',
+    'end_after_start_date'                       => 'Enddatum des Berichts muss nach dem Startdatum liegen.',
+    'select_category'                            => 'Wählen Sie eine oder mehrere Kategorien aus.',
+    'select_budget'                              => 'Wählen Sie ein oder mehrere Budgets aus.',
     'income_per_category'                        => 'Einnahmen pro Kategorie',
     'expense_per_category'                       => 'Ausgaben pro Kategorie',
     'expense_per_budget'                         => 'Ausgaben pro Budget',

From 02eff06cd3a75e4b26dc961107d2e2320ff1e77c Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 08:11:28 +0100
Subject: [PATCH 145/223] New translations

---
 resources/lang/de_DE/firefly.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index ab796481eb..1934fd2309 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -792,7 +792,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'balancing_act'              => 'The tag takes at most two transactions; an expense and a transfer. They\'ll balance each other out.',
     'advance_payment'            => 'The tag accepts one expense and any number of deposits aimed to repay the original expense.',
     'delete_tag'                 => 'Tag ":tag" entfernen',
-    'deleted_tag'                => 'Deleted tag ":tag"',
+    'deleted_tag'                => 'Tag ":tag" entfernt',
     'new_tag'                    => 'Neuen Tag erstellen',
     'edit_tag'                   => 'Tag ":tag" bearbeiten',
     'updated_tag'                => 'Aktualisierter Tag ":tag"',
@@ -819,7 +819,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'blocked_domains'                      => 'Blockierte Domains',
     'no_domains_banned'                    => 'Keine blockierten Domains',
     'all_user_domains'                     => 'All user email address domains',
-    'all_domains_is_filtered'              => 'This list does not include already blocked domains.',
+    'all_domains_is_filtered'              => 'Diese Liste enthält keine bereits gesperrten Domains.',
     'domain_now_blocked'                   => 'Domain :domain ist jetzt gesperrt',
     'domain_now_unblocked'                 => 'Domain :domain ist wieder freigegeben',
     'manual_block_domain'                  => 'Domain von Hand sperren',
@@ -839,17 +839,17 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'user_information'                     => 'Benutzerinformationen',
     'total_size'                           => 'Gesamtgröße',
     'budget_or_budgets'                    => 'Budget(s)',
-    'budgets_with_limits'                  => 'budget(s) with configured amount',
+    'budgets_with_limits'                  => 'Budget(s) mit konfigurierten Betrag',
     'rule_or_rules'                        => 'Regel(n)',
-    'rulegroup_or_groups'                  => 'rule group(s)',
+    'rulegroup_or_groups'                  => 'Regelgruppe(n)',
     'setting_must_confirm_account'         => 'Kontobestätigung',
     'setting_must_confirm_account_explain' => 'Wenn sie diese Option auswählen, müssen Benutzer vor Benutzung ihr Konto aktivieren.',
     'configuration_updated'                => 'Die Konfiguration wurde aktualisiert',
     'setting_is_demo_site'                 => 'Demonstrationsseite',
     'setting_is_demo_site_explain'         => 'Wenn sie diese Option auswählen, wird sich diese Installation wie eine Demonstrationsseite verhalten, was ungwollte Auswirkungen haben kann.',
-    'setting_send_email_notifications'     => 'Send email notifications',
+    'setting_send_email_notifications'     => 'E-Mail-Benachrichtigungen senden',
     'setting_send_email_explain'           => 'Firefly III can send you email notifications about certain events. They will be sent to :site_owner. This email address can be set in the .env file.',
-    'mail_for_lockout_help'                => 'When a user is locked out',
+    'mail_for_lockout_help'                => 'Wenn ein Benutzer gesperrt ist',
     'mail_for_blocked_domain_help'         => 'When a user tries to register using a blocked domain',
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
     'mail_for_bad_login_help'              => 'When a user fails to login',

From 6fbc3ba060ac49c6dafb0f9f3ddcbbb4bb828fc9 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 08:16:34 +0100
Subject: [PATCH 146/223] New screenshots [skip ci]

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1043c10aa8..b6a4297b78 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,11 @@
 
 ## A personal finances manager
 
-[![Screenshot](https://i.nder.be/hhfv03hp/400)](https://i.nder.be/hhfv03hp) [![Screenshot](https://i.nder.be/hhmwmqw9/400)](https://i.nder.be/hhmwmqw9)
+[![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)
 
-[![Screenshot](https://i.nder.be/g63q05m0/400)](https://i.nder.be/g63q05m0) [![Screenshot](https://i.nder.be/c2g30ngg/400)](https://i.nder.be/c2g30ngg)
+[![The useful financial reports of Firefly III](https://i.nder.be/h7sk6nb7/400)](https://i.nder.be/ccn0u2mp) [![Even more useful reports in Firefly III](https://i.nder.be/g237hr35/400)](https://i.nder.be/gm8hbh7z)
+
+_(You can click on the images for a better view)_
 
 "Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared  household accounts and savings accounts! It's pretty fancy. You should use it to save and organise money.
 

From bdc0df8350800d975db677bac8cf8370828c9e8e Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 08:31:26 +0100
Subject: [PATCH 147/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index a9851fbba8..df8ac7b013 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -847,7 +847,7 @@ return [
     'setting_is_demo_site'                 => 'Demo website',
     'setting_is_demo_site_explain'         => 'Als je dit aanzet doet jouw installatie alsof het een demo-site is, en dat kan problemen opleveren.',
     'setting_send_email_notifications'     => 'Stuur e-mail notificaties',
-    'setting_send_email_explain'           => 'Firefly III kan je email notificaties sturen over allerhande zaken. Deze worden gestuurd naar : site_owner. Dat e-mailadres kan je instellen in het .env-bestand.',
+    'setting_send_email_explain'           => 'Firefly III kan je email notificaties sturen over allerhande zaken. Deze worden gestuurd naar :site_owner. Dat e-mailadres kan je instellen in het .env-bestand.',
     'mail_for_lockout_help'                => 'Als een user tijdelijk niet mag inloggen',
     'mail_for_blocked_domain_help'         => 'Als een gebruiker wil registreren met een geblokkeerd domein',
     'mail_for_blocked_email_help'          => 'Als een gebruiker wil registreren met een geblokkeerd e-mailadres',

From 47aded820d6cd27af4db583516963f8433db450f Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 08:53:10 +0100
Subject: [PATCH 148/223] New test.

---
 .../Controllers/HelpControllerTest.php        | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/tests/acceptance/Controllers/HelpControllerTest.php b/tests/acceptance/Controllers/HelpControllerTest.php
index f005ea4ff6..9acadb6482 100644
--- a/tests/acceptance/Controllers/HelpControllerTest.php
+++ b/tests/acceptance/Controllers/HelpControllerTest.php
@@ -8,6 +8,7 @@
  *
  * See the LICENSE file for details.
  */
+use FireflyIII\Helpers\Help\HelpInterface;
 
 
 /**
@@ -28,21 +29,17 @@ class HelpControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\HelpController::show
-     * Implement testShow().
      */
     public function testShow()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
+        $help = $this->mock(HelpInterface::class);
+        $help->shouldReceive('hasRoute')->andReturn(true)->once();
+        $help->shouldReceive('inCache')->andReturn(false)->once();
+        $help->shouldReceive('getFromGithub')->andReturn('Help content here.')->once();
+        $help->shouldReceive('putInCache')->once();
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
+        $this->be($this->user());
+        $this->call('GET', route('help.show', ['index']));
+        $this->assertResponseStatus(200);
     }
 }

From 95654cc4d40f959c60208f4faa633aab567eb6cb Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 09:49:35 +0100
Subject: [PATCH 149/223] New budget chart generator

---
 .../Chart/Basic/ChartJsGenerator.php          |   4 +-
 .../Controllers/Chart/BudgetController.php    | 161 +++++++++++++-----
 2 files changed, 120 insertions(+), 45 deletions(-)

diff --git a/app/Generator/Chart/Basic/ChartJsGenerator.php b/app/Generator/Chart/Basic/ChartJsGenerator.php
index 5571599f44..ffc2b14f38 100644
--- a/app/Generator/Chart/Basic/ChartJsGenerator.php
+++ b/app/Generator/Chart/Basic/ChartJsGenerator.php
@@ -24,7 +24,9 @@ class ChartJsGenerator implements GeneratorInterface
 {
 
     /**
-     * Will generate a Chart JS compatible array from the given input. Expects this format:
+     * Will generate a Chart JS compatible array from the given input. Expects this format
+     *
+     * Will take labels for all from first set.
      *
      * 0: [
      *    'label' => 'label of set',
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 67606ec75e..10ffdbf9df 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -14,6 +14,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface;
 use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Http\Controllers\Controller;
@@ -66,7 +67,7 @@ class BudgetController extends Controller
         $cache = new CacheProperties();
         $cache->addProperty($first);
         $cache->addProperty($last);
-        $cache->addProperty('budget');
+        $cache->addProperty('chart.budget.budget');
 
         if ($cache->has()) {
             return Response::json($cache->get());
@@ -77,7 +78,7 @@ class BudgetController extends Controller
 
         $budgetCollection = new Collection([$budget]);
         $last             = Navigation::endOfX($last, $range, $final); // not to overshoot.
-        $entries          = new Collection;
+        $entries          = [];
         while ($first < $last) {
 
             // periodspecific dates:
@@ -85,13 +86,16 @@ class BudgetController extends Controller
             $currentEnd   = Navigation::endOfPeriod($first, $range);
             // sub another day because reasons.
             $currentEnd->subDay();
-            $spent = $repository->spentInPeriod($budgetCollection, new Collection, $currentStart, $currentEnd);
-            $entry = [$first, ($spent * -1)];
-            $entries->push($entry);
-            $first = Navigation::addPeriod($first, $range, 0);
+            $spent            = $repository->spentInPeriod($budgetCollection, new Collection, $currentStart, $currentEnd);
+            $format           = Navigation::periodShow($first, $range);
+            $entries[$format] = bcmul($spent, '-1');
+            $first            = Navigation::addPeriod($first, $range, 0);
         }
 
-        $data = $this->generator->budgetLimit($entries, 'month');
+        /** @var GeneratorInterface $generator */
+        $generator = app(GeneratorInterface::class);
+        $data      = $generator->singleSet(strval(trans('firefly.spent')), $entries);
+
         $cache->store($data);
 
         return Response::json($data);
@@ -113,25 +117,27 @@ class BudgetController extends Controller
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('budget-limit');
-        $cache->addProperty($budget->id);
+        $cache->addProperty('chart.budget.budget.limit');
         $cache->addProperty($repetition->id);
 
         if ($cache->has()) {
             return Response::json($cache->get());
         }
 
-        $entries          = new Collection;
+        $entries          = [];
         $amount           = $repetition->amount;
         $budgetCollection = new Collection([$budget]);
         while ($start <= $end) {
-            $spent  = $repository->spentInPeriod($budgetCollection, new Collection, $start, $start);
-            $amount = bcadd($amount, $spent);
-            $entries->push([clone $start, round($amount, 2)]);
+            $spent            = $repository->spentInPeriod($budgetCollection, new Collection, $start, $start);
+            $amount           = bcadd($amount, $spent);
+            $format           = $start->formatLocalized(strval(trans('config.month_and_day')));
+            $entries[$format] = $amount;
 
             $start->addDay();
         }
-        $data = $this->generator->budgetLimit($entries, 'month_and_day');
+        /** @var GeneratorInterface $generator */
+        $generator = app(GeneratorInterface::class);
+        $data      = $generator->singleSet(strval(trans('firefly.left')), $entries);
         $cache->store($data);
 
         return Response::json($data);
@@ -152,14 +158,30 @@ class BudgetController extends Controller
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('budget');
-        $cache->addProperty('all');
+        $cache->addProperty('chart.budget.frontpage');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            //return Response::json($cache->get());
         }
         $budgets     = $repository->getActiveBudgets();
         $repetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
-        $allEntries  = new Collection;
+        $chartData   = [
+            [
+                'label'   => strval(trans('firefly.spent_in_budget')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+            [
+                'label'   => strval(trans('firefly.left_to_spend')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+            [
+                'label'   => strval(trans('firefly.overspent')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+        ];
+
 
         /** @var Budget $budget */
         foreach ($budgets as $budget) {
@@ -167,17 +189,36 @@ class BudgetController extends Controller
             $reps = $this->filterRepetitions($repetitions, $budget, $start, $end);
 
             if ($reps->count() === 0) {
-                $collection = $this->spentInPeriodSingle($repository, $budget, $start, $end);
-                $allEntries = $allEntries->merge($collection);
+                $row = $this->spentInPeriodSingle($repository, $budget, $start, $end);
+                if (bccomp($row['spent'], '0') !== 0) {
+                    $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
+                    $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
+                    $chartData[2]['entries'][$row['name']] = $row['repetition_overspent'];
+                }
                 continue;
             }
-            $collection = $this->spentInPeriodMulti($repository, $budget, $reps);
-            $allEntries = $allEntries->merge($collection);
+            $rows = $this->spentInPeriodMulti($repository, $budget, $reps);
+            foreach ($rows as $row) {
+                if (bccomp($row['spent'], '0') !== 0) {
+                    $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
+                    $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
+                    $chartData[2]['entries'][$row['name']] = $row['repetition_overspent'];
+                }
+            }
+            unset($rows, $row);
 
         }
-        $entry = $this->spentInPeriodWithout($start, $end);
-        $allEntries->push($entry);
-        $data = $this->generator->frontpage($allEntries);
+        // for no budget:
+        $row = $this->spentInPeriodWithout($start, $end);
+        if (bccomp($row['spent'], '0') !== 0) {
+            $chartData[0]['entries'][$row['name']] = $row['spent'];
+            $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
+            $chartData[2]['entries'][$row['name']] = $row['repetition_overspent'];
+        }
+
+        /** @var GeneratorInterface $generator */
+        $generator = app(GeneratorInterface::class);
+        $data      = $generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -316,17 +357,25 @@ class BudgetController extends Controller
     }
 
     /**
+     * Returns an array with the following values:
+     * 0 =>
+     *   'name' => name of budget + repetition
+     *   'repetition_left' => left in budget repetition (always zero)
+     *   'repetition_overspent' => spent more than budget repetition? (always zero)
+     *   'spent' => actually spent in period for budget
+     * 1 => (etc)
+     *
      * @param BudgetRepositoryInterface $repository
      * @param Budget                    $budget
      * @param Collection                $repetitions
      *
-     * @return Collection
+     * @return array
      */
-    private function spentInPeriodMulti(BudgetRepositoryInterface $repository, Budget $budget, Collection $repetitions): Collection
+    private function spentInPeriodMulti(BudgetRepositoryInterface $repository, Budget $budget, Collection $repetitions): array
     {
-        $format     = strval(trans('config.month_and_day'));
-        $collection = new Collection;
-        $name       = $budget->name;
+        $return = [];
+        $format = strval(trans('config.month_and_day'));
+        $name   = $budget->name;
         /** @var LimitRepetition $repetition */
         foreach ($repetitions as $repetition) {
             $expenses = $repository->spentInPeriod(new Collection([$budget]), new Collection, $repetition->startdate, $repetition->enddate);
@@ -341,35 +390,53 @@ class BudgetController extends Controller
             $left      = bccomp(bcadd($amount, $expenses), '0') < 1 ? '0' : bcadd($amount, $expenses);
             $spent     = bccomp(bcadd($amount, $expenses), '0') < 1 ? bcmul($amount, '-1') : $expenses;
             $overspent = bccomp(bcadd($amount, $expenses), '0') < 1 ? bcadd($amount, $expenses) : '0';
-            $array     = [$name, $left, $spent, $overspent, $amount, $spent];
-            $collection->push($array);
+            $return[]  = [
+                'name'                 => $name,
+                'repetition_left'      => $left,
+                'repetition_overspent' => $overspent,
+                'spent'                => $spent,
+            ];
+            //$array     = [$name, $left, $spent, $overspent, $amount, $spent];
         }
 
-        return $collection;
+        return $return;
     }
 
     /**
+     * Returns an array with the following values:
+     * 'name' => name of budget
+     * 'repetition_left' => left in budget repetition (always zero)
+     * 'repetition_overspent' => spent more than budget repetition? (always zero)
+     * 'spent' => actually spent in period for budget
+     *
+     *
      * @param BudgetRepositoryInterface $repository
      * @param Budget                    $budget
      * @param Carbon                    $start
      * @param Carbon                    $end
      *
-     * @return Collection
+     * @return array
      */
-    private function spentInPeriodSingle(BudgetRepositoryInterface $repository, Budget $budget, Carbon $start, Carbon $end): Collection
+    private function spentInPeriodSingle(BudgetRepositoryInterface $repository, Budget $budget, Carbon $start, Carbon $end): array
     {
-        $collection = new Collection;
-        $amount     = '0';
-        $left       = '0';
-        $spent      = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end);
-        $overspent  = '0';
-        $array      = [$budget->name, $left, $spent, $overspent, $amount, $spent];
-        $collection->push($array);
+        $spent = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end);
+        $array = [
+            'name'                 => $budget->name,
+            'repetition_left'      => '0',
+            'repetition_overspent' => '0',
+            'spent'                => $spent,
+        ];
 
-        return $collection;
+        return $array;
     }
 
     /**
+     * Returns an array with the following values:
+     * 'name' => "no budget" in local language
+     * 'repetition_left' => left in budget repetition (always zero)
+     * 'repetition_overspent' => spent more than budget repetition? (always zero)
+     * 'spent' => actually spent in period for budget
+     *
      * @param Carbon $start
      * @param Carbon $end
      *
@@ -387,7 +454,13 @@ class BudgetController extends Controller
         foreach ($journals as $entry) {
             $sum = bcadd($entry->transaction_amount, $sum);
         }
+        $array = [
+            'name'                 => strval(trans('firefly.no_budget')),
+            'repetition_left'      => '0',
+            'repetition_overspent' => '0',
+            'spent'                => $sum,
+        ];
 
-        return [trans('firefly.no_budget'), '0', '0', $sum, '0', '0'];
+        return $array;
     }
 }

From 46506abeb8fb67cbb436a36e67e17428c3204e7d Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 09:50:22 +0100
Subject: [PATCH 150/223] Forgot to do * -1. [skip ci]

---
 app/Http/Controllers/Chart/BudgetController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 10ffdbf9df..34e0169b6b 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -211,7 +211,7 @@ class BudgetController extends Controller
         // for no budget:
         $row = $this->spentInPeriodWithout($start, $end);
         if (bccomp($row['spent'], '0') !== 0) {
-            $chartData[0]['entries'][$row['name']] = $row['spent'];
+            $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
             $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
             $chartData[2]['entries'][$row['name']] = $row['repetition_overspent'];
         }

From e34ec228453ed6b3576c804abf84f028b1763db6 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 09:51:22 +0100
Subject: [PATCH 151/223] Forgot to do * -1. [skip ci]

---
 app/Http/Controllers/Chart/BudgetController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 34e0169b6b..ab823b085d 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -193,7 +193,7 @@ class BudgetController extends Controller
                 if (bccomp($row['spent'], '0') !== 0) {
                     $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
                     $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
-                    $chartData[2]['entries'][$row['name']] = $row['repetition_overspent'];
+                    $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
                 }
                 continue;
             }
@@ -202,7 +202,7 @@ class BudgetController extends Controller
                 if (bccomp($row['spent'], '0') !== 0) {
                     $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
                     $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
-                    $chartData[2]['entries'][$row['name']] = $row['repetition_overspent'];
+                    $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
                 }
             }
             unset($rows, $row);
@@ -213,7 +213,7 @@ class BudgetController extends Controller
         if (bccomp($row['spent'], '0') !== 0) {
             $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
             $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
-            $chartData[2]['entries'][$row['name']] = $row['repetition_overspent'];
+            $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
         }
 
         /** @var GeneratorInterface $generator */

From 7cf38bb01e3d8f499adb719c66c2b0e835e9c35d Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 09:52:58 +0100
Subject: [PATCH 152/223] Include budgeted info as well. [skip ci]

---
 app/Http/Controllers/Chart/BudgetController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index ab823b085d..4c4bee7d87 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -190,7 +190,7 @@ class BudgetController extends Controller
 
             if ($reps->count() === 0) {
                 $row = $this->spentInPeriodSingle($repository, $budget, $start, $end);
-                if (bccomp($row['spent'], '0') !== 0) {
+                if (bccomp($row['spent'], '0') !== 0 && bccomp($row['repetition_left'], '0') !== 0) {
                     $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
                     $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
                     $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
@@ -199,7 +199,7 @@ class BudgetController extends Controller
             }
             $rows = $this->spentInPeriodMulti($repository, $budget, $reps);
             foreach ($rows as $row) {
-                if (bccomp($row['spent'], '0') !== 0) {
+                if (bccomp($row['spent'], '0') !== 0 && bccomp($row['repetition_left'], '0') !== 0) {
                     $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
                     $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
                     $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
@@ -210,7 +210,7 @@ class BudgetController extends Controller
         }
         // for no budget:
         $row = $this->spentInPeriodWithout($start, $end);
-        if (bccomp($row['spent'], '0') !== 0) {
+        if (bccomp($row['spent'], '0') !== 0 && bccomp($row['repetition_left'], '0') !== 0) {
             $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
             $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
             $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');

From e1b6df6fb1344eac5ef9766c48512bf1ae0cedff Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 09:54:10 +0100
Subject: [PATCH 153/223] Include budgeted info as well. [skip ci]

---
 app/Http/Controllers/Chart/BudgetController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 4c4bee7d87..7e52555928 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -190,7 +190,7 @@ class BudgetController extends Controller
 
             if ($reps->count() === 0) {
                 $row = $this->spentInPeriodSingle($repository, $budget, $start, $end);
-                if (bccomp($row['spent'], '0') !== 0 && bccomp($row['repetition_left'], '0') !== 0) {
+                if (bccomp($row['spent'], '0') !== 0 || bccomp($row['repetition_left'], '0') !== 0) {
                     $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
                     $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
                     $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
@@ -199,7 +199,7 @@ class BudgetController extends Controller
             }
             $rows = $this->spentInPeriodMulti($repository, $budget, $reps);
             foreach ($rows as $row) {
-                if (bccomp($row['spent'], '0') !== 0 && bccomp($row['repetition_left'], '0') !== 0) {
+                if (bccomp($row['spent'], '0') !== 0 || bccomp($row['repetition_left'], '0') !== 0) {
                     $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
                     $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
                     $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
@@ -210,7 +210,7 @@ class BudgetController extends Controller
         }
         // for no budget:
         $row = $this->spentInPeriodWithout($start, $end);
-        if (bccomp($row['spent'], '0') !== 0 && bccomp($row['repetition_left'], '0') !== 0) {
+        if (bccomp($row['spent'], '0') !== 0 || bccomp($row['repetition_left'], '0') !== 0) {
             $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1');
             $chartData[1]['entries'][$row['name']] = $row['repetition_left'];
             $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');

From 1d7119114dbeeecae8a01595807fc95106737796 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 09:55:10 +0100
Subject: [PATCH 154/223] New translations [skip ci]

---
 resources/lang/en_US/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 8dd00ccdcf..45665c2921 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -727,6 +727,8 @@ return [
     'month'                                      => 'Month',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Spent',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Earned',
     'overspent'                                  => 'Overspent',
     'left'                                       => 'Left',

From 4bf9bfb52187acd0adb50aa81402e66b3c4e9b83 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:02:26 +0100
Subject: [PATCH 155/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index df8ac7b013..1f0ec2f718 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -727,6 +727,8 @@ return [
     'month'                                      => 'Maand',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Uitgegeven',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Verdiend',
     'overspent'                                  => 'Teveel uitgegeven',
     'left'                                       => 'Over',

From 1f9b362b6f2081c72b5149d4a34f3c177d9ea747 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:03:01 +0100
Subject: [PATCH 156/223] New translations

---
 resources/lang/pt_BR/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index d3a27c9068..20bd7125bf 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -727,6 +727,8 @@ return [
     'month'                                      => 'Mês',
     'budget'                                     => 'Orçamento',
     'spent'                                      => 'Gasto',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Ganho',
     'overspent'                                  => 'Gasto excedido',
     'left'                                       => 'Esquerda',

From 10aa41a7ea6f790699bc2ec6d4ffaa411f8bbb79 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:03:15 +0100
Subject: [PATCH 157/223] New translations

---
 resources/lang/zh_HK/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index 080a5b33ba..f2c7241cfb 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -727,6 +727,8 @@ return [
     'month'                                      => 'Month',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Spent',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Earned',
     'overspent'                                  => 'Overspent',
     'left'                                       => 'Left',

From 7ef5eed6e2da751f8ffd49d71a8dd76b56bcddc7 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:03:22 +0100
Subject: [PATCH 158/223] New translations

---
 resources/lang/zh_TW/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 2d58c97ccd..5cd9c71015 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -727,6 +727,8 @@ return [
     'month'                                      => 'Month',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Spent',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Earned',
     'overspent'                                  => 'Overspent',
     'left'                                       => 'Left',

From 7e55d1a4fd44f2289c212e1c9dad1fef56f296ac Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:03:36 +0100
Subject: [PATCH 159/223] New translations

---
 resources/lang/fr_FR/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index b4197eef0b..6ac388a78b 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -727,6 +727,8 @@ return [
     'month'                                      => 'Mois',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Dépensé',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Gagné',
     'overspent'                                  => 'Overspent',
     'left'                                       => 'Gauche',

From 4ad5881760b3bd4791d3588cd9ceb2ec26062d2d Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:03:43 +0100
Subject: [PATCH 160/223] New translations

---
 resources/lang/de_DE/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 1934fd2309..2443a89599 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -728,6 +728,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'month'                                      => 'Monat',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Ausgegeben',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Verdient',
     'overspent'                                  => 'Zuviel ausgegeben',
     'left'                                       => 'Übrig',

From 3080d2ddc494b79dad78dd4310285eeb2eadcb37 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:03:53 +0100
Subject: [PATCH 161/223] New translations

---
 resources/lang/hr_HR/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index 080a5b33ba..f2c7241cfb 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -727,6 +727,8 @@ return [
     'month'                                      => 'Month',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Spent',
+    'spent_in_budget'                            => 'Spent in budget',
+    'left_to_spend'                              => 'Left to spend',
     'earned'                                     => 'Earned',
     'overspent'                                  => 'Overspent',
     'left'                                       => 'Left',

From f74c6c2d19b4b00d76be51caba361e35cf95b2f6 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:41:10 +0100
Subject: [PATCH 162/223] Updated budget charts [skip ci]

---
 .../Controllers/Chart/BudgetController.php    | 70 +++++++++++--------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 7e52555928..b64f2cd99a 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -242,20 +242,19 @@ class BudgetController extends Controller
         $cache->addProperty($end);
         $cache->addProperty($accounts);
         $cache->addProperty($budget->id);
-        $cache->addProperty('budget');
-        $cache->addProperty('period');
+        $cache->addProperty('chart.budget.period');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            //return Response::json($cache->get());
         }
 
-        // the expenses:
-        $periods  = Navigation::listOfPeriods($start, $end);
-        $entries  = $repository->getBudgetPeriodReport(new Collection([$budget]), $accounts, $start, $end, false);
+        // get the expenses
         $budgeted = [];
+        $periods  = Navigation::listOfPeriods($start, $end);
+        $entries  = $repository->getBudgetPeriodReport(new Collection([$budget]), $accounts, $start, $end);
         $key      = Navigation::preferredCarbonFormat($start, $end);
         $range    = Navigation::preferredRangeFormat($start, $end);
 
-        // get budgeted:
+        // get the budget limits (if any)
         $repetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
         $current     = clone $start;
         while ($current < $end) {
@@ -276,18 +275,31 @@ class BudgetController extends Controller
             $current = clone $currentEnd;
         }
 
-        // join them:
-        $result = [];
+        // join them into one set of data:
+        $chartData = [
+            [
+                'label'   => strval(trans('firefly.spent')),
+                'type'    => 'bar',
+                'entries' => [],
+            ],
+            [
+                'label'   => strval(trans('firefly.budgeted')),
+                'type'    => 'bar',
+                'entries' => [],
+            ],
+        ];
+
         foreach (array_keys($periods) as $period) {
-            $nice          = $periods[$period];
-            $result[$nice] = [
-                'spent'    => isset($entries[$budget->id]['entries'][$period]) ? $entries[$budget->id]['entries'][$period] : '0',
-                'budgeted' => isset($entries[$period]) ? $budgeted[$period] : 0,
-            ];
+            $label                           = $periods[$period];
+            $spent                           = isset($entries[$budget->id]['entries'][$period]) ? $entries[$budget->id]['entries'][$period] : '0';
+            $limit                           = isset($entries[$period]) ? $budgeted[$period] : 0;
+            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
+            $chartData[1]['entries'][$label] = $limit;
+
         }
-
-        $data = $this->generator->period($result);
-
+        /** @var GeneratorInterface $generator */
+        $generator = app(GeneratorInterface::class);
+        $data      = $generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -308,27 +320,25 @@ class BudgetController extends Controller
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($accounts);
-        $cache->addProperty('no-budget');
-        $cache->addProperty('period');
+        $cache->addProperty('chart.budget.no-budget');
         if ($cache->has()) {
-            return Response::json($cache->get());
+            // return Response::json($cache->get());
         }
 
         // the expenses:
-        $periods = Navigation::listOfPeriods($start, $end);
-        $entries = $repository->getNoBudgetPeriodReport($accounts, $start, $end);
+        $periods   = Navigation::listOfPeriods($start, $end);
+        $entries   = $repository->getNoBudgetPeriodReport($accounts, $start, $end);
+        $chartData = [];
 
         // join them:
-        $result = [];
         foreach (array_keys($periods) as $period) {
-            $nice          = $periods[$period];
-            $result[$nice] = [
-                'spent' => isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0',
-            ];
+            $label             = $periods[$period];
+            $spent             = isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0';
+            $chartData[$label] = $spent;
         }
-
-        $data = $this->generator->periodNoBudget($result);
-
+        /** @var GeneratorInterface $generator */
+        $generator = app(GeneratorInterface::class);
+        $data      = $generator->singleSet(strval(trans('firefly.spent')), $chartData);
         $cache->store($data);
 
         return Response::json($data);

From d7cbc53b4befb00eeb3dc1f711f7fbc76baa6d98 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:41:56 +0100
Subject: [PATCH 163/223] Multiply by -1.

---
 app/Http/Controllers/Chart/BudgetController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index b64f2cd99a..3dc6b43620 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -334,7 +334,7 @@ class BudgetController extends Controller
         foreach (array_keys($periods) as $period) {
             $label             = $periods[$period];
             $spent             = isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0';
-            $chartData[$label] = $spent;
+            $chartData[$label] = bcmul($spent, '-1');
         }
         /** @var GeneratorInterface $generator */
         $generator = app(GeneratorInterface::class);

From aea31b5e287f2cece15df9d0b0662acc2dde8c1c Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 10:44:06 +0100
Subject: [PATCH 164/223] Budget charts #452

---
 .../Budget/BudgetChartGeneratorInterface.php  |  54 ------
 .../Budget/ChartJsBudgetChartGenerator.php    | 164 ------------------
 .../Controllers/Chart/BudgetController.php    |  30 +---
 3 files changed, 9 insertions(+), 239 deletions(-)
 delete mode 100644 app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php
 delete mode 100644 app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php

diff --git a/app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php b/app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php
deleted file mode 100644
index 1abaa89746..0000000000
--- a/app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php
+++ /dev/null
@@ -1,54 +0,0 @@
- [],
-            'datasets' => [
-                [
-                    'label' => 'Amount',
-                    'data'  => [],
-                ],
-            ],
-        ];
-
-        /** @var array $entry */
-        foreach ($entries as $entry) {
-            $data['labels'][]              = $entry[0]->formatLocalized($format);
-            $data['datasets'][0]['data'][] = $entry[1];
-
-        }
-
-        $data['count'] = count($data['datasets']);
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries): array
-    {
-        $data      = [
-            'count'    => 0,
-            'labels'   => [],
-            'datasets' => [],
-        ];
-        $left      = [];
-        $spent     = [];
-        $overspent = [];
-        $filtered  = $entries->filter(
-            function ($entry) {
-                return ($entry[1] != 0 || $entry[2] != 0 || $entry[3] != 0);
-            }
-        );
-        foreach ($filtered as $entry) {
-            $data['labels'][] = $entry[0];
-            $left[]           = round($entry[1], 2);
-            $spent[]          = round(bcmul($entry[2], '-1'), 2); // spent is coming in negative, must be positive
-            $overspent[]      = round(bcmul($entry[3], '-1'), 2); // same
-        }
-
-        $data['datasets'][] = [
-            'label' => trans('firefly.overspent'),
-            'data'  => $overspent,
-        ];
-        $data['datasets'][] = [
-            'label' => trans('firefly.left'),
-            'data'  => $left,
-        ];
-        $data['datasets'][] = [
-            'label' => trans('firefly.spent'),
-            'data'  => $spent,
-        ];
-
-        $data['count'] = 3;
-
-        return $data;
-    }
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function period(array $entries): array
-    {
-
-        $data = [
-            'labels'   => array_keys($entries),
-            'datasets' => [
-                0 => [
-                    'label' => trans('firefly.budgeted'),
-                    'data'  => [],
-                ],
-                1 => [
-                    'label' => trans('firefly.spent'),
-                    'data'  => [],
-                ],
-            ],
-            'count'    => 2,
-        ];
-
-        foreach ($entries as $label => $entry) {
-            // data set 0 is budgeted
-            // data set 1 is spent:
-            $data['datasets'][0]['data'][] = $entry['budgeted'];
-            $data['datasets'][1]['data'][] = round(($entry['spent'] * -1), 2);
-
-        }
-
-        return $data;
-
-    }
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function periodNoBudget(array $entries): array
-    {
-        $data = [
-            'labels'   => array_keys($entries),
-            'datasets' => [
-                0 => [
-                    'label' => trans('firefly.spent'),
-                    'data'  => [],
-                ],
-            ],
-            'count'    => 1,
-        ];
-
-        foreach ($entries as $label => $entry) {
-            // data set 0 is budgeted
-            // data set 1 is spent:
-            $data['datasets'][0]['data'][] = round(($entry['spent'] * -1), 2);
-
-        }
-
-        return $data;
-    }
-}
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index 3dc6b43620..b17bac12fe 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -15,7 +15,6 @@ namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
-use FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface;
 use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
@@ -37,7 +36,7 @@ use Response;
 class BudgetController extends Controller
 {
 
-    /** @var BudgetChartGeneratorInterface */
+    /** @var GeneratorInterface */
     protected $generator;
 
     /**
@@ -46,8 +45,7 @@ class BudgetController extends Controller
     public function __construct()
     {
         parent::__construct();
-        // create chart generator:
-        $this->generator = app(BudgetChartGeneratorInterface::class);
+        $this->generator = app(GeneratorInterface::class);
     }
 
     /**
@@ -92,9 +90,7 @@ class BudgetController extends Controller
             $first            = Navigation::addPeriod($first, $range, 0);
         }
 
-        /** @var GeneratorInterface $generator */
-        $generator = app(GeneratorInterface::class);
-        $data      = $generator->singleSet(strval(trans('firefly.spent')), $entries);
+        $data = $this->generator->singleSet(strval(trans('firefly.spent')), $entries);
 
         $cache->store($data);
 
@@ -135,9 +131,7 @@ class BudgetController extends Controller
 
             $start->addDay();
         }
-        /** @var GeneratorInterface $generator */
-        $generator = app(GeneratorInterface::class);
-        $data      = $generator->singleSet(strval(trans('firefly.left')), $entries);
+        $data = $this->generator->singleSet(strval(trans('firefly.left')), $entries);
         $cache->store($data);
 
         return Response::json($data);
@@ -216,9 +210,7 @@ class BudgetController extends Controller
             $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1');
         }
 
-        /** @var GeneratorInterface $generator */
-        $generator = app(GeneratorInterface::class);
-        $data      = $generator->multiSet($chartData);
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -244,7 +236,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());
         }
 
         // get the expenses
@@ -297,9 +289,7 @@ class BudgetController extends Controller
             $chartData[1]['entries'][$label] = $limit;
 
         }
-        /** @var GeneratorInterface $generator */
-        $generator = app(GeneratorInterface::class);
-        $data      = $generator->multiSet($chartData);
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -322,7 +312,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());
         }
 
         // the expenses:
@@ -336,9 +326,7 @@ class BudgetController extends Controller
             $spent             = isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0';
             $chartData[$label] = bcmul($spent, '-1');
         }
-        /** @var GeneratorInterface $generator */
-        $generator = app(GeneratorInterface::class);
-        $data      = $generator->singleSet(strval(trans('firefly.spent')), $chartData);
+        $data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
         $cache->store($data);
 
         return Response::json($data);

From b58bc9742275f2c7c6badc95eb022354b0d08193 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 13:47:28 +0100
Subject: [PATCH 165/223] Code for #452

---
 .../Chart/Basic/ChartJsGenerator.php          |   7 +-
 .../CategoryChartGeneratorInterface.php       |  67 -----
 .../ChartJsCategoryChartGenerator.php         | 209 ----------------
 .../Controllers/Chart/CategoryController.php  | 198 ++++++++-------
 .../Chart/CategoryReportController.php        | 231 ++++++++++--------
 app/Support/CacheProperties.php               |   7 +
 app/Support/Navigation.php                    |  44 ++++
 7 files changed, 305 insertions(+), 458 deletions(-)
 delete mode 100644 app/Generator/Chart/Category/CategoryChartGeneratorInterface.php
 delete mode 100644 app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

diff --git a/app/Generator/Chart/Basic/ChartJsGenerator.php b/app/Generator/Chart/Basic/ChartJsGenerator.php
index ffc2b14f38..a4a4caa8c1 100644
--- a/app/Generator/Chart/Basic/ChartJsGenerator.php
+++ b/app/Generator/Chart/Basic/ChartJsGenerator.php
@@ -52,11 +52,16 @@ class ChartJsGenerator implements GeneratorInterface
      */
     public function multiSet(array $data): array
     {
+        reset($data);
+        $first  = current($data);
+        $labels = array_keys($first['entries']);
+
         $chartData = [
             'count'    => count($data),
-            'labels'   => array_keys($data[0]['entries']), // take ALL labels from the first set.
+            'labels'   => $labels, // take ALL labels from the first set.
             'datasets' => [],
         ];
+        unset($first, $labels);
 
         foreach ($data as $set) {
             $chartData['datasets'][] = [
diff --git a/app/Generator/Chart/Category/CategoryChartGeneratorInterface.php b/app/Generator/Chart/Category/CategoryChartGeneratorInterface.php
deleted file mode 100644
index c311d70298..0000000000
--- a/app/Generator/Chart/Category/CategoryChartGeneratorInterface.php
+++ /dev/null
@@ -1,67 +0,0 @@
- 2,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.spent'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.earned'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-
-        foreach ($entries as $entry) {
-            $data['labels'][] = $entry[1];
-            $spent            = $entry[2];
-            $earned           = $entry[3];
-
-            $data['datasets'][0]['data'][] = bccomp($spent, '0') === 0 ? null : round(bcmul($spent, '-1'), 4);
-            $data['datasets'][1]['data'][] = bccomp($earned, '0') === 0 ? null : round($earned, 4);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries): array
-    {
-        $data = [
-            'count'    => 1,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.spent'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-        foreach ($entries as $entry) {
-            if ($entry->spent != 0) {
-                $data['labels'][]              = $entry->name;
-                $data['datasets'][0]['data'][] = round(bcmul($entry->spent, '-1'), 2);
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function mainReportChart(array $entries): array
-    {
-
-        $data = [
-            'count'    => 0,
-            'labels'   => array_keys($entries),
-            'datasets' => [],
-        ];
-
-
-        foreach ($entries as $row) {
-            foreach ($row['in'] as $categoryId => $amount) {
-                // get in:
-                $data['datasets'][$categoryId . 'in']['data'][] = round($amount, 2);
-
-                // get out:
-                $opposite                                        = $row['out'][$categoryId];
-                $data['datasets'][$categoryId . 'out']['data'][] = round($opposite, 2);
-
-                // set name:
-                $data['datasets'][$categoryId . 'out']['label'] = $row['name'][$categoryId] . ' (' . strtolower(strval(trans('firefly.expenses'))) . ')';
-                $data['datasets'][$categoryId . 'in']['label']  = $row['name'][$categoryId] . ' (' . strtolower(strval(trans('firefly.income'))) . ')';
-
-            }
-        }
-
-        // remove empty rows:
-        foreach ($data['datasets'] as $key => $content) {
-            if (array_sum($content['data']) === 0.0) {
-                unset($data['datasets'][$key]);
-            }
-        }
-
-        // re-key the datasets array:
-        $data['datasets'] = array_values($data['datasets']);
-        $data['count']    = count($data['datasets']);
-
-        return $data;
-    }
-
-    /**
-     *
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function period(Collection $entries): array
-    {
-        return $this->all($entries);
-
-    }
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function pieChart(array $entries): array
-    {
-        $data  = [
-            'datasets' => [
-                0 => [],
-            ],
-            'labels'   => [],
-        ];
-        $index = 0;
-        foreach ($entries as $entry) {
-
-            if (bccomp($entry['amount'], '0') === -1) {
-                $entry['amount'] = bcmul($entry['amount'], '-1');
-            }
-
-            $data['datasets'][0]['data'][]            = round($entry['amount'], 2);
-            $data['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
-            $data['labels'][]                         = $entry['name'];
-            $index++;
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function reportPeriod(array $entries): array
-    {
-
-        $data = [
-            'labels'   => array_keys($entries),
-            'datasets' => [
-                0 => [
-                    'label' => trans('firefly.earned'),
-                    'data'  => [],
-                ],
-                1 => [
-                    'label' => trans('firefly.spent'),
-                    'data'  => [],
-                ],
-            ],
-            'count'    => 2,
-        ];
-
-        foreach ($entries as $label => $entry) {
-            // data set 0 is budgeted
-            // data set 1 is spent:
-            $data['datasets'][0]['data'][] = round($entry['earned'], 2);
-            $data['datasets'][1]['data'][] = round(bcmul($entry['spent'], '-1'), 2);
-
-        }
-
-        return $data;
-
-    }
-
-}
diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php
index a2ff4338c7..c0ff85e2e3 100644
--- a/app/Http/Controllers/Chart/CategoryController.php
+++ b/app/Http/Controllers/Chart/CategoryController.php
@@ -15,7 +15,7 @@ namespace FireflyIII\Http\Controllers\Chart;
 
 
 use Carbon\Carbon;
-use FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Category;
@@ -26,7 +26,6 @@ use Illuminate\Support\Collection;
 use Navigation;
 use Preferences;
 use Response;
-use stdClass;
 
 /**
  * Class CategoryController
@@ -35,7 +34,7 @@ use stdClass;
  */
 class CategoryController extends Controller
 {
-    /** @var  CategoryChartGeneratorInterface */
+    /** @var  GeneratorInterface */
     protected $generator;
 
     /**
@@ -45,7 +44,7 @@ class CategoryController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = app(CategoryChartGeneratorInterface::class);
+        $this->generator = app(GeneratorInterface::class);
     }
 
     /**
@@ -59,34 +58,42 @@ class CategoryController extends Controller
      */
     public function all(CRI $repository, AccountRepositoryInterface $accountRepository, Category $category)
     {
-        $start              = $repository->firstUseDate($category);
-        $range              = Preferences::get('viewRange', '1M')->data;
-        $start              = Navigation::startOfPeriod($start, $range);
-        $categoryCollection = new Collection([$category]);
-        $end                = new Carbon;
-        $entries            = new Collection;
-        $cache              = new CacheProperties;
-        $accounts           = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty('all');
-        $cache->addProperty('categories');
+        $cache = new CacheProperties;
+        $cache->addProperty('chart.category.all');
+        $cache->addProperty($category->id);
         if ($cache->has()) {
             return Response::json($cache->get());
         }
 
+        $start     = $repository->firstUseDate($category);
+        $range     = Preferences::get('viewRange', '1M')->data;
+        $start     = Navigation::startOfPeriod($start, $range);
+        $end       = new Carbon;
+        $accounts  = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $chartData = [
+            [
+                'label'   => strval(trans('firefly.spent')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+            [
+                'label'   => strval(trans('firefly.earned')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+        ];
+
         while ($start <= $end) {
-            $currentEnd = Navigation::endOfPeriod($start, $range);
-            $spent      = $repository->spentInPeriod($categoryCollection, $accounts, $start, $currentEnd);
-            $earned     = $repository->earnedInPeriod($categoryCollection, $accounts, $start, $currentEnd);
-            $date       = Navigation::periodShow($start, $range);
-            $entries->push([clone $start, $date, $spent, $earned]);
-            $start = Navigation::addPeriod($start, $range, 0);
+            $currentEnd                      = Navigation::endOfPeriod($start, $range);
+            $spent                           = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $currentEnd);
+            $earned                          = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $currentEnd);
+            $label                           = Navigation::periodShow($start, $range);
+            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
+            $chartData[1]['entries'][$label] = $earned;
+            $start                           = Navigation::addPeriod($start, $range, 0);
         }
-        $entries = $entries->reverse();
-        $entries = $entries->slice(0, 48);
-        $entries = $entries->reverse();
-        $data    = $this->generator->all($entries);
+
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -122,34 +129,29 @@ class CategoryController extends Controller
         $cache = new CacheProperties;
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('category');
-        $cache->addProperty('frontpage');
+        $cache->addProperty('chart.category.frontpage');
         if ($cache->has()) {
             return Response::json($cache->get());
         }
+        $chartData  = [];
         $categories = $repository->getCategories();
         $accounts   = $accountRepository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]);
-        $set        = new Collection;
         /** @var Category $category */
         foreach ($categories as $category) {
             $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $end);
             if (bccomp($spent, '0') === -1) {
-                $category->spent = $spent;
-                $set->push($category);
+                $chartData[$category->name] = bcmul($spent, '-1');
             }
         }
-        // this is a "fake" entry for the "no category" entry.
-        $entry        = new stdClass;
-        $entry->name  = trans('firefly.no_category');
-        $entry->spent = $repository->spentInPeriodWithoutCategory(new Collection, $start, $end);
-        $set->push($entry);
+        $chartData[strval(trans('firefly.no_category'))] = bcmul($repository->spentInPeriodWithoutCategory(new Collection, $start, $end), '-1');
 
-        $set  = $set->sortBy('spent');
-        $data = $this->generator->frontpage($set);
+        // sort
+        arsort($chartData);
+
+        $data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
         $cache->store($data);
 
         return Response::json($data);
-
     }
 
     /**
@@ -166,35 +168,43 @@ class CategoryController extends Controller
         $cache = new CacheProperties;
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('category-period-chart');
+        $cache->addProperty('chart.category.period');
         $cache->addProperty($accounts->pluck('id')->toArray());
         $cache->addProperty($category);
         if ($cache->has()) {
-
             return $cache->get();
         }
-        $expenses = $repository->periodExpenses(new Collection([$category]), $accounts, $start, $end);
-        $income   = $repository->periodIncome(new Collection([$category]), $accounts, $start, $end);
-        $periods  = Navigation::listOfPeriods($start, $end);
+        $expenses  = $repository->periodExpenses(new Collection([$category]), $accounts, $start, $end);
+        $income    = $repository->periodIncome(new Collection([$category]), $accounts, $start, $end);
+        $periods   = Navigation::listOfPeriods($start, $end);
+        $chartData = [
+            [
+                'label'   => strval(trans('firefly.spent')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+            [
+                'label'   => strval(trans('firefly.earned')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+        ];
 
-
-        // join them:
-        $result = [];
         foreach (array_keys($periods) as $period) {
-            $nice          = $periods[$period];
-            $result[$nice] = [
-                'earned' => $income[$category->id]['entries'][$period] ?? '0',
-                'spent'  => $expenses[$category->id]['entries'][$period] ?? '0',
-            ];
+            $label                           = $periods[$period];
+            $spent                           = $expenses[$category->id]['entries'][$period] ?? '0';
+            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
+            $chartData[1]['entries'][$label] = $income[$category->id]['entries'][$period] ?? '0';
         }
-        $data = $this->generator->reportPeriod($result);
+
+        $data = $this->generator->multiSet($chartData);
+        $cache->store($data);
 
         return Response::json($data);
     }
 
     /**
      * @param CRI        $repository
-     * @param Category   $category
      * @param Collection $accounts
      * @param Carbon     $start
      * @param Carbon     $end
@@ -206,26 +216,36 @@ class CategoryController extends Controller
         $cache = new CacheProperties;
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('no-category-period-chart');
+        $cache->addProperty('chart.category.period.no-cat');
         $cache->addProperty($accounts->pluck('id')->toArray());
         if ($cache->has()) {
-
             return $cache->get();
         }
-        $expenses = $repository->periodExpensesNoCategory($accounts, $start, $end);
-        $income   = $repository->periodIncomeNoCategory($accounts, $start, $end);
-        $periods  = Navigation::listOfPeriods($start, $end);
+        $expenses  = $repository->periodExpensesNoCategory($accounts, $start, $end);
+        $income    = $repository->periodIncomeNoCategory($accounts, $start, $end);
+        $periods   = Navigation::listOfPeriods($start, $end);
+        $chartData = [
+            [
+                'label'   => strval(trans('firefly.spent')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+            [
+                'label'   => strval(trans('firefly.earned')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+        ];
 
-        // join them:
-        $result = [];
         foreach (array_keys($periods) as $period) {
-            $nice          = $periods[$period];
-            $result[$nice] = [
-                'earned' => $income['entries'][$period] ?? '0',
-                'spent'  => $expenses['entries'][$period] ?? '0',
-            ];
+            $label                           = $periods[$period];
+            $spent                           = $expenses['entries'][$period] ?? '0';
+            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
+            $chartData[1]['entries'][$label] = $income['entries'][$period] ?? '0';
+
         }
-        $data = $this->generator->reportPeriod($result);
+        $data = $this->generator->multiSet($chartData);
+        $cache->store($data);
 
         return Response::json($data);
     }
@@ -260,33 +280,47 @@ class CategoryController extends Controller
      */
     private function makePeriodChart(CRI $repository, Category $category, Carbon $start, Carbon $end)
     {
-        $categoryCollection = new Collection([$category]);
-        $cache              = new CacheProperties;
+        $cache = new CacheProperties;
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty($category->id);
+        $cache->addProperty('chart.category.period-chart');
 
         /** @var AccountRepositoryInterface $accountRepository */
         $accountRepository = app(AccountRepositoryInterface::class);
         $accounts          = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
 
-        $cache->addProperty($start);
-        $cache->addProperty($end);
-        $cache->addProperty($accounts);
-        $cache->addProperty($category->id);
-        $cache->addProperty('specific-period');
-
-
         if ($cache->has()) {
             return $cache->get();
         }
-        $entries = new Collection;
+
+        // chart data
+        $chartData = [
+            [
+                'label'   => strval(trans('firefly.spent')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+            [
+                'label'   => strval(trans('firefly.earned')),
+                'entries' => [],
+                'type'    => 'bar',
+            ],
+        ];
+
         while ($start <= $end) {
-            $spent  = $repository->spentInPeriod($categoryCollection, $accounts, $start, $start);
-            $earned = $repository->earnedInPeriod($categoryCollection, $accounts, $start, $start);
-            $date   = Navigation::periodShow($start, '1D');
-            $entries->push([clone $start, $date, $spent, $earned]);
+            $spent  = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $start);
+            $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $start);
+            $label  = Navigation::periodShow($start, '1D');
+
+            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
+            $chartData[1]['entries'][$label] = $earned;
+
+
             $start->addDay();
         }
 
-        $data = $this->generator->period($entries);
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return $data;
diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php
index 0cabf7ad52..003648218c 100644
--- a/app/Http/Controllers/Chart/CategoryReportController.php
+++ b/app/Http/Controllers/Chart/CategoryReportController.php
@@ -15,7 +15,7 @@ namespace FireflyIII\Http\Controllers\Chart;
 
 
 use Carbon\Carbon;
-use FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Generator\Report\Category\MonthReportGenerator;
 use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Http\Controllers\Controller;
@@ -24,8 +24,9 @@ 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 Log;
+use Navigation;
 use Response;
 
 
@@ -43,7 +44,7 @@ class CategoryReportController extends Controller
     private $accountRepository;
     /** @var CategoryRepositoryInterface */
     private $categoryRepository;
-    /** @var  CategoryChartGeneratorInterface */
+    /** @var  GeneratorInterface */
     private $generator;
 
     /**
@@ -54,7 +55,7 @@ class CategoryReportController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                $this->generator          = app(CategoryChartGeneratorInterface::class);
+                $this->generator          = app(GeneratorInterface::class);
                 $this->categoryRepository = app(CategoryRepositoryInterface::class);
                 $this->accountRepository  = app(AccountRepositoryInterface::class);
 
@@ -76,38 +77,45 @@ class CategoryReportController extends Controller
     {
         /** @var bool $others */
         $others = intval($others) === 1;
-        $names  = [];
+        $cache  = new CacheProperties;
+        $cache->addProperty('chart.category.report.account-expense');
+        $cache->addProperty($accounts);
+        $cache->addProperty($categories);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
 
-        // collect journals (just like the category report does):
-        $set     = $this->getExpenses($accounts, $categories, $start, $end);
-        $grouped = $this->groupByOpposingAccount($set);
+        $names     = [];
+        $set       = $this->getExpenses($accounts, $categories, $start, $end);
+        $grouped   = $this->groupByOpposingAccount($set);
+        $chartData = [];
+        $total     = '0';
 
-        // show the grouped results:
-        $result = [];
-        $total  = '0';
         foreach ($grouped as $accountId => $amount) {
             if (!isset($names[$accountId])) {
                 $account           = $this->accountRepository->find(intval($accountId));
                 $names[$accountId] = $account->name;
             }
-            $amount   = bcmul($amount, '-1');
-            $total    = bcadd($total, $amount);
-            $result[] = ['name' => $names[$accountId], 'id' => $accountId, 'amount' => $amount];
+            $amount                        = bcmul($amount, '-1');
+            $total                         = bcadd($total, $amount);
+            $chartData[$names[$accountId]] = $amount;
         }
 
         // also collect all transactions NOT in these categories.
         if ($others) {
             $collector = new JournalCollector(auth()->user());
             $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
-            $journals = $collector->getJournals();
-            $sum      = strval($journals->sum('transaction_amount'));
-            $sum      = bcmul($sum, '-1');
-            Log::debug(sprintf('Sum of others in accountExpense is %f', $sum));
-            $sum      = bcsub($sum, $total);
-            $result[] = ['name' => trans('firefly.everything_else'), 'id' => 0, 'amount' => $sum];
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcmul($sum, '-1');
+            $sum                                                 = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
         }
 
-        $data = $this->generator->pieChart($result);
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
 
         return Response::json($data);
     }
@@ -125,36 +133,44 @@ class CategoryReportController extends Controller
     {
         /** @var bool $others */
         $others = intval($others) === 1;
-        $names  = [];
+        $cache  = new CacheProperties;
+        $cache->addProperty('chart.category.report.account-income');
+        $cache->addProperty($accounts);
+        $cache->addProperty($categories);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
 
-        // collect journals (just like the category report does):
-        $set     = $this->getIncome($accounts, $categories, $start, $end);
-        $grouped = $this->groupByOpposingAccount($set);
 
-        // loop and show the grouped results:
-        $result = [];
-        $total  = '0';
+        $names     = [];
+        $set       = $this->getIncome($accounts, $categories, $start, $end);
+        $grouped   = $this->groupByOpposingAccount($set);
+        $chartData = [];
+        $total     = '0';
+
         foreach ($grouped as $accountId => $amount) {
             if (!isset($names[$accountId])) {
                 $account           = $this->accountRepository->find(intval($accountId));
                 $names[$accountId] = $account->name;
             }
-            $total    = bcadd($total, $amount);
-            $result[] = ['name' => $names[$accountId], 'id' => $accountId, 'amount' => $amount];
+            $total                         = bcadd($total, $amount);
+            $chartData[$names[$accountId]] = $amount;
         }
 
         // also collect others?
         if ($others) {
             $collector = new JournalCollector(auth()->user());
             $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT]);
-            $journals = $collector->getJournals();
-            $sum      = strval($journals->sum('transaction_amount'));
-            Log::debug(sprintf('Sum of others in accountIncome is %f', $sum));
-            $sum      = bcsub($sum, $total);
-            $result[] = ['name' => trans('firefly.everything_else'), 'id' => 0, 'amount' => $sum];
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
         }
 
-        $data = $this->generator->pieChart($result);
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
 
         return Response::json($data);
     }
@@ -172,38 +188,45 @@ class CategoryReportController extends Controller
     {
         /** @var bool $others */
         $others = intval($others) === 1;
-        $names  = [];
+        $cache  = new CacheProperties;
+        $cache->addProperty('chart.category.report.category-expense');
+        $cache->addProperty($accounts);
+        $cache->addProperty($categories);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
 
-        // collect journals (just like the category report does):
-        $set     = $this->getExpenses($accounts, $categories, $start, $end);
-        $grouped = $this->groupByCategory($set);
+        $names     = [];
+        $set       = $this->getExpenses($accounts, $categories, $start, $end);
+        $grouped   = $this->groupByCategory($set);
+        $total     = '0';
+        $chartData = [];
 
-        // show the grouped results:
-        $result = [];
-        $total  = '0';
         foreach ($grouped as $categoryId => $amount) {
             if (!isset($names[$categoryId])) {
                 $category           = $this->categoryRepository->find(intval($categoryId));
                 $names[$categoryId] = $category->name;
             }
-            $amount   = bcmul($amount, '-1');
-            $total    = bcadd($total, $amount);
-            $result[] = ['name' => $names[$categoryId], 'id' => $categoryId, 'amount' => $amount];
+            $amount                         = bcmul($amount, '-1');
+            $total                          = bcadd($total, $amount);
+            $chartData[$names[$categoryId]] = $amount;
         }
 
         // also collect all transactions NOT in these categories.
         if ($others) {
             $collector = new JournalCollector(auth()->user());
             $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
-            $journals = $collector->getJournals();
-            $sum      = strval($journals->sum('transaction_amount'));
-            $sum      = bcmul($sum, '-1');
-            Log::debug(sprintf('Sum of others in categoryExpense is %f', $sum));
-            $sum      = bcsub($sum, $total);
-            $result[] = ['name' => trans('firefly.everything_else'), 'id' => 0, 'amount' => $sum];
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcmul($sum, '-1');
+            $sum                                                 = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
         }
 
-        $data = $this->generator->pieChart($result);
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
 
         return Response::json($data);
     }
@@ -221,36 +244,42 @@ class CategoryReportController extends Controller
     {
         /** @var bool $others */
         $others = intval($others) === 1;
-        $names  = [];
+        $cache  = new CacheProperties;
+        $cache->addProperty('chart.category.report.category-income');
+        $cache->addProperty($accounts);
+        $cache->addProperty($categories);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
 
-        // collect journals (just like the category report does):
-        $set     = $this->getIncome($accounts, $categories, $start, $end);
-        $grouped = $this->groupByCategory($set);
+        $names     = [];
+        $set       = $this->getIncome($accounts, $categories, $start, $end);
+        $grouped   = $this->groupByCategory($set);
+        $total     = '0';
+        $chartData = [];
 
-        // loop and show the grouped results:
-        $result = [];
-        $total  = '0';
         foreach ($grouped as $categoryId => $amount) {
             if (!isset($names[$categoryId])) {
                 $category           = $this->categoryRepository->find(intval($categoryId));
                 $names[$categoryId] = $category->name;
             }
-            $total    = bcadd($total, $amount);
-            $result[] = ['name' => $names[$categoryId], 'id' => $categoryId, 'amount' => $amount];
+            $total                          = bcadd($total, $amount);
+            $chartData[$names[$categoryId]] = $amount;
         }
 
-        // also collect others?
         if ($others) {
             $collector = new JournalCollector(auth()->user());
             $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT]);
-            $journals = $collector->getJournals();
-            $sum      = strval($journals->sum('transaction_amount'));
-            Log::debug(sprintf('Sum of others in categoryIncome is %f', $sum));
-            $sum      = bcsub($sum, $total);
-            $result[] = ['name' => trans('firefly.everything_else'), 'id' => 0, 'amount' => $sum];
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
         }
 
-        $data = $this->generator->pieChart($result);
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
 
         return Response::json($data);
     }
@@ -265,52 +294,56 @@ class CategoryReportController extends Controller
      */
     public function mainChart(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
     {
-        // determin optimal period:
-        $period   = '1D';
-        $format   = 'month_and_day';
-        $function = 'endOfDay';
-        if ($start->diffInMonths($end) > 1) {
-            $period   = '1M';
-            $format   = 'month';
-            $function = 'endOfMonth';
+        $cache = new CacheProperties;
+        $cache->addProperty('chart.category.report.main');
+        $cache->addProperty($accounts);
+        $cache->addProperty($categories);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get());
         }
-        if ($start->diffInMonths($end) > 13) {
-            $period   = '1Y';
-            $format   = 'year';
-            $function = 'endOfYear';
-        }
-        Log::debug(sprintf('Period is %s', $period));
-        $data         = [];
+
+        $format       = Navigation::preferredCarbonLocalizedFormat($start, $end);
+        $function     = Navigation::preferredEndOfPeriod($start, $end);
+        $chartData    = [];
         $currentStart = clone $start;
+
+        // prep chart data:
+        foreach ($categories as $category) {
+            $chartData[$category->id . '-in']  = [
+                'label'   => $category->name . ' (' . strtolower(strval(trans('firefly.income'))) . ')',
+                'type'    => 'bar',
+                'entries' => [],
+            ];
+            $chartData[$category->id . '-out'] = [
+                'label'   => $category->name . ' (' . strtolower(strval(trans('firefly.expenses'))) . ')',
+                'type'    => 'bar',
+                'entries' => [],
+            ];
+        }
+
         while ($currentStart < $end) {
             $currentEnd = clone $currentStart;
-            Log::debug(sprintf('Function is %s', $function));
             $currentEnd = $currentEnd->$function();
             $expenses   = $this->groupByCategory($this->getExpenses($accounts, $categories, $currentStart, $currentEnd));
             $income     = $this->groupByCategory($this->getIncome($accounts, $categories, $currentStart, $currentEnd));
-            $label      = $currentStart->formatLocalized(strval(trans('config.' . $format)));
-
-            Log::debug(sprintf('Now grabbing CMC expenses between %s and %s', $currentStart->format('Y-m-d'), $currentEnd->format('Y-m-d')));
-
-            $data[$label] = [
-                'in'  => [],
-                'out' => [],
-            ];
+            $label      = $currentStart->formatLocalized($format);
 
             /** @var Category $category */
             foreach ($categories as $category) {
+                $labelIn  = $category->id . '-in';
+                $labelOut = $category->id . '-out';
                 // get sum, and get label:
-                $categoryId                        = $category->id;
-                $data[$label]['name'][$categoryId] = $category->name;
-                $data[$label]['in'][$categoryId]   = $income[$categoryId] ?? '0';
-                $data[$label]['out'][$categoryId]  = $expenses[$categoryId] ?? '0';
+                $chartData[$labelIn]['entries'][$label]  = $income[$category->id] ?? '0';
+                $chartData[$labelOut]['entries'][$label] = $expenses[$category->id] ?? '0';
             }
-
             $currentStart = clone $currentEnd;
             $currentStart->addDay();
         }
 
-        $data = $this->generator->mainReportChart($data);
+        $data = $this->generator->multiSet($chartData);
+        $cache->store($data);
 
         return Response::json($data);
     }
diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php
index 7ed1c1fdfb..bfe3b857d0 100644
--- a/app/Support/CacheProperties.php
+++ b/app/Support/CacheProperties.php
@@ -95,6 +95,7 @@ class CacheProperties
      */
     private function md5()
     {
+        $this->md5 = '';
         foreach ($this->properties as $property) {
 
             if ($property instanceof Collection || $property instanceof EloquentCollection) {
@@ -108,6 +109,12 @@ class CacheProperties
             if (is_object($property)) {
                 $this->md5 .= $property->__toString();
             }
+            if (is_bool($property) && $property === false) {
+                $this->md5 .= 'false';
+            }
+            if (is_bool($property) && $property === true) {
+                $this->md5 .= 'true';
+            }
 
             $this->md5 .= json_encode($property);
         }
diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index f36d54e054..6a6e360e78 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -243,6 +243,28 @@ class Navigation
         throw new FireflyException(sprintf('No date formats for frequency "%s"!', $repeatFrequency));
     }
 
+    /**
+     * If the date difference between start and end is less than a month, method returns "endOfDay". If the difference is less than a year,
+     * method returns "endOfMonth". If the date difference is larger, method returns "endOfYear".
+     *
+     * @param \Carbon\Carbon $start
+     * @param \Carbon\Carbon $end
+     *
+     * @return string
+     */
+    public function preferredEndOfPeriod(Carbon $start, Carbon $end): string
+    {
+        $format = 'endOfDay';
+        if ($start->diffInMonths($end) > 1) {
+            $format = 'endOfMonth';
+        }
+
+        if ($start->diffInMonths($end) > 12) {
+            $format = 'endOfYear';
+        }
+        return $format;
+    }
+
     /**
      * If the date difference between start and end is less than a month, method returns "Y-m-d". If the difference is less than a year,
      * method returns "Y-m". If the date difference is larger, method returns "Y".
@@ -262,6 +284,28 @@ class Navigation
         if ($start->diffInMonths($end) > 12) {
             $format = 'Y';
         }
+        return $format;
+    }
+
+    /**
+     * If the date difference between start and end is less than a month, method returns trans(config.month_and_day). If the difference is less than a year,
+     * method returns "config.month". If the date difference is larger, method returns "config.year".
+     *
+     * @param \Carbon\Carbon $start
+     * @param \Carbon\Carbon $end
+     *
+     * @return string
+     */
+    public function preferredCarbonLocalizedFormat(Carbon $start, Carbon $end): string
+    {
+        $format = strval(trans('config.month_and_day'));
+        if ($start->diffInMonths($end) > 1) {
+            $format = strval(trans('config.month'));
+        }
+
+        if ($start->diffInMonths($end) > 12) {
+            $format = strval(trans('config.year'));
+        }
 
         return $format;
 

From cdd988b4de66856769778c335700bdd1efa1a495 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 14:05:50 +0100
Subject: [PATCH 166/223] Piggy banks and #452

---
 .../ChartJsPiggyBankChartGenerator.php        | 58 -------------------
 .../PiggyBankChartGeneratorInterface.php      | 31 ----------
 .../Controllers/Chart/PiggyBankController.php | 27 ++++-----
 3 files changed, 12 insertions(+), 104 deletions(-)
 delete mode 100644 app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php
 delete mode 100644 app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php

diff --git a/app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php b/app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php
deleted file mode 100644
index 2908fa0661..0000000000
--- a/app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php
+++ /dev/null
@@ -1,58 +0,0 @@
- 1,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => 'Diff',
-                    'data'  => [],
-                ],
-            ],
-        ];
-        $sum  = '0';
-        foreach ($set as $key => $value) {
-            $date                          = new Carbon($key);
-            $sum                           = bcadd($sum, $value);
-            $data['labels'][]              = $date->formatLocalized($format);
-            $data['datasets'][0]['data'][] = round($sum, 2);
-        }
-
-        return $data;
-    }
-}
diff --git a/app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php b/app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php
deleted file mode 100644
index 2841cd928e..0000000000
--- a/app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-generator = app(PiggyBankChartGeneratorInterface::class);
+        $this->generator = app(GeneratorInterface::class);
     }
 
     /**
@@ -56,26 +55,24 @@ class PiggyBankController extends Controller
     {
         // chart properties for cache:
         $cache = new CacheProperties;
-        $cache->addProperty('piggy-history');
+        $cache->addProperty('chart.piggy-bank.history');
         $cache->addProperty($piggyBank->id);
         if ($cache->has()) {
             return Response::json($cache->get());
         }
 
-        $set        = $repository->getEvents($piggyBank);
-        $set        = $set->reverse();
-        $collection = [];
+        $set       = $repository->getEvents($piggyBank);
+        $set       = $set->reverse();
+        $chartData = [];
+        $sum       = '0';
         /** @var PiggyBankEvent $entry */
         foreach ($set as $entry) {
-            $date   = $entry->date->format('Y-m-d');
-            $amount = $entry->amount;
-            if (isset($collection[$date])) {
-                $amount = bcadd($amount, $collection[$date]);
-            }
-            $collection[$date] = $amount;
+            $label             = $entry->date->formatLocalized(strval(trans('config.month_and_day')));
+            $sum               = bcadd($sum, $entry->amount);
+            $chartData[$label] = $sum;
         }
 
-        $data = $this->generator->history(new Collection($collection));
+        $data = $this->generator->singleSet($piggyBank->name, $chartData);
         $cache->store($data);
 
         return Response::json($data);

From 975a6c34bfe777a007f78221c5baa5967777a237 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 14:38:05 +0100
Subject: [PATCH 167/223] Finished #452

---
 .../Report/ChartJsReportChartGenerator.php    | 180 -----------
 .../Report/ReportChartGeneratorInterface.php  |  65 ----
 .../Controllers/Chart/ReportController.php    | 290 +++++++-----------
 resources/lang/en_US/firefly.php              |   2 +
 4 files changed, 112 insertions(+), 425 deletions(-)
 delete mode 100644 app/Generator/Chart/Report/ChartJsReportChartGenerator.php
 delete mode 100644 app/Generator/Chart/Report/ReportChartGeneratorInterface.php

diff --git a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php b/app/Generator/Chart/Report/ChartJsReportChartGenerator.php
deleted file mode 100644
index d36c68815c..0000000000
--- a/app/Generator/Chart/Report/ChartJsReportChartGenerator.php
+++ /dev/null
@@ -1,180 +0,0 @@
- 2,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-
-        foreach ($entries as $entry) {
-            $data['labels'][]              = $entry[0]->formatLocalized('%Y');
-            $data['datasets'][0]['data'][] = round($entry[1], 2);
-            $data['datasets'][1]['data'][] = round($entry[2], 2);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function multiYearSum(string $income, string $expense, int $count): array
-    {
-        $data                          = [
-            'count'    => 2,
-            'labels'   => [trans('firefly.sum_of_years'), trans('firefly.average_of_years')],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-        $data['datasets'][0]['data'][] = round($income, 2);
-        $data['datasets'][1]['data'][] = round($expense, 2);
-        $data['datasets'][0]['data'][] = round(($income / $count), 2);
-        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function netWorth(Collection $entries): array
-    {
-        $format = (string)trans('config.month_and_day');
-        $data   = [
-            'count'    => 1,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.net_worth'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-        foreach ($entries as $entry) {
-            $data['labels'][]              = trim($entry['date']->formatLocalized($format));
-            $data['datasets'][0]['data'][] = round($entry['net-worth'], 2);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function yearOperations(Collection $entries): array
-    {
-        // language:
-        $format = (string)trans('config.month');
-
-        $data = [
-            'count'    => 2,
-            'labels'   => [],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-
-        foreach ($entries as $entry) {
-            $data['labels'][]              = $entry[0]->formatLocalized($format);
-            $data['datasets'][0]['data'][] = round($entry[1], 2);
-            $data['datasets'][1]['data'][] = round($entry[2], 2);
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function yearSum(string $income, string $expense, int $count): array
-    {
-
-        $data                          = [
-            'count'    => 2,
-            'labels'   => [trans('firefly.sum_of_year'), trans('firefly.average_of_year')],
-            'datasets' => [
-                [
-                    'label' => trans('firefly.income'),
-                    'data'  => [],
-                ],
-                [
-                    'label' => trans('firefly.expenses'),
-                    'data'  => [],
-                ],
-            ],
-        ];
-        $data['datasets'][0]['data'][] = round($income, 2);
-        $data['datasets'][1]['data'][] = round($expense, 2);
-        $data['datasets'][0]['data'][] = round(($income / $count), 2);
-        $data['datasets'][1]['data'][] = round(($expense / $count), 2);
-
-        return $data;
-    }
-}
diff --git a/app/Generator/Chart/Report/ReportChartGeneratorInterface.php b/app/Generator/Chart/Report/ReportChartGeneratorInterface.php
deleted file mode 100644
index 745756c825..0000000000
--- a/app/Generator/Chart/Report/ReportChartGeneratorInterface.php
+++ /dev/null
@@ -1,65 +0,0 @@
-generator = app(ReportChartGeneratorInterface::class);
+        $this->generator = app(GeneratorInterface::class);
     }
 
     /**
@@ -59,30 +59,25 @@ class ReportController extends Controller
     {
         // chart properties for cache:
         $cache = new CacheProperties;
-        $cache->addProperty('netWorth');
+        $cache->addProperty('chart.report.net-worth');
         $cache->addProperty($start);
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
             return Response::json($cache->get());
         }
-        $ids     = $accounts->pluck('id')->toArray();
-        $current = clone $start;
-        $entries = new Collection;
+        $ids       = $accounts->pluck('id')->toArray();
+        $current   = clone $start;
+        $chartData = [];
         while ($current < $end) {
-            $balances = Steam::balancesById($ids, $current);
-            $sum      = $this->arraySum($balances);
-            $entries->push(
-                [
-                    'date'      => clone $current,
-                    'net-worth' => $sum,
-                ]
-            );
-
+            $balances          = Steam::balancesById($ids, $current);
+            $sum               = $this->arraySum($balances);
+            $label             = $current->formatLocalized(strval(trans('config.month_and_day')));
+            $chartData[$label] = $sum;
             $current->addDays(7);
         }
-        $data = $this->generator->netWorth($entries);
 
+        $data = $this->generator->singleSet(strval(trans('firefly.net_worth')), $chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -103,31 +98,47 @@ class ReportController extends Controller
     {
         // chart properties for cache:
         $cache = new CacheProperties;
-        $cache->addProperty('yearInOut');
+        $cache->addProperty('chart.report.operations');
         $cache->addProperty($start);
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
             return Response::json($cache->get());
         }
+        $format    = Navigation::preferredCarbonLocalizedFormat($start, $end);
+        $source    = $this->getChartData($accounts, $start, $end);
+        $chartData = [
+            [
+                'label'   => trans('firefly.income'),
+                'type'    => 'bar',
+                'entries' => [],
+            ],
+            [
+                'label'   => trans('firefly.expenses'),
+                'type'    => 'bar',
+                'entries' => [],
+            ],
+        ];
 
-        $chartSource = $this->getYearData($accounts, $start, $end);
-
-        if ($start->diffInMonths($end) > 12) {
-            // data = method X
-            $data = $this->multiYearOperations($chartSource['earned'], $chartSource['spent'], $start, $end);
-            $cache->store($data);
-
-            return Response::json($data);
+        foreach ($source['earned'] as $date => $amount) {
+            $carbon                          = new Carbon($date);
+            $label                           = $carbon->formatLocalized($format);
+            $earned                          = $chartData[0]['entries'][$label] ?? '0';
+            $chartData[0]['entries'][$label] = bcadd($earned, $amount);
+        }
+        foreach ($source['spent'] as $date => $amount) {
+            $carbon                          = new Carbon($date);
+            $label                           = $carbon->formatLocalized($format);
+            $spent                           = $chartData[1]['entries'][$label] ?? '0';
+            $chartData[1]['entries'][$label] = bcadd($spent, $amount);
         }
 
-        // data = method Y
-        $data = $this->singleYearOperations($chartSource['earned'], $chartSource['spent'], $start, $end);
+
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);
 
-
     }
 
     /**
@@ -142,162 +153,67 @@ class ReportController extends Controller
     public function sum(Collection $accounts, Carbon $start, Carbon $end)
     {
 
+
         // chart properties for cache:
         $cache = new CacheProperties;
-        $cache->addProperty('yearInOutSummarized');
+        $cache->addProperty('chart.report.sum');
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($accounts);
         if ($cache->has()) {
             return Response::json($cache->get());
         }
-        $chartSource = $this->getYearData($accounts, $start, $end);
-
-        if ($start->diffInMonths($end) > 12) {
-            // per year
-            $data = $this->multiYearSum($chartSource['earned'], $chartSource['spent'], $start, $end);
-            $cache->store($data);
-
-            return Response::json($data);
+        $source  = $this->getChartData($accounts, $start, $end);
+        $numbers = [
+            'sum_earned'   => '0',
+            'avg_earned'   => '0',
+            'count_earned' => 0,
+            'sum_spent'    => '0',
+            'avg_spent'    => '0',
+            'count_spent'  => 0,
+        ];
+        foreach ($source['earned'] as $amount) {
+            $numbers['sum_earned'] = bcadd($amount, $numbers['sum_earned']);
+            $numbers['count_earned']++;
         }
-        // per month!
-        $data = $this->singleYearSum($chartSource['earned'], $chartSource['spent'], $start, $end);
+        if ($numbers['count_earned'] > 0) {
+            $numbers['avg_earned'] = $numbers['sum_earned'] / $numbers['count_earned'];
+        }
+        foreach ($source['spent'] as $amount) {
+            $numbers['sum_spent'] = bcadd($amount, $numbers['sum_spent']);
+            $numbers['count_spent']++;
+        }
+        if ($numbers['count_spent'] > 0) {
+            $numbers['avg_spent'] = $numbers['sum_spent'] / $numbers['count_spent'];
+        }
+
+        $chartData = [
+            [
+                'label'   => strval(trans('firefly.income')),
+                'type'    => 'bar',
+                'entries' => [
+                    strval(trans('firefly.sum_of_period'))     => $numbers['sum_earned'],
+                    strval(trans('firefly.average_in_period')) => $numbers['avg_earned'],
+                ],
+            ],
+            [
+                'label'   => trans('firefly.expenses'),
+                'type'    => 'bar',
+                'entries' => [
+                    strval(trans('firefly.sum_of_period'))     => $numbers['sum_spent'],
+                    strval(trans('firefly.average_in_period')) => $numbers['avg_spent'],
+                ],
+            ],
+        ];
+
+
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);
 
     }
 
-    /**
-     * @param array  $earned
-     * @param array  $spent
-     * @param Carbon $start
-     * @param Carbon $end
-     *
-     * @return array
-     */
-    protected function multiYearOperations(array $earned, array $spent, Carbon $start, Carbon $end)
-    {
-        $entries = new Collection;
-        while ($start < $end) {
-
-            $incomeSum  = $this->pluckFromArray($start->year, $earned);
-            $expenseSum = $this->pluckFromArray($start->year, $spent);
-
-            $entries->push([clone $start, $incomeSum, $expenseSum]);
-            $start->addYear();
-        }
-
-        $data = $this->generator->multiYearOperations($entries);
-
-        return $data;
-    }
-
-    /**
-     * @param array  $earned
-     * @param array  $spent
-     * @param Carbon $start
-     * @param Carbon $end
-     *
-     * @return array
-     */
-    protected function multiYearSum(array $earned, array $spent, Carbon $start, Carbon $end)
-    {
-        $income  = '0';
-        $expense = '0';
-        $count   = 0;
-        while ($start < $end) {
-
-            $currentIncome  = $this->pluckFromArray($start->year, $earned);
-            $currentExpense = $this->pluckFromArray($start->year, $spent);
-            $income         = bcadd($income, $currentIncome);
-            $expense        = bcadd($expense, $currentExpense);
-
-            $count++;
-            $start->addYear();
-        }
-
-        $data = $this->generator->multiYearSum($income, $expense, $count);
-
-        return $data;
-    }
-
-    /**
-     * @param int   $year
-     * @param array $set
-     *
-     * @return string
-     */
-    protected function pluckFromArray($year, array $set)
-    {
-        $sum = '0';
-        foreach ($set as $date => $amount) {
-            if (substr($date, 0, 4) == $year) {
-                $sum = bcadd($sum, $amount);
-            }
-        }
-
-        return $sum;
-
-    }
-
-    /**
-     * @param array  $earned
-     * @param array  $spent
-     * @param Carbon $start
-     * @param Carbon $end
-     *
-     * @return array
-     */
-    protected function singleYearOperations(array $earned, array $spent, Carbon $start, Carbon $end)
-    {
-        // per month? simply use each month.
-
-        $entries = new Collection;
-        while ($start < $end) {
-            // total income and total expenses:
-            $date       = $start->format('Y-m');
-            $incomeSum  = isset($earned[$date]) ? $earned[$date] : 0;
-            $expenseSum = isset($spent[$date]) ? $spent[$date] : 0;
-
-            $entries->push([clone $start, $incomeSum, $expenseSum]);
-            $start->addMonth();
-        }
-
-        $data = $this->generator->yearOperations($entries);
-
-        return $data;
-    }
-
-    /**
-     * @param array  $earned
-     * @param array  $spent
-     * @param Carbon $start
-     * @param Carbon $end
-     *
-     * @return array
-     */
-    protected function singleYearSum(array $earned, array $spent, Carbon $start, Carbon $end)
-    {
-        $income  = '0';
-        $expense = '0';
-        $count   = 0;
-        while ($start < $end) {
-            $date           = $start->format('Y-m');
-            $currentIncome  = isset($earned[$date]) ? $earned[$date] : 0;
-            $currentExpense = isset($spent[$date]) ? $spent[$date] : 0;
-            $income         = bcadd($income, $currentIncome);
-            $expense        = bcadd($expense, $currentExpense);
-
-            $count++;
-            $start->addMonth();
-        }
-
-        $data = $this->generator->yearSum($income, $expense, $count);
-
-        return $data;
-    }
-
     /**
      * @param $array
      *
@@ -314,31 +230,45 @@ class ReportController extends Controller
     }
 
     /**
+     * Collects the incomes and expenses for the given periods, grouped per month. Will cache its results
+     *
      * @param Collection $accounts
      * @param Carbon     $start
      * @param Carbon     $end
      *
      * @return array
      */
-    private function getYearData(Collection $accounts, Carbon $start, Carbon $end): array
+    private function getChartData(Collection $accounts, Carbon $start, Carbon $end): array
     {
+        $cache = new CacheProperties;
+        $cache->addProperty('chart.report.get-chart-data');
+        $cache->addProperty($start);
+        $cache->addProperty($accounts);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return $cache->get();
+        }
+
+
         $tasker       = app(AccountTaskerInterface::class);
         $currentStart = clone $start;
         $spentArray   = [];
         $earnedArray  = [];
         while ($currentStart <= $end) {
-            $currentEnd         = Navigation::endOfPeriod($currentStart, '1M');
-            $date               = $currentStart->format('Y-m');
-            $spent              = $tasker->amountOutInPeriod($accounts, $accounts, $currentStart, $currentEnd);
-            $earned             = $tasker->amountInInPeriod($accounts, $accounts, $currentStart, $currentEnd);
-            $spentArray[$date]  = bcmul($spent, '-1');
-            $earnedArray[$date] = $earned;
-            $currentStart       = Navigation::addPeriod($currentStart, '1M', 0);
+            $currentEnd          = Navigation::endOfPeriod($currentStart, '1M');
+            $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);
         }
-
-        return [
+        $result = [
             'spent'  => $spentArray,
             'earned' => $earnedArray,
         ];
+        $cache->store($result);
+
+        return $result;
     }
 }
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 45665c2921..0e698e598e 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -719,6 +719,8 @@ return [
     'average_income_per_account'                 => 'Average income per account',
     'total'                                      => 'Total',
     'description'                                => 'Description',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
 
 
     // charts:

From 915edbecc9b4f0c1c5d858b5d2e773c665dd062b Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 14:42:28 +0100
Subject: [PATCH 168/223] New translations

---
 resources/lang/pt_BR/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 20bd7125bf..86f5868d83 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -719,6 +719,8 @@ return [
     'average_income_per_account'                 => 'Rendimento médio por conta',
     'total'                                      => 'Total',
     'description'                                => 'Descrição',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
 
 
     // charts:

From 8e411a898bdda14e356cade230f3ae003b4a69b9 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 14:42:40 +0100
Subject: [PATCH 169/223] New translations

---
 resources/lang/zh_HK/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index f2c7241cfb..bf4a08a112 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -719,6 +719,8 @@ return [
     'average_income_per_account'                 => 'Average income per account',
     'total'                                      => 'Total',
     'description'                                => 'Description',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
 
 
     // charts:

From f3bc02e11cd2904eb9f14b94d31eaa2952d89057 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 14:42:46 +0100
Subject: [PATCH 170/223] New translations

---
 resources/lang/zh_TW/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 5cd9c71015..f0e2bd7c4b 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -719,6 +719,8 @@ return [
     'average_income_per_account'                 => 'Average income per account',
     'total'                                      => 'Total',
     'description'                                => 'Description',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
 
 
     // charts:

From 4112acfb8da5a090219db6942405a18d22a4cb6a Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 14:42:56 +0100
Subject: [PATCH 171/223] New translations

---
 resources/lang/fr_FR/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 6ac388a78b..2bd9293870 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -719,6 +719,8 @@ return [
     'average_income_per_account'                 => 'Average income per account',
     'total'                                      => 'Total',
     'description'                                => 'Description',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
 
 
     // charts:

From 537748334521901f4b871e7bdfcf65b9d12d3b88 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 14:43:08 +0100
Subject: [PATCH 172/223] New translations

---
 resources/lang/de_DE/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 2443a89599..d74c8c5c3b 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -720,6 +720,8 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'average_income_per_account'                 => 'Durchschnittseinkommen pro Konto',
     'total'                                      => 'Gesamt',
     'description'                                => 'Beschreibung',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
 
 
     // charts:

From e875587260502282bd7915d8fa5ce9eaca28cbdf Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 14:43:18 +0100
Subject: [PATCH 173/223] New translations

---
 resources/lang/hr_HR/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index f2c7241cfb..bf4a08a112 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -719,6 +719,8 @@ return [
     'average_income_per_account'                 => 'Average income per account',
     'total'                                      => 'Total',
     'description'                                => 'Description',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
 
 
     // charts:

From 41553e9b86c7677de4636b087f02ffa2fe21878f Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 14:43:23 +0100
Subject: [PATCH 174/223] New translations

---
 resources/lang/nl_NL/firefly.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 1f0ec2f718..541085a108 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -719,6 +719,8 @@ return [
     'average_income_per_account'                 => 'Gemiddeld verdiend per rekening',
     'total'                                      => 'Totaal',
     'description'                                => 'Omschrijving',
+    'sum_of_period'                              => 'Sum of period',
+    'average_in_period'                          => 'Average in period',
 
 
     // charts:

From e247aace8d43c44683f73528f306ba68999c66fb Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 17:16:46 +0100
Subject: [PATCH 175/223] Various code cleanup.

---
 app/Helpers/Collector/JournalCollector.php    |  2 +-
 app/Http/Controllers/AccountController.php    |  1 +
 .../Controllers/Auth/RegisterController.php   | 29 -------------------
 .../Controllers/Chart/AccountController.php   |  4 +--
 .../Controllers/Chart/BudgetController.php    |  3 +-
 .../Controllers/Report/CategoryController.php |  8 ++---
 .../Report/OperationsController.php           |  2 +-
 .../Budget/BudgetRepositoryInterface.php      |  5 ++--
 .../Auth/TwoFactorControllerTest.php          |  3 --
 .../Controllers/BudgetControllerTest.php      | 10 ++++++-
 .../Controllers/CategoryControllerTest.php    |  6 ++++
 .../Chart/AccountControllerTest.php           | 16 ++++++++++
 .../Controllers/Chart/BillControllerTest.php  |  4 ++-
 .../Chart/BudgetControllerTest.php            | 12 ++++++--
 .../Chart/CategoryControllerTest.php          | 10 ++++++-
 15 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php
index eafacdc363..76f66a0019 100644
--- a/app/Helpers/Collector/JournalCollector.php
+++ b/app/Helpers/Collector/JournalCollector.php
@@ -709,7 +709,7 @@ class JournalCollector implements JournalCollectorInterface
      */
     private function startQuery(): EloquentBuilder
     {
-
+        /** @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')
                             ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id')
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 28c9726917..2372e7e101 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -235,6 +235,7 @@ class AccountController extends Controller
         $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type);
         $subTitle     = $account->name;
         $range        = Preferences::get('viewRange', '1M')->data;
+
         $start        = session('start', Navigation::startOfPeriod(new Carbon, $range));
         $end          = session('end', Navigation::endOfPeriod(new Carbon, $range));
         $page         = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page'));
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 189fc1f174..dd2b9ec905 100755
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -96,7 +96,6 @@ class RegisterController extends Controller
             $validator->getMessageBag()->add('email', (string)trans('validation.invalid_domain'));
 
             event(new BlockedUseOfDomain($data['email'], $request->ip()));
-            // $this->reportBlockedDomainRegistrationAttempt($data['email'], $request->ip());
             $this->throwValidationException($request, $validator);
         }
 
@@ -109,7 +108,6 @@ class RegisterController extends Controller
         if (in_array($hash, $set)) {
             $validator->getMessageBag()->add('email', (string)trans('validation.deleted_user'));
             event(new BlockedUseOfEmail($data['email'], $request->ip()));
-            //$this->reportBlockedDomainRegistrationAttempt($data['email'], $request->ip());
             $this->throwValidationException($request, $validator);
         }
 
@@ -217,31 +215,4 @@ class RegisterController extends Controller
         return false;
     }
 
-    /**
-     * Send a message home about a blocked domain and the address attempted to register.
-     *
-     * @param string $registrationMail
-     * @param string $ipAddress
-     */
-    private function reportBlockedDomainRegistrationAttempt(string $registrationMail, string $ipAddress)
-    {
-        try {
-            $email  = env('SITE_OWNER', false);
-            $parts  = explode('@', $registrationMail);
-            $domain = $parts[1];
-            $fields = [
-                'email_address'  => $registrationMail,
-                'blocked_domain' => $domain,
-                'ip'             => $ipAddress,
-            ];
-
-            Mail::send(
-                ['emails.blocked-registration-html', 'emails.blocked-registration-text'], $fields, function (Message $message) use ($email, $domain) {
-                $message->to($email, $email)->subject('Blocked a registration attempt with domain ' . $domain . '.');
-            }
-            );
-        } catch (Swift_TransportException $e) {
-            Log::error($e->getMessage());
-        }
-    }
 }
diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 3cd14bbfe5..f1e20b369a 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -129,7 +129,7 @@ class AccountController extends Controller
             }
         }
         arsort($chartData);
-        $data = $this->generator->singleSet(trans('firefly.spent'), $chartData);
+        $data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -393,7 +393,7 @@ class AccountController extends Controller
         }
 
         arsort($chartData);
-        $data = $this->generator->singleSet(trans('firefly.spent'), $chartData);
+        $data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
         $cache->store($data);
 
         return Response::json($data);
diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php
index b17bac12fe..4fcb736e0f 100644
--- a/app/Http/Controllers/Chart/BudgetController.php
+++ b/app/Http/Controllers/Chart/BudgetController.php
@@ -154,7 +154,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());
         }
         $budgets     = $repository->getActiveBudgets();
         $repetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
@@ -394,7 +394,6 @@ class BudgetController extends Controller
                 'repetition_overspent' => $overspent,
                 'spent'                => $spent,
             ];
-            //$array     = [$name, $left, $spent, $overspent, $amount, $spent];
         }
 
         return $return;
diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php
index 475e0ce67f..0d5f3e3f07 100644
--- a/app/Http/Controllers/Report/CategoryController.php
+++ b/app/Http/Controllers/Report/CategoryController.php
@@ -99,12 +99,12 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param ReportHelperInterface $helper
-     * @param Collection            $accounts
-     * @param Carbon                $start
-     * @param Carbon                $end
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
      * @return mixed|string
+     * @internal param ReportHelperInterface $helper
      */
     public function operations(Collection $accounts, Carbon $start, Carbon $end)
     {
diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php
index 5241e5f12a..3282e98d80 100644
--- a/app/Http/Controllers/Report/OperationsController.php
+++ b/app/Http/Controllers/Report/OperationsController.php
@@ -72,7 +72,7 @@ class OperationsController extends Controller
         $cache->addProperty('income-report');
         $cache->addProperty($accounts->pluck('id')->toArray());
         if ($cache->has()) {
-            //return $cache->get();
+            return $cache->get();
         }
         $income = $this->getIncomeReport($start, $end, $accounts);
 
diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php
index 6161545760..30633beff9 100644
--- a/app/Repositories/Budget/BudgetRepositoryInterface.php
+++ b/app/Repositories/Budget/BudgetRepositoryInterface.php
@@ -112,8 +112,9 @@ interface BudgetRepositoryInterface
     public function getInactiveBudgets(): Collection;
 
     /**
-     * @param Carbon $start
-     * @param Carbon $end
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
      *
      * @return array
      */
diff --git a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php b/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php
index d23aeb4928..5661e5823c 100644
--- a/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php
+++ b/tests/acceptance/Controllers/Auth/TwoFactorControllerTest.php
@@ -13,7 +13,6 @@ namespace Auth;
 
 use FireflyIII\Models\Preference;
 use FireflyIII\Support\Facades\Preferences;
-use Google2FA;
 use TestCase;
 
 /**
@@ -46,7 +45,6 @@ class TwoFactorControllerTest extends TestCase
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference);
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret', null])->andReturn($secretPreference);
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn($secretPreference);
-        //$has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
         $this->call('get', route('two-factor.index'));
         $this->assertResponseStatus(200);
     }
@@ -65,7 +63,6 @@ class TwoFactorControllerTest extends TestCase
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($truePreference);
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret', null])->andReturn($secretPreference);
         Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn($secretPreference);
-        //$has2faSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
         $this->call('get', route('two-factor.lost'));
         $this->assertResponseStatus(200);
     }
diff --git a/tests/acceptance/Controllers/BudgetControllerTest.php b/tests/acceptance/Controllers/BudgetControllerTest.php
index e79442a55a..06d86c3bd1 100644
--- a/tests/acceptance/Controllers/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/BudgetControllerTest.php
@@ -36,7 +36,7 @@ class BudgetControllerTest extends TestCase
             'amount' => 200,
         ];
         $this->be($this->user());
-        $this->call('post', route('budgets.amount', [1], $data));
+        $this->call('post', route('budgets.amount', [1]), $data);
         $this->assertResponseStatus(200);
     }
 
@@ -94,6 +94,8 @@ class BudgetControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\BudgetController::index
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testIndex(string $range)
     {
@@ -108,6 +110,8 @@ class BudgetControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\BudgetController::noBudget
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testNoBudget(string $range)
     {
@@ -135,6 +139,8 @@ class BudgetControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\BudgetController::show
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testShow(string $range)
     {
@@ -148,6 +154,8 @@ class BudgetControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\BudgetController::showByRepetition
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testShowByRepetition(string $range)
     {
diff --git a/tests/acceptance/Controllers/CategoryControllerTest.php b/tests/acceptance/Controllers/CategoryControllerTest.php
index d715dfc21c..d4cf7bb736 100644
--- a/tests/acceptance/Controllers/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/CategoryControllerTest.php
@@ -93,6 +93,8 @@ class CategoryControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\CategoryController::noCategory
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testNoCategory(string $range)
     {
@@ -107,6 +109,8 @@ class CategoryControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\CategoryController::show
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testShow(string $range)
     {
@@ -120,6 +124,8 @@ class CategoryControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\CategoryController::showByDate
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testShowByDate(string $range)
     {
diff --git a/tests/acceptance/Controllers/Chart/AccountControllerTest.php b/tests/acceptance/Controllers/Chart/AccountControllerTest.php
index 38ff8191bf..ab19fe167b 100644
--- a/tests/acceptance/Controllers/Chart/AccountControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/AccountControllerTest.php
@@ -32,6 +32,8 @@ class AccountControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::expenseAccounts
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testExpenseAccounts(string $range)
     {
@@ -44,6 +46,8 @@ class AccountControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::expenseBudget
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testExpenseBudget(string $range)
     {
@@ -56,6 +60,8 @@ class AccountControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::expenseCategory
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testExpenseCategory(string $range)
     {
@@ -68,6 +74,8 @@ class AccountControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::frontpage
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testFrontpage(string $range)
     {
@@ -80,6 +88,8 @@ class AccountControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::incomeCategory
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testIncomeCategory(string $range)
     {
@@ -92,6 +102,8 @@ class AccountControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::period
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testPeriod(string $range)
     {
@@ -114,6 +126,8 @@ class AccountControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::revenueAccounts
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testRevenueAccounts(string $range)
     {
@@ -126,6 +140,8 @@ class AccountControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\AccountController::single
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testSingle(string $range)
     {
diff --git a/tests/acceptance/Controllers/Chart/BillControllerTest.php b/tests/acceptance/Controllers/Chart/BillControllerTest.php
index 63b4644ee8..657c934f28 100644
--- a/tests/acceptance/Controllers/Chart/BillControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/BillControllerTest.php
@@ -30,8 +30,10 @@ class BillControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\BillController::frontpage
+     * @covers       \FireflyIII\Http\Controllers\Chart\BillController::frontpage
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testFrontpage(string $range)
     {
diff --git a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
index 49e1a45c1e..a42033a4ef 100644
--- a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php
@@ -30,8 +30,10 @@ class BudgetControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::budget
+     * @covers       \FireflyIII\Http\Controllers\Chart\BudgetController::budget
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testBudget(string $range)
     {
@@ -42,8 +44,10 @@ class BudgetControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::budgetLimit
+     * @covers       \FireflyIII\Http\Controllers\Chart\BudgetController::budgetLimit
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testBudgetLimit(string $range)
     {
@@ -54,8 +58,10 @@ class BudgetControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::frontpage
+     * @covers       \FireflyIII\Http\Controllers\Chart\BudgetController::frontpage
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testFrontpage(string $range)
     {
diff --git a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
index 74b258349a..13d91768ad 100644
--- a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php
@@ -32,6 +32,8 @@ class CategoryControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\CategoryController::all
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testAll(string $range)
     {
@@ -44,6 +46,8 @@ class CategoryControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\CategoryController::currentPeriod
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testCurrentPeriod(string $range)
     {
@@ -56,6 +60,8 @@ class CategoryControllerTest extends TestCase
     /**
      * @covers       \FireflyIII\Http\Controllers\Chart\CategoryController::frontpage
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testFrontpage(string $range)
     {
@@ -86,8 +92,10 @@ class CategoryControllerTest extends TestCase
     }
 
     /**
-     * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::specificPeriod
+     * @covers       \FireflyIII\Http\Controllers\Chart\CategoryController::specificPeriod
      * @dataProvider dateRangeProvider
+     *
+     * @param string $range
      */
     public function testSpecificPeriod(string $range)
     {

From a8cea4119d481fb3dbfb8b0d50f75dea5fa00762 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 17:21:27 +0100
Subject: [PATCH 176/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 541085a108..9bb6dc172e 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -719,8 +719,8 @@ return [
     'average_income_per_account'                 => 'Gemiddeld verdiend per rekening',
     'total'                                      => 'Totaal',
     'description'                                => 'Omschrijving',
-    'sum_of_period'                              => 'Sum of period',
-    'average_in_period'                          => 'Average in period',
+    'sum_of_period'                              => 'Som van periode',
+    'average_in_period'                          => 'Gemiddelde in periode',
 
 
     // charts:
@@ -729,8 +729,8 @@ return [
     'month'                                      => 'Maand',
     'budget'                                     => 'Budget',
     'spent'                                      => 'Uitgegeven',
-    'spent_in_budget'                            => 'Spent in budget',
-    'left_to_spend'                              => 'Left to spend',
+    'spent_in_budget'                            => 'Uitgegeven in budget',
+    'left_to_spend'                              => 'Over om uit te geven',
     'earned'                                     => 'Verdiend',
     'overspent'                                  => 'Teveel uitgegeven',
     'left'                                       => 'Over',

From 1b4d55cca437d6781a8ab93652e660816301d12e Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 21:35:33 +0100
Subject: [PATCH 177/223] Fix various code style issues.

---
 .../Controllers/Transaction/ConvertController.php    | 12 ++++++------
 app/Models/Account.php                               |  4 ++--
 app/Models/Budget.php                                |  4 ++--
 app/Models/Category.php                              |  4 ++--
 app/Models/LimitRepetition.php                       |  2 +-
 app/Models/Tag.php                                   |  4 ++--
 app/Models/TransactionJournal.php                    |  2 +-
 app/Models/TransactionType.php                       |  8 ++++----
 app/Repositories/Budget/BudgetRepository.php         |  3 +--
 app/Repositories/PiggyBank/PiggyBankRepository.php   |  3 +--
 app/Support/Steam.php                                |  3 +--
 app/Validation/FireflyValidator.php                  |  3 +--
 12 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index c06fa91ff4..f83a317229 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -172,14 +172,14 @@ class ConvertController extends Controller
         switch ($joined) {
             default:
                 throw new FireflyException('Cannot handle ' . $joined);
-            case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: # one
+            case TransactionType::WITHDRAWAL . '-' . TransactionType::DEPOSIT: // one
                 $destination = $sourceAccount;
                 break;
-            case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: # two
+            case TransactionType::WITHDRAWAL . '-' . TransactionType::TRANSFER: // two
                 $destination = $accountRepository->find(intval($data['destination_account_asset']));
                 break;
-            case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: # three
-            case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: #five
+            case TransactionType::DEPOSIT . '-' . TransactionType::WITHDRAWAL: // three
+            case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: // five
                 $data        = [
                     'name'           => $data['destination_account_expense'],
                     'accountType'    => 'expense',
@@ -189,8 +189,8 @@ class ConvertController extends Controller
                 ];
                 $destination = $accountRepository->store($data);
                 break;
-            case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: # four
-            case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: #six
+            case TransactionType::DEPOSIT . '-' . TransactionType::TRANSFER: // four
+            case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: // six
                 $destination = $destinationAccount;
                 break;
         }
diff --git a/app/Models/Account.php b/app/Models/Account.php
index c62c558e8e..bc06e9b665 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -61,7 +61,7 @@ class Account extends Model
     public static function firstOrCreateEncrypted(array $fields)
     {
         // everything but the name:
-        $query  = Account::orderBy('id');
+        $query  = self::orderBy('id');
         $search = $fields;
         unset($search['name'], $search['iban']);
 
@@ -81,7 +81,7 @@ class Account extends Model
         }
 
         // create it!
-        $account = Account::create($fields);
+        $account = self::create($fields);
 
         return $account;
 
diff --git a/app/Models/Budget.php b/app/Models/Budget.php
index c20df153b0..8d073fa561 100644
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@@ -43,7 +43,7 @@ class Budget extends Model
     public static function firstOrCreateEncrypted(array $fields)
     {
         // everything but the name:
-        $query  = Budget::orderBy('id');
+        $query  = self::orderBy('id');
         $search = $fields;
         unset($search['name']);
         foreach ($search as $name => $value) {
@@ -57,7 +57,7 @@ class Budget extends Model
             }
         }
         // create it!
-        $budget = Budget::create($fields);
+        $budget = self::create($fields);
 
         return $budget;
 
diff --git a/app/Models/Category.php b/app/Models/Category.php
index e56adb3f2a..b80e03d1b7 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -42,7 +42,7 @@ class Category extends Model
     public static function firstOrCreateEncrypted(array $fields)
     {
         // everything but the name:
-        $query  = Category::orderBy('id');
+        $query  = self::orderBy('id');
         $search = $fields;
         unset($search['name']);
         foreach ($search as $name => $value) {
@@ -56,7 +56,7 @@ class Category extends Model
             }
         }
         // create it!
-        $category = Category::create($fields);
+        $category = self::create($fields);
 
         return $category;
 
diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php
index 1ce71bb237..be87b5accf 100644
--- a/app/Models/LimitRepetition.php
+++ b/app/Models/LimitRepetition.php
@@ -37,7 +37,7 @@ class LimitRepetition extends Model
     public static function routeBinder($value)
     {
         if (auth()->check()) {
-            $object = LimitRepetition::where('limit_repetitions.id', $value)
+            $object = self::where('limit_repetitions.id', $value)
                                      ->leftJoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id')
                                      ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
                                      ->where('budgets.user_id', auth()->user()->id)
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 8106423a33..6912a47582 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -43,7 +43,7 @@ class Tag extends TagSupport
         $search = $fields;
         unset($search['tag']);
 
-        $query = Tag::orderBy('id');
+        $query = self::orderBy('id');
         foreach ($search as $name => $value) {
             $query->where($name, $value);
         }
@@ -57,7 +57,7 @@ class Tag extends TagSupport
         // create it!
         $fields['tagMode']     = 'nothing';
         $fields['description'] = $fields['description'] ?? '';
-        $tag                   = Tag::create($fields);
+        $tag                   = self::create($fields);
 
         return $tag;
 
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index d46f7349e5..56773f7b5c 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -64,7 +64,7 @@ class TransactionJournal extends TransactionJournalSupport
     public static function routeBinder($value)
     {
         if (auth()->check()) {
-            $object = TransactionJournal::where('transaction_journals.id', $value)
+            $object = self::where('transaction_journals.id', $value)
                                         ->with('transactionType')
                                         ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
                                         ->where('user_id', auth()->user()->id)->first(['transaction_journals.*']);
diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php
index d22d725a0e..9d0e6af288 100644
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@@ -57,7 +57,7 @@ class TransactionType extends Model
      */
     public function isDeposit()
     {
-        return $this->type === TransactionType::DEPOSIT;
+        return $this->type === self::DEPOSIT;
     }
 
     /**
@@ -65,7 +65,7 @@ class TransactionType extends Model
      */
     public function isOpeningBalance()
     {
-        return $this->type === TransactionType::OPENING_BALANCE;
+        return $this->type === self::OPENING_BALANCE;
     }
 
     /**
@@ -73,7 +73,7 @@ class TransactionType extends Model
      */
     public function isTransfer()
     {
-        return $this->type === TransactionType::TRANSFER;
+        return $this->type === self::TRANSFER;
     }
 
     /**
@@ -81,7 +81,7 @@ class TransactionType extends Model
      */
     public function isWithdrawal()
     {
-        return $this->type === TransactionType::WITHDRAWAL;
+        return $this->type === self::WITHDRAWAL;
     }
 
     /**
diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
index ff5e4467b5..f4633d5ec3 100644
--- a/app/Repositories/Budget/BudgetRepository.php
+++ b/app/Repositories/Budget/BudgetRepository.php
@@ -199,8 +199,7 @@ class BudgetRepository implements BudgetRepositoryInterface
      */
     public function getAllBudgetLimitRepetitions(Carbon $start, Carbon $end): Collection
     {
-        $query = LimitRepetition::
-        leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
+        $query = LimitRepetition::leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
                                 ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
                                 ->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00'))
                                 ->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00'))
diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php
index ede86894c7..5a9f07704c 100644
--- a/app/Repositories/PiggyBank/PiggyBankRepository.php
+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php
@@ -136,8 +136,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
     public function reset(): bool
     {
         // split query to make it work in sqlite:
-        $set = PiggyBank::
-        leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id')
+        $set = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.id')
                         ->where('accounts.user_id', $this->user->id)->get(['piggy_banks.*']);
         foreach ($set as $e) {
             $e->order = 0;
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index d94b7af230..65e4b148a6 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -159,8 +159,7 @@ class Steam
             return $cache->get();
         }
 
-        $balances = Transaction::
-        leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+        $balances = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
                                ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
                                ->groupBy('transactions.account_id')
                                ->whereIn('transactions.account_id', $ids)
diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php
index 35b973c265..9555f3e00c 100644
--- a/app/Validation/FireflyValidator.php
+++ b/app/Validation/FireflyValidator.php
@@ -296,8 +296,7 @@ class FireflyValidator extends Validator
     {
         $accountId = $this->data['id'] ?? 0;
 
-        $query = AccountMeta::
-        leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id')
+        $query = AccountMeta::leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id')
                             ->where('accounts.user_id', auth()->user()->id)
                             ->where('account_meta.name', 'accountNumber');
 

From b021c7690f3dd0d39090eb6ea0f13f943d0e0186 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 22:56:31 +0100
Subject: [PATCH 178/223] Basic edit user routine.

---
 app/Http/Controllers/Admin/UserController.php | 52 +++++++++++++++-
 app/Http/Requests/UserFormRequest.php         | 60 +++++++++++++++++++
 app/Support/ExpandedForm.php                  | 18 ++++++
 bootstrap/app.php                             |  2 +-
 config/twigbridge.php                         |  2 +-
 resources/lang/en_US/firefly.php              |  3 +
 resources/lang/en_US/form.php                 | 43 +++++++------
 resources/lang/en_US/list.php                 |  1 +
 resources/views/admin/users/edit.twig         | 41 +++++++++++--
 resources/views/form/password.twig            |  9 +++
 routes/web.php                                |  1 +
 11 files changed, 207 insertions(+), 25 deletions(-)
 create mode 100644 app/Http/Requests/UserFormRequest.php
 create mode 100644 resources/views/form/password.twig

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index cd41a758ba..cab96f62a2 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -16,9 +16,12 @@ namespace FireflyIII\Http\Controllers\Admin;
 
 use FireflyConfig;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\UserFormRequest;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Preferences;
+use Session;
+use URL;
 use View;
 
 /**
@@ -53,10 +56,21 @@ class UserController extends Controller
      */
     public function edit(User $user)
     {
+        // put previous url in session if not redirect from store (not "return_to_edit").
+        if (session('users.edit.fromUpdate') !== true) {
+            Session::put('users.edit.url', URL::previous());
+        }
+        Session::forget('users.edit.fromUpdate');
+
         $subTitle     = strval(trans('firefly.edit_user', ['email' => $user->email]));
         $subTitleIcon = 'fa-user-o';
+        $codes        = [
+            ''        => strval(trans('firefly.no_block_code')),
+            'bounced' => strval(trans('firefly.block_code_bounced')),
+            'expired' => strval(trans('firefly.block_code_expired')),
+        ];
 
-        return view('admin.users.edit', compact('user', 'subTitle', 'subTitleIcon'));
+        return view('admin.users.edit', compact('user', 'subTitle', 'subTitleIcon', 'codes'));
 
     }
 
@@ -146,5 +160,41 @@ class UserController extends Controller
         );
     }
 
+    /**
+     * @param UserFormRequest $request
+     * @param User            $user
+     *
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function update(UserFormRequest $request, User $user)
+    {
+        $data = $request->getUserData();
+
+        // update password
+        if (strlen($data['password']) > 0) {
+            $user->password = bcrypt($data['password']);
+            $user->save();
+        }
+
+        // change blocked status and 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:
+            Session::put('users.edit.fromUpdate', true);
+
+            return redirect(route('admin.users.edit', [$user->id]))->withInput(['return_to_edit' => 1]);
+        }
+
+        // redirect to previous URL.
+        return redirect(session('users.edit.url'));
+
+    }
+
 
 }
diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php
new file mode 100644
index 0000000000..faf12136e1
--- /dev/null
+++ b/app/Http/Requests/UserFormRequest.php
@@ -0,0 +1,60 @@
+check();
+    }
+
+    /**
+     * @return array
+     */
+    public function getUserData(): array
+    {
+        return [
+            'email'        => trim($this->get('email')),
+            'blocked'      => intval($this->get('blocked')),
+            'blocked_code' => trim($this->get('blocked_code')),
+            'password'     => trim($this->get('password')),
+
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'id'           => 'required|exists:users,id',
+            'email'        => 'required',
+            'password'     => 'confirmed',
+            'blocked_code' => 'between:0,30',
+            'blocked'      => 'between:0,1|numeric',
+        ];
+    }
+}
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index c0aa1dbc67..0943ac9a00 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -341,6 +341,24 @@ class ExpandedForm
         return $html;
     }
 
+    /**
+     * @param       $name
+     * @param null  $value
+     * @param array $options
+     *
+     * @return string
+     */
+    public function password(string $name, array $options = []): string
+    {
+        $label   = $this->label($name, $options);
+        $options = $this->expandOptionArray($name, $label, $options);
+        $classes = $this->getHolderClasses($name);
+        $html    = view('form.password', compact('classes', 'name', 'label', 'value', 'options'))->render();
+
+        return $html;
+
+    }
+
     /**
      * @param       $name
      * @param null  $value
diff --git a/bootstrap/app.php b/bootstrap/app.php
index dd875c174b..06a88210b2 100755
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 |
 */
 
-bcscale(4);
+bcscale(6);
 
 
 $app = new Illuminate\Foundation\Application(
diff --git a/config/twigbridge.php b/config/twigbridge.php
index 886f44d6e1..dc51e30651 100644
--- a/config/twigbridge.php
+++ b/config/twigbridge.php
@@ -159,7 +159,7 @@ return [
             'ExpandedForm' => [
                 'is_safe' => [
                     'date', 'text', 'select', 'balance', 'optionsList', 'checkbox', 'amount', 'tags', 'integer', 'textarea', 'location',
-                    'multiRadio', 'file', 'multiCheckbox', 'staticText', 'amountSmall',
+                    'multiRadio', 'file', 'multiCheckbox', 'staticText', 'amountSmall', 'password',
                 ],
             ],
             'Form'         => [
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 0e698e598e..b6553ec393 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -857,6 +857,9 @@ return [
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
     'mail_for_bad_login_help'              => 'When a user fails to login',
     'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+    'block_code_bounced'                   => 'Email message(s) bounced',
+    'block_code_expired'                   => 'Demo account expired',
+    'no_block_code'                        => 'No reason for block or user not blocked',
 
 
     // split a transaction:
diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php
index 7ad4babc53..58ab10e01a 100644
--- a/resources/lang/en_US/form.php
+++ b/resources/lang/en_US/form.php
@@ -150,28 +150,35 @@ return [
     'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
     'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
+    'email'                   => 'Email address',
+    'password'                => 'Password',
+    'password_confirmation'   => 'Password (again)',
+    'blocked'                 => 'Is blocked?',
+    'blocked_code'            => 'Reason for block',
+
+
     // admin
-    'domain'                     => 'Domain',
-    'single_user_mode'           => 'Single user mode',
-    'must_confirm_account'       => 'New users must activate account',
-    'is_demo_site'               => 'Is demo site',
-    'mail_for_lockout'           => 'Locked out',
-    'mail_for_blocked_domain'    => 'Blocked domain',
-    'mail_for_blocked_email'     => 'Blocked email address',
-    'mail_for_bad_login'         => 'Login failure',
-    'mail_for_blocked_login'     => 'Blocked user',
+    'domain'                  => 'Domain',
+    'single_user_mode'        => 'Single user mode',
+    'must_confirm_account'    => 'New users must activate account',
+    'is_demo_site'            => 'Is demo site',
+    'mail_for_lockout'        => 'Locked out',
+    'mail_for_blocked_domain' => 'Blocked domain',
+    'mail_for_blocked_email'  => 'Blocked email address',
+    'mail_for_bad_login'      => 'Login failure',
+    'mail_for_blocked_login'  => 'Blocked user',
 
 
     // import
-    'import_file'                => 'Import file',
-    'configuration_file'         => 'Configuration file',
-    'import_file_type'           => 'Import file type',
-    'csv_comma'                  => 'A comma (,)',
-    'csv_semicolon'              => 'A semicolon (;)',
-    'csv_tab'                    => 'A tab (invisible)',
-    'csv_delimiter'              => 'CSV field delimiter',
-    'csv_import_account'         => 'Default import account',
-    'csv_config'                 => 'CSV import configuration',
+    'import_file'             => 'Import file',
+    'configuration_file'      => 'Configuration file',
+    'import_file_type'        => 'Import file type',
+    'csv_comma'               => 'A comma (,)',
+    'csv_semicolon'           => 'A semicolon (;)',
+    'csv_tab'                 => 'A tab (invisible)',
+    'csv_delimiter'           => 'CSV field delimiter',
+    'csv_import_account'      => 'Default import account',
+    'csv_config'              => 'CSV import configuration',
 
 
     'due_date'           => 'Due date',
diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php
index fa8d71969e..91254e401d 100644
--- a/resources/lang/en_US/list.php
+++ b/resources/lang/en_US/list.php
@@ -12,6 +12,7 @@
 return [
     'buttons'               => 'Buttons',
     'icon'                  => 'Icon',
+    'id'                    => 'ID',
     'create_date'           => 'Created at',
     'update_date'           => 'Updated at',
     'balance_before'        => 'Balance before',
diff --git a/resources/views/admin/users/edit.twig b/resources/views/admin/users/edit.twig
index 00536742a0..0e7a531fc3 100644
--- a/resources/views/admin/users/edit.twig
+++ b/resources/views/admin/users/edit.twig
@@ -4,11 +4,44 @@
     {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, user) }}
 {% endblock %}
 {% block content %}
+
+
+    {{ Form.model(user, {'class' : 'form-horizontal','id' : 'update','url' : route('admin.users.update',user.id) } ) }}
+
+    
+
     
                                              
-        
                                              
-            
                                              
-                This page is empty.
-            
                                              
+        
                                              
+            
                                              
+                
                                              
+                    
                                              {{ 'mandatoryFields'|_ }}
                                              
+                
                                              
+                
                                              
+                    {{ ExpandedForm.text('email') }}
+                    {{ ExpandedForm.password('password') }}
+                    {{ ExpandedForm.password('password_confirmation') }}
+                    {{ ExpandedForm.checkbox('blocked') }}
+                    {{ ExpandedForm.select('blocked_code', codes, user.blocked_code) }}
+
+                
                                              
+            
                                              
+        
                                              
+        
                                              
+            
+            
                                              
+                
                                              
+                    
                                              {{ 'options'|_ }}
                                              
+                
                                              
+                
                                              
+                    {{ ExpandedForm.optionsList('update','account') }}
+                
                                              
+                
                                              
+                    
+                
                                              
+            
                                              
         
                                              
     
                                              
+    {{ Form.close|raw }}
 {% endblock %}
diff --git a/resources/views/form/password.twig b/resources/views/form/password.twig
new file mode 100644
index 0000000000..aa700af9cd
--- /dev/null
+++ b/resources/views/form/password.twig
@@ -0,0 +1,9 @@
+
                                              
+    
+
+    
                                              
+        {{ Form.input('password', name, value, options) }}
+        {% include 'form/help' %}
+        {% include 'form/feedback' %}
+    
                                              
+
                                              
diff --git a/routes/web.php b/routes/web.php
index ee7ec39d1f..0f607e21d5 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -676,6 +676,7 @@ Route::group(
     Route::get('users', ['uses' => 'UserController@index', 'as' => 'users']);
     Route::get('users/edit/{user}', ['uses' => 'UserController@edit', 'as' => 'users.edit']);
     Route::get('users/show/{user}', ['uses' => 'UserController@show', 'as' => 'users.show']);
+    Route::post('users/update/{user}', ['uses' => 'UserController@update', 'as' => 'users.update']);
 
     // user domain manager
     Route::get('domains', ['uses' => 'DomainController@domains', 'as' => 'users.domains']);

From 7b479316eaf590ab16982b1566137ff6dd7ef8cd Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:01:38 +0100
Subject: [PATCH 179/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 9bb6dc172e..960f89a9a1 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -857,6 +857,9 @@ return [
     'mail_for_blocked_email_help'          => 'Als een gebruiker wil registreren met een geblokkeerd e-mailadres',
     'mail_for_bad_login_help'              => 'Als een user met de verkeerde gegevens probeert in te loggen',
     'mail_for_blocked_login_help'          => 'Als een geblokkeerde gebruiker probeert in te loggen',
+    'block_code_bounced'                   => 'Email message(s) bounced',
+    'block_code_expired'                   => 'Demo account expired',
+    'no_block_code'                        => 'No reason for block or user not blocked',
 
 
     // split a transaction:

From 4c4625583a281374a5f69b92f565ae644f544143 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:01:46 +0100
Subject: [PATCH 180/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/form.php | 43 ++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index a976726e74..b42cccded4 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -150,28 +150,35 @@ return [
     'category_keep_transactions' => 'De transactie verbonden aan deze categorie blijft bewaard.|De :count transacties verbonden aan deze categorie blijven bewaard.',
     'tag_keep_transactions'      => 'De transactie verbonden aan deze tag blijft bewaard.|De :count transacties verbonden aan deze tag blijven bewaard.',
 
+    'email'                   => 'Email address',
+    'password'                => 'Password',
+    'password_confirmation'   => 'Password (again)',
+    'blocked'                 => 'Is blocked?',
+    'blocked_code'            => 'Reason for block',
+
+
     // admin
-    'domain'                     => 'Domein',
-    'single_user_mode'           => 'Enkele gebruiker-modus',
-    'must_confirm_account'       => 'Nieuwe gebruikers moeten hun account activeren',
-    'is_demo_site'               => 'Is demo website',
-    'mail_for_lockout'           => 'Tijdelijk niet inloggen',
-    'mail_for_blocked_domain'    => 'Geblokkeerd domein',
-    'mail_for_blocked_email'     => 'Geblokkeerd e-mailadres',
-    'mail_for_bad_login'         => 'Mislukte login',
-    'mail_for_blocked_login'     => 'Geblokkeerde gebruiker',
+    'domain'                  => 'Domein',
+    'single_user_mode'        => 'Enkele gebruiker-modus',
+    'must_confirm_account'    => 'Nieuwe gebruikers moeten hun account activeren',
+    'is_demo_site'            => 'Is demo website',
+    'mail_for_lockout'        => 'Tijdelijk niet inloggen',
+    'mail_for_blocked_domain' => 'Geblokkeerd domein',
+    'mail_for_blocked_email'  => 'Geblokkeerd e-mailadres',
+    'mail_for_bad_login'      => 'Mislukte login',
+    'mail_for_blocked_login'  => 'Geblokkeerde gebruiker',
 
 
     // import
-    'import_file'                => 'Importbestand',
-    'configuration_file'         => 'Configuratiebestand',
-    'import_file_type'           => 'Importbestandstype',
-    'csv_comma'                  => 'Een komma (,)',
-    'csv_semicolon'              => 'Een puntkomma (;)',
-    'csv_tab'                    => 'Een tab (onzichtbaar)',
-    'csv_delimiter'              => 'CSV scheidingsteken',
-    'csv_import_account'         => 'Standaard rekening voor importeren',
-    'csv_config'                 => 'Configuratiebestand',
+    'import_file'             => 'Importbestand',
+    'configuration_file'      => 'Configuratiebestand',
+    'import_file_type'        => 'Importbestandstype',
+    'csv_comma'               => 'Een komma (,)',
+    'csv_semicolon'           => 'Een puntkomma (;)',
+    'csv_tab'                 => 'Een tab (onzichtbaar)',
+    'csv_delimiter'           => 'CSV scheidingsteken',
+    'csv_import_account'      => 'Standaard rekening voor importeren',
+    'csv_config'              => 'Configuratiebestand',
 
 
     'due_date'           => 'Vervaldatum',

From a1609542c38a45c8ea9f6f226b4aeedd94deb061 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:01:48 +0100
Subject: [PATCH 181/223] Translated

---
 resources/lang/de_DE/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php
index 0e08e2ee69..b7aeba4eb0 100644
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@@ -12,6 +12,7 @@
 return [
     'buttons'               => 'Schaltfläche',
     'icon'                  => 'Icon',
+    'id'                    => 'ID',
     'create_date'           => 'Erstellt am',
     'update_date'           => 'Aktualisiert am',
     'balance_before'        => 'Bilanz vor',

From 3609b515e56dc009ff844a46c8ded4d8ba5da2d6 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:01:50 +0100
Subject: [PATCH 182/223] Translated

---
 resources/lang/de_DE/form.php | 43 ++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php
index 056c7b8f5e..a695d4be5f 100644
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@@ -150,28 +150,35 @@ return [
     'category_keep_transactions' => 'Die eine Überweisungen, die mit dieser Kategorie verknüpft ist, wird nicht gelöscht. | Keine der :count Kategorien, die mit dieser Rechnung verknüpft sind, werden gelöscht.',
     'tag_keep_transactions'      => 'Die einzige Überweisung, die mit diesem Tag verknüpft ist, wird nicht gelöscht. | Keiner der :count Tags, die mit dieser Rechnung verknüpft sind, werden gelöscht.',
 
+    'email'                   => 'Email address',
+    'password'                => 'Password',
+    'password_confirmation'   => 'Password (again)',
+    'blocked'                 => 'Is blocked?',
+    'blocked_code'            => 'Reason for block',
+
+
     // admin
-    'domain'                     => 'Domain',
-    'single_user_mode'           => 'Einzelnutzermodus',
-    'must_confirm_account'       => 'Erstanwender müssen ihr Konto aktivieren',
-    'is_demo_site'               => 'Ist eine Demonstrationsseite',
-    'mail_for_lockout'           => 'Ausgesperrt',
-    'mail_for_blocked_domain'    => 'Gesperrte Domain',
-    'mail_for_blocked_email'     => 'Gesperrte Email-Adresse',
-    'mail_for_bad_login'         => 'Anmeldung fehlgeschlagen',
-    'mail_for_blocked_login'     => 'Gesperrter Benutzer',
+    'domain'                  => 'Domain',
+    'single_user_mode'        => 'Einzelnutzermodus',
+    'must_confirm_account'    => 'Erstanwender müssen ihr Konto aktivieren',
+    'is_demo_site'            => 'Ist eine Demonstrationsseite',
+    'mail_for_lockout'        => 'Ausgesperrt',
+    'mail_for_blocked_domain' => 'Gesperrte Domain',
+    'mail_for_blocked_email'  => 'Gesperrte Email-Adresse',
+    'mail_for_bad_login'      => 'Anmeldung fehlgeschlagen',
+    'mail_for_blocked_login'  => 'Gesperrter Benutzer',
 
 
     // import
-    'import_file'                => 'Datei importieren',
-    'configuration_file'         => 'Konfigurationsdatei',
-    'import_file_type'           => 'Import-Dateityp',
-    'csv_comma'                  => 'Ein Komma (,)',
-    'csv_semicolon'              => 'Ein Semikolon (;)',
-    'csv_tab'                    => 'Ein Tab (unsichtbar)',
-    'csv_delimiter'              => 'CSV-Trennzeichen',
-    'csv_import_account'         => 'Standard Import-Konto',
-    'csv_config'                 => 'CSV-Import Einstellungen',
+    'import_file'             => 'Datei importieren',
+    'configuration_file'      => 'Konfigurationsdatei',
+    'import_file_type'        => 'Import-Dateityp',
+    'csv_comma'               => 'Ein Komma (,)',
+    'csv_semicolon'           => 'Ein Semikolon (;)',
+    'csv_tab'                 => 'Ein Tab (unsichtbar)',
+    'csv_delimiter'           => 'CSV-Trennzeichen',
+    'csv_import_account'      => 'Standard Import-Konto',
+    'csv_config'              => 'CSV-Import Einstellungen',
 
 
     'due_date'           => 'Fälligkeitstermin',

From e87456b2f8180de81ec3dcf10b38f9bd1928fa56 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:01:52 +0100
Subject: [PATCH 183/223] New translations

---
 resources/lang/pt_BR/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php
index 6a994e6ba4..4cc4bbbd49 100644
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@@ -12,6 +12,7 @@
 return [
     'buttons'               => 'Botões',
     'icon'                  => 'Ícone',
+    'id'                    => 'ID',
     'create_date'           => 'Criado em',
     'update_date'           => 'Atualizado em',
     'balance_before'        => 'Saldo Antes',

From 2ec56626f30837a67e277a964eb52db7988c94ff Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:01:56 +0100
Subject: [PATCH 184/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php
index ced437cc40..95efafc5d6 100644
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@@ -12,6 +12,7 @@
 return [
     'buttons'               => 'Knoppen',
     'icon'                  => 'Icoon',
+    'id'                    => 'ID',
     'create_date'           => 'Aangemaakt op',
     'update_date'           => 'Bijgewerkt op',
     'balance_before'        => 'Saldo voor',

From 5c0c00188ff4da0ccfd32cbeb0100f6175799e3f Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:01:59 +0100
Subject: [PATCH 185/223] New translations

---
 resources/lang/pt_BR/form.php | 43 ++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php
index 9745c121c8..b9e54eeeaf 100644
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@@ -150,28 +150,35 @@ return [
     'category_keep_transactions' => 'A única transação ligada a esta categoria não será excluída.|Todos :count transações ligadas a esta categoria não serão excluídos.',
     'tag_keep_transactions'      => 'A única transação ligada a essa marca não será excluída.|Todos :count transações ligadas a essa marca não serão excluídos.',
 
+    'email'                   => 'Email address',
+    'password'                => 'Password',
+    'password_confirmation'   => 'Password (again)',
+    'blocked'                 => 'Is blocked?',
+    'blocked_code'            => 'Reason for block',
+
+
     // admin
-    'domain'                     => 'Domínio',
-    'single_user_mode'           => 'Modo de usuário único',
-    'must_confirm_account'       => 'Novos usuários devem ativar a conta',
-    'is_demo_site'               => 'É o site de demonstração',
-    'mail_for_lockout'           => 'Locked out',
-    'mail_for_blocked_domain'    => 'Blocked domain',
-    'mail_for_blocked_email'     => 'Blocked email address',
-    'mail_for_bad_login'         => 'Login failure',
-    'mail_for_blocked_login'     => 'Blocked user',
+    'domain'                  => 'Domínio',
+    'single_user_mode'        => 'Modo de usuário único',
+    'must_confirm_account'    => 'Novos usuários devem ativar a conta',
+    'is_demo_site'            => 'É o site de demonstração',
+    'mail_for_lockout'        => 'Locked out',
+    'mail_for_blocked_domain' => 'Blocked domain',
+    'mail_for_blocked_email'  => 'Blocked email address',
+    'mail_for_bad_login'      => 'Login failure',
+    'mail_for_blocked_login'  => 'Blocked user',
 
 
     // import
-    'import_file'                => 'Importar arquivo',
-    'configuration_file'         => 'Arquivo de configuração',
-    'import_file_type'           => 'Tipo de arquivo de importação',
-    'csv_comma'                  => 'Uma vírgula (,)',
-    'csv_semicolon'              => 'Um ponto e vírgula (;)',
-    'csv_tab'                    => 'Um Tab (invisível)',
-    'csv_delimiter'              => 'Delimitador de campo CSV',
-    'csv_import_account'         => 'Conta de importação padrão',
-    'csv_config'                 => 'Importar CSV de configuração',
+    'import_file'             => 'Importar arquivo',
+    'configuration_file'      => 'Arquivo de configuração',
+    'import_file_type'        => 'Tipo de arquivo de importação',
+    'csv_comma'               => 'Uma vírgula (,)',
+    'csv_semicolon'           => 'Um ponto e vírgula (;)',
+    'csv_tab'                 => 'Um Tab (invisível)',
+    'csv_delimiter'           => 'Delimitador de campo CSV',
+    'csv_import_account'      => 'Conta de importação padrão',
+    'csv_config'              => 'Importar CSV de configuração',
 
 
     'due_date'           => 'Data de vencimento',

From 00b3dced2c4c3d145914d2a80ee25aec63dbe3e8 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:02 +0100
Subject: [PATCH 186/223] New translations

---
 resources/lang/pt_BR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 86f5868d83..ad85daa201 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -857,6 +857,9 @@ return [
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
     'mail_for_bad_login_help'              => 'When a user fails to login',
     'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+    'block_code_bounced'                   => 'Email message(s) bounced',
+    'block_code_expired'                   => 'Demo account expired',
+    'no_block_code'                        => 'No reason for block or user not blocked',
 
 
     // split a transaction:

From d42e9c75ef4ea4aff7909dd513ed0ce445db714c Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:03 +0100
Subject: [PATCH 187/223] New translations

---
 resources/lang/zh_HK/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/zh_HK/list.php b/resources/lang/zh_HK/list.php
index cdebfbd8db..90625d54e6 100644
--- a/resources/lang/zh_HK/list.php
+++ b/resources/lang/zh_HK/list.php
@@ -12,6 +12,7 @@
 return [
     'buttons'               => 'Buttons',
     'icon'                  => 'Icon',
+    'id'                    => 'ID',
     'create_date'           => 'Created at',
     'update_date'           => 'Updated at',
     'balance_before'        => 'Balance before',

From 50278a679a1a3da27cad63bccf25b53e684555eb Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:05 +0100
Subject: [PATCH 188/223] New translations

---
 resources/lang/zh_HK/form.php | 43 ++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/resources/lang/zh_HK/form.php b/resources/lang/zh_HK/form.php
index bcb6e0c3b2..af698dcb73 100644
--- a/resources/lang/zh_HK/form.php
+++ b/resources/lang/zh_HK/form.php
@@ -150,28 +150,35 @@ return [
     'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
     'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
+    'email'                   => 'Email address',
+    'password'                => 'Password',
+    'password_confirmation'   => 'Password (again)',
+    'blocked'                 => 'Is blocked?',
+    'blocked_code'            => 'Reason for block',
+
+
     // admin
-    'domain'                     => 'Domain',
-    'single_user_mode'           => 'Single user mode',
-    'must_confirm_account'       => 'New users must activate account',
-    'is_demo_site'               => 'Is demo site',
-    'mail_for_lockout'           => 'Locked out',
-    'mail_for_blocked_domain'    => 'Blocked domain',
-    'mail_for_blocked_email'     => 'Blocked email address',
-    'mail_for_bad_login'         => 'Login failure',
-    'mail_for_blocked_login'     => 'Blocked user',
+    'domain'                  => 'Domain',
+    'single_user_mode'        => 'Single user mode',
+    'must_confirm_account'    => 'New users must activate account',
+    'is_demo_site'            => 'Is demo site',
+    'mail_for_lockout'        => 'Locked out',
+    'mail_for_blocked_domain' => 'Blocked domain',
+    'mail_for_blocked_email'  => 'Blocked email address',
+    'mail_for_bad_login'      => 'Login failure',
+    'mail_for_blocked_login'  => 'Blocked user',
 
 
     // import
-    'import_file'                => 'Import file',
-    'configuration_file'         => 'Configuration file',
-    'import_file_type'           => 'Import file type',
-    'csv_comma'                  => 'A comma (,)',
-    'csv_semicolon'              => 'A semicolon (;)',
-    'csv_tab'                    => 'A tab (invisible)',
-    'csv_delimiter'              => 'CSV field delimiter',
-    'csv_import_account'         => 'Default import account',
-    'csv_config'                 => 'CSV import configuration',
+    'import_file'             => 'Import file',
+    'configuration_file'      => 'Configuration file',
+    'import_file_type'        => 'Import file type',
+    'csv_comma'               => 'A comma (,)',
+    'csv_semicolon'           => 'A semicolon (;)',
+    'csv_tab'                 => 'A tab (invisible)',
+    'csv_delimiter'           => 'CSV field delimiter',
+    'csv_import_account'      => 'Default import account',
+    'csv_config'              => 'CSV import configuration',
 
 
     'due_date'           => 'Due date',

From 814fc6eabdaa21dc2e48d84e965592712d3fedd4 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:11 +0100
Subject: [PATCH 189/223] New translations

---
 resources/lang/zh_HK/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index bf4a08a112..b300e5b679 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -857,6 +857,9 @@ return [
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
     'mail_for_bad_login_help'              => 'When a user fails to login',
     'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+    'block_code_bounced'                   => 'Email message(s) bounced',
+    'block_code_expired'                   => 'Demo account expired',
+    'no_block_code'                        => 'No reason for block or user not blocked',
 
 
     // split a transaction:

From 6af2b37ac20daf6bf77265e48288be02bd91c4aa Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:13 +0100
Subject: [PATCH 190/223] New translations

---
 resources/lang/zh_TW/form.php | 43 ++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/resources/lang/zh_TW/form.php b/resources/lang/zh_TW/form.php
index 8cba160c13..b50b217c62 100644
--- a/resources/lang/zh_TW/form.php
+++ b/resources/lang/zh_TW/form.php
@@ -150,28 +150,35 @@ return [
     'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
     'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
+    'email'                   => 'Email address',
+    'password'                => 'Password',
+    'password_confirmation'   => 'Password (again)',
+    'blocked'                 => 'Is blocked?',
+    'blocked_code'            => 'Reason for block',
+
+
     // admin
-    'domain'                     => 'Domain',
-    'single_user_mode'           => 'Single user mode',
-    'must_confirm_account'       => 'New users must activate account',
-    'is_demo_site'               => 'Is demo site',
-    'mail_for_lockout'           => 'Locked out',
-    'mail_for_blocked_domain'    => 'Blocked domain',
-    'mail_for_blocked_email'     => 'Blocked email address',
-    'mail_for_bad_login'         => 'Login failure',
-    'mail_for_blocked_login'     => 'Blocked user',
+    'domain'                  => 'Domain',
+    'single_user_mode'        => 'Single user mode',
+    'must_confirm_account'    => 'New users must activate account',
+    'is_demo_site'            => 'Is demo site',
+    'mail_for_lockout'        => 'Locked out',
+    'mail_for_blocked_domain' => 'Blocked domain',
+    'mail_for_blocked_email'  => 'Blocked email address',
+    'mail_for_bad_login'      => 'Login failure',
+    'mail_for_blocked_login'  => 'Blocked user',
 
 
     // import
-    'import_file'                => '匯入檔案',
-    'configuration_file'         => 'Configuration file',
-    'import_file_type'           => '匯入檔案類型',
-    'csv_comma'                  => 'A comma (,)',
-    'csv_semicolon'              => 'A semicolon (;)',
-    'csv_tab'                    => 'A tab (invisible)',
-    'csv_delimiter'              => 'CSV field delimiter',
-    'csv_import_account'         => 'Default import account',
-    'csv_config'                 => 'CSV import configuration',
+    'import_file'             => '匯入檔案',
+    'configuration_file'      => 'Configuration file',
+    'import_file_type'        => '匯入檔案類型',
+    'csv_comma'               => 'A comma (,)',
+    'csv_semicolon'           => 'A semicolon (;)',
+    'csv_tab'                 => 'A tab (invisible)',
+    'csv_delimiter'           => 'CSV field delimiter',
+    'csv_import_account'      => 'Default import account',
+    'csv_config'              => 'CSV import configuration',
 
 
     'due_date'           => '到期日',

From d0084becea1c1a56f8c36a0dbfa19575afa4e4d0 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:16 +0100
Subject: [PATCH 191/223] New translations

---
 resources/lang/zh_TW/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index f0e2bd7c4b..5589304af8 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -857,6 +857,9 @@ return [
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
     'mail_for_bad_login_help'              => 'When a user fails to login',
     'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+    'block_code_bounced'                   => 'Email message(s) bounced',
+    'block_code_expired'                   => 'Demo account expired',
+    'no_block_code'                        => 'No reason for block or user not blocked',
 
 
     // split a transaction:

From ebbf2659b1ee5d5e827b6065b9a4b01d8b5924fe Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:17 +0100
Subject: [PATCH 192/223] New translations

---
 resources/lang/zh_TW/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/zh_TW/list.php b/resources/lang/zh_TW/list.php
index f8633af468..d5df766461 100644
--- a/resources/lang/zh_TW/list.php
+++ b/resources/lang/zh_TW/list.php
@@ -12,6 +12,7 @@
 return [
     'buttons'               => '按鈕',
     'icon'                  => '圖標',
+    'id'                    => 'ID',
     'create_date'           => '建立於',
     'update_date'           => '更新於',
     'balance_before'        => '交易前餘額',

From 82bb35262430ca45a9076e43ff292607b47b8c73 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:22 +0100
Subject: [PATCH 193/223] New translations

---
 resources/lang/fr_FR/form.php | 43 ++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php
index da3a9b3a66..ec5aca8d95 100644
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@@ -150,28 +150,35 @@ return [
     'category_keep_transactions' => 'La seule opération liée à cette catégorie ne sera pas supprimée.|Les :count opérations liées à cette catégorie ne seront pas supprimées.',
     'tag_keep_transactions'      => 'La seule opération liée à ce tag ne sera pas supprimée.|Les :count opérations liées à ce tag ne seront pas supprimées.',
 
+    'email'                   => 'Email address',
+    'password'                => 'Password',
+    'password_confirmation'   => 'Password (again)',
+    'blocked'                 => 'Is blocked?',
+    'blocked_code'            => 'Reason for block',
+
+
     // admin
-    'domain'                     => 'Domaine',
-    'single_user_mode'           => 'Mode utilisateur unique',
-    'must_confirm_account'       => 'New users must activate account',
-    'is_demo_site'               => 'Is demo site',
-    'mail_for_lockout'           => 'Locked out',
-    'mail_for_blocked_domain'    => 'Blocked domain',
-    'mail_for_blocked_email'     => 'Blocked email address',
-    'mail_for_bad_login'         => 'Login failure',
-    'mail_for_blocked_login'     => 'Blocked user',
+    'domain'                  => 'Domaine',
+    'single_user_mode'        => 'Mode utilisateur unique',
+    'must_confirm_account'    => 'New users must activate account',
+    'is_demo_site'            => 'Is demo site',
+    'mail_for_lockout'        => 'Locked out',
+    'mail_for_blocked_domain' => 'Blocked domain',
+    'mail_for_blocked_email'  => 'Blocked email address',
+    'mail_for_bad_login'      => 'Login failure',
+    'mail_for_blocked_login'  => 'Blocked user',
 
 
     // import
-    'import_file'                => 'Fichier à importer',
-    'configuration_file'         => 'Fichier de configuration',
-    'import_file_type'           => 'Type de fichier de configuration',
-    'csv_comma'                  => 'Une virgule (,)',
-    'csv_semicolon'              => 'Un point-virgule (;)',
-    'csv_tab'                    => 'Un onglet (invisible)',
-    'csv_delimiter'              => 'Délimiteur de champ CSV',
-    'csv_import_account'         => 'Compte d’importation par défaut',
-    'csv_config'                 => 'Configuration d\'importation CSV',
+    'import_file'             => 'Fichier à importer',
+    'configuration_file'      => 'Fichier de configuration',
+    'import_file_type'        => 'Type de fichier de configuration',
+    'csv_comma'               => 'Une virgule (,)',
+    'csv_semicolon'           => 'Un point-virgule (;)',
+    'csv_tab'                 => 'Un onglet (invisible)',
+    'csv_delimiter'           => 'Délimiteur de champ CSV',
+    'csv_import_account'      => 'Compte d’importation par défaut',
+    'csv_config'              => 'Configuration d\'importation CSV',
 
 
     'due_date'           => 'Due date',

From a5b412f546c4a5be0ca31fb74faa7dd06cb00e9e Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:26 +0100
Subject: [PATCH 194/223] New translations

---
 resources/lang/fr_FR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 2bd9293870..f429f4e364 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -857,6 +857,9 @@ return [
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
     'mail_for_bad_login_help'              => 'When a user fails to login',
     'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+    'block_code_bounced'                   => 'Email message(s) bounced',
+    'block_code_expired'                   => 'Demo account expired',
+    'no_block_code'                        => 'No reason for block or user not blocked',
 
 
     // split a transaction:

From ce8164dd873a91213983e03bc722386bc0cb751a Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:28 +0100
Subject: [PATCH 195/223] New translations

---
 resources/lang/fr_FR/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php
index 3d09d60ae9..55aba8cc1d 100644
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@@ -12,6 +12,7 @@
 return [
     'buttons'               => 'Boutons',
     'icon'                  => 'Icône',
+    'id'                    => 'ID',
     'create_date'           => 'Créé le',
     'update_date'           => 'Mis à jour le',
     'balance_before'        => 'Solde avant',

From 913dbe6b1a9e2174b58417766353667b1b8b485f Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:31 +0100
Subject: [PATCH 196/223] New translations

---
 resources/lang/de_DE/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index d74c8c5c3b..9330403f7f 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -858,6 +858,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
     'mail_for_bad_login_help'              => 'When a user fails to login',
     'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+    'block_code_bounced'                   => 'Email message(s) bounced',
+    'block_code_expired'                   => 'Demo account expired',
+    'no_block_code'                        => 'No reason for block or user not blocked',
 
 
     // split a transaction:

From 4bcacc5d685abd0163d1f387c0a1b0dfcc9a6664 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:35 +0100
Subject: [PATCH 197/223] New translations

---
 resources/lang/hr_HR/form.php | 43 ++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/resources/lang/hr_HR/form.php b/resources/lang/hr_HR/form.php
index bcb6e0c3b2..af698dcb73 100644
--- a/resources/lang/hr_HR/form.php
+++ b/resources/lang/hr_HR/form.php
@@ -150,28 +150,35 @@ return [
     'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
     'tag_keep_transactions'      => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
 
+    'email'                   => 'Email address',
+    'password'                => 'Password',
+    'password_confirmation'   => 'Password (again)',
+    'blocked'                 => 'Is blocked?',
+    'blocked_code'            => 'Reason for block',
+
+
     // admin
-    'domain'                     => 'Domain',
-    'single_user_mode'           => 'Single user mode',
-    'must_confirm_account'       => 'New users must activate account',
-    'is_demo_site'               => 'Is demo site',
-    'mail_for_lockout'           => 'Locked out',
-    'mail_for_blocked_domain'    => 'Blocked domain',
-    'mail_for_blocked_email'     => 'Blocked email address',
-    'mail_for_bad_login'         => 'Login failure',
-    'mail_for_blocked_login'     => 'Blocked user',
+    'domain'                  => 'Domain',
+    'single_user_mode'        => 'Single user mode',
+    'must_confirm_account'    => 'New users must activate account',
+    'is_demo_site'            => 'Is demo site',
+    'mail_for_lockout'        => 'Locked out',
+    'mail_for_blocked_domain' => 'Blocked domain',
+    'mail_for_blocked_email'  => 'Blocked email address',
+    'mail_for_bad_login'      => 'Login failure',
+    'mail_for_blocked_login'  => 'Blocked user',
 
 
     // import
-    'import_file'                => 'Import file',
-    'configuration_file'         => 'Configuration file',
-    'import_file_type'           => 'Import file type',
-    'csv_comma'                  => 'A comma (,)',
-    'csv_semicolon'              => 'A semicolon (;)',
-    'csv_tab'                    => 'A tab (invisible)',
-    'csv_delimiter'              => 'CSV field delimiter',
-    'csv_import_account'         => 'Default import account',
-    'csv_config'                 => 'CSV import configuration',
+    'import_file'             => 'Import file',
+    'configuration_file'      => 'Configuration file',
+    'import_file_type'        => 'Import file type',
+    'csv_comma'               => 'A comma (,)',
+    'csv_semicolon'           => 'A semicolon (;)',
+    'csv_tab'                 => 'A tab (invisible)',
+    'csv_delimiter'           => 'CSV field delimiter',
+    'csv_import_account'      => 'Default import account',
+    'csv_config'              => 'CSV import configuration',
 
 
     'due_date'           => 'Due date',

From 02f2def88beedd8cd1ec3c744ed72246d1917262 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:38 +0100
Subject: [PATCH 198/223] New translations

---
 resources/lang/hr_HR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index bf4a08a112..b300e5b679 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -857,6 +857,9 @@ return [
     'mail_for_blocked_email_help'          => 'When a user tries to register using a blocked email address',
     'mail_for_bad_login_help'              => 'When a user fails to login',
     'mail_for_blocked_login_help'          => 'When a blocked user tries to login',
+    'block_code_bounced'                   => 'Email message(s) bounced',
+    'block_code_expired'                   => 'Demo account expired',
+    'no_block_code'                        => 'No reason for block or user not blocked',
 
 
     // split a transaction:

From 4c1d8e8e85c098697823629637502aa4d44177de Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Thu, 15 Dec 2016 23:02:39 +0100
Subject: [PATCH 199/223] New translations

---
 resources/lang/hr_HR/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/hr_HR/list.php b/resources/lang/hr_HR/list.php
index cdebfbd8db..90625d54e6 100644
--- a/resources/lang/hr_HR/list.php
+++ b/resources/lang/hr_HR/list.php
@@ -12,6 +12,7 @@
 return [
     'buttons'               => 'Buttons',
     'icon'                  => 'Icon',
+    'id'                    => 'ID',
     'create_date'           => 'Created at',
     'update_date'           => 'Updated at',
     'balance_before'        => 'Balance before',

From a923c288e6aa1a6e457f563112d871aa6d2dff66 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 16 Dec 2016 07:31:41 +0100
Subject: [PATCH 200/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 960f89a9a1..8af126f24c 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -857,9 +857,9 @@ return [
     'mail_for_blocked_email_help'          => 'Als een gebruiker wil registreren met een geblokkeerd e-mailadres',
     'mail_for_bad_login_help'              => 'Als een user met de verkeerde gegevens probeert in te loggen',
     'mail_for_blocked_login_help'          => 'Als een geblokkeerde gebruiker probeert in te loggen',
-    'block_code_bounced'                   => 'Email message(s) bounced',
-    'block_code_expired'                   => 'Demo account expired',
-    'no_block_code'                        => 'No reason for block or user not blocked',
+    'block_code_bounced'                   => 'Email kwam niet aan',
+    'block_code_expired'                   => 'Demo-account verlopen',
+    'no_block_code'                        => 'Geen reden of gebruiker niet geblokkeerd',
 
 
     // split a transaction:

From 6c64023bf7f904072e3e7c84053b89de7a2d1aa8 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 16 Dec 2016 07:31:43 +0100
Subject: [PATCH 201/223] New translations

---
 resources/lang/nl_NL/form.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php
index b42cccded4..8119fed791 100644
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@@ -150,11 +150,11 @@ return [
     'category_keep_transactions' => 'De transactie verbonden aan deze categorie blijft bewaard.|De :count transacties verbonden aan deze categorie blijven bewaard.',
     'tag_keep_transactions'      => 'De transactie verbonden aan deze tag blijft bewaard.|De :count transacties verbonden aan deze tag blijven bewaard.',
 
-    'email'                   => 'Email address',
-    'password'                => 'Password',
-    'password_confirmation'   => 'Password (again)',
-    'blocked'                 => 'Is blocked?',
-    'blocked_code'            => 'Reason for block',
+    'email'                   => 'E-mailadres',
+    'password'                => 'Wachtwoord',
+    'password_confirmation'   => 'Wachtwoord (nogmaals)',
+    'blocked'                 => 'Is geblokkeerd?',
+    'blocked_code'            => 'Reden voor blokkade',
 
 
     // admin

From 4de14eba0cbef390bc3e11a3df47fa3d00c20258 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Fri, 16 Dec 2016 08:07:31 +0100
Subject: [PATCH 202/223] Fix some routes for the budget report.

---
 .../Report/Budget/MonthReportGenerator.php    |   4 +-
 app/Http/Controllers/Auth/LoginController.php |  10 -
 .../Controllers/Auth/PasswordController.php   |  10 -
 .../Controllers/Auth/RegisterController.php   |  10 -
 .../Auth/ResetPasswordController.php          |  10 -
 .../Controllers/Chart/AccountController.php   |   6 +
 .../Chart/BudgetReportController.php          | 292 ++++++++++++++++++
 app/Jobs/Job.php                              |  10 -
 app/Repositories/Bill/BillRepository.php      |   2 -
 app/Support/CacheProperties.php               |   6 +-
 public/js/ff/reports/budget/month.js          |  14 +-
 resources/views/reports/budget/month.twig     |  71 +++--
 resources/views/reports/category/month.twig   |  91 +++---
 routes/web.php                                |  17 +-
 14 files changed, 414 insertions(+), 139 deletions(-)
 create mode 100644 app/Http/Controllers/Chart/BudgetReportController.php

diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php
index 8a8e96d4b5..a2512f3a72 100644
--- a/app/Generator/Report/Budget/MonthReportGenerator.php
+++ b/app/Generator/Report/Budget/MonthReportGenerator.php
@@ -58,7 +58,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
     public function generate(): string
     {
         $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
-        $categoryIds     = join(',', $this->budgets->pluck('id')->toArray());
+        $budgetIds       = join(',', $this->budgets->pluck('id')->toArray());
         $expenses        = $this->getExpenses();
         $accountSummary  = $this->summarizeByAccount($expenses);
         $budgetSummary   = $this->summarizeByBudget($expenses);
@@ -66,7 +66,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
         $topExpenses     = $this->getTopExpenses();
 
         // render!
-        return view('reports.budget.month', compact('accountIds', 'categoryIds', 'accountSummary', 'budgetSummary', 'averageExpenses', 'topExpenses'))
+        return view('reports.budget.month', compact('accountIds', 'budgetIds', 'accountSummary', 'budgetSummary', 'averageExpenses', 'topExpenses'))
             ->with('start', $this->start)->with('end', $this->end)
             ->with('budgets', $this->budgets)
             ->with('accounts', $this->accounts)
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 6378a341e6..06faf92d07 100755
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -30,16 +30,6 @@ use Lang;
  */
 class LoginController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Login Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles authenticating users for the application and
-    | redirecting them to your home screen. The controller uses a trait
-    | to conveniently provide its functionality to your applications.
-    |
-    */
 
     use AuthenticatesUsers;
 
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
index 95a5c82132..02a4757bc2 100644
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ b/app/Http/Controllers/Auth/PasswordController.php
@@ -31,16 +31,6 @@ use Illuminate\Support\Facades\Password;
  */
 class PasswordController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset requests
-    | and uses a simple trait to include this behavior. You're free to
-    | explore this trait and override any methods you wish to tweak.
-    |
-    */
 
     use ResetsPasswords;
 
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index dd2b9ec905..b56978153a 100755
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -36,16 +36,6 @@ use Validator;
  */
 class RegisterController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Register Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users as well as their
-    | validation and creation. By default this controller uses a trait to
-    | provide this functionality without requiring any additional code.
-    |
-    */
 
     use RegistersUsers;
 
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 3e8c162572..1d99a0c179 100755
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -22,16 +22,6 @@ use Illuminate\Foundation\Auth\ResetsPasswords;
  */
 class ResetPasswordController extends Controller
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset requests
-    | and uses a simple trait to include this behavior. You're free to
-    | explore this trait and override any methods you wish to tweak.
-    |
-    */
 
     use ResetsPasswords;
 
diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index f1e20b369a..8bf0047e6f 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -65,8 +65,11 @@ class AccountController extends Controller
         $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());
         }
+        Log::debug('Regenerate chart.account.all from scratch.');
 
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
@@ -458,8 +461,11 @@ 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();
         }
+        Log::debug('Regenerate chart.account.account-balance-chart from scratch.');
 
         $chartData = [];
         foreach ($accounts as $account) {
diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php
new file mode 100644
index 0000000000..e053189066
--- /dev/null
+++ b/app/Http/Controllers/Chart/BudgetReportController.php
@@ -0,0 +1,292 @@
+middleware(
+            function ($request, $next) {
+                $this->generator         = app(GeneratorInterface::class);
+                $this->budgetRepository  = app(BudgetRepositoryInterface::class);
+                $this->accountRepository = app(AccountRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $budgets
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param string     $others
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function accountExpense(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end, string $others)
+    {
+        /** @var bool $others */
+        $others = intval($others) === 1;
+        $cache  = new CacheProperties;
+        $cache->addProperty('chart.budget.report.account-expense');
+        $cache->addProperty($accounts);
+        $cache->addProperty($budgets);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
+
+        $names     = [];
+        $set       = $this->getExpenses($accounts, $budgets, $start, $end);
+        $grouped   = $this->groupByOpposingAccount($set);
+        $chartData = [];
+        $total     = '0';
+
+        foreach ($grouped as $accountId => $amount) {
+            if (!isset($names[$accountId])) {
+                $account           = $this->accountRepository->find(intval($accountId));
+                $names[$accountId] = $account->name;
+            }
+            $amount                        = bcmul($amount, '-1');
+            $total                         = bcadd($total, $amount);
+            $chartData[$names[$accountId]] = $amount;
+        }
+
+        // also collect all transactions NOT in these budgets.
+        if ($others) {
+            $collector = new JournalCollector(auth()->user());
+            $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcmul($sum, '-1');
+            $sum                                                 = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+        }
+
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $budgets
+     * @param Carbon     $start
+     * @param Carbon     $end
+     * @param string     $others
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function budgetExpense(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end, string $others)
+    {
+        /** @var bool $others */
+        $others = intval($others) === 1;
+        $cache  = new CacheProperties;
+        $cache->addProperty('chart.budget.report.budget-expense');
+        $cache->addProperty($accounts);
+        $cache->addProperty($budgets);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
+
+        $names     = [];
+        $set       = $this->getExpenses($accounts, $budgets, $start, $end);
+        $grouped   = $this->groupByBudget($set);
+        $total     = '0';
+        $chartData = [];
+
+        foreach ($grouped as $budgetId => $amount) {
+            if (!isset($names[$budgetId])) {
+                $budget           = $this->budgetRepository->find(intval($budgetId));
+                $names[$budgetId] = $budget->name;
+            }
+            $amount                       = bcmul($amount, '-1');
+            $total                        = bcadd($total, $amount);
+            $chartData[$names[$budgetId]] = $amount;
+        }
+
+        // also collect all transactions NOT in these budgets.
+        if ($others) {
+            $collector = new JournalCollector(auth()->user());
+            $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL]);
+            $journals                                            = $collector->getJournals();
+            $sum                                                 = strval($journals->sum('transaction_amount'));
+            $sum                                                 = bcmul($sum, '-1');
+            $sum                                                 = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
+        }
+
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+    }
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $budgets
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function mainChart(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end)
+    {
+        $cache = new CacheProperties;
+        $cache->addProperty('chart.budget.report.main');
+        $cache->addProperty($accounts);
+        $cache->addProperty($budgets);
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
+
+        $format       = Navigation::preferredCarbonLocalizedFormat($start, $end);
+        $function     = Navigation::preferredEndOfPeriod($start, $end);
+        $chartData    = [];
+        $currentStart = clone $start;
+
+        // prep chart data:
+        foreach ($budgets as $budget) {
+            $chartData[$budget->id] = [
+                'label'   => $budget->name,
+                'type'    => 'bar',
+                'entries' => [],
+            ];
+        }
+
+        while ($currentStart < $end) {
+            $currentEnd = clone $currentStart;
+            $currentEnd = $currentEnd->$function();
+            $expenses   = $this->groupByBudget($this->getExpenses($accounts, $budgets, $currentStart, $currentEnd));
+            $label      = $currentStart->formatLocalized($format);
+
+            /** @var Budget $budget */
+            foreach ($budgets as $budget) {
+                $chartData[$budget->id]['entries'][$label] = $expenses[$budget->id] ?? '0';
+            }
+            $currentStart = clone $currentEnd;
+            $currentStart->addDay();
+        }
+
+        $data = $this->generator->multiSet($chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+    }
+
+
+    /**
+     * @param Collection $accounts
+     * @param Collection $budgets
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return Collection
+     */
+    private function getExpenses(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): Collection
+    {
+        $collector = new JournalCollector(auth()->user());
+        $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
+                  ->setBudgets($budgets)->withOpposingAccount()->disableFilter();
+        $accountIds   = $accounts->pluck('id')->toArray();
+        $transactions = $collector->getJournals();
+        $set          = MonthReportGenerator::filterExpenses($transactions, $accountIds);
+
+        return $set;
+    }
+
+    /**
+     * @param Collection $set
+     *
+     * @return array
+     */
+    private function groupByBudget(Collection $set): array
+    {
+        // group by category ID:
+        $grouped = [];
+        /** @var Transaction $transaction */
+        foreach ($set as $transaction) {
+            $jrnlBudId          = intval($transaction->transaction_journal_budget_id);
+            $transBudId         = intval($transaction->transaction_budget_id);
+            $budgetId           = max($jrnlBudId, $transBudId);
+            $grouped[$budgetId] = $grouped[$budgetId] ?? '0';
+            $grouped[$budgetId] = bcadd($transaction->transaction_amount, $grouped[$budgetId]);
+        }
+
+        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;
+    }
+}
\ No newline at end of file
diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php
index b5c465e455..92fa2f3246 100644
--- a/app/Jobs/Job.php
+++ b/app/Jobs/Job.php
@@ -22,16 +22,6 @@ use Illuminate\Bus\Queueable;
  */
 abstract class Job
 {
-    /*
-    |--------------------------------------------------------------------------
-    | Queueable Jobs
-    |--------------------------------------------------------------------------
-    |
-    | This job base class provides a central location to place any logic that
-    | is shared across all of your jobs. The trait included with the class
-    | provides access to the "onQueue" and "delay" queue helper methods.
-    |
-    */
 
     use Queueable;
 }
diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php
index 179e0aa12b..d3bfa01572 100644
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -211,7 +211,6 @@ class BillRepository implements BillRepositoryInterface
                 $sum        = bcadd($sum, $amount);
                 Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f', $amount, $sum));
             }
-            Log::debug('---');
         }
 
         return $sum;
@@ -245,7 +244,6 @@ class BillRepository implements BillRepositoryInterface
                 $sum     = bcadd($sum, $multi);
                 Log::debug(sprintf('Total > 0, so add to sum %f, which becomes %f', $multi, $sum));
             }
-            Log::debug('---');
         }
 
         return $sum;
diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php
index bfe3b857d0..105115f959 100644
--- a/app/Support/CacheProperties.php
+++ b/app/Support/CacheProperties.php
@@ -18,6 +18,7 @@ use Cache;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Collection;
+use Log;
 use Preferences as Prefs;
 
 /**
@@ -75,6 +76,8 @@ class CacheProperties
     public function has(): bool
     {
         if (getenv('APP_ENV') == 'testing') {
+            Log::debug('APP_ENV is testing, cache disabled.');
+
             return false;
         }
         $this->md5();
@@ -118,7 +121,8 @@ class CacheProperties
 
             $this->md5 .= json_encode($property);
         }
-
+        Log::debug(sprintf('Cache string is %s', $this->md5));
         $this->md5 = md5($this->md5);
+        Log::debug(sprintf('Cache MD5 is    %s', $this->md5));
     }
 }
diff --git a/public/js/ff/reports/budget/month.js b/public/js/ff/reports/budget/month.js
index 90a4f3a5a2..0eeb33fa93 100644
--- a/public/js/ff/reports/budget/month.js
+++ b/public/js/ff/reports/budget/month.js
@@ -13,16 +13,8 @@ $(function () {
     "use strict";
     drawChart();
 
-    $('#budgets-in-pie-chart-checked').on('change', function () {
-        redrawPieChart('budgets-in-pie-chart', categoryIncomeUri);
-    });
-
     $('#budgets-out-pie-chart-checked').on('change', function () {
-        redrawPieChart('budgets-out-pie-chart', categoryExpenseUri);
-    });
-
-    $('#accounts-in-pie-chart-checked').on('change', function () {
-        redrawPieChart('accounts-in-pie-chart', accountIncomeUri);
+        redrawPieChart('budgets-out-pie-chart', budgetExpenseUri);
     });
 
     $('#accounts-out-pie-chart-checked').on('change', function () {
@@ -39,9 +31,7 @@ function drawChart() {
     stackedColumnChart(mainUri, 'in-out-chart');
 
     // draw pie chart of income, depending on "show other transactions too":
-    redrawPieChart('budgets-in-pie-chart', categoryIncomeUri);
-    redrawPieChart('budgets-out-pie-chart', categoryExpenseUri);
-    redrawPieChart('accounts-in-pie-chart', accountIncomeUri);
+    redrawPieChart('budgets-out-pie-chart', budgetExpenseUri);
     redrawPieChart('accounts-out-pie-chart', accountExpenseUri);
 
 
diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig
index aeccc2dbde..d8623ebf32 100644
--- a/resources/views/reports/budget/month.twig
+++ b/resources/views/reports/budget/month.twig
@@ -84,22 +84,20 @@
                 
                                              
             
                                              
         {% endif %}
-        {% if accounts.count > 1 %}
-            
                                              
-                
                                              
-                    
                                              
-                        
                                              {{ 'expense_per_budget'|_ }}
                                              
-                    
                                              
-                    
                                              
-                        
-                        
-                    
                                              
+        
                                              
+            
                                              
+                
                                              
+                    
                                              {{ 'expense_per_account'|_ }}
                                              
+                
                                              
+                
                                              
+                    
+                    
                 
                                              
             
                                              
-        {% endif %}
+        
                                              
     
                                              
 
     
                                              
@@ -137,22 +135,35 @@
                             
                             
                             {% for row in averageExpenses %}
-                                
-                                    
-                                        {{ row.name }}
-                                    
-                                    
-                                        {{ row.average|formatAmount }}
-                                    
-                                    
-                                        {{ row.sum|formatAmount }}
-                                    
-                                    
-                                        {{ row.count }}
-                                    
+                                {% if loop.index > listLength %}
+                                    
+                                {% else %}
+                                    
+                                {% endif %}
+                                
+                                    {{ row.name }}
+                                
+                                
+                                    {{ row.average|formatAmount }}
+                                
+                                
+                                    {{ row.sum|formatAmount }}
+                                
+                                
+                                    {{ row.count }}
+                                
                                 
                             {% endfor %}
                             
+                            
+                            {% if averageExpenses|length > listLength %}
+                                
+                                    
+                                        {{ trans('firefly.show_full_list',{number:incomeTopLength}) }}
+                                    
+                                
+                            {% endif %}
+                            
                         
                     
                                              
                 
                                              
@@ -206,9 +217,9 @@
                             {% endfor %}
                             
                             
-                            {% if topExpenses.count > listLength %}
+                            {% if topExpenses|length > listLength %}
                                 
-                                    
+                                    
                                         {{ trans('firefly.show_full_list',{number:incomeTopLength}) }}
                                     
                                 
@@ -237,9 +248,7 @@
         var budgetIds = '{{ budgetIds }}';
 
         // chart uri's
-        var budgetIncomeUri = '{{ route('chart.budget.budget-income', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
         var budgetExpenseUri = '{{ route('chart.budget.budget-expense', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
-        var accountIncomeUri = '{{ route('chart.budget.account-income', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
         var accountExpenseUri = '{{ route('chart.budget.account-expense', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd'),'OTHERS']) }}';
         var mainUri = '{{ route('chart.budget.main', [accountIds, budgetIds, start.format('Ymd'), end.format('Ymd')]) }}';
     
diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig
index cc393df917..679793d770 100644
--- a/resources/views/reports/category/month.twig
+++ b/resources/views/reports/category/month.twig
@@ -110,36 +110,34 @@
                 
                                              
             
                                              
         {% endif %}
-        {% if accounts.count > 1 %}
-            
                                              
-                
                                              
-                    
                                              
-                        
                                              {{ 'income_per_account'|_ }}
                                              
-                    
                                              
-                    
                                              
-                        
-                        
-                    
                                              
+        
                                              
+            
                                              
+                
                                              
+                    
                                              {{ 'income_per_account'|_ }}
                                              
+                
                                              
+                
                                              
+                    
+                    
                 
                                              
             
                                              
-            
                                              
-                
                                              
-                    
                                              
-                        
                                              {{ 'expense_per_account'|_ }}
                                              
-                    
                                              
-                    
                                              
-                        
-                        
-                    
                                              
+        
                                              
+        
                                              
+            
                                              
+                
                                              
+                    
                                              {{ 'expense_per_account'|_ }}
                                              
+                
                                              
+                
                                              
+                    
+                    
                 
                                              
             
                                              
-        {% endif %}
+        
                                              
     
                                              
 
     
                                              
@@ -173,22 +171,35 @@
                             
                             
                             {% for row in averageExpenses %}
-                                
-                                    
-                                        {{ row.name }}
-                                    
-                                    
-                                        {{ row.average|formatAmount }}
-                                    
-                                    
-                                        {{ row.sum|formatAmount }}
-                                    
-                                    
-                                        {{ row.count }}
-                                    
+                                {% if loop.index > listLength %}
+                                    
+                                {% else %}
+                                    
+                                {% endif %}
+                                
+                                    {{ row.name }}
+                                
+                                
+                                    {{ row.average|formatAmount }}
+                                
+                                
+                                    {{ row.sum|formatAmount }}
+                                
+                                
+                                    {{ row.count }}
+                                
                                 
                             {% endfor %}
                             
+                            
+                            {% if averageExpenses|length > listLength %}
+                                
+                                    
+                                        {{ trans('firefly.show_full_list',{number:incomeTopLength}) }}
+                                    
+                                
+                            {% endif %}
+                            
                         
                     
                                              
                 
                                              
@@ -242,7 +253,7 @@
                             {% endfor %}
                             
                             
-                            {% if topExpenses.count > listLength %}
+                            {% if topExpenses|length > listLength %}
                                 
                                     
                                         {{ trans('firefly.show_full_list',{number:incomeTopLength}) }}
diff --git a/routes/web.php b/routes/web.php
index 0f607e21d5..2a12fc1c2f 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -263,6 +263,21 @@ Route::group(
     Route::get('budget/{budget}/{limitrepetition}', ['uses' => 'BudgetController@budgetLimit', 'as' => 'budget-limit']);
     Route::get('budget/{budget}', ['uses' => 'BudgetController@budget', 'as' => 'budget']);
 
+
+    // these charts are used in reports (category reports):
+    Route::get(
+        'budget/expense/{accountList}/{budgetList}/{start_date}/{end_date}/{others}',
+        ['uses' => 'BudgetReportController@budgetExpense', 'as' => 'budget-expense']
+    );
+    Route::get(
+        'account/expense/{accountList}/{budgetList}/{start_date}/{end_date}/{others}',
+        ['uses' => 'BudgetReportController@accountExpense', 'as' => 'account-expense']
+    );
+
+    Route::get(
+        'operations/{accountList}/{budgetList}/{start_date}/{end_date}',
+        ['uses' => 'BudgetReportController@mainChart', 'as' => 'main']
+    );
 }
 );
 
@@ -298,7 +313,7 @@ Route::group(
     );
 
     Route::get(
-        'report-in-out/{accountList}/{categoryList}/{start_date}/{end_date}',
+        'operations/{accountList}/{categoryList}/{start_date}/{end_date}',
         ['uses' => 'CategoryReportController@mainChart', 'as' => 'main']
     );
 

From 9165e0238f92073879ebb710c8d303bf9e368a92 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 08:35:03 +0100
Subject: [PATCH 203/223] Import related tests.

---
 app/Http/breadcrumbs.php                      | 31 +++++-
 resources/lang/en_US/firefly.php              |  3 +
 resources/seeds/seed.testing.json             | 91 +++++++++++++++++
 .../Controllers/ImportControllerTest.php      | 99 +++++++++----------
 4 files changed, 171 insertions(+), 53 deletions(-)

diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index 5edec159df..5b99d097ee 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -18,6 +18,7 @@ use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
+use FireflyIII\Models\ImportJob;
 use FireflyIII\Models\LimitRepetition;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Rule;
@@ -416,6 +417,35 @@ Breadcrumbs::register(
 }
 );
 
+/**
+ * IMPORT
+ */
+Breadcrumbs::register(
+    'import.index', function (BreadCrumbGenerator $breadcrumbs) {
+    $breadcrumbs->parent('home');
+    $breadcrumbs->push(trans('firefly.import'), route('import.index'));
+}
+);
+Breadcrumbs::register(
+    'import.complete', function (BreadCrumbGenerator $breadcrumbs, ImportJob $job) {
+    $breadcrumbs->parent('import.index');
+    $breadcrumbs->push(trans('firefly.bread_crumb_import_complete', ['key' => $job->key]), route('import.complete', [$job->key]));
+}
+);
+Breadcrumbs::register(
+    'import.configure', function (BreadCrumbGenerator $breadcrumbs, ImportJob $job) {
+    $breadcrumbs->parent('import.index');
+    $breadcrumbs->push(trans('firefly.bread_crumb_configure_import', ['key' => $job->key]), route('import.configure', [$job->key]));
+}
+);
+Breadcrumbs::register(
+    'import.finished', function (BreadCrumbGenerator $breadcrumbs, ImportJob $job) {
+    $breadcrumbs->parent('import.index');
+    $breadcrumbs->push(trans('firefly.bread_crumb_import_finished', ['key' => $job->key]), route('import.finished', [$job->key]));
+}
+);
+
+
 /**
  * PREFERENCES
  */
@@ -423,7 +453,6 @@ Breadcrumbs::register(
     'preferences.index', function (BreadCrumbGenerator $breadcrumbs) {
     $breadcrumbs->parent('home');
     $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences.index'));
-
 }
 );
 
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index b6553ec393..2dd05190e8 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -934,4 +934,7 @@ return [
     'import_finished_link'                 => 'The transactions imported can be found in tag :tag.',
     'need_at_least_one_account'            => 'You need at least one asset account to be able to create piggy banks',
     'see_help_top_right'                   => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
+    'bread_crumb_import_complete'          => 'Import ":key" complete',
+    'bread_crumb_configure_import'         => 'Configure import ":key"',
+    'bread_crumb_import_finished'          => 'Import ":key" finished',
 ];
diff --git a/resources/seeds/seed.testing.json b/resources/seeds/seed.testing.json
index 2ff87151c1..7f1f8a811d 100644
--- a/resources/seeds/seed.testing.json
+++ b/resources/seeds/seed.testing.json
@@ -1070,6 +1070,97 @@
         },
         "column-mapping-complete": false
       }
+    },
+
+    {
+      "user_id": 1,
+      "key": "complete",
+      "file_type": "csv",
+      "status": "settings_complete",
+      "extended_status": {
+        "steps_done": 0,
+        "total_steps": 0,
+        "errors": [],
+        "import_count": 0,
+        "importTag": 0
+      },
+      "configuration": {
+      }
+    },
+    {
+      "user_id": 1,
+      "key": "configure",
+      "file_type": "csv",
+      "status": "import_status_never_started",
+      "extended_status": {
+        "steps_done": 0,
+        "total_steps": 0,
+        "errors": [],
+        "import_count": 0,
+        "importTag": 0
+      },
+      "configuration": {
+      }
+    },
+    {
+      "user_id": 1,
+      "key": "settings",
+      "file_type": "csv",
+      "status": "import_configuration_saved",
+      "extended_status": {
+        "steps_done": 0,
+        "total_steps": 0,
+        "errors": [],
+        "import_count": 0,
+        "importTag": 0
+      },
+      "configuration": {
+      }
+    },
+    {
+      "user_id": 1,
+      "key": "p-settings",
+      "file_type": "csv",
+      "status": "import_configuration_saved",
+      "extended_status": {
+        "steps_done": 0,
+        "total_steps": 0,
+        "errors": [],
+        "import_count": 0,
+        "importTag": 0
+      },
+      "configuration": {
+      }
+    },
+    {
+      "user_id": 1,
+      "key": "p-configure",
+      "file_type": "csv",
+      "status": "import_status_never_started",
+      "extended_status": {
+        "steps_done": 0,
+        "total_steps": 0,
+        "errors": [],
+        "import_count": 0,
+        "importTag": 0
+      },
+      "configuration": {
+      }
+    },
+    {
+      "user_id": 1,
+      "key": "finished",
+      "file_type": "csv",
+      "status": "import_complete",
+      "extended_status": {
+        "steps_done": 0,
+        "total_steps": 0,
+        "errors": [],
+        "import_count": 0,
+        "importTag": 0
+      },
+      "configuration": {
+      }
     }
   ],
   "export-jobs": [
diff --git a/tests/acceptance/Controllers/ImportControllerTest.php b/tests/acceptance/Controllers/ImportControllerTest.php
index 30fee63469..8437b851e9 100644
--- a/tests/acceptance/Controllers/ImportControllerTest.php
+++ b/tests/acceptance/Controllers/ImportControllerTest.php
@@ -8,6 +8,7 @@
  *
  * See the LICENSE file for details.
  */
+use FireflyIII\Import\Setup\CsvSetup;
 
 
 /**
@@ -28,98 +29,97 @@ class ImportControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::complete
-     * Implement testComplete().
      */
     public function testComplete()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('GET', route('import.complete', ['complete']));
+        $this->assertResponseStatus(200);
+        $this->see('
                                                ');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::configure
-     * Implement testConfigure().
      */
     public function testConfigure()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('GET', route('import.configure', ['configure']));
+        $this->assertResponseStatus(200);
+        $this->see('
                                                  ');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::download
-     * Implement testDownload().
      */
     public function testDownload()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('GET', route('import.download', ['configure']));
+        $this->assertResponseStatus(200);
+        $this->see('[]');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::finished
-     * Implement testFinished().
      */
     public function testFinished()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('GET', route('import.finished', ['finished']));
+        $this->assertResponseStatus(200);
+        $this->see('
                                                    ');
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::index
-     * Implement testIndex().
      */
     public function testIndex()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('GET', route('import.index'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::json
-     * Implement testJson().
      */
     public function testJson()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('GET', route('import.json', ['configure']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::postConfigure
-     * Implement testPostConfigure().
      */
     public function testPostConfigure()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $importer = $this->mock(CsvSetup::class);
+        $importer->shouldReceive('setJob')->once();
+        $importer->shouldReceive('saveImportConfiguration')->once();
+
+        $data = [];
+        $this->be($this->user());
+        $this->call('post', route('import.process-configuration', ['p-configure']), $data);
+        $this->assertResponseStatus(302);
+        $this->assertRedirectedToRoute('import.settings', ['p-configure']);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::postSettings
-     * Implement testPostSettings().
      */
     public function testPostSettings()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $importer = $this->mock(CsvSetup::class);
+        $importer->shouldReceive('setJob')->once();
+        $importer->shouldReceive('storeSettings')->once();
+        $data = [];
+        $this->be($this->user());
+        $this->call('post', route('import.post-settings', ['p-settings']), $data);
+        $this->assertResponseStatus(302);
+        $this->assertRedirectedToRoute('import.settings', ['p-settings']);
     }
 
     /**
@@ -128,10 +128,13 @@ class ImportControllerTest extends TestCase
      */
     public function testSettings()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $importer = $this->mock(CsvSetup::class);
+        $importer->shouldReceive('setJob')->once();
+        $importer->shouldReceive('requireUserSettings')->once()->andReturn(false);
+        $this->be($this->user());
+        $this->call('get', route('import.settings', ['settings']));
+        $this->assertResponseStatus(302);
+        $this->assertRedirectedToRoute('import.complete', ['settings']);
     }
 
     /**
@@ -169,12 +172,4 @@ class ImportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }

From 0a4b0ec929c7e33774169bd21f5116db60abf144 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 08:41:17 +0100
Subject: [PATCH 204/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 8af126f24c..c59160341d 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -934,4 +934,7 @@ return [
     'import_finished_link'                 => 'De geimporteerde transacties kan je vinden onder tag :tag.',
     'need_at_least_one_account'            => 'Je moet minstens één betaalrekening hebben voor je spaarpotjes kan maken',
     'see_help_top_right'                   => 'Meer informatie vind je in de help pagina\'s. Gebruik daarvoor het icoontje rechtsboven in de hoek.',
+    'bread_crumb_import_complete'          => 'Import ":key" complete',
+    'bread_crumb_configure_import'         => 'Configure import ":key"',
+    'bread_crumb_import_finished'          => 'Import ":key" finished',
 ];
\ No newline at end of file

From 15f0bc63b282fcaa33d243b9d71a9d91d885ab2b Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 08:41:27 +0100
Subject: [PATCH 205/223] New translations

---
 resources/lang/pt_BR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index ad85daa201..3fefd921d5 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -934,4 +934,7 @@ return [
     'import_finished_link'                 => 'The transactions imported can be found in tag :tag.',
     'need_at_least_one_account'            => 'Você precisa de pelo menos uma conta de ativo para ser capaz de criar cofrinhos',
     'see_help_top_right'                   => 'Para obter mais informações, por favor, confira as páginas de ajuda usando o ícone no canto superior direito da página.',
+    'bread_crumb_import_complete'          => 'Import ":key" complete',
+    'bread_crumb_configure_import'         => 'Configure import ":key"',
+    'bread_crumb_import_finished'          => 'Import ":key" finished',
 ];
\ No newline at end of file

From 3eed67f10827fe1db415a061f2f887b29949f80e Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 08:41:33 +0100
Subject: [PATCH 206/223] New translations

---
 resources/lang/zh_HK/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index b300e5b679..07a4e121aa 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -934,4 +934,7 @@ return [
     'import_finished_link'                 => 'The transactions imported can be found in tag :tag.',
     'need_at_least_one_account'            => 'You need at least one asset account to be able to create piggy banks',
     'see_help_top_right'                   => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
+    'bread_crumb_import_complete'          => 'Import ":key" complete',
+    'bread_crumb_configure_import'         => 'Configure import ":key"',
+    'bread_crumb_import_finished'          => 'Import ":key" finished',
 ];
\ No newline at end of file

From b83d346a8698413a5d851550730f5d84f43dd0f7 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 08:41:37 +0100
Subject: [PATCH 207/223] New translations

---
 resources/lang/zh_TW/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index 5589304af8..b964d73986 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -934,4 +934,7 @@ return [
     'import_finished_link'                 => '匯入成功的所有交易都可以在標籤 :tag 內找到。',
     'need_at_least_one_account'            => 'You need at least one asset account to be able to create piggy banks',
     'see_help_top_right'                   => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
+    'bread_crumb_import_complete'          => 'Import ":key" complete',
+    'bread_crumb_configure_import'         => 'Configure import ":key"',
+    'bread_crumb_import_finished'          => 'Import ":key" finished',
 ];
\ No newline at end of file

From 312e79921a42f1a30b4631f693d7045aec2d63c5 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 08:41:43 +0100
Subject: [PATCH 208/223] New translations

---
 resources/lang/fr_FR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index f429f4e364..6508a4bc40 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -934,4 +934,7 @@ return [
     'import_finished_link'                 => 'The transactions imported can be found in tag :tag.',
     'need_at_least_one_account'            => 'You need at least one asset account to be able to create piggy banks',
     'see_help_top_right'                   => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
+    'bread_crumb_import_complete'          => 'Import ":key" complete',
+    'bread_crumb_configure_import'         => 'Configure import ":key"',
+    'bread_crumb_import_finished'          => 'Import ":key" finished',
 ];
\ No newline at end of file

From f5c5cb7fb98913b00e65cf8e8b05e7e409d39baf Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 08:41:47 +0100
Subject: [PATCH 209/223] New translations

---
 resources/lang/de_DE/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 9330403f7f..16b5f20692 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -935,4 +935,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'import_finished_link'                 => 'The transactions imported can be found in tag :tag.',
     'need_at_least_one_account'            => 'Sie benötigen mindestens ein Bestandskonto, um ein Sparschwein zu erstellen',
     'see_help_top_right'                   => 'Mehr Information finden sie in den Hilfeseiten, indem sie auf das Fragezeichen in der rechten oberen Ecke klicken.',
+    'bread_crumb_import_complete'          => 'Import ":key" complete',
+    'bread_crumb_configure_import'         => 'Configure import ":key"',
+    'bread_crumb_import_finished'          => 'Import ":key" finished',
 ];
\ No newline at end of file

From 90644e662d3c49680396ffe6837c7cd9b9c18092 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 08:41:52 +0100
Subject: [PATCH 210/223] New translations

---
 resources/lang/hr_HR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index b300e5b679..07a4e121aa 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -934,4 +934,7 @@ return [
     'import_finished_link'                 => 'The transactions imported can be found in tag :tag.',
     'need_at_least_one_account'            => 'You need at least one asset account to be able to create piggy banks',
     'see_help_top_right'                   => 'For more information, please check out the help pages using the icon in the top right corner of the page.',
+    'bread_crumb_import_complete'          => 'Import ":key" complete',
+    'bread_crumb_configure_import'         => 'Configure import ":key"',
+    'bread_crumb_import_finished'          => 'Import ":key" finished',
 ];
\ No newline at end of file

From f3398c7dec94206617fff643c780dfd0674ce1f9 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 17:09:46 +0100
Subject: [PATCH 211/223] This fixes #472

---
 app/Import/ImportStorage.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Import/ImportStorage.php b/app/Import/ImportStorage.php
index 8b4986a9fe..ce13b7b381 100644
--- a/app/Import/ImportStorage.php
+++ b/app/Import/ImportStorage.php
@@ -113,7 +113,11 @@ class ImportStorage
     private function alreadyImported(string $hash): TransactionJournal
     {
 
-        $meta = TransactionJournalMeta::where('name', 'originalImportHash')->where('data', json_encode($hash))->first(['journal_meta.*']);
+        $meta = TransactionJournalMeta
+            ::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
+            ->where('journal_meta.name', 'originalImportHash')
+            ->where('transaction_journals.user_id', $this->user->id)
+            ->where('journal_meta.data', json_encode($hash))->first(['journal_meta.*']);
         if (!is_null($meta)) {
             /** @var TransactionJournal $journal */
             $journal = $meta->transactionjournal;

From 7ecd691ee2031f04f63f48bb784a3c7b60a5475a Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sat, 17 Dec 2016 19:19:49 +0100
Subject: [PATCH 212/223] New tests.

---
 app/Http/Controllers/ImportController.php     |  3 ++-
 app/Import/ImportProcedure.php                |  2 +-
 app/Support/Migration/TestData.php            |  7 ++++-
 resources/seeds/seed.testing.json             |  4 +++
 resources/stubs/csv.csv                       |  3 +++
 .../Controllers/ImportControllerTest.php      | 27 +++++++++----------
 6 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 resources/stubs/csv.csv

diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index bbf09436c2..d854f141d9 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -318,7 +318,8 @@ class ImportController extends Controller
     {
         set_time_limit(0);
         if ($job->status == 'settings_complete') {
-            ImportProcedure::runImport($job);
+            $importProcedure = new ImportProcedure;
+            $importProcedure->runImport($job);
         }
     }
 
diff --git a/app/Import/ImportProcedure.php b/app/Import/ImportProcedure.php
index ae6b2cf910..dd3878a01b 100644
--- a/app/Import/ImportProcedure.php
+++ b/app/Import/ImportProcedure.php
@@ -31,7 +31,7 @@ class ImportProcedure
      *
      * @return Collection
      */
-    public static function runImport(ImportJob $job): Collection
+    public function runImport(ImportJob $job): Collection
     {
         // update job to say we started.
         $job->status = 'import_running';
diff --git a/app/Support/Migration/TestData.php b/app/Support/Migration/TestData.php
index d6f510642f..dab024765c 100644
--- a/app/Support/Migration/TestData.php
+++ b/app/Support/Migration/TestData.php
@@ -292,9 +292,12 @@ class TestData
      */
     private function createImportJobs()
     {
+
+        $disk   = Storage::disk('upload');
         $insert = [];
         foreach ($this->data['import-jobs'] as $job) {
-            $insert[] = [
+            $insert[]
+                = [
                 'created_at'      => $this->time,
                 'updated_at'      => $this->time,
                 'user_id'         => $job['user_id'],
@@ -304,6 +307,8 @@ class TestData
                 'extended_status' => json_encode($job['extended_status']),
                 'configuration'   => json_encode($job['configuration']),
             ];
+
+            $disk->put($job['key'] . '.upload', Crypt::encrypt(''));
         }
         DB::table('import_jobs')->insert($insert);
     }
diff --git a/resources/seeds/seed.testing.json b/resources/seeds/seed.testing.json
index 7f1f8a811d..5411ed03a1 100644
--- a/resources/seeds/seed.testing.json
+++ b/resources/seeds/seed.testing.json
@@ -1085,6 +1085,10 @@
         "importTag": 0
       },
       "configuration": {
+        "has-headers": false,
+        "date-format": "Ymd",
+        "delimiter": ",",
+        "import-account": 1
       }
     },
     {
diff --git a/resources/stubs/csv.csv b/resources/stubs/csv.csv
new file mode 100644
index 0000000000..05de7d7338
--- /dev/null
+++ b/resources/stubs/csv.csv
@@ -0,0 +1,3 @@
+Header
+Value
+Value
\ No newline at end of file
diff --git a/tests/acceptance/Controllers/ImportControllerTest.php b/tests/acceptance/Controllers/ImportControllerTest.php
index 8437b851e9..bec5fc7dd9 100644
--- a/tests/acceptance/Controllers/ImportControllerTest.php
+++ b/tests/acceptance/Controllers/ImportControllerTest.php
@@ -9,6 +9,7 @@
  * See the LICENSE file for details.
  */
 use FireflyIII\Import\Setup\CsvSetup;
+use Illuminate\Http\UploadedFile;
 
 
 /**
@@ -124,7 +125,6 @@ class ImportControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::settings
-     * Implement testSettings().
      */
     public function testSettings()
     {
@@ -139,14 +139,12 @@ class ImportControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::start
-     * Implement testStart().
      */
     public function testStart()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('post', route('import.start', ['complete']));
+        $this->assertResponseStatus(200);
     }
 
     /**
@@ -155,21 +153,20 @@ class ImportControllerTest extends TestCase
      */
     public function testStatus()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        // complete
+        $this->be($this->user());
+        $this->call('get', route('import.status', ['complete']));
+        $this->assertResponseStatus(302);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\ImportController::upload
-     * Implement testUpload().
      */
     public function testUpload()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $path = resource_path('stubs/csv.csv');
+        $file = new UploadedFile($path, 'upload.csv', filesize($path), 'text/csv', null, true);
+        $this->call('POST', route('import.upload'), [], [], ['import_file' => $file], ['Accept' => 'application/json']);
+        $this->assertResponseStatus(302);
     }
 }

From 279d7769f5cbbe4f5ce10ff4895a9599f9538204 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 09:27:27 +0100
Subject: [PATCH 213/223] This fixes #470

---
 app/Http/Controllers/ImportController.php |  5 ++++-
 resources/lang/en_US/firefly.php          |  3 +++
 resources/seeds/seed.testing.json         |  2 +-
 resources/views/import/finished.twig      | 13 ++++++++++++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index d854f141d9..270afe99d1 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -145,10 +145,13 @@ class ImportController extends Controller
             return $this->redirectToCorrectStep($job);
         }
 
+        // if there is a tag (there might not be), we can link to it:
+        $tagId = $job->extended_status['importTag'] ?? 0;
+
         $subTitle     = trans('firefly.import_finished');
         $subTitleIcon = 'fa-star';
 
-        return view('import.finished', compact('job', 'subTitle', 'subTitleIcon'));
+        return view('import.finished', compact('job', 'subTitle', 'subTitleIcon', 'tagId'));
     }
 
     /**
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index 2dd05190e8..226834da8a 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -937,4 +937,7 @@ return [
     'bread_crumb_import_complete'          => 'Import ":key" complete',
     'bread_crumb_configure_import'         => 'Configure import ":key"',
     'bread_crumb_import_finished'          => 'Import ":key" finished',
+    'import_finished_intro'                => 'The import has finished! You can now see the new transactions in Firefly.',
+    'import_finished_text_without_link'    => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
+    'import_finished_text_with_link'       => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
 ];
diff --git a/resources/seeds/seed.testing.json b/resources/seeds/seed.testing.json
index 5411ed03a1..5ec4e900f2 100644
--- a/resources/seeds/seed.testing.json
+++ b/resources/seeds/seed.testing.json
@@ -1161,7 +1161,7 @@
         "total_steps": 0,
         "errors": [],
         "import_count": 0,
-        "importTag": 0
+        "importTag": 1
       },
       "configuration": {
       }
diff --git a/resources/views/import/finished.twig b/resources/views/import/finished.twig
index 63e5b450fc..aa4066385e 100644
--- a/resources/views/import/finished.twig
+++ b/resources/views/import/finished.twig
@@ -11,7 +11,18 @@
                     
                                                    {{ 'import_finished'|_ }}
                                                    
                 
                                              
                 
                                              
-                    This import has beeen done. Link to tag or set of transactions.
+                    
                                              
+                        {{ 'import_finished_intro'|_ }}
+                    
                                              
+                    {% if tagId > 0 %}
+                    
                                              
+                        {{ trans('firefly.import_finished_text_with_link', {tag: tagId})|raw }}
+                    
                                              
+                    {% else %}
+                    
                                              
+                        {{ 'import_finished_text_without_link'|_ }}
+                    
                                              
+                    {% endif %}
 
                     
                                              
                         {{ 'import_share_configuration'|_ }}

From 341da327e3572f9cc0e7fee58814d4eb92746e15 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 09:41:12 +0100
Subject: [PATCH 214/223] New translations

---
 resources/lang/pt_BR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php
index 3fefd921d5..71fb3492b6 100644
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@@ -937,4 +937,7 @@ return [
     'bread_crumb_import_complete'          => 'Import ":key" complete',
     'bread_crumb_configure_import'         => 'Configure import ":key"',
     'bread_crumb_import_finished'          => 'Import ":key" finished',
+    'import_finished_intro'                => 'The import has finished! You can now see the new transactions in Firefly.',
+    'import_finished_text_without_link'    => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
+    'import_finished_text_with_link'       => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
 ];
\ No newline at end of file

From f71e7a2f287d2aecddb107f2e1c32f194b9bc668 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 09:41:31 +0100
Subject: [PATCH 215/223] New translations

---
 resources/lang/zh_HK/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php
index 07a4e121aa..7d587786c5 100644
--- a/resources/lang/zh_HK/firefly.php
+++ b/resources/lang/zh_HK/firefly.php
@@ -937,4 +937,7 @@ return [
     'bread_crumb_import_complete'          => 'Import ":key" complete',
     'bread_crumb_configure_import'         => 'Configure import ":key"',
     'bread_crumb_import_finished'          => 'Import ":key" finished',
+    'import_finished_intro'                => 'The import has finished! You can now see the new transactions in Firefly.',
+    'import_finished_text_without_link'    => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
+    'import_finished_text_with_link'       => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
 ];
\ No newline at end of file

From 73129b0ce5afdd1c21dfc39d3fb70c48ccba69ab Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 09:41:35 +0100
Subject: [PATCH 216/223] New translations

---
 resources/lang/zh_TW/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php
index b964d73986..6e9d309c22 100644
--- a/resources/lang/zh_TW/firefly.php
+++ b/resources/lang/zh_TW/firefly.php
@@ -937,4 +937,7 @@ return [
     'bread_crumb_import_complete'          => 'Import ":key" complete',
     'bread_crumb_configure_import'         => 'Configure import ":key"',
     'bread_crumb_import_finished'          => 'Import ":key" finished',
+    'import_finished_intro'                => 'The import has finished! You can now see the new transactions in Firefly.',
+    'import_finished_text_without_link'    => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
+    'import_finished_text_with_link'       => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
 ];
\ No newline at end of file

From 6282d8c82838c07ebdeb64c6bea9a0ce9d45f9c7 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 09:41:40 +0100
Subject: [PATCH 217/223] New translations

---
 resources/lang/fr_FR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php
index 6508a4bc40..9bd76c4595 100644
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@@ -937,4 +937,7 @@ return [
     'bread_crumb_import_complete'          => 'Import ":key" complete',
     'bread_crumb_configure_import'         => 'Configure import ":key"',
     'bread_crumb_import_finished'          => 'Import ":key" finished',
+    'import_finished_intro'                => 'The import has finished! You can now see the new transactions in Firefly.',
+    'import_finished_text_without_link'    => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
+    'import_finished_text_with_link'       => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
 ];
\ No newline at end of file

From da1d3b82f95ca1df582647ab7de00a19f73b02fc Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 09:41:45 +0100
Subject: [PATCH 218/223] New translations

---
 resources/lang/de_DE/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php
index 16b5f20692..8dd703474f 100644
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@@ -938,4 +938,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
     'bread_crumb_import_complete'          => 'Import ":key" complete',
     'bread_crumb_configure_import'         => 'Configure import ":key"',
     'bread_crumb_import_finished'          => 'Import ":key" finished',
+    'import_finished_intro'                => 'The import has finished! You can now see the new transactions in Firefly.',
+    'import_finished_text_without_link'    => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
+    'import_finished_text_with_link'       => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
 ];
\ No newline at end of file

From b2f14dc1770e156a11258109b7f3e21661301399 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 09:41:50 +0100
Subject: [PATCH 219/223] New translations

---
 resources/lang/hr_HR/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php
index 07a4e121aa..7d587786c5 100644
--- a/resources/lang/hr_HR/firefly.php
+++ b/resources/lang/hr_HR/firefly.php
@@ -937,4 +937,7 @@ return [
     'bread_crumb_import_complete'          => 'Import ":key" complete',
     'bread_crumb_configure_import'         => 'Configure import ":key"',
     'bread_crumb_import_finished'          => 'Import ":key" finished',
+    'import_finished_intro'                => 'The import has finished! You can now see the new transactions in Firefly.',
+    'import_finished_text_without_link'    => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
+    'import_finished_text_with_link'       => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
 ];
\ No newline at end of file

From 6b51a116d1a0521467c6fa753a20d9f22764c41d Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 09:41:52 +0100
Subject: [PATCH 220/223] New translations

---
 resources/lang/nl_NL/firefly.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index c59160341d..5d57bb4a11 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -937,4 +937,7 @@ return [
     'bread_crumb_import_complete'          => 'Import ":key" complete',
     'bread_crumb_configure_import'         => 'Configure import ":key"',
     'bread_crumb_import_finished'          => 'Import ":key" finished',
+    'import_finished_intro'                => 'The import has finished! You can now see the new transactions in Firefly.',
+    'import_finished_text_without_link'    => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
+    'import_finished_text_with_link'       => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
 ];
\ No newline at end of file

From 7716ff4e8c80d0da198a72f10cc664592ee16b12 Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 10:37:59 +0100
Subject: [PATCH 221/223] Update various tests and the composer lock file.

---
 app/Http/Controllers/CategoryController.php   |   6 +-
 .../Journal/JournalRepository.php             |  11 +-
 composer.lock                                 | 146 +++++++++---------
 routes/web.php                                |   2 +-
 .../Controllers/CategoryControllerTest.php    |  37 +++++
 .../Controllers/JsonControllerTest.php        | 112 +++++---------
 .../Controllers/NewUserControllerTest.php     |   9 --
 .../Controllers/PiggyBankControllerTest.php   |   7 -
 .../Controllers/PreferencesControllerTest.php |   8 -
 .../Controllers/ProfileControllerTest.php     |   8 -
 .../Controllers/ReportControllerTest.php      |   8 -
 .../Controllers/RuleControllerTest.php        |   8 -
 .../Controllers/RuleGroupControllerTest.php   |   8 -
 .../Controllers/SearchControllerTest.php      |   8 -
 .../Controllers/TagControllerTest.php         |   8 -
 .../Controllers/TransactionControllerTest.php |   8 -
 16 files changed, 161 insertions(+), 233 deletions(-)

diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
index 1ffb912259..e832f3245d 100644
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -15,6 +15,7 @@ namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
 use FireflyIII\Helpers\Collector\JournalCollector;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Requests\CategoryFormRequest;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Category;
@@ -60,7 +61,6 @@ class CategoryController extends Controller
      */
     public function create()
     {
-        // put previous url in session if not redirect from store (not "create another").
         if (session('categories.create.fromStore') !== true) {
             Session::put('categories.create.url', URL::previous());
         }
@@ -190,7 +190,7 @@ class CategoryController extends Controller
         $subTitleIcon = 'fa-bar-chart';
 
         // use journal collector
-        $collector = new JournalCollector(auth()->user());
+        $collector = app(JournalCollectorInterface::class);
         $collector->setPage($page)->setLimit($pageSize)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category);
         $journals = $collector->getPaginatedJournals();
         $journals->setPath('categories/show/' . $category->id);
@@ -257,7 +257,7 @@ class CategoryController extends Controller
         $pageSize     = intval(Preferences::get('transactionPageSize', 50)->data);
 
         // new collector:
-        $collector = new JournalCollector(auth()->user());
+        $collector = app(JournalCollectorInterface::class);
         $collector->setPage($page)->setLimit($pageSize)->setAllAssetAccounts()->setRange($start, $end)->setCategory($category);
         $journals = $collector->getPaginatedJournals();
         $journals->setPath('categories/show/' . $category->id . '/' . $date);
diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php
index c655b20f41..2093793c8d 100644
--- a/app/Repositories/Journal/JournalRepository.php
+++ b/app/Repositories/Journal/JournalRepository.php
@@ -82,10 +82,15 @@ class JournalRepository implements JournalRepositoryInterface
         $destinationTransaction->save();
         $journal->transaction_type_id = $type->id;
         $journal->save();
-        Preferences::mark();
-        $messages = new MessageBag;
 
-        return $messages;
+        // if journal is a transfer now, remove budget:
+        if ($type->type === TransactionType::TRANSFER) {
+            $journal->budgets()->detach();
+        }
+
+        Preferences::mark();
+
+        return new MessageBag;
     }
 
     /**
diff --git a/composer.lock b/composer.lock
index aeb5bf11c3..b165ea68f1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1942,16 +1942,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "5be36e1f3ac7ecbe7e34fb641480ad8497b83aa6"
+                "reference": "221a60fb2f369a065eea1ed96b61183219fdfa6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5be36e1f3ac7ecbe7e34fb641480ad8497b83aa6",
-                "reference": "5be36e1f3ac7ecbe7e34fb641480ad8497b83aa6",
+                "url": "https://api.github.com/repos/symfony/console/zipball/221a60fb2f369a065eea1ed96b61183219fdfa6e",
+                "reference": "221a60fb2f369a065eea1ed96b61183219fdfa6e",
                 "shasum": ""
             },
             "require": {
@@ -1999,11 +1999,11 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-16 22:17:09"
+            "time": "2016-12-08 14:58:14"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
@@ -2060,7 +2060,7 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -2120,16 +2120,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "9925935bf7144f9e4d2b976905881b4face036fb"
+                "reference": "74dcd370c8d057882575e535616fde935e411b19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/9925935bf7144f9e4d2b976905881b4face036fb",
-                "reference": "9925935bf7144f9e4d2b976905881b4face036fb",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/74dcd370c8d057882575e535616fde935e411b19",
+                "reference": "74dcd370c8d057882575e535616fde935e411b19",
                 "shasum": ""
             },
             "require": {
@@ -2165,20 +2165,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-03 08:04:31"
+            "time": "2016-12-13 09:38:21"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "5a4c8099a1547fe451256e056180ad4624177017"
+                "reference": "88a1d3cee2dbd06f7103ff63938743b903b65a92"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5a4c8099a1547fe451256e056180ad4624177017",
-                "reference": "5a4c8099a1547fe451256e056180ad4624177017",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/88a1d3cee2dbd06f7103ff63938743b903b65a92",
+                "reference": "88a1d3cee2dbd06f7103ff63938743b903b65a92",
                 "shasum": ""
             },
             "require": {
@@ -2218,20 +2218,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-16 22:17:09"
+            "time": "2016-11-27 04:21:07"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "674ac403c7b3742c2a988a86e3baf9aca2c696a0"
+                "reference": "d7a4671a6f8e4174127770263dcd95bee5713f76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/674ac403c7b3742c2a988a86e3baf9aca2c696a0",
-                "reference": "674ac403c7b3742c2a988a86e3baf9aca2c696a0",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d7a4671a6f8e4174127770263dcd95bee5713f76",
+                "reference": "d7a4671a6f8e4174127770263dcd95bee5713f76",
                 "shasum": ""
             },
             "require": {
@@ -2300,7 +2300,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-21 02:44:20"
+            "time": "2016-12-13 12:52:10"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -2471,16 +2471,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "66de154ae86b1a07001da9fbffd620206e4faf94"
+                "reference": "d23427a7f97a373129f61bc3b876fe4c66e2b3c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/66de154ae86b1a07001da9fbffd620206e4faf94",
-                "reference": "66de154ae86b1a07001da9fbffd620206e4faf94",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d23427a7f97a373129f61bc3b876fe4c66e2b3c7",
+                "reference": "d23427a7f97a373129f61bc3b876fe4c66e2b3c7",
                 "shasum": ""
             },
             "require": {
@@ -2516,20 +2516,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2016-09-29 14:13:09"
+            "time": "2016-11-24 01:08:05"
         },
         {
             "name": "symfony/routing",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "8edf62498a1a4c57ba317664a4b698339c10cdf6"
+                "reference": "4beb3dceb14cf2dd63dd222d1825ca981a2952cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/8edf62498a1a4c57ba317664a4b698339c10cdf6",
-                "reference": "8edf62498a1a4c57ba317664a4b698339c10cdf6",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/4beb3dceb14cf2dd63dd222d1825ca981a2952cb",
+                "reference": "4beb3dceb14cf2dd63dd222d1825ca981a2952cb",
                 "shasum": ""
             },
             "require": {
@@ -2591,11 +2591,11 @@
                 "uri",
                 "url"
             ],
-            "time": "2016-08-16 14:58:24"
+            "time": "2016-11-25 12:27:14"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
@@ -2659,16 +2659,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "0c2d613e890e33f4da810159ac97931068f5bd17"
+                "reference": "5ccbd23a97035886e595ce497dbe94bc88ac0b57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0c2d613e890e33f4da810159ac97931068f5bd17",
-                "reference": "0c2d613e890e33f4da810159ac97931068f5bd17",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5ccbd23a97035886e595ce497dbe94bc88ac0b57",
+                "reference": "5ccbd23a97035886e595ce497dbe94bc88ac0b57",
                 "shasum": ""
             },
             "require": {
@@ -2718,20 +2718,20 @@
                 "debug",
                 "dump"
             ],
-            "time": "2016-11-03 08:04:31"
+            "time": "2016-12-08 14:58:14"
         },
         {
             "name": "twig/twig",
-            "version": "v1.28.2",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c"
+                "reference": "74f723e542368ca2080b252740be5f1113ebb898"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/b22ce0eb070e41f7cba65d78fe216de29726459c",
-                "reference": "b22ce0eb070e41f7cba65d78fe216de29726459c",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/74f723e542368ca2080b252740be5f1113ebb898",
+                "reference": "74f723e542368ca2080b252740be5f1113ebb898",
                 "shasum": ""
             },
             "require": {
@@ -2744,7 +2744,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.28-dev"
+                    "dev-master": "1.29-dev"
                 }
             },
             "autoload": {
@@ -2779,7 +2779,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2016-11-23 18:41:40"
+            "time": "2016-12-13 17:28:18"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -2939,16 +2939,16 @@
         },
         {
             "name": "barryvdh/laravel-ide-helper",
-            "version": "v2.2.1",
+            "version": "v2.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463"
+                "reference": "105f14a50d0959a0e80004a15b3350fdf78f9623"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/28af7cd19ca41cc0c63dd1de2b46c2b84d31c463",
-                "reference": "28af7cd19ca41cc0c63dd1de2b46c2b84d31c463",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/105f14a50d0959a0e80004a15b3350fdf78f9623",
+                "reference": "105f14a50d0959a0e80004a15b3350fdf78f9623",
                 "shasum": ""
             },
             "require": {
@@ -3001,7 +3001,7 @@
                 "phpstorm",
                 "sublime"
             ],
-            "time": "2016-07-04 11:52:48"
+            "time": "2016-11-15 08:21:23"
         },
         {
             "name": "barryvdh/reflection-docblock",
@@ -3822,16 +3822,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.7.2",
+            "version": "5.7.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "336aff0ac52e306c98e7455bc3e8d7b0bf777a5e"
+                "reference": "af91da3f2671006ff5d0628023de3b7ac4d1ef09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/336aff0ac52e306c98e7455bc3e8d7b0bf777a5e",
-                "reference": "336aff0ac52e306c98e7455bc3e8d7b0bf777a5e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/af91da3f2671006ff5d0628023de3b7ac4d1ef09",
+                "reference": "af91da3f2671006ff5d0628023de3b7ac4d1ef09",
                 "shasum": ""
             },
             "require": {
@@ -3842,7 +3842,7 @@
                 "ext-xml": "*",
                 "myclabs/deep-copy": "~1.3",
                 "php": "^5.6 || ^7.0",
-                "phpspec/prophecy": "^1.3.1",
+                "phpspec/prophecy": "^1.6.2",
                 "phpunit/php-code-coverage": "^4.0.3",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
@@ -3852,7 +3852,7 @@
                 "sebastian/diff": "~1.2",
                 "sebastian/environment": "^1.3.4 || ^2.0",
                 "sebastian/exporter": "~2.0",
-                "sebastian/global-state": "~1.0",
+                "sebastian/global-state": "^1.0 || ^2.0",
                 "sebastian/object-enumerator": "~2.0",
                 "sebastian/resource-operations": "~1.0",
                 "sebastian/version": "~1.0|~2.0",
@@ -3900,20 +3900,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-12-03 08:33:00"
+            "time": "2016-12-13 16:19:44"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "3.4.2",
+            "version": "3.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "90a08f5deed5f7ac35463c161f2e8fa0e5652faf"
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/90a08f5deed5f7ac35463c161f2e8fa0e5652faf",
-                "reference": "90a08f5deed5f7ac35463c161f2e8fa0e5652faf",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
                 "shasum": ""
             },
             "require": {
@@ -3959,7 +3959,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2016-11-27 07:52:03"
+            "time": "2016-12-08 20:27:08"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -4476,7 +4476,7 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
@@ -4532,7 +4532,7 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -4585,16 +4585,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.1.7",
+            "version": "v3.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "1eb3b4d216e8db117218dd2bb7d23dfe67bdf518"
+                "reference": "51e979357eba65b1e6aac7cba75cf5aa6379b8f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1eb3b4d216e8db117218dd2bb7d23dfe67bdf518",
-                "reference": "1eb3b4d216e8db117218dd2bb7d23dfe67bdf518",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/51e979357eba65b1e6aac7cba75cf5aa6379b8f3",
+                "reference": "51e979357eba65b1e6aac7cba75cf5aa6379b8f3",
                 "shasum": ""
             },
             "require": {
@@ -4637,20 +4637,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-14 16:20:02"
+            "time": "2016-12-10 14:24:45"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "f2300ba8fbb002c028710b92e1906e7457410693"
+                "reference": "a7095af4b97a0955f85c8989106c249fa649011f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/f2300ba8fbb002c028710b92e1906e7457410693",
-                "reference": "f2300ba8fbb002c028710b92e1906e7457410693",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/a7095af4b97a0955f85c8989106c249fa649011f",
+                "reference": "a7095af4b97a0955f85c8989106c249fa649011f",
                 "shasum": ""
             },
             "require": {
@@ -4692,7 +4692,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-18 21:17:59"
+            "time": "2016-12-10 10:07:06"
         },
         {
             "name": "webmozart/assert",
diff --git a/routes/web.php b/routes/web.php
index 2a12fc1c2f..4573eb6696 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -392,7 +392,7 @@ Route::group(
     Route::get('trigger', ['uses' => 'JsonController@trigger', 'as' => 'trigger']);
     Route::get('action', ['uses' => 'JsonController@action', 'as' => 'action']);
 
-    Route::post('end-tour', ['uses' => 'JsonController@endTour']);
+    Route::post('end-tour', ['uses' => 'JsonController@endTour','as' => 'end-tour']);
 
 }
 );
diff --git a/tests/acceptance/Controllers/CategoryControllerTest.php b/tests/acceptance/Controllers/CategoryControllerTest.php
index d4cf7bb736..0d4c0c25d9 100644
--- a/tests/acceptance/Controllers/CategoryControllerTest.php
+++ b/tests/acceptance/Controllers/CategoryControllerTest.php
@@ -8,7 +8,12 @@
  *
  * See the LICENSE file for details.
  */
+use Carbon\Carbon;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Collection;
 
 
 /**
@@ -114,6 +119,27 @@ class CategoryControllerTest extends TestCase
      */
     public function testShow(string $range)
     {
+
+        $collector     = $this->mock(JournalCollectorInterface::class);
+        $accRepository = $this->mock(AccountRepositoryInterface::class);
+        $catRepository = $this->mock(CategoryRepositoryInterface::class);
+
+        $accRepository->shouldReceive('getAccountsByType')->once()->andReturn(new Collection);
+        $catRepository->shouldReceive('firstUseDate')->once()->andReturn(new Carbon);
+
+        // collector stuff:
+        $collector->shouldReceive('setPage')->andReturnSelf()->once();
+        $collector->shouldReceive('setLimit')->andReturnSelf()->once();
+        $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once();
+        $collector->shouldReceive('setRange')->andReturnSelf()->once();
+        $collector->shouldReceive('setCategory')->andReturnSelf()->once();
+        $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once();
+
+        // more repos stuff:
+        $catRepository->shouldReceive('spentInPeriod')->andReturn('0');
+        $catRepository->shouldReceive('earnedInPeriod')->andReturn('0');
+
+
         $this->be($this->user());
         $this->changeDateRange($this->user(), $range);
         $this->call('GET', route('categories.show', [1]));
@@ -129,6 +155,17 @@ class CategoryControllerTest extends TestCase
      */
     public function testShowByDate(string $range)
     {
+        $collector     = $this->mock(JournalCollectorInterface::class);
+
+        // collector stuff:
+        $collector->shouldReceive('setPage')->andReturnSelf()->once();
+        $collector->shouldReceive('setLimit')->andReturnSelf()->once();
+        $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once();
+        $collector->shouldReceive('setRange')->andReturnSelf()->once();
+        $collector->shouldReceive('setCategory')->andReturnSelf()->once();
+        $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once();
+
+
         $this->be($this->user());
         $this->changeDateRange($this->user(), $range);
         $this->call('GET', route('categories.show', [1, '2015-01-01']));
diff --git a/tests/acceptance/Controllers/JsonControllerTest.php b/tests/acceptance/Controllers/JsonControllerTest.php
index 43b8f164c6..bcd30afada 100644
--- a/tests/acceptance/Controllers/JsonControllerTest.php
+++ b/tests/acceptance/Controllers/JsonControllerTest.php
@@ -28,165 +28,131 @@ class JsonControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::action
-     * Implement testAction().
      */
     public function testAction()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.action'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsPaid
-     * Implement testBoxBillsPaid().
      */
     public function testBoxBillsPaid()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.box.paid'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::boxBillsUnpaid
-     * Implement testBoxBillsUnpaid().
      */
     public function testBoxBillsUnpaid()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.box.unpaid'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::boxIn
-     * Implement testBoxIn().
      */
     public function testBoxIn()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.box.in'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::boxOut
-     * Implement testBoxOut().
      */
     public function testBoxOut()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.box.out'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::categories
-     * Implement testCategories().
      */
     public function testCategories()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.categories'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::endTour
-     * Implement testEndTour().
      */
     public function testEndTour()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('post', route('json.end-tour'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::expenseAccounts
-     * Implement testExpenseAccounts().
      */
     public function testExpenseAccounts()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.expense-accounts'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::revenueAccounts
-     * Implement testRevenueAccounts().
      */
     public function testRevenueAccounts()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.revenue-accounts'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::tags
-     * Implement testTags().
      */
     public function testTags()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.tags'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::tour
-     * Implement testTour().
      */
     public function testTour()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.tour'));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::transactionJournals
-     * Implement testTransactionJournals().
      */
     public function testTransactionJournals()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
+        $this->be($this->user());
+        $this->call('get', route('json.transaction-journals', ['deposit']));
+        $this->assertResponseStatus(200);
     }
 
     /**
      * @covers \FireflyIII\Http\Controllers\JsonController::trigger
-     * Implement testTrigger().
      */
     public function testTrigger()
     {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-            'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
+        $this->be($this->user());
+        $this->call('get', route('json.trigger'));
+        $this->assertResponseStatus(200);
     }
 }
diff --git a/tests/acceptance/Controllers/NewUserControllerTest.php b/tests/acceptance/Controllers/NewUserControllerTest.php
index 04d9394c63..dd51e1fa8c 100644
--- a/tests/acceptance/Controllers/NewUserControllerTest.php
+++ b/tests/acceptance/Controllers/NewUserControllerTest.php
@@ -28,7 +28,6 @@ class NewUserControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\NewUserController::index
-     * Implement testIndex().
      */
     public function testIndex()
     {
@@ -40,7 +39,6 @@ class NewUserControllerTest extends TestCase
 
     /**
      * @covers \FireflyIII\Http\Controllers\NewUserController::submit
-     * Implement testSubmit().
      */
     public function testSubmit()
     {
@@ -50,11 +48,4 @@ class NewUserControllerTest extends TestCase
         );
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/PiggyBankControllerTest.php b/tests/acceptance/Controllers/PiggyBankControllerTest.php
index 769a7a6d5c..9ad18fb30c 100644
--- a/tests/acceptance/Controllers/PiggyBankControllerTest.php
+++ b/tests/acceptance/Controllers/PiggyBankControllerTest.php
@@ -206,11 +206,4 @@ class PiggyBankControllerTest extends TestCase
         );
     }
 
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/PreferencesControllerTest.php b/tests/acceptance/Controllers/PreferencesControllerTest.php
index 05405ae396..25c39e2a3f 100644
--- a/tests/acceptance/Controllers/PreferencesControllerTest.php
+++ b/tests/acceptance/Controllers/PreferencesControllerTest.php
@@ -85,12 +85,4 @@ class PreferencesControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/ProfileControllerTest.php b/tests/acceptance/Controllers/ProfileControllerTest.php
index 800490f612..c9d53bca71 100644
--- a/tests/acceptance/Controllers/ProfileControllerTest.php
+++ b/tests/acceptance/Controllers/ProfileControllerTest.php
@@ -85,12 +85,4 @@ class ProfileControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/ReportControllerTest.php b/tests/acceptance/Controllers/ReportControllerTest.php
index 441fcc1651..5ce19e0e61 100644
--- a/tests/acceptance/Controllers/ReportControllerTest.php
+++ b/tests/acceptance/Controllers/ReportControllerTest.php
@@ -109,12 +109,4 @@ class ReportControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/RuleControllerTest.php b/tests/acceptance/Controllers/RuleControllerTest.php
index ae36e1b5e3..174803647b 100644
--- a/tests/acceptance/Controllers/RuleControllerTest.php
+++ b/tests/acceptance/Controllers/RuleControllerTest.php
@@ -169,12 +169,4 @@ class RuleControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/RuleGroupControllerTest.php b/tests/acceptance/Controllers/RuleGroupControllerTest.php
index 741c354a92..586e4002bf 100644
--- a/tests/acceptance/Controllers/RuleGroupControllerTest.php
+++ b/tests/acceptance/Controllers/RuleGroupControllerTest.php
@@ -145,12 +145,4 @@ class RuleGroupControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/SearchControllerTest.php b/tests/acceptance/Controllers/SearchControllerTest.php
index af47690eb9..8bc0f55566 100644
--- a/tests/acceptance/Controllers/SearchControllerTest.php
+++ b/tests/acceptance/Controllers/SearchControllerTest.php
@@ -37,12 +37,4 @@ class SearchControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/TagControllerTest.php b/tests/acceptance/Controllers/TagControllerTest.php
index 7449bad0d0..362578276d 100644
--- a/tests/acceptance/Controllers/TagControllerTest.php
+++ b/tests/acceptance/Controllers/TagControllerTest.php
@@ -121,12 +121,4 @@ class TagControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }
diff --git a/tests/acceptance/Controllers/TransactionControllerTest.php b/tests/acceptance/Controllers/TransactionControllerTest.php
index 9870f9a8b9..aa97b8b7a4 100644
--- a/tests/acceptance/Controllers/TransactionControllerTest.php
+++ b/tests/acceptance/Controllers/TransactionControllerTest.php
@@ -85,12 +85,4 @@ class TransactionControllerTest extends TestCase
             'This test has not been implemented yet.'
         );
     }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
 }

From 04c5f583f6148b951d8c4f06230cb7a59555c84c Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 10:41:08 +0100
Subject: [PATCH 222/223] Approved. Step name: Proofread

---
 resources/lang/nl_NL/firefly.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php
index 5d57bb4a11..8da6423cd9 100644
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@@ -934,10 +934,10 @@ return [
     'import_finished_link'                 => 'De geimporteerde transacties kan je vinden onder tag :tag.',
     'need_at_least_one_account'            => 'Je moet minstens één betaalrekening hebben voor je spaarpotjes kan maken',
     'see_help_top_right'                   => 'Meer informatie vind je in de help pagina\'s. Gebruik daarvoor het icoontje rechtsboven in de hoek.',
-    'bread_crumb_import_complete'          => 'Import ":key" complete',
-    'bread_crumb_configure_import'         => 'Configure import ":key"',
-    'bread_crumb_import_finished'          => 'Import ":key" finished',
-    'import_finished_intro'                => 'The import has finished! You can now see the new transactions in Firefly.',
-    'import_finished_text_without_link'    => 'It seems there is no tag that points to all your imported transactions. Please look for your imported data in the menu on the left, under "Transactions".',
-    'import_finished_text_with_link'       => 'You can find a list of your imported transactions on the page of the tag that was created for this import.',
+    'bread_crumb_import_complete'          => 'Import ":key" compleet',
+    'bread_crumb_configure_import'         => 'Import ":key" instellen',
+    'bread_crumb_import_finished'          => 'Import ":key" klaar',
+    'import_finished_intro'                => 'De import is klaar! Je kan de transacties nu terugvinden in Firefly.',
+    'import_finished_text_without_link'    => 'Er is geen tag die al je transacties bevat. Kijk links in het menu onder "Transacties" en zoek daar je nieuwe transacties op.',
+    'import_finished_text_with_link'       => 'Je kan je geïmporteerde transacties op deze pagina terug vinden.',
 ];
\ No newline at end of file

From 8666197e05c13f1d2b5c85f58d72bf1f31f4c67d Mon Sep 17 00:00:00 2001
From: James Cole 
Date: Sun, 18 Dec 2016 10:48:05 +0100
Subject: [PATCH 223/223] Changelog and version bump.

---
 CHANGELOG.md       | 12 ++++++++++++
 config/firefly.php |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e688d23b82..107e66c744 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.2.2] - 2016-12-18
+### Added
+- New budget report (still a bit of a beta)
+- Can now edit user
+
+### Changed
+- New config for specific events. Still need to build Notifications.
+
+### Fixed
+- Various bugs
+- Issue #472 thanks to @zjean
+
 ## [4.2.1] - 2016-12-09
 ### Added
 - BIC support (see #430)
diff --git a/config/firefly.php b/config/firefly.php
index 07fdd04ee1..d48a4299cf 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -29,7 +29,7 @@ return [
         'mail_for_blocked_login'  => false,
     ],
     'chart'               => 'chartjs',
-    'version'             => '4.2.1',
+    'version'             => '4.2.2',
     'csv_import_enabled'  => true,
     'maxUploadSize'       => 5242880,
     'allowedMimes'        => ['image/png', 'image/jpeg', 'application/pdf'],