Merge branch 'release/4.2.2'

CHANGELOG.md

@@ -2,7 +2,19 @@
 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.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)
 - New category report section and chart (see the general financial report)

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.
 

app/Console/Commands/CreateImport.php

@@ -50,7 +50,7 @@ class CreateImport extends Command
     }
 
     /**
-     * 
+     *
      */
     public function handle()
     {

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('transaction_journals.deleted_at')
-            ->whereNull('transactions.deleted_at')
+                                      ->whereNull('transactions.deleted_at')
-            ->groupBy(['transaction_journals.id'])
+                                      ->groupBy(['transaction_journals.id'])
-            ->select(['transaction_journals.id', DB::raw('COUNT(transactions.id) AS t_count')]);
+                                      ->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)
+                                           ->where('amount', $amount)->where('identifier', '=', 0)
-                        ->whereNotIn('id', $processed)
+                                           ->whereNotIn('id', $processed)
-                        ->first();
+                                           ->first();
                 } catch (QueryException $e) {
                     Log::error($e->getMessage());
                     $this->error('Firefly III could not find the "identifier" field in the "transactions" table.');

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')
+                      ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
-            ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
+                      ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
-            ->whereNull('transactions.account_id')
+                      ->whereNull('transactions.account_id')
-            ->get(
+                      ->get(
-                ['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']
+                          ['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')
+                     ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
-            ->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email'])
+                     ->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email'])
-            ->whereNull('budget_limits.id')
+                     ->whereNull('budget_limits.id')
-            ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']);
+                     ->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')
+                      ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-            ->whereNotNull('accounts.deleted_at')
+                      ->whereNotNull('accounts.deleted_at')
-            ->whereNotNull('transactions.id')
+                      ->whereNotNull('transactions.id')
-            ->where(
+                      ->where(
-                function (Builder $q) {
+                          function (Builder $q) {
-                    $q->whereNull('transactions.deleted_at');
+                              $q->whereNull('transactions.deleted_at');
-                    $q->orWhereNull('transaction_journals.deleted_at');
+                              $q->orWhereNull('transaction_journals.deleted_at');
-                }
+                          }
-            )
+                      )
-            ->get(
+                      ->get(
-                ['accounts.id as account_id', 'accounts.deleted_at as account_deleted_at', 'transactions.id as transaction_id',
+                          ['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',
+                           'transactions.deleted_at as transaction_deleted_at', 'transaction_journals.id as journal_id',
-                 'transaction_journals.deleted_at as journal_deleted_at']
+                           '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('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+                                     ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
+                                     ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
-                ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
+                                     ->leftJoin('users', 'users.id', '=', 'transaction_journals.user_id')
-                ->where('transaction_types.type', $transactionType)
+                                     ->where('transaction_types.type', $transactionType)
-                ->whereIn('account_types.type', $accountTypes)
+                                     ->whereIn('account_types.type', $accountTypes)
-                ->whereNull('transaction_journals.deleted_at')
+                                     ->whereNull('transaction_journals.deleted_at')
-                ->get(['transaction_journals.id', 'transaction_journals.user_id', 'users.email', 'account_types.type as a_type', 'transaction_types.type']);
+                                     ->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
+                                 ->whereNotNull('transaction_journals.deleted_at')// USE THIS
-            ->whereNull('transactions.deleted_at')
+                                 ->whereNull('transactions.deleted_at')
-            ->whereNotNull('transactions.id')
+                                 ->whereNotNull('transactions.id')
-            ->get(
+                                 ->get(
-                [
+                                     [
-                    'transaction_journals.id as journal_id',
+                                         'transaction_journals.id as journal_id',
-                    'transaction_journals.description',
+                                         'transaction_journals.description',
-                    'transaction_journals.deleted_at as journal_deleted',
+                                         'transaction_journals.deleted_at as journal_deleted',
-                    'transactions.id as transaction_id',
+                                         'transactions.id as transaction_id',
-                    'transactions.deleted_at as transaction_deleted_at']
+                                         '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')
+                                 ->groupBy('transaction_journals.id')
-            ->whereNull('transactions.transaction_journal_id')
+                                 ->whereNull('transactions.transaction_journal_id')
-            ->get(['transaction_journals.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')
+                        ->leftJoin('users', $plural . '.user_id', '=', 'users.id')
-            ->distinct()
+                        ->distinct()
-            ->whereNull($name . '_transaction_journal.' . $name . '_id')
+                        ->whereNull($name . '_transaction_journal.' . $name . '_id')
-            ->whereNull($plural . '.deleted_at')
+                        ->whereNull($plural . '.deleted_at')
-            ->get([$plural . '.id', $plural . '.' . $field . ' as name', $plural . '.user_id', 'users.email']);
+                        ->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')
+                          ->whereNotNull('transactions.deleted_at')
-            ->whereNull('transaction_journals.deleted_at')
+                          ->whereNull('transaction_journals.deleted_at')
-            ->get(
+                          ->get(
-                ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
+                              ['transactions.id as transaction_id', 'transactions.deleted_at as transaction_deleted', 'transaction_journals.id as journal_id',
-                 'transaction_journals.deleted_at']
+                               '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('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-            ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
+                                 ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
-            ->where('transaction_types.type', TransactionType::TRANSFER)
+                                 ->where('transaction_types.type', TransactionType::TRANSFER)
-            ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
+                                 ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']);
 
         /** @var TransactionJournal $entry */
         foreach ($set as $entry) {

app/Events/BlockedBadLogin.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * BlockedBadLogin.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class LockedOutUser
+ *
+ * @package FireflyIII\Events
+ */
+class BlockedBadLogin extends Event
+{
+    use SerializesModels;
+
+    public $email;
+    public $ipAddress;
+
+    /**
+     * Create a new event instance. This event is triggered when a user gets themselves locked out.
+     *
+     * @param string $email
+     * @param string $ipAddress
+     */
+    public function __construct(string $email, string $ipAddress)
+    {
+        $this->email     = $email;
+        $this->ipAddress = $ipAddress;
+    }
+}

app/Events/BlockedUseOfDomain.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * BlockedUseOfDomain.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class BlockedUseOfDomain
+ *
+ * @package FireflyIII\Events
+ */
+class BlockedUseOfDomain extends Event
+{
+    use SerializesModels;
+
+    public $email;
+    public $ipAddress;
+
+    /**
+     * Create a new event instance. This event is triggered when a user tries to register with a banned domain (on blocked domain list).
+     *
+     * @param string $email
+     * @param string $ipAddress
+     */
+    public function __construct(string $email, string $ipAddress)
+    {
+        $this->email     = $email;
+        $this->ipAddress = $ipAddress;
+    }
+}

app/Events/BlockedUseOfEmail.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * BlockedUseOfEmail.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class BlockedUseOfEmail
+ *
+ * @package FireflyIII\Events
+ */
+class BlockedUseOfEmail extends Event
+{
+    use SerializesModels;
+
+    public $email;
+    public $ipAddress;
+
+    /**
+     * Create a new event instance. This event is triggered when a user tries to register with a banned email address (already used before).
+     *
+     * @param string $email
+     * @param string $ipAddress
+     */
+    public function __construct(string $email, string $ipAddress)
+    {
+        $this->email     = $email;
+        $this->ipAddress = $ipAddress;
+    }
+}

app/Events/BlockedUserLogin.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * BlockedUserLogin.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use FireflyIII\User;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class BlockedUserLogin
+ *
+ * @package FireflyIII\Events
+ */
+class BlockedUserLogin extends Event
+{
+    use SerializesModels;
+
+    public $ipAddress;
+    public $user;
+
+    /**
+     * Create a new event instance. This event is triggered when a blocked user logs in.
+     *
+     * @param User   $user
+     * @param string $ipAddress
+     */
+    public function __construct(User $user, string $ipAddress)
+    {
+        $this->user      = $user;
+        $this->ipAddress = $ipAddress;
+    }
+}

app/Events/DeletedUser.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * DeletedUser.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class DeletedUser
+ *
+ * @package FireflyIII\Events
+ */
+class DeletedUser extends Event
+{
+    use SerializesModels;
+
+    public $email;
+
+    /**
+     * Create a new event instance. This event is triggered when a user deletes themselves.
+     *
+     * @param  string $email
+     */
+    public function __construct(string $email)
+    {
+        $this->email = $email;
+    }
+}

app/Events/LockedOutUser.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * LockedOutUser.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class LockedOutUser
+ *
+ * @package FireflyIII\Events
+ */
+class LockedOutUser extends Event
+{
+    use SerializesModels;
+
+    public $email;
+    public $ipAddress;
+
+    /**
+     * Create a new event instance. This event is triggered when a user gets themselves locked out.
+     *
+     * @param string $email
+     * @param string $ipAddress
+     */
+    public function __construct(string $email, string $ipAddress)
+    {
+        $this->email     = $email;
+        $this->ipAddress = $ipAddress;
+    }
+}

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(
+                                    ->leftJoin(
-                'transactions AS opposing', function (JoinClause $join) {
+                                        'transactions AS opposing', function (JoinClause $join) {
-                $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
+                                        $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')
-                     ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'))
+                                             ->where('opposing.amount', '=', DB::raw('transactions.amount * -1'))
-                     ->where('transactions.identifier', '=', DB::raw('opposing.identifier'));
+                                             ->where('transactions.identifier', '=', DB::raw('opposing.identifier'));
-            }
+                                    }
-            )
+                                    )
-            ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
+                                    ->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')
-            ->leftJoin('accounts AS opposing_accounts', 'opposing.account_id', '=', 'opposing_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_types', 'transaction_journals.transaction_type_id', 'transaction_types.id')
-            ->leftJoin('transaction_currencies', 'transaction_journals.transaction_currency_id', '=', 'transaction_currencies.id')
+                                    ->leftJoin('transaction_currencies', 'transaction_journals.transaction_currency_id', '=', 'transaction_currencies.id')
-            ->whereIn('transactions.account_id', $accountIds)
+                                    ->whereIn('transactions.account_id', $accountIds)
-            ->where('transaction_journals.user_id', $this->job->user_id)
+                                    ->where('transaction_journals.user_id', $this->job->user_id)
-            ->where('transaction_journals.date', '>=', $this->start->format('Y-m-d'))
+                                    ->where('transaction_journals.date', '>=', $this->start->format('Y-m-d'))
-            ->where('transaction_journals.date', '<=', $this->end->format('Y-m-d'))
+                                    ->where('transaction_journals.date', '<=', $this->end->format('Y-m-d'))
-            ->where('transaction_journals.completed', 1)
+                                    ->where('transaction_journals.completed', 1)
-            ->whereNull('transaction_journals.deleted_at')
+                                    ->whereNull('transaction_journals.deleted_at')
-            ->whereNull('transactions.deleted_at')
+                                    ->whereNull('transactions.deleted_at')
-            ->whereNull('opposing.deleted_at')
+                                    ->whereNull('opposing.deleted_at')
-            ->orderBy('transaction_journals.date', 'DESC')
+                                    ->orderBy('transaction_journals.date', 'DESC')
-            ->orderBy('transactions.identifier', 'ASC')
+                                    ->orderBy('transactions.identifier', 'ASC')
-            ->get(
+                                    ->get(
-                [
+                                        [
-                    'transactions.id',
+                                            'transactions.id',
-                    'transactions.amount',
+                                            'transactions.amount',
-                    'transactions.description',
+                                            'transactions.description',
-                    'transactions.account_id',
+                                            'transactions.account_id',
-                    'accounts.name as account_name',
+                                            'accounts.name as account_name',
-                    'accounts.encrypted as account_name_encrypted',
+                                            'accounts.encrypted as account_name_encrypted',
-                    'transactions.identifier',
+                                            'transactions.identifier',
 
-                    'opposing.id as opposing_id',
+                                            'opposing.id as opposing_id',
-                    'opposing.amount AS opposing_amount',
+                                            'opposing.amount AS opposing_amount',
-                    'opposing.description as opposing_description',
+                                            'opposing.description as opposing_description',
-                    'opposing.account_id as opposing_account_id',
+                                            'opposing.account_id as opposing_account_id',
-                    'opposing_accounts.name as opposing_account_name',
+                                            'opposing_accounts.name as opposing_account_name',
-                    'opposing_accounts.encrypted as opposing_account_encrypted',
+                                            'opposing_accounts.encrypted as opposing_account_encrypted',
-                    'opposing.identifier as opposing_identifier',
+                                            'opposing.identifier as opposing_identifier',
 
-                    'transaction_journals.id as transaction_journal_id',
+                                            'transaction_journals.id as transaction_journal_id',
-                    'transaction_journals.date',
+                                            'transaction_journals.date',
-                    'transaction_journals.description as journal_description',
+                                            'transaction_journals.description as journal_description',
-                    'transaction_journals.encrypted as journal_encrypted',
+                                            'transaction_journals.encrypted as journal_encrypted',
-                    'transaction_journals.transaction_type_id',
+                                            'transaction_journals.transaction_type_id',
-                    'transaction_types.type as transaction_type',
+                                            'transaction_types.type as transaction_type',
-                    'transaction_journals.transaction_currency_id',
+                                            'transaction_journals.transaction_currency_id',
-                    'transaction_currencies.code AS transaction_currency_code',
+                                            'transaction_currencies.code AS transaction_currency_code',
 
-                ]
+                                        ]
-            );
+                                    );
     }
 }

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();

app/Export/Processor.php

@@ -30,7 +30,7 @@ use ZipArchive;
  *
  * @package FireflyIII\Export
  */
-class Processor
+class Processor implements ProcessorInterface
 {
 
     /** @var Collection */

app/Export/ProcessorInterface.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * ProcessorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export;
+
+use Illuminate\Support\Collection;
+
+/**
+ * Interface ProcessorInterface
+ *
+ * @package FireflyIII\Export
+ */
+interface ProcessorInterface
+{
+
+    /**
+     * Processor constructor.
+     *
+     * @param array $settings
+     */
+    public function __construct(array $settings);
+
+    /**
+     * @return bool
+     */
+    public function collectAttachments(): bool;
+
+    /**
+     * @return bool
+     */
+    public function collectJournals(): bool;
+
+    /**
+     * @return bool
+     */
+    public function collectOldUploads(): bool;
+
+    /**
+     * @return bool
+     */
+    public function convertJournals(): bool;
+
+    /**
+     * @return bool
+     */
+    public function createZipFile(): bool;
+
+    /**
+     * @return bool
+     */
+    public function exportJournals(): bool;
+
+    /**
+     * @return Collection
+     */
+    public function getFiles(): Collection;
+}

app/Generator/Chart/Account/AccountChartGeneratorInterface.php

@@ -1,71 +0,0 @@
-<?php
-/**
- * AccountChartGeneratorInterface.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Generator\Chart\Account;
-
-use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use Illuminate\Support\Collection;
-
-/**
- * Interface AccountChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Account
- */
-interface AccountChartGeneratorInterface
-{
-
-    /**
-     * @param array $values
-     * @param array $names
-     *
-     * @return array
-     */
-    public function pieChart(array $values, array $names): array;
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end): array;
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function frontpage(Collection $accounts, Carbon $start, Carbon $end): array;
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function revenueAccounts(Collection $accounts, Carbon $start, Carbon $end): array;
-
-    /**
-     * @param Account $account
-     * @param array   $labels
-     * @param array   $dataSet
-     *
-     * @return array
-     */
-    public function single(Account $account, array $labels, array $dataSet): array;
-}

app/Generator/Chart/Account/ChartJsAccountChartGenerator.php

@@ -1,164 +0,0 @@
-<?php
-/**
- * ChartJsAccountChartGenerator.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-namespace FireflyIII\Generator\Chart\Account;
-
-use Carbon\Carbon;
-use FireflyIII\Models\Account;
-use FireflyIII\Support\ChartColour;
-use Illuminate\Support\Collection;
-
-/**
- * Class ChartJsAccountChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Account
- */
-class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function expenseAccounts(Collection $accounts, Carbon $start, Carbon $end): array
-    {
-        $data = [
-            'count'  => 1,
-            'labels' => [], 'datasets' => [[
-                                               'label' => trans('firefly.spent'),
-                                               'data'  => []]]];
-        foreach ($accounts as $account) {
-            if ($account->difference > 0) {
-                $data['labels'][]              = $account->name;
-                $data['datasets'][0]['data'][] = $account->difference;
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function frontpage(Collection $accounts, Carbon $start, Carbon $end): array
-    {
-        // language:
-        $format  = (string)trans('config.month_and_day');
-        $data    = ['count' => 0, 'labels' => [], 'datasets' => [],];
-        $current = clone $start;
-        while ($current <= $end) {
-            $data['labels'][] = $current->formatLocalized($format);
-            $current->addDay();
-        }
-
-        foreach ($accounts as $account) {
-            $data['datasets'][] = [
-                'label'                => $account->name,
-                'fillColor'            => 'rgba(220,220,220,0.2)',
-                'strokeColor'          => 'rgba(220,220,220,1)',
-                'pointColor'           => 'rgba(220,220,220,1)',
-                'pointStrokeColor'     => '#fff',
-                'pointHighlightFill'   => '#fff',
-                'pointHighlightStroke' => 'rgba(220,220,220,1)',
-                'data'                 => $account->balances,
-            ];
-        }
-        $data['count'] = count($data['datasets']);
-
-        return $data;
-    }
-
-    /**
-     * @param array $values
-     * @param array $names
-     *
-     * @return array
-     */
-    public function pieChart(array $values, array $names): array
-    {
-        $data  = [
-            'datasets' => [
-                0 => [],
-            ],
-            'labels'   => [],
-        ];
-        $index = 0;
-        foreach ($values as $categoryId => $value) {
-
-            // make larger than 0
-            if (bccomp($value, '0') === -1) {
-                $value = bcmul($value, '-1');
-            }
-
-            $data['datasets'][0]['data'][]            = round($value, 2);
-            $data['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
-            $data['labels'][]                         = $names[$categoryId];
-            $index++;
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return array
-     */
-    public function revenueAccounts(Collection $accounts, Carbon $start, Carbon $end): array
-    {
-        $data = [
-            'count'  => 1,
-            'labels' => [], 'datasets' => [[
-                                               'label' => trans('firefly.earned'),
-                                               'data'  => []]]];
-        foreach ($accounts as $account) {
-            if ($account->difference > 0) {
-                $data['labels'][]              = $account->name;
-                $data['datasets'][0]['data'][] = $account->difference;
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param Account $account
-     * @param array   $labels
-     * @param array   $dataSet
-     *
-     * @return array
-     */
-    public function single(Account $account, array $labels, array $dataSet): array
-    {
-        $data = [
-            'count'    => 1,
-            'labels'   => $labels,
-            'datasets' => [
-                [
-                    'label' => $account->name,
-                    'data'  => $dataSet,
-                ],
-            ],
-        ];
-
-        return $data;
-    }
-}

app/Generator/Chart/Basic/ChartJsGenerator.php

@@ -0,0 +1,137 @@
+<?php
+/**
+ * ChartJsGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Basic;
+
+use FireflyIII\Support\ChartColour;
+
+/**
+ * Class ChartJsGenerator
+ *
+ * @package FireflyIII\Generator\Chart\Basic
+ */
+class ChartJsGenerator implements GeneratorInterface
+{
+
+    /**
+     * 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',
+     *    'type' => bar or line, optional
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     * 1: [
+     *    'label' => 'label of another set',
+     *    'type' => bar or line, optional
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     *
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function multiSet(array $data): array
+    {
+        reset($data);
+        $first  = current($data);
+        $labels = array_keys($first['entries']);
+
+        $chartData = [
+            'count'    => count($data),
+            'labels'   => $labels, // take ALL labels from the first set.
+            'datasets' => [],
+        ];
+        unset($first, $labels);
+
+        foreach ($data as $set) {
+            $chartData['datasets'][] = [
+                'label' => $set['label'],
+                'type'  => $set['type'] ?? 'line',
+                'data'  => array_values($set['entries']),
+            ];
+        }
+
+        return $chartData;
+    }
+
+    /**
+     * Expects data as:
+     *
+     * key => value
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    public function pieChart(array $data): array
+    {
+        $chartData = [
+            'datasets' => [
+                0 => [],
+            ],
+            'labels'   => [],
+        ];
+        $index     = 0;
+        foreach ($data as $key => $value) {
+
+            // make larger than 0
+            if (bccomp($value, '0') === -1) {
+                $value = bcmul($value, '-1');
+            }
+
+            $chartData['datasets'][0]['data'][]            = round($value, 2);
+            $chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
+            $chartData['labels'][]                         = $key;
+            $index++;
+        }
+
+        return $chartData;
+    }
+
+    /**
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     *
+     * 'label-of-entry' => value
+     * 'label-of-entry' => value
+     *
+     * @param string $setLabel
+     * @param array  $data
+     *
+     * @return array
+     */
+    public function singleSet(string $setLabel, array $data): array
+    {
+        $chartData = [
+            'count'    => 1,
+            'labels'   => array_keys($data), // take ALL labels from the first set.
+            'datasets' => [
+                [
+                    'label' => $setLabel,
+                    'data'  => array_values($data),
+                ],
+            ],
+        ];
+
+        return $chartData;
+    }
+}

app/Generator/Chart/Basic/GeneratorInterface.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * GeneratorInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Chart\Basic;
+
+/**
+ * Interface GeneratorInterface
+ *
+ * @package FireflyIII\Generator\Chart\Basic
+ */
+interface GeneratorInterface
+{
+
+    /**
+     * Will generate a (ChartJS) compatible array from the given input. Expects this format:
+     *
+     * 0: [
+     *    'label' => 'label of set',
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     * 1: [
+     *    'label' => 'label of another set',
+     *    'entries' =>
+     *        [
+     *         'label-of-entry' => 'value'
+     *        ]
+     *    ]
+     *
+     *
+     * @param array $data
+     *
+     * @return array
+     */
+    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:
+     *
+     * 'label-of-entry' => value
+     * 'label-of-entry' => value
+     *
+     * @param string $setLabel
+     * @param array  $data
+     *
+     * @return array
+     */
+    public function singleSet(string $setLabel, array $data): array;
+
+}

app/Generator/Chart/Bill/BillChartGeneratorInterface.php

@@ -1,44 +0,0 @@
-<?php
-/**
- * BillChartGeneratorInterface.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Generator\Chart\Bill;
-
-
-use FireflyIII\Models\Bill;
-use Illuminate\Support\Collection;
-
-/**
- * Interface BillChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Bill
- */
-interface BillChartGeneratorInterface
-{
-
-    /**
-     * @param string $paid
-     * @param string $unpaid
-     *
-     * @return array
-     */
-    public function frontpage(string $paid, string $unpaid): array;
-
-    /**
-     * @param Bill       $bill
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function single(Bill $bill, Collection $entries): array;
-
-}

app/Generator/Chart/Bill/ChartJsBillChartGenerator.php

@@ -1,94 +0,0 @@
-<?php
-/**
- * ChartJsBillChartGenerator.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Generator\Chart\Bill;
-
-use FireflyIII\Models\Bill;
-use FireflyIII\Models\Transaction;
-use FireflyIII\Support\ChartColour;
-use Illuminate\Support\Collection;
-
-/**
- * Class ChartJsBillChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Bill
- */
-class ChartJsBillChartGenerator implements BillChartGeneratorInterface
-{
-
-    /**
-     * @param string $paid
-     * @param string $unpaid
-     *
-     * @return array
-     */
-    public function frontpage(string $paid, string $unpaid): array
-    {
-        $data = [
-            'datasets' => [
-                [
-                    'data'            => [round($unpaid, 2), round(bcmul($paid, '-1'), 2)],
-                    'backgroundColor' => [ChartColour::getColour(0), ChartColour::getColour(1)],
-                ],
-
-            ],
-            'labels'   => [strval(trans('firefly.unpaid')), strval(trans('firefly.paid'))],
-
-        ];
-
-        return $data;
-    }
-
-    /**
-     * @param Bill       $bill
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function single(Bill $bill, Collection $entries): array
-    {
-        $format       = (string)trans('config.month');
-        $data         = ['count' => 3, 'labels' => [], 'datasets' => [],];
-        $minAmount    = [];
-        $maxAmount    = [];
-        $actualAmount = [];
-        /** @var Transaction $entry */
-        foreach ($entries as $entry) {
-            $data['labels'][] = $entry->date->formatLocalized($format);
-            $minAmount[]      = round($bill->amount_min, 2);
-            $maxAmount[]      = round($bill->amount_max, 2);
-            // journalAmount has been collected in BillRepository::getJournals
-            $actualAmount[] = bcmul($entry->transaction_amount, '-1');
-        }
-
-        $data['datasets'][] = [
-            'type'  => 'bar',
-            'label' => trans('firefly.minAmount'),
-            'data'  => $minAmount,
-        ];
-        $data['datasets'][] = [
-            'type'  => 'line',
-            'label' => trans('firefly.billEntry'),
-            'data'  => $actualAmount,
-        ];
-        $data['datasets'][] = [
-            'type'  => 'bar',
-            'label' => trans('firefly.maxAmount'),
-            'data'  => $maxAmount,
-        ];
-
-        $data['count'] = count($data['datasets']);
-
-        return $data;
-    }
-}

app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php

@@ -1,54 +0,0 @@
-<?php
-/**
- * BudgetChartGeneratorInterface.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Generator\Chart\Budget;
-
-use Illuminate\Support\Collection;
-
-/**
- * Interface BudgetChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Budget
- */
-interface BudgetChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $entries
-     * @param string     $dateFormat
-     *
-     * @return array
-     */
-    public function budgetLimit(Collection $entries, string $dateFormat): array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries): array;
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function period(array $entries): array;
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function periodNoBudget(array $entries): array;
-}

app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php

@@ -1,164 +0,0 @@
-<?php
-/**
- * ChartJsBudgetChartGenerator.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-namespace FireflyIII\Generator\Chart\Budget;
-
-
-use Illuminate\Support\Collection;
-
-/**
- * Class ChartJsBudgetChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Budget
- */
-class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
-{
-    /**
-     *
-     * @param Collection $entries
-     * @param string     $dateFormat
-     *
-     * @return array
-     */
-    public function budgetLimit(Collection $entries, string $dateFormat = 'month_and_day'): array
-    {
-        $format = strval(trans('config.' . $dateFormat));
-        $data   = [
-            'labels'   => [],
-            '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;
-    }
-}

app/Generator/Chart/Category/CategoryChartGeneratorInterface.php

@@ -1,67 +0,0 @@
-<?php
-/**
- * CategoryChartGeneratorInterface.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Generator\Chart\Category;
-
-use Illuminate\Support\Collection;
-
-/**
- * Interface CategoryChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Category
- */
-interface CategoryChartGeneratorInterface
-{
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function all(Collection $entries): array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function frontpage(Collection $entries): array;
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function mainReportChart(array $entries): array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function period(Collection $entries): array;
-
-    /**
-     * @param array $data
-     *
-     * @return array
-     */
-    public function pieChart(array $data): array;
-
-    /**
-     * @param array $entries
-     *
-     * @return array
-     */
-    public function reportPeriod(array $entries): array;
-
-}

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -1,209 +0,0 @@
-<?php
-/**
- * ChartJsCategoryChartGenerator.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-namespace FireflyIII\Generator\Chart\Category;
-
-use FireflyIII\Support\ChartColour;
-use Illuminate\Support\Collection;
-
-
-/**
- * Class ChartJsCategoryChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Category
- */
-class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function all(Collection $entries): array
-    {
-        $data = [
-            'count'    => 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 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;
-
-    }
-
-    /**
-     * @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;
-    }
-
-}

app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php

@@ -1,58 +0,0 @@
-<?php
-/**
- * ChartJsPiggyBankChartGenerator.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-namespace FireflyIII\Generator\Chart\PiggyBank;
-
-use Carbon\Carbon;
-use Illuminate\Support\Collection;
-
-
-/**
- * Class ChartJsPiggyBankChartGenerator
- *
- * @package FireflyIII\Generator\Chart\PiggyBank
- */
-class ChartJsPiggyBankChartGenerator implements PiggyBankChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $set
-     *
-     * @return array
-     */
-    public function history(Collection $set): array
-    {
-
-        // language:
-        $format = (string)trans('config.month_and_day');
-
-        $data = [
-            'count'    => 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;
-    }
-}

app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php

@@ -1,31 +0,0 @@
-<?php
-/**
- * PiggyBankChartGeneratorInterface.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Generator\Chart\PiggyBank;
-
-use Illuminate\Support\Collection;
-
-/**
- * Interface PiggyBankChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\PiggyBank
- */
-interface PiggyBankChartGeneratorInterface
-{
-    /**
-     * @param Collection $set
-     *
-     * @return array
-     */
-    public function history(Collection $set): array;
-}

app/Generator/Chart/Report/ChartJsReportChartGenerator.php

@@ -1,180 +0,0 @@
-<?php
-/**
- * ChartJsReportChartGenerator.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-namespace FireflyIII\Generator\Chart\Report;
-
-use Illuminate\Support\Collection;
-
-/**
- * Class ChartJsReportChartGenerator
- *
- * @package FireflyIII\Generator\Chart\Report
- */
-class ChartJsReportChartGenerator implements ReportChartGeneratorInterface
-{
-
-    /**
-     * Same as above but other translations.
-     *
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function multiYearOperations(Collection $entries): array
-    {
-        $data = [
-            'count'    => 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;
-    }
-}

app/Generator/Chart/Report/ReportChartGeneratorInterface.php

@@ -1,65 +0,0 @@
-<?php
-/**
- * ReportChartGeneratorInterface.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Generator\Chart\Report;
-
-use Illuminate\Support\Collection;
-
-/**
- * Interface ReportChartGeneratorInterface
- *
- * @package FireflyIII\Generator\Chart\Report
- */
-interface ReportChartGeneratorInterface
-{
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function multiYearOperations(Collection $entries): array;
-
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function multiYearSum(string $income, string $expense, int $count): array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function netWorth(Collection $entries) : array;
-
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function yearOperations(Collection $entries): array;
-
-    /**
-     * @param string $income
-     * @param string $expense
-     * @param int    $count
-     *
-     * @return array
-     */
-    public function yearSum(string $income, string $expense, int $count): array;
-
-}

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
 {
@@ -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
      *

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -0,0 +1,247 @@
+<?php
+/**
+ * MonthReportGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Generator\Report\Budget;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Generator\Report\Support;
+use FireflyIII\Helpers\Collector\JournalCollector;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class MonthReportGenerator
+ *
+ * @package FireflyIII\Generator\Report\Budget
+ */
+class MonthReportGenerator extends Support implements ReportGeneratorInterface
+{
+    /** @var  Collection */
+    private $accounts;
+    /** @var  Collection */
+    private $budgets;
+    /** @var  Carbon */
+    private $end;
+    /** @var Collection */
+    private $expenses;
+    /** @var Collection */
+    private $income;
+    /** @var  Carbon */
+    private $start;
+
+    /**
+     * MonthReportGenerator constructor.
+     */
+    public function __construct()
+    {
+        $this->income   = new Collection;
+        $this->expenses = new Collection;
+    }
+
+    /**
+     * @return string
+     */
+    public function generate(): string
+    {
+        $accountIds      = join(',', $this->accounts->pluck('id')->toArray());
+        $budgetIds       = join(',', $this->budgets->pluck('id')->toArray());
+        $expenses        = $this->getExpenses();
+        $accountSummary  = $this->summarizeByAccount($expenses);
+        $budgetSummary   = $this->summarizeByBudget($expenses);
+        $averageExpenses = $this->getAverages($expenses, SORT_ASC);
+        $topExpenses     = $this->getTopExpenses();
+
+        // render!
+        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)
+            ->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
+    {
+        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])
+                  ->setBudgets($this->budgets)->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 getTopExpenses(): Collection
+    {
+        $transactions = $this->getExpenses()->sortBy('transaction_amount');
+
+        return $transactions;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    private function summarizeByAccount(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $accountId          = $transaction->account_id;
+            $result[$accountId] = $result[$accountId] ?? '0';
+            $result[$accountId] = bcadd($transaction->transaction_amount, $result[$accountId]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Collection $collection
+     *
+     * @return array
+     */
+    private function summarizeByBudget(Collection $collection): array
+    {
+        $result = [];
+        /** @var Transaction $transaction */
+        foreach ($collection as $transaction) {
+            $jrnlBudId         = intval($transaction->transaction_journal_budget_id);
+            $transBudId        = intval($transaction->transaction_budget_id);
+            $budgetId          = max($jrnlBudId, $transBudId);
+            $result[$budgetId] = $result[$budgetId] ?? '0';
+            $result[$budgetId] = bcadd($transaction->transaction_amount, $result[$budgetId]);
+        }
+
+        return $result;
+    }
+}

app/Generator/Report/Budget/MultiYearReportGenerator.php

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

app/Generator/Report/Budget/YearReportGenerator.php

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

app/Generator/Report/Category/MonthReportGenerator.php

@@ -15,8 +15,8 @@ namespace FireflyIII\Generator\Report\Category;
 
 
 use Carbon\Carbon;
-use Crypt;
 use FireflyIII\Generator\Report\ReportGeneratorInterface;
+use FireflyIII\Generator\Report\Support;
 use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionType;
@@ -95,6 +95,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
      *

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
      *

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
      *

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
      *

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
      *

app/Generator/Report/Support.php

@@ -11,7 +11,7 @@
 
 declare(strict_types = 1);
 
-namespace FireflyIII\Generator\Report\Category;
+namespace FireflyIII\Generator\Report;
 
 use FireflyIII\Models\Transaction;
 use Illuminate\Support\Collection;

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'))

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;

app/Handlers/Events/UserEventHandler.php

@@ -15,10 +15,17 @@ 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;
+use FireflyIII\Events\LockedOutUser;
 use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Events\RequestedNewPassword;
 use FireflyIII\Events\ResentConfirmation;
+use FireflyIII\Models\Configuration;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Mail\Message;
@@ -75,6 +82,210 @@ class UserEventHandler
         return true;
     }
 
+    /**
+     * @param BlockedBadLogin $event
+     *
+     * @return bool
+     */
+    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'));
+        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)) {
+
+            return true;
+        }
+
+        try {
+            Mail::send(
+                ['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress],
+                function (Message $message) use ($owner) {
+                    $message->to($owner, $owner)->subject('Blocked login attempt with bad credentials');
+                }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param BlockedUserLogin $event
+     *
+     * @return bool
+     */
+    public function reportBlockedUser(BlockedUserLogin $event): bool
+    {
+        $user      = $event->user;
+        $owner     = env('SITE_OWNER');
+        $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 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)) {
+            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 ($owner, $user) {
+                $message->to($owner, $owner)->subject('Blocked login attempt of blocked user');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param LockedOutUser $event
+     *
+     * @return bool
+     */
+    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'));
+        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)) {
+            return true;
+        }
+
+        // send email message:
+        try {
+            Mail::send(
+                ['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) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param BlockedUseOfDomain $event
+     *
+     * @return bool
+     */
+    public function reportUseBlockedDomain(BlockedUseOfDomain $event): bool
+    {
+        $email     = $event->email;
+        $owner     = env('SITE_OWNER');
+        $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-registration-html', 'emails.blocked-registration-text'],
+                [
+                    '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) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param BlockedUseOfEmail $event
+     *
+     * @return bool
+     */
+    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'));
+        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 ($owner) {
+                $message->to($owner, $owner)->subject('Blocked registration attempt with blocked email address');
+            }
+            );
+        } catch (Swift_TransportException $e) {
+            Log::error($e->getMessage());
+        }
+
+        return true;
+    }
+
+    /**
+     * @param DeletedUser $event
+     *
+     * @return bool
+     */
+    public function saveEmailAddress(DeletedUser $event): bool
+    {
+        Preferences::mark();
+        $email = hash('sha256', $event->email);
+        Log::debug(sprintf('Hash of email is %s', $email));
+        /** @var Configuration $configuration */
+        $configuration = FireflyConfig::get('deleted_users', []);
+        $content       = $configuration->data;
+        if (!is_array($content)) {
+            $content = [];
+        }
+        $content[]           = $email;
+        $configuration->data = $content;
+        Log::debug('New content of deleted_users is ', $content);
+        FireflyConfig::set('deleted_users', $content);
+
+        Preferences::mark();
+
+        return true;
+    }
+
     /**
      * This method will send a newly registered user a confirmation message, urging him or her to activate their account.
      *
@@ -152,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) {
@@ -194,7 +405,6 @@ class UserEventHandler
 
     }
 
-
     /**
      * @param User   $user
      * @param string $ipAddress

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;
-    }
-
 
 }

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')

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);

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

app/Http/Controllers/AccountController.php

@@ -235,11 +235,12 @@ 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'));
         $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 +249,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', 'entries', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
     }
 
     /**
@@ -262,6 +263,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 +275,8 @@ class AccountController extends Controller
         $start = $repository->oldestJournalDate($account);
         $end   = $repository->newestJournalDate($account);
 
-        return view('accounts.show_with_date', compact('account', 'journals', 'subTitle', 'start', 'end'));
+        // same call, except "entries".
+        return view('accounts.show', compact('account', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
     }
 
     /**
@@ -291,6 +294,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 +302,8 @@ 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'));
+        // same call, except "entries".
+        return view('accounts.show', compact('account', 'subTitleIcon', 'journals', 'subTitle', 'start', 'end', 'chartUri'));
     }
 
     /**

app/Http/Controllers/Admin/ConfigurationController.php

@@ -61,8 +61,21 @@ 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');
 
-        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', 'siteOwner')
+        );
 
     }
 
@@ -81,6 +94,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();

app/Http/Controllers/Admin/UserController.php

@@ -16,9 +16,13 @@ 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;
 
 /**
  * Class UserController
@@ -27,28 +31,56 @@ 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;
+        // 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', 'codes'));
 
     }
 
     /**
      * @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 +109,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'));
 
     }
 
@@ -128,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'));
+
+    }
+
 
 }

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
@@ -31,16 +30,6 @@ use Swift_TransportException;
  */
 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;
 
@@ -49,7 +38,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
@@ -71,19 +60,17 @@ 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);
 
+            event(new LockedOutUser($request->get('email'), $request->ip()));
+
             return $this->sendLockoutResponse($request);
         }
 
         $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);
@@ -94,10 +81,15 @@ 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()));
+        }
+
+        // simply a bad login.
+        if (is_null($foundUser)) {
+            event(new BlockedBadLogin($credentials['email'], $request->ip()));
         }
 
         // If the login attempt was unsuccessful we will increment the number of attempts
@@ -167,34 +159,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());
-        }
-    }
 }

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;
 

app/Http/Controllers/Auth/RegisterController.php

@@ -14,9 +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 FireflyIII\Support\Facades\FireflyConfig;
 use FireflyIII\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
@@ -34,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;
 
@@ -93,8 +85,19 @@ class RegisterController extends Controller
         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->throwValidationException($request, $validator);
+        }
 
+        // is user a deleted user?
+        $hash          = hash('sha256', $data['email']);
+        $configuration = FireflyConfig::get('deleted_users', []);
+        $set           = $configuration->data;
+        Log::debug(sprintf('Hash of email is %s', $hash));
+        Log::debug('Hashes of deleted users: ', $set);
+        if (in_array($hash, $set)) {
+            $validator->getMessageBag()->add('email', (string)trans('validation.deleted_user'));
+            event(new BlockedUseOfEmail($data['email'], $request->ip()));
             $this->throwValidationException($request, $validator);
         }
 
@@ -202,31 +205,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());
-        }
-    }
 }

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;
 

app/Http/Controllers/BudgetController.php

@@ -299,12 +299,12 @@ class BudgetController extends Controller
     public function show(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository, Budget $budget)
     {
         /** @var Carbon $start */
-        $start    = session('first', Carbon::create()->startOfYear());
+        $start      = session('first', Carbon::create()->startOfYear());
-        $end      = new Carbon;
+        $end        = new Carbon;
-        $page     = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
+        $page       = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
-        $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
+        $pageSize   = intval(Preferences::get('transactionPageSize', 50)->data);
-        $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
+        $accounts   = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
-
+        $repetition = null;
         // collector:
         $collector = new JournalCollector(auth()->user());
         $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page);

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);

app/Http/Controllers/Chart/AccountController.php

@@ -16,7 +16,7 @@ namespace FireflyIII\Http\Controllers\Chart;
 use Carbon\Carbon;
 use Exception;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Account;
@@ -42,7 +42,7 @@ use Steam;
 class AccountController extends Controller
 {
 
-    /** @var  \FireflyIII\Generator\Chart\Account\AccountChartGeneratorInterface */
+    /** @var  GeneratorInterface */
     protected $generator;
 
     /**
@@ -51,8 +51,49 @@ class AccountController extends Controller
     public function __construct()
     {
         parent::__construct();
-        // create chart generator:
+        $this->generator = app(GeneratorInterface::class);
-        $this->generator = app(AccountChartGeneratorInterface::class);
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function all(Account $account)
+    {
+        $cache = new CacheProperties();
+        $cache->addProperty('chart.account.all');
+        $cache->addProperty($account->id);
+        if ($cache->has()) {
+            Log::debug('Return chart.account.all from cache.');
+
+            return Response::json($cache->get());
+        }
+        Log::debug('Regenerate chart.account.all from scratch.');
+
+        /** @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];
+        $chartData  = [];
+
+        while ($end >= $current) {
+            $theDate           = $current->format('Y-m-d');
+            $balance           = $range[$theDate] ?? $previous;
+            $label             = $current->formatLocalized($format);
+            $chartData[$label] = $balance;
+            $previous          = $balance;
+            $current->addDay();
+        }
+
+        $data = $this->generator->singleSet($account->name, $chartData);
+        $cache->store($data);
+
+        return Response::json($data);
     }
 
     /**
@@ -69,36 +110,29 @@ class AccountController extends Controller
         $cache = new CacheProperties;
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('expenseAccounts');
+        $cache->addProperty('chart.account.expense-accounts');
-        $cache->addProperty('accounts');
         if ($cache->has()) {
             return Response::json($cache->get());
         }
-        $accounts = $repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY]);
-
         $start->subDay();
+
+        $accounts      = $repository->getAccountsByType([AccountType::EXPENSE, AccountType::BENEFICIARY]);
         $ids           = $accounts->pluck('id')->toArray();
         $startBalances = Steam::balancesById($ids, $start);
         $endBalances   = Steam::balancesById($ids, $end);
+        $chartData     = [];
 
-        $accounts->each(
+        foreach ($accounts as $account) {
-            function (Account $account) use ($startBalances, $endBalances) {
+            $id           = $account->id;
-                $id                  = $account->id;
+            $startBalance = $startBalances[$id] ?? '0';
-                $startBalance        = $startBalances[$id] ?? '0';
+            $endBalance   = $endBalances[$id] ?? '0';
-                $endBalance          = $endBalances[$id] ?? '0';
+            $diff         = bcsub($endBalance, $startBalance);
-                $diff                = bcsub($endBalance, $startBalance);
+            if (bccomp($diff, '0') !== 0) {
-                $account->difference = round($diff, 2);
+                $chartData[$account->name] = round($diff, 2);
             }
-        );
+        }
-
+        arsort($chartData);
-
+        $data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
-        $accounts = $accounts->sortByDesc(
-            function (Account $account) {
-                return $account->difference;
-            }
-        );
-
-        $data = $this->generator->expenseAccounts($accounts, $start, $end);
         $cache->store($data);
 
         return Response::json($data);
@@ -118,28 +152,33 @@ class AccountController extends Controller
         $cache->addProperty($account->id);
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('expenseByBudget');
+        $cache->addProperty('chart.account.expense-budget');
         if ($cache->has()) {
             return Response::json($cache->get());
         }
-
+        $collector->setAccounts(new Collection([$account]))
-
+                  ->setRange($start, $end)
-        // grab all journals:
+                  ->withBudgetInformation()
-        $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withBudgetInformation()->setTypes([TransactionType::WITHDRAWAL]);
+                  ->setTypes([TransactionType::WITHDRAWAL]);
         $transactions = $collector->getJournals();
+        $chartData    = [];
+        $result       = [];
 
-        $result = [];
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
-            $jrnlBudgetId  = intval($transaction->transaction_journal_budget_id);
+            $jrnlBudgetId      = intval($transaction->transaction_journal_budget_id);
-            $transBudgetId = intval($transaction->transaction_budget_id);
+            $transBudgetId     = intval($transaction->transaction_budget_id);
-            $budgetId      = max($jrnlBudgetId, $transBudgetId);
+            $budgetId          = max($jrnlBudgetId, $transBudgetId);
-
             $result[$budgetId] = $result[$budgetId] ?? '0';
             $result[$budgetId] = bcadd($transaction->transaction_amount, $result[$budgetId]);
         }
+
         $names = $this->getBudgetNames(array_keys($result));
-        $data  = $this->generator->pieChart($result, $names);
+        foreach ($result as $budgetId => $amount) {
+            $chartData[$names[$budgetId]] = $amount;
+        }
+
+        $data = $this->generator->pieChart($chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -159,26 +198,30 @@ class AccountController extends Controller
         $cache->addProperty($account->id);
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('expenseByCategory');
+        $cache->addProperty('chart.account.expense-category');
         if ($cache->has()) {
             return Response::json($cache->get());
         }
 
-        // grab all journals:
         $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionType::WITHDRAWAL]);
         $transactions = $collector->getJournals();
         $result       = [];
+        $chartData    = [];
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
-            $jrnlCatId  = intval($transaction->transaction_journal_category_id);
+            $jrnlCatId           = intval($transaction->transaction_journal_category_id);
-            $transCatId = intval($transaction->transaction_category_id);
+            $transCatId          = intval($transaction->transaction_category_id);
-            $categoryId = max($jrnlCatId, $transCatId);
+            $categoryId          = max($jrnlCatId, $transCatId);
-
             $result[$categoryId] = $result[$categoryId] ?? '0';
             $result[$categoryId] = bcadd($transaction->transaction_amount, $result[$categoryId]);
         }
+
         $names = $this->getCategoryNames(array_keys($result));
-        $data  = $this->generator->pieChart($result, $names);
+        foreach ($result as $categoryId => $amount) {
+            $chartData[$names[$categoryId]] = $amount;
+        }
+
+        $data = $this->generator->pieChart($chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -194,10 +237,18 @@ class AccountController extends Controller
      */
     public function frontpage(AccountRepositoryInterface $repository)
     {
-        $start     = clone session('start', Carbon::now()->startOfMonth());
+        $start      = clone session('start', Carbon::now()->startOfMonth());
-        $end       = clone session('end', Carbon::now()->endOfMonth());
+        $end        = clone session('end', Carbon::now()->endOfMonth());
-        $frontPage = Preferences::get('frontPageAccounts', $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray());
+        $defaultSet = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray();
-        $accounts  = $repository->getAccountsById($frontPage->data);
+        Log::debug('Default set is ', $defaultSet);
+        $frontPage = Preferences::get('frontPageAccounts', $defaultSet);
+        Log::debug('Frontpage preference set is ', $frontPage->data);
+        if (count($frontPage->data) === 0) {
+            $frontPage->data = $defaultSet;
+            Log::debug('frontpage set is empty!');
+            $frontPage->save();
+        }
+        $accounts = $repository->getAccountsById($frontPage->data);
 
         return Response::json($this->accountBalanceChart($accounts, $start, $end));
     }
@@ -216,7 +267,7 @@ class AccountController extends Controller
         $cache->addProperty($account->id);
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('incomeByCategory');
+        $cache->addProperty('chart.account.income-category');
         if ($cache->has()) {
             return Response::json($cache->get());
         }
@@ -225,23 +276,74 @@ class AccountController extends Controller
         $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionType::DEPOSIT]);
         $transactions = $collector->getJournals();
         $result       = [];
+        $chartData    = [];
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
-            $jrnlCatId  = intval($transaction->transaction_journal_category_id);
+            $jrnlCatId           = intval($transaction->transaction_journal_category_id);
-            $transCatId = intval($transaction->transaction_category_id);
+            $transCatId          = intval($transaction->transaction_category_id);
-            $categoryId = max($jrnlCatId, $transCatId);
+            $categoryId          = max($jrnlCatId, $transCatId);
-
             $result[$categoryId] = $result[$categoryId] ?? '0';
             $result[$categoryId] = bcadd($transaction->transaction_amount, $result[$categoryId]);
         }
+
         $names = $this->getCategoryNames(array_keys($result));
-        $data  = $this->generator->pieChart($result, $names);
+        foreach ($result as $categoryId => $amount) {
+            $chartData[$names[$categoryId]] = $amount;
+        }
+        $data = $this->generator->pieChart($chartData);
         $cache->store($data);
 
         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);
+        $cache = new CacheProperties();
+        $cache->addProperty($start);
+        $cache->addProperty($end);
+        $cache->addProperty('chart.account.period');
+        $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];
+        $chartData = [];
+
+        while ($end >= $current) {
+            $theDate           = $current->format('Y-m-d');
+            $balance           = $range[$theDate] ?? $previous;
+            $label             = $current->formatLocalized($format);
+            $chartData[$label] = $balance;
+            $previous          = $balance;
+            $current->addDay();
+        }
+
+        $data = $this->generator->singleSet($account->name, $chartData);
+        $cache->store($data);
+
+        return Response::json($data);
+    }
+
     /**
      * Shows the balances for a given set of dates and accounts.
      *
@@ -265,13 +367,13 @@ class AccountController extends Controller
      */
     public function revenueAccounts(AccountRepositoryInterface $repository)
     {
-        $start = clone session('start', Carbon::now()->startOfMonth());
+        $start     = clone session('start', Carbon::now()->startOfMonth());
-        $end   = clone session('end', Carbon::now()->endOfMonth());
+        $end       = clone session('end', Carbon::now()->endOfMonth());
-        $cache = new CacheProperties;
+        $chartData = [];
+        $cache     = new CacheProperties;
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('revenueAccounts');
+        $cache->addProperty('chart.account.revenue-accounts');
-        $cache->addProperty('accounts');
         if ($cache->has()) {
             return Response::json($cache->get());
         }
@@ -282,25 +384,19 @@ class AccountController extends Controller
         $startBalances = Steam::balancesById($ids, $start);
         $endBalances   = Steam::balancesById($ids, $end);
 
-        $accounts->each(
+        foreach ($accounts as $account) {
-            function (Account $account) use ($startBalances, $endBalances) {
+            $id           = $account->id;
-                $id                  = $account->id;
+            $startBalance = $startBalances[$id] ?? '0';
-                $startBalance        = $startBalances[$id] ?? '0';
+            $endBalance   = $endBalances[$id] ?? '0';
-                $endBalance          = $endBalances[$id] ?? '0';
+            $diff         = bcsub($endBalance, $startBalance);
-                $diff                = bcsub($endBalance, $startBalance);
+            $diff         = bcmul($diff, '-1');
-                $diff                = bcmul($diff, '-1');
+            if (bccomp($diff, '0') !== 0) {
-                $account->difference = round($diff, 2);
+                $chartData[$account->name] = round($diff, 2);
             }
-        );
+        }
 
-
+        arsort($chartData);
-        $accounts = $accounts->sortByDesc(
+        $data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
-            function (Account $account) {
-                return $account->difference;
-            }
-        );
-
-        $data = $this->generator->revenueAccounts($accounts, $start, $end);
         $cache->store($data);
 
         return Response::json($data);
@@ -322,8 +418,7 @@ class AccountController extends Controller
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('frontpage');
+        $cache->addProperty('chart.account.single');
-        $cache->addProperty('single');
         $cache->addProperty($account->id);
         if ($cache->has()) {
             return Response::json($cache->get());
@@ -333,73 +428,18 @@ class AccountController extends Controller
         $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');
+            $theDate           = $current->format('Y-m-d');
-            $balance = $range[$theDate] ?? $previous;
+            $balance           = $range[$theDate] ?? $previous;
-
+            $label             = $current->formatLocalized($format);
-            $labels[]    = $current->formatLocalized($format);
+            $chartData[$label] = $balance;
-            $chartData[] = $balance;
+            $previous          = $balance;
-            $previous    = $balance;
             $current->addDay();
         }
 
-
+        $data = $this->generator->singleSet($account->name, $chartData);
-        $data = $this->generator->single($account, $labels, $chartData);
-        $cache->store($data);
-
-        return Response::json($data);
-    }
-
-    /**
-     * @param Account $account
-     * @param string  $date
-     *
-     * @return \Illuminate\Http\JsonResponse
-     * @throws FireflyException
-     */
-    public function specificPeriod(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);
@@ -418,27 +458,35 @@ class AccountController extends Controller
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('account-balance-chart');
+        $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) {
-            $balances = [];
+            $currentSet   = [
-            $current  = clone $start;
+                'label'   => $account->name,
-            $range    = Steam::balanceInRange($account, $start, clone $end);
+                'entries' => [],
-            $previous = round(array_values($range)[0], 2);
+            ];
-            while ($current <= $end) {
+            $currentStart = clone $start;
-                $format     = $current->format('Y-m-d');
+            $range        = Steam::balanceInRange($account, $start, clone $end);
-                $balance    = isset($range[$format]) ? round($range[$format], 2) : $previous;
+            $previous     = round(array_values($range)[0], 2);
-                $previous   = $balance;
+            while ($currentStart <= $end) {
-                $balances[] = $balance;
+                $format   = $currentStart->format('Y-m-d');
-                $current->addDay();
+                $label    = $currentStart->formatLocalized(strval(trans('config.month_and_day')));
+                $balance  = isset($range[$format]) ? round($range[$format], 2) : $previous;
+                $previous = $balance;
+                $currentStart->addDay();
+                $currentSet['entries'][$label] = $balance;
             }
-            $account->balances = $balances;
+            $chartData[] = $currentSet;
         }
-        $data = $this->generator->frontpage($accounts, $start, $end);
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return $data;

app/Http/Controllers/Chart/BillController.php

@@ -14,8 +14,8 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
-use FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
-use FireflyIII\Helpers\Collector\JournalCollector;
+use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Transaction;
@@ -32,7 +32,7 @@ use Response;
 class BillController extends Controller
 {
 
-    /** @var  \FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface */
+    /** @var GeneratorInterface */
     protected $generator;
 
     /**
@@ -41,8 +41,7 @@ class BillController extends Controller
     public function __construct()
     {
         parent::__construct();
-        // create chart generator:
+        $this->generator = app(GeneratorInterface::class);
-        $this->generator = app(BillChartGeneratorInterface::class);
     }
 
     /**
@@ -54,45 +53,81 @@ class BillController extends Controller
      */
     public function frontpage(BillRepositoryInterface $repository)
     {
-        $start  = session('start', Carbon::now()->startOfMonth());
+        $start = session('start', Carbon::now()->startOfMonth());
-        $end    = session('end', Carbon::now()->endOfMonth());
+        $end   = session('end', Carbon::now()->endOfMonth());
-        $paid   = $repository->getBillsPaidInRange($start, $end); // will be a negative amount.
+        $cache = new CacheProperties;
-        $unpaid = $repository->getBillsUnpaidInRange($start, $end); // will be a positive amount.
+        $cache->addProperty($start);
-        $data   = $this->generator->frontpage($paid, $unpaid);
+        $cache->addProperty($end);
+        $cache->addProperty('chart.bill.frontpage');
+        if ($cache->has()) {
+            return Response::json($cache->get());
+        }
+
+        $paid      = $repository->getBillsPaidInRange($start, $end); // will be a negative amount.
+        $unpaid    = $repository->getBillsUnpaidInRange($start, $end); // will be a positive amount.
+        $chartData = [
+            strval(trans('firefly.unpaid')) => $unpaid,
+            strval(trans('firefly.paid'))   => $paid,
+        ];
+
+        $data = $this->generator->pieChart($chartData);
+        $cache->store($data);
 
         return Response::json($data);
     }
 
     /**
-     * Shows the overview for a bill. The min/max amount and matched journals.
+     * @param JournalCollectorInterface $collector
+     * @param Bill                      $bill
      *
-     * @param Bill $bill
+     * @return \Illuminate\Http\JsonResponse
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function single(Bill $bill)
+    public function single(JournalCollectorInterface $collector, Bill $bill)
     {
         $cache = new CacheProperties;
-        $cache->addProperty('single');
+        $cache->addProperty('chart.bill.single');
-        $cache->addProperty('bill');
         $cache->addProperty($bill->id);
         if ($cache->has()) {
             return Response::json($cache->get());
         }
 
-        // get first transaction or today for start:
+        $results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getJournals();
-        $collector = new JournalCollector(auth()->user());
-        $collector->setAllAssetAccounts()->setBills(new Collection([$bill]));
-        $results = $collector->getJournals();
-
-        // resort:
         $results = $results->sortBy(
             function (Transaction $transaction) {
                 return $transaction->date->format('U');
             }
         );
 
-        $data = $this->generator->single($bill, $results);
+        $chartData = [
+            [
+                'type'    => 'bar',
+                'label'   => trans('firefly.min-amount'),
+                'entries' => [],
+            ],
+            [
+                'type'    => 'bar',
+                'label'   => trans('firefly.max-amount'),
+                'entries' => [],
+            ],
+            [
+                'type'    => 'line',
+                'label'   => trans('firefly.journal-amount'),
+                'entries' => [],
+            ],
+        ];
+
+        /** @var Transaction $entry */
+        foreach ($results as $entry) {
+            $date = $entry->date->formatLocalized(strval(trans('config.month_and_day')));
+            // minimum amount of bill:
+            $chartData[0]['entries'][$date] = $bill->amount_min;
+            // maximum amount of bill:
+            $chartData[1]['entries'][$date] = $bill->amount_max;
+            // amount of journal:
+            $chartData[2]['entries'][$date] = bcmul($entry->transaction_amount, '-1');
+        }
+
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);

app/Http/Controllers/Chart/BudgetController.php

@@ -14,7 +14,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
-use FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Helpers\Collector\JournalCollector;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\Budget;
@@ -36,7 +36,7 @@ use Response;
 class BudgetController extends Controller
 {
 
-    /** @var BudgetChartGeneratorInterface */
+    /** @var GeneratorInterface */
     protected $generator;
 
     /**
@@ -45,8 +45,7 @@ class BudgetController extends Controller
     public function __construct()
     {
         parent::__construct();
-        // create chart generator:
+        $this->generator = app(GeneratorInterface::class);
-        $this->generator = app(BudgetChartGeneratorInterface::class);
     }
 
     /**
@@ -66,7 +65,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 +76,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 +84,14 @@ class BudgetController extends Controller
             $currentEnd   = Navigation::endOfPeriod($first, $range);
             // sub another day because reasons.
             $currentEnd->subDay();
-            $spent = $repository->spentInPeriod($budgetCollection, new Collection, $currentStart, $currentEnd);
+            $spent            = $repository->spentInPeriod($budgetCollection, new Collection, $currentStart, $currentEnd);
-            $entry = [$first, ($spent * -1)];
+            $format           = Navigation::periodShow($first, $range);
-            $entries->push($entry);
+            $entries[$format] = bcmul($spent, '-1');
-            $first = Navigation::addPeriod($first, $range, 0);
+            $first            = Navigation::addPeriod($first, $range, 0);
         }
 
-        $data = $this->generator->budgetLimit($entries, 'month');
+        $data = $this->generator->singleSet(strval(trans('firefly.spent')), $entries);
+
         $cache->store($data);
 
         return Response::json($data);
@@ -113,25 +113,25 @@ class BudgetController extends Controller
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('budget-limit');
+        $cache->addProperty('chart.budget.budget.limit');
-        $cache->addProperty($budget->id);
         $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);
+            $spent            = $repository->spentInPeriod($budgetCollection, new Collection, $start, $start);
-            $amount = bcadd($amount, $spent);
+            $amount           = bcadd($amount, $spent);
-            $entries->push([clone $start, round($amount, 2)]);
+            $format           = $start->formatLocalized(strval(trans('config.month_and_day')));
+            $entries[$format] = $amount;
 
             $start->addDay();
         }
-        $data = $this->generator->budgetLimit($entries, 'month_and_day');
+        $data = $this->generator->singleSet(strval(trans('firefly.left')), $entries);
         $cache->store($data);
 
         return Response::json($data);
@@ -152,14 +152,30 @@ class BudgetController extends Controller
         $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
-        $cache->addProperty('budget');
+        $cache->addProperty('chart.budget.frontpage');
-        $cache->addProperty('all');
         if ($cache->has()) {
             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 +183,34 @@ class BudgetController extends Controller
             $reps = $this->filterRepetitions($repetitions, $budget, $start, $end);
 
             if ($reps->count() === 0) {
-                $collection = $this->spentInPeriodSingle($repository, $budget, $start, $end);
+                $row = $this->spentInPeriodSingle($repository, $budget, $start, $end);
-                $allEntries = $allEntries->merge($collection);
+                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');
+                }
                 continue;
             }
-            $collection = $this->spentInPeriodMulti($repository, $budget, $reps);
+            $rows = $this->spentInPeriodMulti($repository, $budget, $reps);
-            $allEntries = $allEntries->merge($collection);
+            foreach ($rows as $row) {
+                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');
+                }
+            }
+            unset($rows, $row);
 
         }
-        $entry = $this->spentInPeriodWithout($start, $end);
+        // for no budget:
-        $allEntries->push($entry);
+        $row = $this->spentInPeriodWithout($start, $end);
-        $data = $this->generator->frontpage($allEntries);
+        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');
+        }
+
+        $data = $this->generator->multiSet($chartData);
         $cache->store($data);
 
         return Response::json($data);
@@ -201,20 +234,19 @@ class BudgetController extends Controller
         $cache->addProperty($end);
         $cache->addProperty($accounts);
         $cache->addProperty($budget->id);
-        $cache->addProperty('budget');
+        $cache->addProperty('chart.budget.period');
-        $cache->addProperty('period');
         if ($cache->has()) {
-             return Response::json($cache->get());
+            return Response::json($cache->get());
         }
 
-        // the expenses:
+        // get the expenses
-        $periods  = Navigation::listOfPeriods($start, $end);
-        $entries  = $repository->getBudgetPeriodReport(new Collection([$budget]), $accounts, $start, $end, false);
         $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) {
@@ -235,18 +267,29 @@ class BudgetController extends Controller
             $current = clone $currentEnd;
         }
 
-        // join them:
+        // join them into one set of data:
-        $result = [];
+        $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];
+            $label                           = $periods[$period];
-            $result[$nice] = [
+            $spent                           = isset($entries[$budget->id]['entries'][$period]) ? $entries[$budget->id]['entries'][$period] : '0';
-                'spent'    => isset($entries[$budget->id]['entries'][$period]) ? $entries[$budget->id]['entries'][$period] : '0',
+            $limit                           = isset($entries[$period]) ? $budgeted[$period] : 0;
-                'budgeted' => isset($entries[$period]) ? $budgeted[$period] : 0,
+            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
-            ];
+            $chartData[1]['entries'][$label] = $limit;
+
         }
-
+        $data = $this->generator->multiSet($chartData);
-        $data = $this->generator->period($result);
-
         $cache->store($data);
 
         return Response::json($data);
@@ -267,27 +310,23 @@ class BudgetController extends Controller
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($accounts);
-        $cache->addProperty('no-budget');
+        $cache->addProperty('chart.budget.no-budget');
-        $cache->addProperty('period');
         if ($cache->has()) {
             return Response::json($cache->get());
         }
 
         // the expenses:
-        $periods  = Navigation::listOfPeriods($start, $end);
+        $periods   = Navigation::listOfPeriods($start, $end);
-        $entries  = $repository->getNoBudgetPeriodReport($accounts, $start, $end);
+        $entries   = $repository->getNoBudgetPeriodReport($accounts, $start, $end);
+        $chartData = [];
 
         // join them:
-        $result = [];
         foreach (array_keys($periods) as $period) {
-            $nice          = $periods[$period];
+            $label             = $periods[$period];
-            $result[$nice] = [
+            $spent             = isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0';
-                'spent'    => isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0',
+            $chartData[$label] = bcmul($spent, '-1');
-            ];
         }
-
+        $data = $this->generator->singleSet(strval(trans('firefly.spent')), $chartData);
-        $data = $this->generator->periodNoBudget($result);
-
         $cache->store($data);
 
         return Response::json($data);
@@ -316,17 +355,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'));
+        $return = [];
-        $collection = new Collection;
+        $format = strval(trans('config.month_and_day'));
-        $name       = $budget->name;
+        $name   = $budget->name;
         /** @var LimitRepetition $repetition */
         foreach ($repetitions as $repetition) {
             $expenses = $repository->spentInPeriod(new Collection([$budget]), new Collection, $repetition->startdate, $repetition->enddate);
@@ -341,35 +388,52 @@ 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];
+            $return[]  = [
-            $collection->push($array);
+                'name'                 => $name,
+                'repetition_left'      => $left,
+                'repetition_overspent' => $overspent,
+                'spent'                => $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;
+        $spent = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end);
-        $amount     = '0';
+        $array = [
-        $left       = '0';
+            'name'                 => $budget->name,
-        $spent      = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end);
+            'repetition_left'      => '0',
-        $overspent  = '0';
+            'repetition_overspent' => '0',
-        $array      = [$budget->name, $left, $spent, $overspent, $amount, $spent];
+            'spent'                => $spent,
-        $collection->push($array);
+        ];
 
-        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 +451,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;
     }
 }

app/Http/Controllers/Chart/BudgetReportController.php

@@ -0,0 +1,292 @@
+<?php
+/**
+ * BudgetReportController.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Controllers\Chart;
+
+
+use Carbon\Carbon;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
+use FireflyIII\Generator\Report\Category\MonthReportGenerator;
+use FireflyIII\Helpers\Collector\JournalCollector;
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\CacheProperties;
+use Illuminate\Support\Collection;
+use Navigation;
+use Response;
+
+
+/**
+ * Separate controller because many helper functions are shared.
+ *
+ * Class BudgetReportController
+ *
+ * @package FireflyIII\Http\Controllers\Chart
+ */
+class BudgetReportController extends Controller
+{
+
+    /** @var AccountRepositoryInterface */
+    private $accountRepository;
+    /** @var BudgetRepositoryInterface */
+    private $budgetRepository;
+    /** @var  GeneratorInterface */
+    private $generator;
+
+    /**
+     *
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->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;
+    }
+}

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);
+        $cache = new CacheProperties;
-        $range              = Preferences::get('viewRange', '1M')->data;
+        $cache->addProperty('chart.category.all');
-        $start              = Navigation::startOfPeriod($start, $range);
+        $cache->addProperty($category->id);
-        $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');
         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);
+            $currentEnd                      = Navigation::endOfPeriod($start, $range);
-            $spent      = $repository->spentInPeriod($categoryCollection, $accounts, $start, $currentEnd);
+            $spent                           = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $currentEnd);
-            $earned     = $repository->earnedInPeriod($categoryCollection, $accounts, $start, $currentEnd);
+            $earned                          = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $currentEnd);
-            $date       = Navigation::periodShow($start, $range);
+            $label                           = Navigation::periodShow($start, $range);
-            $entries->push([clone $start, $date, $spent, $earned]);
+            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
-            $start = Navigation::addPeriod($start, $range, 0);
+            $chartData[1]['entries'][$label] = $earned;
+            $start                           = Navigation::addPeriod($start, $range, 0);
         }
-        $entries = $entries->reverse();
+
-        $entries = $entries->slice(0, 48);
+        $data = $this->generator->multiSet($chartData);
-        $entries = $entries->reverse();
-        $data    = $this->generator->all($entries);
         $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('chart.category.frontpage');
-        $cache->addProperty('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;
+                $chartData[$category->name] = bcmul($spent, '-1');
-                $set->push($category);
             }
         }
-        // this is a "fake" entry for the "no category" entry.
+        $chartData[strval(trans('firefly.no_category'))] = bcmul($repository->spentInPeriodWithoutCategory(new Collection, $start, $end), '-1');
-        $entry        = new stdClass;
-        $entry->name  = trans('firefly.no_category');
-        $entry->spent = $repository->spentInPeriodWithoutCategory(new Collection, $start, $end);
-        $set->push($entry);
 
-        $set  = $set->sortBy('spent');
+        // sort
-        $data = $this->generator->frontpage($set);
+        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);
+        $expenses  = $repository->periodExpenses(new Collection([$category]), $accounts, $start, $end);
-        $income   = $repository->periodIncome(new Collection([$category]), $accounts, $start, $end);
+        $income    = $repository->periodIncome(new Collection([$category]), $accounts, $start, $end);
-        $periods  = Navigation::listOfPeriods($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];
+            $label                           = $periods[$period];
-            $result[$nice] = [
+            $spent                           = $expenses[$category->id]['entries'][$period] ?? '0';
-                'earned' => $income[$category->id]['entries'][$period] ?? '0',
+            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
-                'spent'  => $expenses[$category->id]['entries'][$period] ?? '0',
+            $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);
+        $expenses  = $repository->periodExpensesNoCategory($accounts, $start, $end);
-        $income   = $repository->periodIncomeNoCategory($accounts, $start, $end);
+        $income    = $repository->periodIncomeNoCategory($accounts, $start, $end);
-        $periods  = Navigation::listOfPeriods($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];
+            $label                           = $periods[$period];
-            $result[$nice] = [
+            $spent                           = $expenses['entries'][$period] ?? '0';
-                'earned' => $income['entries'][$period] ?? '0',
+            $chartData[0]['entries'][$label] = bcmul($spent, '-1');
-                'spent'  => $expenses['entries'][$period] ?? '0',
+            $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);
+            $spent  = $repository->spentInPeriod(new Collection([$category]), $accounts, $start, $start);
-            $earned = $repository->earnedInPeriod($categoryCollection, $accounts, $start, $start);
+            $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $start);
-            $date   = Navigation::periodShow($start, '1D');
+            $label  = Navigation::periodShow($start, '1D');
-            $entries->push([clone $start, $date, $spent, $earned]);
+
+            $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;

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):
+        $names     = [];
-        $set     = $this->getExpenses($accounts, $categories, $start, $end);
+        $set       = $this->getExpenses($accounts, $categories, $start, $end);
-        $grouped = $this->groupByOpposingAccount($set);
+        $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');
+            $amount                        = bcmul($amount, '-1');
-            $total    = bcadd($total, $amount);
+            $total                         = bcadd($total, $amount);
-            $result[] = ['name' => $names[$accountId], 'id' => $accountId, 'amount' => $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();
+            $journals                                            = $collector->getJournals();
-            $sum      = strval($journals->sum('transaction_amount'));
+            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum      = bcmul($sum, '-1');
+            $sum                                                 = bcmul($sum, '-1');
-            Log::debug(sprintf('Sum of others in accountExpense is %f', $sum));
+            $sum                                                 = bcsub($sum, $total);
-            $sum      = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-            $result[] = ['name' => trans('firefly.everything_else'), 'id' => 0, 'amount' => $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:
+        $names     = [];
-        $result = [];
+        $set       = $this->getIncome($accounts, $categories, $start, $end);
-        $total  = '0';
+        $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);
+            $total                         = bcadd($total, $amount);
-            $result[] = ['name' => $names[$accountId], 'id' => $accountId, 'amount' => $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();
+            $journals                                            = $collector->getJournals();
-            $sum      = strval($journals->sum('transaction_amount'));
+            $sum                                                 = strval($journals->sum('transaction_amount'));
-            Log::debug(sprintf('Sum of others in accountIncome is %f', $sum));
+            $sum                                                 = bcsub($sum, $total);
-            $sum      = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-            $result[] = ['name' => trans('firefly.everything_else'), 'id' => 0, 'amount' => $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):
+        $names     = [];
-        $set     = $this->getExpenses($accounts, $categories, $start, $end);
+        $set       = $this->getExpenses($accounts, $categories, $start, $end);
-        $grouped = $this->groupByCategory($set);
+        $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');
+            $amount                         = bcmul($amount, '-1');
-            $total    = bcadd($total, $amount);
+            $total                          = bcadd($total, $amount);
-            $result[] = ['name' => $names[$categoryId], 'id' => $categoryId, 'amount' => $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();
+            $journals                                            = $collector->getJournals();
-            $sum      = strval($journals->sum('transaction_amount'));
+            $sum                                                 = strval($journals->sum('transaction_amount'));
-            $sum      = bcmul($sum, '-1');
+            $sum                                                 = bcmul($sum, '-1');
-            Log::debug(sprintf('Sum of others in categoryExpense is %f', $sum));
+            $sum                                                 = bcsub($sum, $total);
-            $sum      = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-            $result[] = ['name' => trans('firefly.everything_else'), 'id' => 0, 'amount' => $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):
+        $names     = [];
-        $set     = $this->getIncome($accounts, $categories, $start, $end);
+        $set       = $this->getIncome($accounts, $categories, $start, $end);
-        $grouped = $this->groupByCategory($set);
+        $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);
+            $total                          = bcadd($total, $amount);
-            $result[] = ['name' => $names[$categoryId], 'id' => $categoryId, 'amount' => $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();
+            $journals                                            = $collector->getJournals();
-            $sum      = strval($journals->sum('transaction_amount'));
+            $sum                                                 = strval($journals->sum('transaction_amount'));
-            Log::debug(sprintf('Sum of others in categoryIncome is %f', $sum));
+            $sum                                                 = bcsub($sum, $total);
-            $sum      = bcsub($sum, $total);
+            $chartData[strval(trans('firefly.everything_else'))] = $sum;
-            $result[] = ['name' => trans('firefly.everything_else'), 'id' => 0, 'amount' => $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:
+        $cache = new CacheProperties;
-        $period   = '1D';
+        $cache->addProperty('chart.category.report.main');
-        $format   = 'month_and_day';
+        $cache->addProperty($accounts);
-        $function = 'endOfDay';
+        $cache->addProperty($categories);
-        if ($start->diffInMonths($end) > 1) {
+        $cache->addProperty($start);
-            $period   = '1M';
+        $cache->addProperty($end);
-            $format   = 'month';
+        if ($cache->has()) {
-            $function = 'endOfMonth';
+            return Response::json($cache->get());
         }
-        if ($start->diffInMonths($end) > 13) {
+
-            $period   = '1Y';
+        $format       = Navigation::preferredCarbonLocalizedFormat($start, $end);
-            $format   = 'year';
+        $function     = Navigation::preferredEndOfPeriod($start, $end);
-            $function = 'endOfYear';
+        $chartData    = [];
-        }
-        Log::debug(sprintf('Period is %s', $period));
-        $data         = [];
         $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)));
+            $label      = $currentStart->formatLocalized($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' => [],
-            ];
 
             /** @var Category $category */
             foreach ($categories as $category) {
+                $labelIn  = $category->id . '-in';
+                $labelOut = $category->id . '-out';
                 // get sum, and get label:
-                $categoryId                        = $category->id;
+                $chartData[$labelIn]['entries'][$label]  = $income[$category->id] ?? '0';
-                $data[$label]['name'][$categoryId] = $category->name;
+                $chartData[$labelOut]['entries'][$label] = $expenses[$category->id] ?? '0';
-                $data[$label]['in'][$categoryId]   = $income[$categoryId] ?? '0';
-                $data[$label]['out'][$categoryId]  = $expenses[$categoryId] ?? '0';
             }
-
             $currentStart = clone $currentEnd;
             $currentStart->addDay();
         }
 
-        $data = $this->generator->mainReportChart($data);
+        $data = $this->generator->multiSet($chartData);
+        $cache->store($data);
 
         return Response::json($data);
     }

app/Http/Controllers/Chart/PiggyBankController.php

@@ -13,13 +13,12 @@ declare(strict_types = 1);
 
 namespace FireflyIII\Http\Controllers\Chart;
 
-use FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Support\CacheProperties;
-use Illuminate\Support\Collection;
 use Response;
 
 
@@ -31,7 +30,7 @@ use Response;
 class PiggyBankController extends Controller
 {
 
-    /** @var PiggyBankChartGeneratorInterface */
+    /** @var GeneratorInterface */
     protected $generator;
 
     /**
@@ -41,7 +40,7 @@ class PiggyBankController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->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       = $repository->getEvents($piggyBank);
-        $set        = $set->reverse();
+        $set       = $set->reverse();
-        $collection = [];
+        $chartData = [];
+        $sum       = '0';
         /** @var PiggyBankEvent $entry */
         foreach ($set as $entry) {
-            $date   = $entry->date->format('Y-m-d');
+            $label             = $entry->date->formatLocalized(strval(trans('config.month_and_day')));
-            $amount = $entry->amount;
+            $sum               = bcadd($sum, $entry->amount);
-            if (isset($collection[$date])) {
+            $chartData[$label] = $sum;
-                $amount = bcadd($amount, $collection[$date]);
-            }
-            $collection[$date] = $amount;
         }
 
-        $data = $this->generator->history(new Collection($collection));
+        $data = $this->generator->singleSet($piggyBank->name, $chartData);
         $cache->store($data);
 
         return Response::json($data);

app/Http/Controllers/Chart/ReportController.php

@@ -15,7 +15,7 @@ namespace FireflyIII\Http\Controllers\Chart;
 
 
 use Carbon\Carbon;
-use FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface;
+use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Repositories\Account\AccountTaskerInterface;
 use FireflyIII\Support\CacheProperties;
@@ -32,7 +32,7 @@ use Steam;
 class ReportController extends Controller
 {
 
-    /** @var ReportChartGeneratorInterface */
+    /** @var GeneratorInterface */
     protected $generator;
 
     /**
@@ -42,7 +42,7 @@ class ReportController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $this->generator = app(ReportChartGeneratorInterface::class);
+        $this->generator = app(GeneratorInterface::class);
     }
 
     /**
@@ -50,38 +50,34 @@ 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)
     {
         // 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();
+        $ids       = $accounts->pluck('id')->toArray();
-        $current = clone $start;
+        $current   = clone $start;
-        $entries = new Collection;
+        $chartData = [];
         while ($current < $end) {
-            $balances = Steam::balancesById($ids, $current);
+            $balances          = Steam::balancesById($ids, $current);
-            $sum      = $this->arraySum($balances);
+            $sum               = $this->arraySum($balances);
-            $entries->push(
+            $label             = $current->formatLocalized(strval(trans('config.month_and_day')));
-                [
+            $chartData[$label] = $sum;
-                    'date'      => clone $current,
-                    'net-worth' => $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);
@@ -102,35 +98,52 @@ 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);
+        foreach ($source['earned'] as $date => $amount) {
-
+            $carbon                          = new Carbon($date);
-        if ($start->diffInMonths($end) > 12) {
+            $label                           = $carbon->formatLocalized($format);
-            // data = method X
+            $earned                          = $chartData[0]['entries'][$label] ?? '0';
-            $data = $this->multiYearOperations($chartSource['earned'], $chartSource['spent'], $start, $end);
+            $chartData[0]['entries'][$label] = bcadd($earned, $amount);
-            $cache->store($data);
+        }
-
+        foreach ($source['spent'] as $date => $amount) {
-            return Response::json($data);
+            $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);
 
-
     }
 
     /**
      * Shows sum income and expense, debet/credit: operations
+     *
      * @param Carbon     $start
      * @param Carbon     $end
      * @param Collection $accounts
@@ -140,168 +153,73 @@ 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);
+        $source  = $this->getChartData($accounts, $start, $end);
-
+        $numbers = [
-        if ($start->diffInMonths($end) > 12) {
+            'sum_earned'   => '0',
-            // per year
+            'avg_earned'   => '0',
-            $data = $this->multiYearSum($chartSource['earned'], $chartSource['spent'], $start, $end);
+            'count_earned' => 0,
-            $cache->store($data);
+            'sum_spent'    => '0',
-
+            'avg_spent'    => '0',
-            return Response::json($data);
+            'count_spent'  => 0,
+        ];
+        foreach ($source['earned'] as $amount) {
+            $numbers['sum_earned'] = bcadd($amount, $numbers['sum_earned']);
+            $numbers['count_earned']++;
         }
-        // per month!
+        if ($numbers['count_earned'] > 0) {
-        $data = $this->singleYearSum($chartSource['earned'], $chartSource['spent'], $start, $end);
+            $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
      *
      * @return string
      */
-    private function arraySum($array) : string
+    private function arraySum($array): string
     {
         $sum = '0';
         foreach ($array as $entry) {
@@ -312,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');
+            $currentEnd          = Navigation::endOfPeriod($currentStart, '1M');
-            $date               = $currentStart->format('Y-m');
+            $label               = $currentStart->format('Y-m') . '-01';
-            $spent              = $tasker->amountOutInPeriod($accounts, $accounts, $currentStart, $currentEnd);
+            $spent               = $tasker->amountOutInPeriod($accounts, $accounts, $currentStart, $currentEnd);
-            $earned             = $tasker->amountInInPeriod($accounts, $accounts, $currentStart, $currentEnd);
+            $earned              = $tasker->amountInInPeriod($accounts, $accounts, $currentStart, $currentEnd);
-            $spentArray[$date]  = bcmul($spent, '-1');
+            $spentArray[$label]  = bcmul($spent, '-1');
-            $earnedArray[$date] = $earned;
+            $earnedArray[$label] = $earned;
-            $currentStart       = Navigation::addPeriod($currentStart, '1M', 0);
+            $currentStart        = Navigation::addPeriod($currentStart, '1M', 0);
         }
-
+        $result = [
-        return [
             'spent'  => $spentArray,
             'earned' => $earnedArray,
         ];
+        $cache->store($result);
+
+        return $result;
     }
 }

app/Http/Controllers/CurrencyController.php

@@ -89,14 +89,16 @@ class CurrencyController extends Controller
 
     }
 
+
     /**
-     * @param TransactionCurrency $currency
+     * @param CurrencyRepositoryInterface $repository
+     * @param TransactionCurrency         $currency
      *
-     * @return \Illuminate\Http\RedirectResponse|View
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
      */
-    public function delete(TransactionCurrency $currency)
+    public function delete(CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
-        if (!$this->canDeleteCurrency($currency)) {
+        if (!$repository->canDeleteCurrency($currency)) {
             Session::flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name]));
 
             return redirect(route('currencies.index'));
@@ -114,23 +116,21 @@ class CurrencyController extends Controller
     }
 
     /**
-     * @param TransactionCurrency $currency
+     * @param CurrencyRepositoryInterface $repository
+     * @param TransactionCurrency         $currency
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws \Exception
      */
-    public function destroy(TransactionCurrency $currency)
+    public function destroy(CurrencyRepositoryInterface $repository, TransactionCurrency $currency)
     {
-        if (!$this->canDeleteCurrency($currency)) {
+        if (!$repository->canDeleteCurrency($currency)) {
             Session::flash('error', trans('firefly.cannot_delete_currency', ['name' => $currency->name]));
 
             return redirect(route('currencies.index'));
         }
 
+        $repository->destroy($currency);
         Session::flash('success', trans('firefly.deleted_currency', ['name' => $currency->name]));
-        if (auth()->user()->hasRole('owner')) {
-            $currency->forceDelete();
-        }
 
         return redirect(session('currencies.delete.url'));
     }
@@ -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')]));
         }
 
 
@@ -235,40 +235,4 @@ class CurrencyController extends Controller
         return redirect(session('currencies.edit.url'));
 
     }
-
-    /**
-     * @param TransactionCurrency $currency
-     *
-     * @return bool
-     */
-    private function canDeleteCurrency(TransactionCurrency $currency): bool
-    {
-        $repository = app(CurrencyRepositoryInterface::class);
-
-        // has transactions still
-        if ($repository->countJournals($currency) > 0) {
-            return false;
-        }
-
-        // is the only currency left
-        if ($repository->get()->count() === 1) {
-            return false;
-        }
-
-        // is the default currency for the user or the system
-        $defaultCode = Preferences::get('currencyPreference', config('firefly.default_currency', 'EUR'))->data;
-        if ($currency->code === $defaultCode) {
-            return false;
-        }
-
-        // is the default currency for the system
-        $defaultSystemCode = config('firefly.default_currency', 'EUR');
-        if ($currency->code === $defaultSystemCode) {
-            return false;
-        }
-
-        // can be deleted
-        return true;
-    }
-
 }

app/Http/Controllers/ExportController.php

@@ -17,7 +17,7 @@ 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;
 use FireflyIII\Models\ExportJob;
@@ -71,7 +71,6 @@ class ExportController extends Controller
             throw new FireflyException('Against all expectations, zip file "' . $file . '" does not exist.');
         }
 
-
         $job->change('export_downloaded');
 
         return response($disk->get($file), 200)
@@ -133,7 +132,6 @@ class ExportController extends Controller
      */
     public function postIndex(ExportFormRequest $request, AccountRepositoryInterface $repository, EJRI $jobs)
     {
-        set_time_limit(0);
         $job      = $jobs->findByKey($request->get('job'));
         $settings = [
             'accounts'           => $repository->getAccountsById($request->get('accounts')),
@@ -146,7 +144,9 @@ class ExportController extends Controller
         ];
 
         $job->change('export_status_make_exporter');
-        $processor = new Processor($settings);
+
+        /** @var ProcessorInterface $processor */
+        $processor = app(ProcessorInterface::class, [$settings]);
 
         /*
          * Collect journals:

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',
+        $ignore = [
-                   'piggy-banks.remove', 'preferences.', 'rules.rule.up', 'rules.rule.down', 'rules.rule-group.up', 'rules.rule-group.down', 'popup.report',
+            // login and two-factor routes:
-                   'admin.users.domains.block-', 'import.json', 'help.',
+            '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 = '<pre>';

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'));
     }
 
     /**
@@ -318,7 +321,8 @@ class ImportController extends Controller
     {
         set_time_limit(0);
         if ($job->status == 'settings_complete') {
-            ImportProcedure::runImport($job);
+            $importProcedure = new ImportProcedure;
+            $importProcedure->runImport($job);
         }
     }
 

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);

app/Http/Controllers/ProfileController.php

@@ -15,9 +15,9 @@ namespace FireflyIII\Http\Controllers;
 
 use FireflyIII\Http\Requests\DeleteAccountFormRequest;
 use FireflyIII\Http\Requests\ProfileFormRequest;
-use FireflyIII\User;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use Hash;
-use Preferences;
+use Log;
 use Session;
 use View;
 
@@ -112,12 +112,12 @@ class ProfileController extends Controller
     }
 
     /**
+     * @param UserRepositoryInterface  $repository
      * @param DeleteAccountFormRequest $request
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
-     * @throws \Exception
      */
-    public function postDeleteAccount(DeleteAccountFormRequest $request)
+    public function postDeleteAccount(UserRepositoryInterface $repository, DeleteAccountFormRequest $request)
     {
         // old, new1, new2
         if (!Hash::check($request->get('password'), auth()->user()->password)) {
@@ -125,34 +125,16 @@ class ProfileController extends Controller
 
             return redirect(route('profile.delete-account'));
         }
-
+        $user = auth()->user();
-        // store some stuff for the future:
+        Log::info(sprintf('User #%d has opted to delete their account', auth()->user()->id));
-        $registration = Preferences::get('registration_ip_address')->data;
+        // make repository delete user:
-        $confirmation = Preferences::get('confirmation_ip_address')->data;
+        auth()->logout();
-
-        // DELETE!
-        $email = auth()->user()->email;
-        auth()->user()->delete();
         Session::flush();
+        $repository->destroy($user);
+
         Session::flash('gaEventCategory', 'user');
         Session::flash('gaEventAction', 'delete-account');
 
-        // create a new user with the same email address so re-registration is blocked.
-        $newUser = User::create(
-            [
-                'email'        => $email,
-                'password'     => 'deleted',
-                'blocked'      => 1,
-                'blocked_code' => 'deleted',
-            ]
-        );
-        if (strlen($registration) > 0) {
-            Preferences::setForUser($newUser, 'registration_ip_address', $registration);
-
-        }
-        if (strlen($confirmation) > 0) {
-            Preferences::setForUser($newUser, 'confirmation_ip_address', $confirmation);
-        }
 
         return redirect(route('index'));
     }

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)
     {
 
 

app/Http/Controllers/Report/CategoryController.php

@@ -99,12 +99,12 @@ class CategoryController extends Controller
     }
 
     /**
-     * @param ReportHelperInterface $helper
+     * @param Collection $accounts
-     * @param Collection            $accounts
+     * @param Carbon     $start
-     * @param Carbon                $start
+     * @param Carbon     $end
-     * @param Carbon                $end
      *
      * @return mixed|string
+     * @internal param ReportHelperInterface $helper
      */
     public function operations(Collection $accounts, Carbon $start, Carbon $end)
     {

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

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 $budgets
+     * @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
      */

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::DEPOSIT . '-' . TransactionType::WITHDRAWAL: // three
-            case TransactionType::TRANSFER . '-' . TransactionType::WITHDRAWAL: #five
+            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::DEPOSIT . '-' . TransactionType::TRANSFER: // four
-            case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: #six
+            case TransactionType::TRANSFER . '-' . TransactionType::DEPOSIT: // six
                 $destination = $destinationAccount;
                 break;
         }

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;

app/Http/Controllers/Transaction/SingleController.php

@@ -184,7 +184,7 @@ class SingleController extends Controller
 
         $what          = strtolower(TransactionJournal::transactionTypeStr($journal));
         $assetAccounts = ExpandedForm::makeSelectList($this->accounts->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]));
-        $budgetList    = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets());
+        $budgetList    = ExpandedForm::makeSelectListWithEmpty($this->budgets->getBudgets());
 
         // view related code
         $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]);

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);
         }

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'));
         }

app/Http/Requests/AccountFormRequest.php

@@ -39,15 +39,15 @@ class AccountFormRequest extends Request
     public function getAccountData(): array
     {
         return [
-            'name'                   => trim($this->input('name')),
+            'name'                   => trim(strval($this->input('name'))),
             'active'                 => intval($this->input('active')) === 1,
             'accountType'            => $this->input('what'),
             'currency_id'            => intval($this->input('currency_id')),
             'virtualBalance'         => round($this->input('virtualBalance'), 2),
             'virtualBalanceCurrency' => intval($this->input('amount_currency_id_virtualBalance')),
-            'iban'                   => trim($this->input('iban')),
+            'iban'                   => trim(strval($this->input('iban'))),
-            'BIC'                    => trim($this->input('BIC')),
+            'BIC'                    => trim(strval($this->input('BIC'))),
-            'accountNumber'          => trim($this->input('accountNumber')),
+            'accountNumber'          => trim(strval($this->input('accountNumber'))),
             'accountRole'            => $this->input('accountRole'),
             'openingBalance'         => round($this->input('openingBalance'), 2),
             'openingBalanceDate'     => new Carbon((string)$this->input('openingBalanceDate')),
@@ -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',

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,
+            'single_user_mode'        => intval($this->get('single_user_mode')) === 1,
-            'must_confirm_account' => intval($this->get('must_confirm_account')) === 1,
+            'must_confirm_account'    => intval($this->get('must_confirm_account')) === 1,
-            'is_demo_site'         => intval($this->get('is_demo_site')) === 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',
+            'single_user_mode'        => 'between:0,1|numeric',
-            'must_confirm_account' => 'between:0,1|numeric',
+            'must_confirm_account'    => 'between:0,1|numeric',
-            'is_demo_site'         => '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;

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);
     }
 }

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;
 
@@ -40,7 +41,7 @@ class ReportFormRequest extends Request
     /**
      * @return Collection
      */
-    public function getAccountList():Collection
+    public function getAccountList(): Collection
     {
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
@@ -58,6 +59,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 Collection
      */
@@ -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',
         ];
     }
 

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');

app/Http/Requests/UserFormRequest.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * UserFormRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Requests;
+
+/**
+ * Class UserFormRequest
+ *
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class UserFormRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users
+        return auth()->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',
+        ];
+    }
+}

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;
@@ -27,6 +28,7 @@ use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\User;
+use Illuminate\Support\Collection;
 
 /**
  * HOME
@@ -67,29 +69,33 @@ Breadcrumbs::register(
 Breadcrumbs::register(
     'accounts.show', function (BreadCrumbGenerator $breadcrumbs, Account $account) {
     $what = config('firefly.shortNamesByFullName.' . $account->accountType->type);
+
     $breadcrumbs->parent('accounts.index', $what);
-    $breadcrumbs->push(e($account->name), route('accounts.show', [$account->id]));
+    $breadcrumbs->push($account->name, route('accounts.show', [$account->id]));
 }
 );
 
 Breadcrumbs::register(
-    'accounts.show.date', function (BreadCrumbGenerator $breadcrumbs, Account $account, Carbon $date) {
+    'accounts.show.date', function (BreadCrumbGenerator $breadcrumbs, Account $account, Carbon $start, Carbon $end) {
+
+    $startString = $start->formatLocalized(strval(trans('config.month_and_day')));
+    $endString   = $end->formatLocalized(strval(trans('config.month_and_day')));
+    $title       = sprintf('%s (%s)', $account->name, trans('firefly.from_to', ['start' => $startString, 'end' => $endString]));
+
     $breadcrumbs->parent('accounts.show', $account);
-
+    $breadcrumbs->push($title, route('accounts.show.date', [$account->id, $start->format('Y-m-d')]));
-    $range = Preferences::get('viewRange', '1M')->data;
-    $title = $account->name . ' (' . Navigation::periodShow($date, $range) . ')';
-
-    $breadcrumbs->push($title, route('accounts.show.date', [$account->id, $date->format('Y-m-d')]));
 }
 );
 
 Breadcrumbs::register(
-    'accounts.show.all', function (BreadCrumbGenerator $breadcrumbs, Account $account) {
+    'accounts.show.all', function (BreadCrumbGenerator $breadcrumbs, Account $account, Carbon $start, Carbon $end) {
+
+    $startString = $start->formatLocalized(strval(trans('config.month_and_day')));
+    $endString   = $end->formatLocalized(strval(trans('config.month_and_day')));
+    $title       = sprintf('%s (%s)', $account->name, trans('firefly.from_to', ['start' => $startString, 'end' => $endString]));
+
     $breadcrumbs->parent('accounts.show', $account);
-
+    $breadcrumbs->push($title, route('accounts.show.all', [$account->id, $start->format('Y-m-d')]));
-    $title = sprintf('%s (%s)', $account->name, strtolower(trans('firefly.everything')));
-
-    $breadcrumbs->push($title, route('accounts.show.all', [$account->id]));
 }
 );
 
@@ -134,6 +140,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) {
@@ -248,21 +260,26 @@ Breadcrumbs::register(
 );
 
 Breadcrumbs::register(
-    'budgets.noBudget', function (BreadCrumbGenerator $breadcrumbs, $subTitle) {
+    'budgets.no-budget', function (BreadCrumbGenerator $breadcrumbs, $subTitle) {
     $breadcrumbs->parent('budgets.index');
-    $breadcrumbs->push($subTitle, route('budgets.noBudget'));
+    $breadcrumbs->push($subTitle, route('budgets.no-budget'));
 }
 );
 
 Breadcrumbs::register(
-    'budgets.show', function (BreadCrumbGenerator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) {
+    'budgets.show', function (BreadCrumbGenerator $breadcrumbs, Budget $budget) {
     $breadcrumbs->parent('budgets.index');
     $breadcrumbs->push(e($budget->name), route('budgets.show', [$budget->id]));
-    if (!is_null($repetition) && !is_null($repetition->id)) {
+}
-        $breadcrumbs->push(
+);
-            Navigation::periodShow($repetition->startdate, $repetition->budgetLimit->repeat_freq), route('budgets.show', [$budget->id, $repetition->id])
+
-        );
+Breadcrumbs::register(
-    }
+    'budgets.show.repetition', function (BreadCrumbGenerator $breadcrumbs, Budget $budget, LimitRepetition $repetition) {
+    $breadcrumbs->parent('budgets.index');
+    $breadcrumbs->push(e($budget->name), route('budgets.show.repetition', [$budget->id, $repetition->id]));
+    $breadcrumbs->push(
+        Navigation::periodShow($repetition->startdate, $repetition->budgetLimit->repeat_freq), route('budgets.show', [$budget->id, $repetition->id])
+    );
 }
 );
 
@@ -317,9 +334,9 @@ Breadcrumbs::register(
 );
 
 Breadcrumbs::register(
-    'categories.noCategory', function (BreadCrumbGenerator $breadcrumbs, $subTitle) {
+    'categories.no-category', function (BreadCrumbGenerator $breadcrumbs, $subTitle) {
     $breadcrumbs->parent('categories.index');
-    $breadcrumbs->push($subTitle, route('categories.noCategory'));
+    $breadcrumbs->push($subTitle, route('categories.no-category'));
 }
 );
 
@@ -400,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
  */
@@ -407,7 +453,6 @@ Breadcrumbs::register(
     'preferences.index', function (BreadCrumbGenerator $breadcrumbs) {
     $breadcrumbs->parent('home');
     $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences.index'));
-
 }
 );
 
@@ -646,20 +691,36 @@ 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
  */
 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->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.split.edit', [$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]));
 }
 );

app/Import/Converter/BasicConverter.php

@@ -37,7 +37,7 @@ class BasicConverter
     /**
      * @return int
      */
-    public function getCertainty():int
+    public function getCertainty(): int
     {
         return $this->certainty;
     }

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';

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;

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;

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;
 }

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;
 
@@ -200,10 +200,10 @@ class Account extends Model
     public function getOpeningBalanceAmount(): string
     {
         $journal = TransactionJournal::sortCorrectly()
-            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+                                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->where('transactions.account_id', $this->id)
+                                     ->where('transactions.account_id', $this->id)
-            ->transactionTypes([TransactionType::OPENING_BALANCE])
+                                     ->transactionTypes([TransactionType::OPENING_BALANCE])
-            ->first(['transaction_journals.*']);
+                                     ->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')
+                                     ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-            ->where('transactions.account_id', $this->id)
+                                     ->where('transactions.account_id', $this->id)
-            ->transactionTypes([TransactionType::OPENING_BALANCE])
+                                     ->transactionTypes([TransactionType::OPENING_BALANCE])
-            ->first(['transaction_journals.*']);
+                                     ->first(['transaction_journals.*']);
         if (is_null($journal)) {
             return $date;
         }

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;
 

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;
 

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)

app/Models/Preference.php

@@ -48,7 +48,7 @@ class Preference extends Model
         }
 
 
-        return json_decode($data);
+        return json_decode($data, true);
     }
 
     /**

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;
 

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)) {

app/Models/TransactionJournal.php

@@ -64,10 +64,10 @@ 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')
+                                        ->with('transactionType')
-                ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
+                                        ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-                ->where('user_id', auth()->user()->id)->first(['transaction_journals.*']);
+                                        ->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();
 

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;
         }
@@ -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;
     }
 
     /**

app/Providers/CurrencyServiceProvider.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * CurrencyServiceProvider.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International License.
+ *
+ * See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+
+namespace FireflyIII\Providers;
+
+use FireflyIII\Exceptions\FireflyException;
+use Illuminate\Foundation\Application;
+use Illuminate\Support\ServiceProvider;
+
+/**
+ * Class CurrencyServiceProvider
+ *
+ * @package FireflyIII\Providers
+ */
+class CurrencyServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap the application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        //
+    }
+
+    /**
+     * Register the application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->bind(
+            'FireflyIII\Repositories\Currency\CurrencyRepositoryInterface',
+            function (Application $app, array $arguments) {
+                if (!isset($arguments[0]) && $app->auth->check()) {
+                    return app('FireflyIII\Repositories\Currency\CurrencyRepository', [auth()->user()]);
+                }
+                if (!isset($arguments[0]) && !$app->auth->check()) {
+                    throw new FireflyException('There is no user present.');
+                }
+
+                return app('FireflyIII\Repositories\Currency\CurrencyRepository', $arguments);
+            }
+        );
+    }
+
+}