Merge branch 'release/3.9.0'

Signed-off-by: James Cole <thegrumpydictator@gmail.com>

# Conflicts:
#	app/Helpers/Csv/Converter/BillName.php

app/Bootstrap/ConfigureLogging.php

@@ -7,11 +7,13 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Bootstrap;
 
-use Illuminate\Log\Writer;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Foundation\Bootstrap\ConfigureLogging as IlluminateConfigureLogging;
+use Illuminate\Log\Writer;
 
 /**
  * Class ConfigureLogging
@@ -24,20 +26,20 @@ class ConfigureLogging extends IlluminateConfigureLogging
      * @param Application $app
      * @param Writer      $log
      */
-    protected function configureSingleHandler(Application $app, Writer $log)
+    protected function configureDailyHandler(Application $app, Writer $log)
     {
-        $log->useFiles($app->storagePath().'/logs/firefly-iii.log');
+        $log->useDailyFiles(
+            $app->storagePath() . '/logs/firefly-iii.log',
+            $app->make('config')->get('app.log_max_files', 5)
+        );
     }
 
     /**
      * @param Application $app
      * @param Writer      $log
      */
-    protected function configureDailyHandler(Application $app, Writer $log)
+    protected function configureSingleHandler(Application $app, Writer $log)
     {
-        $log->useDailyFiles(
-            $app->storagePath().'/logs/firefly-iii.log',
-            $app->make('config')->get('app.log_max_files', 5)
-        );
+        $log->useFiles($app->storagePath() . '/logs/firefly-iii.log');
     }
 }

app/Console/Commands/UpgradeFireflyInstructions.php

@@ -1,9 +1,16 @@
 <?php
+/**
+ * UpgradeFireflyInstructions.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Console\Commands;
 
-use Config;
 use Illuminate\Console\Command;
 
 /**
@@ -43,8 +50,9 @@ class UpgradeFireflyInstructions extends Command
     public function handle()
     {
         //
-        $version = Config::get('firefly.version');
-        $config  = Config::get('upgrade.text');
+        /** @var string $version */
+        $version = config('firefly.version');
+        $config  = config('upgrade.text');
         $text    = $config[$version] ?? null;
 
         $this->line('+------------------------------------------------------------------------------+');

app/Console/Commands/VerifyDatabase.php

@@ -1,4 +1,13 @@
 <?php
+/**
+ * VerifyDatabase.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
 
 namespace FireflyIII\Console\Commands;
 
@@ -10,7 +19,6 @@ use FireflyIII\Models\Category;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Console\Command;
@@ -39,8 +47,6 @@ class VerifyDatabase extends Command
 
     /**
      * Create a new command instance.
-     *
-     * @return void
      */
     public function __construct()
     {
@@ -72,6 +78,9 @@ class VerifyDatabase extends Command
         $this->reportTransactions();
         // deleted accounts that still have not deleted transactions or journals attached to them.
         $this->reportDeletedAccounts();
+
+        // report on journals with no transactions at all.
+        $this->reportNoTransactions();
     }
 
     /**
@@ -123,7 +132,9 @@ class VerifyDatabase extends Command
             ::leftJoin('budget_transaction_journal', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
             ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
             ->distinct()
-            ->get(['budgets.id', 'budgets.name', 'budget_transaction_journal.budget_id', 'budgets.user_id', 'users.email']);
+            ->whereNull('budget_transaction_journal.budget_id')
+            ->whereNull('budgets.deleted_at')
+            ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']);
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -142,7 +153,9 @@ class VerifyDatabase extends Command
             ::leftJoin('category_transaction_journal', 'categories.id', '=', 'category_transaction_journal.category_id')
             ->leftJoin('users', 'categories.user_id', '=', 'users.id')
             ->distinct()
-            ->get(['categories.id', 'categories.name', 'category_transaction_journal.category_id', 'categories.user_id', 'users.email']);
+            ->whereNull('category_transaction_journal.category_id')
+            ->whereNull('categories.deleted_at')
+            ->get(['categories.id', 'categories.name', 'categories.user_id', 'users.email']);
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {
@@ -210,19 +223,39 @@ class VerifyDatabase extends Command
         }
     }
 
+    private function reportNoTransactions()
+    {
+        /*
+         * select transaction_journals.id, count(transactions.id) as transaction_count from transaction_journals
+left join transactions ON transaction_journals.id = transactions.transaction_journal_id
+group by transaction_journals.id
+having transaction_count = 0
+         */
+        $set = TransactionJournal
+            ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->groupBy('transaction_journals.id')
+            ->having('transaction_count', '=', 0)
+            ->get(['transaction_journals.id', DB::raw('COUNT(`transactions`.`id`) as `transaction_count`')]);
+
+        foreach ($set as $entry) {
+            $this->error(
+                'Error: Journal #' . $entry->id . ' has zero transactions. Open table `transaction_journals` and delete the entry with id #' . $entry->id
+            );
+        }
+
+    }
+
     /**
      * Reports for each user when the sum of their transactions is not zero.
      */
     private function reportSum()
     {
         /** @var UserRepositoryInterface $userRepository */
-        $userRepository = app('FireflyIII\Repositories\User\UserRepositoryInterface');
+        $userRepository = app(UserRepositoryInterface::class);
 
         /** @var User $user */
         foreach ($userRepository->all() as $user) {
-            /** @var AccountRepositoryInterface $repository */
-            $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface', [$user]);
-            $sum        = $repository->sumOfEverything();
+            $sum = strval($user->transactions()->sum('amount'));
             if (bccomp($sum, '0') !== 0) {
                 $this->error('Error: Transactions for user #' . $user->id . ' (' . $user->email . ') are off by ' . $sum . '!');
             }
@@ -238,7 +271,9 @@ class VerifyDatabase extends Command
             ::leftJoin('tag_transaction_journal', 'tags.id', '=', 'tag_transaction_journal.tag_id')
             ->leftJoin('users', 'tags.user_id', '=', 'users.id')
             ->distinct()
-            ->get(['tags.id', 'tags.tag', 'tag_transaction_journal.tag_id', 'tags.user_id', 'users.email']);
+            ->whereNull('tag_transaction_journal.tag_id')
+            ->whereNull('tags.deleted_at')
+            ->get(['tags.id', 'tags.tag', 'tags.user_id', 'users.email']);
 
         /** @var stdClass $entry */
         foreach ($set as $entry) {

app/Console/Kernel.php

@@ -1,6 +1,4 @@
 <?php
-declare(strict_types = 1);
-
 /**
  * Kernel.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -9,11 +7,12 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Console;
 
 use FireflyIII\Console\Commands\UpgradeFireflyInstructions;
 use FireflyIII\Console\Commands\VerifyDatabase;
-use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 /**
@@ -53,17 +52,4 @@ class Kernel extends ConsoleKernel
             UpgradeFireflyInstructions::class,
             VerifyDatabase::class,
         ];
-
-    /**
-     * Define the application's command schedule.
-     *
-     * @param  \Illuminate\Console\Scheduling\Schedule $schedule
-     *
-     * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameters)
-     */
-    protected function schedule(Schedule $schedule)
-    {
-    }
 }

app/Crud/Account/AccountCrud.php

@@ -0,0 +1,421 @@
+<?php
+/**
+ * AccountCrud.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Crud\Account;
+
+use DB;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountMeta;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Collection;
+use Log;
+
+/**
+ * Class AccountCrud
+ *
+ * @package FireflyIII\Crud\Account
+ */
+class AccountCrud implements AccountCrudInterface
+{
+
+    /** @var User */
+    private $user;
+    /** @var array */
+    private $validFields = ['accountRole', 'ccMonthlyPaymentDate', 'ccType', 'accountNumber'];
+
+    /**
+     * AccountCrud constructor.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @param Account $account
+     * @param Account $moveTo
+     *
+     * @return bool
+     */
+    public function destroy(Account $account, Account $moveTo = null): bool
+    {
+        if (!is_null($moveTo)) {
+            // update all transactions:
+            DB::table('transactions')->where('account_id', $account->id)->update(['account_id' => $moveTo->id]);
+        }
+
+        $account->delete();
+
+        return true;
+    }
+
+    /**
+     * @param $accountId
+     *
+     * @return Account
+     */
+    public function find(int $accountId): Account
+    {
+        $account = $this->user->accounts()->find($accountId);
+        if (is_null($account)) {
+            $account = new Account;
+        }
+
+        return $account;
+    }
+
+    /**
+     * @param array $accountIds
+     *
+     * @return Collection
+     */
+    public function getAccountsById(array $accountIds): Collection
+    {
+        /** @var Collection $result */
+        $query = $this->user->accounts()->with(
+            ['accountmeta' => function (HasMany $query) {
+                $query->where('name', 'accountRole');
+            }]
+        );
+
+        if (count($accountIds) > 0) {
+            $query->whereIn('accounts.id', $accountIds);
+        }
+
+        $result = $query->get(['accounts.*']);
+
+        $result = $result->sortBy(
+            function (Account $account) {
+                return strtolower($account->name);
+            }
+        );
+
+        return $result;
+    }
+
+    /**
+     * @param array $types
+     *
+     * @return Collection
+     */
+    public function getAccountsByType(array $types): Collection
+    {
+        /** @var Collection $result */
+        $query = $this->user->accounts()->with(
+            ['accountmeta' => function (HasMany $query) {
+                $query->where('name', 'accountRole');
+            }]
+        );
+        if (count($types) > 0) {
+            $query->accountTypeIn($types);
+        }
+
+        $result = $query->get(['accounts.*']);
+
+        $result = $result->sortBy(
+            function (Account $account) {
+                return strtolower($account->name);
+            }
+        );
+
+        return $result;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Account
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function store(array $data): Account
+    {
+        $newAccount = $this->storeAccount($data);
+        if (!is_null($newAccount)) {
+            $this->storeMetadata($newAccount, $data);
+        }
+
+        // continue with the opposing account:
+        if ($data['openingBalance'] != 0) {
+            $opposingData = [
+                'user'           => $data['user'],
+                'accountType'    => 'initial',
+                'virtualBalance' => 0,
+                'name'           => $data['name'] . ' initial balance',
+                'active'         => false,
+                'iban'           => '',
+            ];
+            $opposing     = $this->storeAccount($opposingData);
+            if (!is_null($opposing) && !is_null($newAccount)) {
+                $this->storeInitialBalance($newAccount, $opposing, $data);
+            }
+
+        }
+
+        return $newAccount;
+
+    }
+
+    /**
+     * @param $account
+     * @param $name
+     * @param $value
+     *
+     * @return AccountMeta
+     */
+    public function storeMeta(Account $account, string $name, $value): AccountMeta
+    {
+        return AccountMeta::create(['name' => $name, 'data' => $value, 'account_id' => $account->id,]);
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     *
+     * @return Account
+     */
+    public function update(Account $account, array $data): Account
+    {
+        // update the account:
+        $account->name            = $data['name'];
+        $account->active          = $data['active'] == '1' ? true : false;
+        $account->virtual_balance = $data['virtualBalance'];
+        $account->iban            = $data['iban'];
+        $account->save();
+
+        $this->updateMetadata($account, $data);
+        $openingBalance = $this->openingBalanceTransaction($account);
+        if ($data['openingBalance'] != 0) {
+            if (!is_null($openingBalance->id)) {
+                $this->updateInitialBalance($account, $openingBalance, $data);
+
+                return $account;
+            }
+
+            $type         = $data['openingBalance'] < 0 ? 'expense' : 'revenue';
+            $opposingData = [
+                'user'           => $data['user'],
+                'accountType'    => $type,
+                'name'           => $data['name'] . ' initial balance',
+                'active'         => false,
+                'iban'           => '',
+                'virtualBalance' => 0,
+            ];
+            $opposing     = $this->storeAccount($opposingData);
+            if (!is_null($opposing)) {
+                $this->storeInitialBalance($account, $opposing, $data);
+            }
+
+            return $account;
+
+        }
+
+        if ($openingBalance) { // opening balance is zero, should we delete it?
+            $openingBalance->delete(); // delete existing opening balance.
+        }
+
+        return $account;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Account
+     */
+    protected function storeAccount(array $data): Account
+    {
+        $type        = config('firefly.accountTypeByIdentifier.' . $data['accountType']);
+        $accountType = AccountType::whereType($type)->first();
+        $newAccount  = new Account(
+            [
+                'user_id'         => $data['user'],
+                'account_type_id' => $accountType->id,
+                'name'            => $data['name'],
+                'virtual_balance' => $data['virtualBalance'],
+                'active'          => $data['active'] === true ? true : false,
+                'iban'            => $data['iban'],
+            ]
+        );
+
+        if (!$newAccount->isValid()) {
+            // does the account already exist?
+            $searchData      = [
+                'user_id'         => $data['user'],
+                'account_type_id' => $accountType->id,
+                'virtual_balance' => $data['virtualBalance'],
+                'name'            => $data['name'],
+                'iban'            => $data['iban'],
+            ];
+            $existingAccount = Account::firstOrNullEncrypted($searchData);
+            if (!$existingAccount) {
+                Log::error('Account create error: ' . $newAccount->getErrors()->toJson());
+                abort(500);
+            }
+            $newAccount = $existingAccount;
+
+        }
+        $newAccount->save();
+
+        return $newAccount;
+    }
+
+    /**
+     * @param Account $account
+     * @param Account $opposing
+     * @param array   $data
+     *
+     * @return TransactionJournal
+     */
+    protected function storeInitialBalance(Account $account, Account $opposing, array $data): TransactionJournal
+    {
+        $transactionType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
+        $journal         = TransactionJournal::create(
+            [
+                'user_id'                 => $data['user'],
+                'transaction_type_id'     => $transactionType->id,
+                'bill_id'                 => null,
+                'transaction_currency_id' => $data['openingBalanceCurrency'],
+                'description'             => 'Initial balance for "' . $account->name . '"',
+                'completed'               => true,
+                'date'                    => $data['openingBalanceDate'],
+                'encrypted'               => true,
+            ]
+        );
+
+        $firstAccount  = $account;
+        $secondAccount = $opposing;
+        $firstAmount   = $data['openingBalance'];
+        $secondAmount  = $data['openingBalance'] * -1;
+
+        if ($data['openingBalance'] < 0) {
+            $firstAccount  = $opposing;
+            $secondAccount = $account;
+            $firstAmount   = $data['openingBalance'] * -1;
+            $secondAmount  = $data['openingBalance'];
+        }
+
+        $one = new Transaction(['account_id' => $firstAccount->id, 'transaction_journal_id' => $journal->id, 'amount' => $firstAmount]);
+        $one->save();// first transaction: from
+
+        $two = new Transaction(['account_id' => $secondAccount->id, 'transaction_journal_id' => $journal->id, 'amount' => $secondAmount]);
+        $two->save(); // second transaction: to
+
+        return $journal;
+
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     */
+    protected function storeMetadata(Account $account, array $data)
+    {
+        foreach ($this->validFields as $field) {
+            if (isset($data[$field])) {
+                $metaData = new AccountMeta(
+                    [
+                        'account_id' => $account->id,
+                        'name'       => $field,
+                        'data'       => $data[$field],
+                    ]
+                );
+                $metaData->save();
+            }
+
+
+        }
+    }
+
+    /**
+     * @param Account            $account
+     * @param TransactionJournal $journal
+     * @param array              $data
+     *
+     * @return TransactionJournal
+     */
+    protected function updateInitialBalance(Account $account, TransactionJournal $journal, array $data): TransactionJournal
+    {
+        $journal->date = $data['openingBalanceDate'];
+        $journal->save();
+
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions()->get() as $transaction) {
+            if ($account->id == $transaction->account_id) {
+                $transaction->amount = $data['openingBalance'];
+                $transaction->save();
+            }
+            if ($account->id != $transaction->account_id) {
+                $transaction->amount = $data['openingBalance'] * -1;
+                $transaction->save();
+            }
+        }
+
+        return $journal;
+    }
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     *
+     */
+    protected function updateMetadata(Account $account, array $data)
+    {
+        foreach ($this->validFields as $field) {
+            $entry = $account->accountMeta()->where('name', $field)->first();
+
+            if (isset($data[$field])) {
+                // update if new data is present:
+                if (!is_null($entry)) {
+                    $entry->data = $data[$field];
+                    $entry->save();
+
+                    continue;
+                }
+                $metaData = new AccountMeta(
+                    [
+                        'account_id' => $account->id,
+                        'name'       => $field,
+                        'data'       => $data[$field],
+                    ]
+                );
+                $metaData->save();
+            }
+        }
+
+    }
+
+    /**
+     * @param Account $account
+     *
+     * @return TransactionJournal|null
+     */
+    private function openingBalanceTransaction(Account $account): TransactionJournal
+    {
+        $journal = TransactionJournal
+            ::sortCorrectly()
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->where('transactions.account_id', $account->id)
+            ->transactionTypes([TransactionType::OPENING_BALANCE])
+            ->first(['transaction_journals.*']);
+        if (is_null($journal)) {
+            return new TransactionJournal;
+        }
+
+        return $journal;
+    }
+}

app/Crud/Account/AccountCrudInterface.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * AccountCrudInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Crud\Account;
+
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountMeta;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface AccountCrudInterface
+ *
+ * @package FireflyIII\Crud\Account
+ */
+interface AccountCrudInterface
+{
+    /**
+     * @param Account $account
+     * @param Account $moveTo
+     *
+     * @return bool
+     */
+    public function destroy(Account $account, Account $moveTo): bool;
+
+    /**
+     * @param int $accountId
+     *
+     * @return Account
+     */
+    public function find(int $accountId): Account;
+
+    /**
+     * @param array $accountIds
+     *
+     * @return Collection
+     */
+    public function getAccountsById(array $accountIds): Collection;
+
+    /**
+     * @param array $types
+     *
+     * @return Collection
+     */
+    public function getAccountsByType(array $types): Collection;
+
+    /**
+     * @param array $data
+     *
+     * @return Account
+     */
+    public function store(array $data) : Account;
+
+    /**
+     * @param $account
+     * @param $name
+     * @param $value
+     *
+     * @return AccountMeta
+     */
+    public function storeMeta(Account $account, string $name, $value): AccountMeta;
+
+
+    /**
+     * @param Account $account
+     * @param array   $data
+     *
+     * @return Account
+     */
+    public function update(Account $account, array $data): Account;
+}

app/Crud/Split/Journal.php

@@ -0,0 +1,218 @@
+<?php
+/**
+ * Journal.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Crud\Split;
+
+use FireflyIII\Events\TransactionStored;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\AccountType;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Transaction;
+use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
+use FireflyIII\User;
+use Illuminate\Support\Collection;
+
+/**
+ * Class Journal
+ *
+ * @package FireflyIII\Crud\Split
+ */
+class Journal implements JournalInterface
+{
+    /** @var User */
+    private $user;
+
+    /**
+     * AttachmentRepository constructor.
+     *
+     * @param User $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * @param $journal
+     *
+     * @return bool
+     */
+    public function markAsComplete(TransactionJournal $journal)
+    {
+        $journal->completed = 1;
+        $journal->save();
+
+        return true;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     * @param array              $transaction
+     *
+     * @return Collection
+     */
+    public function storeTransaction(TransactionJournal $journal, array $transaction): Collection
+    {
+        // store accounts (depends on type)
+        list($sourceAccount, $destinationAccount) = $this->storeAccounts($journal->transactionType->type, $transaction);
+
+        // store transaction one way:
+        /** @var Transaction $one */
+        $one = Transaction::create(
+            ['account_id'  => $sourceAccount->id, 'transaction_journal_id' => $journal->id, 'amount' => $transaction['amount'] * -1,
+             'description' => $transaction['description']]
+        );
+        $two = Transaction::create(
+            ['account_id'  => $destinationAccount->id, 'transaction_journal_id' => $journal->id, 'amount' => $transaction['amount'],
+             'description' => $transaction['description']]
+        );
+
+        if (strlen($transaction['category']) > 0) {
+            $category = Category::firstOrCreateEncrypted(['name' => $transaction['category'], 'user_id' => $journal->user_id]);
+            $one->categories()->save($category);
+            $two->categories()->save($category);
+        }
+        if (intval($transaction['budget_id']) > 0) {
+            $budget = Budget::find($transaction['budget_id']);
+            $one->budgets()->save($budget);
+            $two->budgets()->save($budget);
+        }
+
+        if ($transaction['piggy_bank_id'] > 0) {
+            $transaction['date'] = $journal->date->format('Y-m-d');
+            event(new TransactionStored($transaction));
+        }
+
+        return new Collection([$one, $two]);
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     * @param array              $data
+     *
+     * @return TransactionJournal
+     */
+    public function updateJournal(TransactionJournal $journal, array $data): TransactionJournal
+    {
+        echo '<pre>';
+        print_r($data);
+
+        $journal->description             = $data['journal_description'];
+        $journal->transaction_currency_id = $data['journal_currency_id'];
+        $journal->date                    = $data['date'];
+        $journal->interest_date           = $data['interest_date'];
+        $journal->book_date               = $data['book_date'];
+        $journal->process_date            = $data['process_date'];
+        $journal->save();
+
+        // delete original transactions, and recreate them.
+        $journal->transactions()->delete();
+
+        foreach ($data['transactions'] as $transaction) {
+            $this->storeTransaction($journal, $transaction);
+        }
+
+        $journal->completed = true;
+        $journal->save();
+
+        return $journal;
+    }
+
+    /**
+     * @param string $type
+     * @param array  $transaction
+     *
+     * @return array
+     * @throws FireflyException
+     */
+    private function storeAccounts(string $type, array $transaction): array
+    {
+        $sourceAccount      = null;
+        $destinationAccount = null;
+        switch ($type) {
+            case TransactionType::WITHDRAWAL:
+                list($sourceAccount, $destinationAccount) = $this->storeWithdrawalAccounts($transaction);
+                break;
+            case TransactionType::DEPOSIT:
+                list($sourceAccount, $destinationAccount) = $this->storeDepositAccounts($transaction);
+                break;
+            case TransactionType::TRANSFER:
+                $sourceAccount      = Account::where('user_id', $this->user->id)->where('id', $transaction['source_account_id'])->first();
+                $destinationAccount = Account::where('user_id', $this->user->id)->where('id', $transaction['destination_account_id'])->first();
+                break;
+            default:
+                throw new FireflyException('Cannot handle ' . e($type));
+        }
+
+        return [$sourceAccount, $destinationAccount];
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return array
+     */
+    private function storeDepositAccounts(array $data): array
+    {
+        $destinationAccount = Account::where('user_id', $this->user->id)->where('id', $data['destination_account_id'])->first(['accounts.*']);
+
+        if (strlen($data['source_account_name']) > 0) {
+            $sourceType    = AccountType::where('type', 'Revenue account')->first();
+            $sourceAccount = Account::firstOrCreateEncrypted(
+                ['user_id' => $this->user->id, 'account_type_id' => $sourceType->id, 'name' => $data['source_account_name'], 'active' => 1]
+            );
+
+            return [$sourceAccount, $destinationAccount];
+        }
+
+        $sourceType    = AccountType::where('type', 'Cash account')->first();
+        $sourceAccount = Account::firstOrCreateEncrypted(
+            ['user_id' => $this->user->id, 'account_type_id' => $sourceType->id, 'name' => 'Cash account', 'active' => 1]
+        );
+
+        return [$sourceAccount, $destinationAccount];
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return array
+     */
+    private function storeWithdrawalAccounts(array $data): array
+    {
+        $sourceAccount = Account::where('user_id', $this->user->id)->where('id', $data['source_account_id'])->first(['accounts.*']);
+
+        if (strlen($data['destination_account_name']) > 0) {
+            $destinationType    = AccountType::where('type', 'Expense account')->first();
+            $destinationAccount = Account::firstOrCreateEncrypted(
+                [
+                    'user_id'         => $this->user->id,
+                    'account_type_id' => $destinationType->id,
+                    'name'            => $data['destination_account_name'],
+                    'active'          => 1,
+                ]
+            );
+
+            return [$sourceAccount, $destinationAccount];
+        }
+        $destinationType    = AccountType::where('type', 'Cash account')->first();
+        $destinationAccount = Account::firstOrCreateEncrypted(
+            ['user_id' => $this->user->id, 'account_type_id' => $destinationType->id, 'name' => 'Cash account', 'active' => 1]
+        );
+
+        return [$sourceAccount, $destinationAccount];
+
+
+    }
+}

app/Crud/Split/JournalInterface.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * JournalInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Crud\Split;
+
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface JournalInterface
+ *
+ * @package FireflyIII\Crud\Split
+ */
+interface JournalInterface
+{
+    /**
+     * @param $journal
+     *
+     * @return bool
+     */
+    public function markAsComplete(TransactionJournal $journal);
+
+    /**
+     * @param TransactionJournal $journal
+     * @param array              $transaction
+     *
+     * @return Collection
+     */
+    public function storeTransaction(TransactionJournal $journal, array $transaction): Collection;
+
+    /**
+     * @param TransactionJournal $journal
+     * @param array              $data
+     *
+     * @return TransactionJournal
+     */
+    public function updateJournal(TransactionJournal $journal, array $data): TransactionJournal;
+}

app/Events/BudgetLimitStored.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * BudgetLimitStored.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use Carbon\Carbon;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class BudgetLimitStored
+ *
+ * @package FireflyIII\Events
+ */
+class BudgetLimitStored extends Event
+{
+
+    use SerializesModels;
+
+    /** @var  BudgetLimit */
+    public $budgetLimit;
+
+    /** @var  Carbon */
+    public $end; // the only variable we can't get from the budget limit (if necessary).
+
+    /**
+     * BudgetLimitEvents constructor.
+     *
+     * @param BudgetLimit $budgetLimit
+     * @param Carbon      $end
+     */
+    public function __construct(BudgetLimit $budgetLimit, Carbon $end)
+    {
+        //
+        $this->budgetLimit = $budgetLimit;
+        $this->end         = $end;
+
+    }
+
+}

app/Events/BudgetLimitUpdated.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * BudgetLimitUpdated.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use Carbon\Carbon;
+use FireflyIII\Models\BudgetLimit;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class BudgetLimitUpdated
+ *
+ * @package FireflyIII\Events
+ */
+class BudgetLimitUpdated extends Event
+{
+
+    use SerializesModels;
+
+    /** @var  BudgetLimit */
+    public $budgetLimit;
+
+    /** @var  Carbon */
+    public $end; // the only variable we can't get from the budget limit (if necessary).
+
+    /**
+     * BudgetLimitEvents constructor.
+     *
+     * @param BudgetLimit $budgetLimit
+     * @param Carbon      $end
+     */
+    public function __construct(BudgetLimit $budgetLimit, Carbon $end)
+    {
+        //
+        $this->budgetLimit = $budgetLimit;
+        $this->end         = $end;
+
+    }
+
+}

app/Events/Event.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Event.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Events;
 

app/Events/ResendConfirmation.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ResendConfirmation.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Events;
 
 use FireflyIII\User;

app/Events/TransactionJournalStored.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * TransactionJournalStored.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,11 +7,12 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Events;
 
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
-use Log;
 
 /**
  * Class TransactionJournalStored
@@ -35,7 +35,6 @@ class TransactionJournalStored extends Event
      */
     public function __construct(TransactionJournal $journal, int $piggyBankId)
     {
-        Log::debug('Created new TransactionJournalStored.');
         //
         $this->journal     = $journal;
         $this->piggyBankId = $piggyBankId;

app/Events/TransactionJournalUpdated.php

@@ -1,11 +1,18 @@
 <?php
+/**
+ * TransactionJournalUpdated.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Events;
 
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Queue\SerializesModels;
-use Log;
 
 /**
  * Class TransactionJournalUpdated
@@ -26,7 +33,6 @@ class TransactionJournalUpdated extends Event
      */
     public function __construct(TransactionJournal $journal)
     {
-        Log::debug('Created new TransactionJournalUpdated');
         //
         $this->journal = $journal;
     }

app/Events/TransactionStored.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * TransactionStored.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Events;
+
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class TransactionJournalStored
+ *
+ * @package FireflyIII\Events
+ */
+class TransactionStored extends Event
+{
+
+    use SerializesModels;
+
+    public $transaction = [];
+
+    /**
+     * Create a new event instance.
+     *
+     * @param array $transaction
+     */
+    public function __construct(array $transaction)
+    {
+        //
+        $this->transaction = $transaction;
+    }
+
+}

app/Events/UserRegistration.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * UserRegistration.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Events;
 
 use FireflyIII\User;

app/Exceptions/FireflyException.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * FireflyException.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Exceptions;
 

app/Exceptions/Handler.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Handler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Exceptions;
 
@@ -6,7 +14,6 @@ use Auth;
 use ErrorException;
 use Exception;
 use FireflyIII\Jobs\MailError;
-use FireflyIII\User;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
@@ -66,9 +73,14 @@ class Handler extends ExceptionHandler
     {
 
         if ($exception instanceof FireflyException || $exception instanceof ErrorException) {
-
-            $user = Auth::check() ? Auth::user() : new User;
-
+            $userData = [
+                'id'    => 0,
+                'email' => 'unknown@example.com',
+            ];
+            if (Auth::check()) {
+                $userData['id']    = Auth::user()->id;
+                $userData['email'] = Auth::user()->email;
+            }
             $data = [
                 'class'        => get_class($exception),
                 'errorMessage' => $exception->getMessage(),
@@ -80,7 +92,7 @@ class Handler extends ExceptionHandler
             ];
 
             // create job that will mail.
-            $job = new MailError($user, env('SITE_OWNER'), Request::ip(), $data);
+            $job = new MailError($userData, env('SITE_OWNER'), Request::ip(), $data);
             dispatch($job);
         }
 

app/Exceptions/NotImplementedException.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * NotImplementedException.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Exceptions;
 

app/Exceptions/ValidationException.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * ValidationException.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Exceptions;
 

app/Export/Collector/AttachmentCollector.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AttachmentCollector.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Export\Collector;
 
 use Amount;
@@ -44,7 +45,8 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
      */
     public function __construct(ExportJob $job)
     {
-        $this->repository = app('FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface');
+        /** @var AttachmentRepositoryInterface repository */
+        $this->repository = app(AttachmentRepositoryInterface::class);
         // make storage:
         $this->uploadDisk = Storage::disk('upload');
         $this->exportDisk = Storage::disk('export');
@@ -68,8 +70,8 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
         // put the explanation string in a file and attach it as well.
         $file = $this->job->key . '-Source of all your attachments explained.txt';
         $this->exportDisk->put($file, $this->explanationString);
-        Log::debug('Also put explanation file "' . $file . '" in the zip.');
         $this->getFiles()->push($file);
+
         return true;
     }
 
@@ -102,14 +104,12 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
     private function exportAttachment(Attachment $attachment): bool
     {
         $file = $attachment->fileName();
-        Log::debug('Original file is at "' . $file . '".');
         if ($this->uploadDisk->exists($file)) {
             try {
                 $decrypted  = Crypt::decrypt($this->uploadDisk->get($file));
                 $exportFile = $this->exportFileName($attachment);
                 $this->exportDisk->put($exportFile, $decrypted);
                 $this->getFiles()->push($exportFile);
-                Log::debug('Stored file content in new file "' . $exportFile . '", which will be in the final zip file.');
 
                 // explain:
                 $this->explain($attachment);
@@ -142,8 +142,6 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
     {
         $attachments = $this->repository->get();
 
-        Log::debug('Found ' . $attachments->count() . ' attachments.');
-
         return $attachments;
     }
 }

app/Export/Collector/BasicCollector.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * BasicCollector.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Export\Collector;
 
 

app/Export/Collector/CollectorInterface.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * CollectorInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Export\Collector;
 
 use Illuminate\Support\Collection;

app/Export/Collector/UploadCollector.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * UploadCollector.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Export\Collector;
 
 use Auth;
@@ -53,11 +54,11 @@ class UploadCollector extends BasicCollector implements CollectorInterface
     {
         // grab upload directory.
         $files = $this->uploadDisk->files();
-        Log::debug('Found ' . count($files) . ' files in the upload directory.');
 
         foreach ($files as $entry) {
             $this->processOldUpload($entry);
         }
+
         return true;
     }
 
@@ -85,11 +86,9 @@ class UploadCollector extends BasicCollector implements CollectorInterface
     {
         $len = strlen($this->expected);
         if (substr($entry, 0, $len) === $this->expected) {
-            Log::debug($entry . ' is part of this users original uploads.');
 
             return true;
         }
-        Log::debug($entry . ' is not part of this users original uploads.');
 
         return false;
     }
@@ -112,7 +111,6 @@ class UploadCollector extends BasicCollector implements CollectorInterface
             // continue with file:
             $date = $this->getOriginalUploadDate($entry);
             $file = $this->job->key . '-Old CSV import dated ' . $date . '.csv';
-            Log::debug('Will put "' . $file . '" in the zip file.');
             $this->exportDisk->put($file, $content);
             $this->getFiles()->push($file);
         }

app/Export/ConfigurationFile.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ConfigurationFile.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,10 +7,12 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Export;
 
+use FireflyIII\Export\Entry\Entry;
 use FireflyIII\Models\ExportJob;
-use Log;
 use Storage;
 
 /**
@@ -42,8 +43,8 @@ class ConfigurationFile
      */
     public function make(): string
     {
-        $fields = array_keys(get_class_vars(Entry::class));
-        $types  = Entry::getTypes();
+        $fields = array_keys(Entry::getFieldsAndTypes());
+        $types  = Entry::getFieldsAndTypes();
 
         $configuration = [
             'date-format' => 'Y-m-d', // unfortunately, this is hard-coded.
@@ -57,8 +58,6 @@ class ConfigurationFile
             $configuration['roles'][] = $types[$field];
         }
         $file = $this->job->key . '-configuration.json';
-        Log::debug('Created JSON config file.');
-        Log::debug('Will put "' . $file . '" in the ZIP file.');
         $this->exportDisk->put($file, json_encode($configuration, JSON_PRETTY_PRINT));
 
         return $file;

app/Export/Entry.php

@@ -1,463 +0,0 @@
-<?php
-declare(strict_types = 1);
-/**
- * Entry.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms
- * of the MIT license.  See the LICENSE file for details.
- */
-
-namespace FireflyIII\Export;
-
-use FireflyIII\Models\Account;
-use FireflyIII\Models\Budget;
-use FireflyIII\Models\Category;
-use FireflyIII\Models\TransactionJournal;
-
-/**
- * To extend the exported object, in case of new features in Firefly III for example,
- * do the following:
- *
- * - Add the field(s) to this class
- * - Make sure the "fromJournal"-routine fills these fields.
- * - Add them to the static function that returns its type (key=value. Remember that the only
- *   valid types can be found in config/csv.php (under "roles").
- *
- * These new entries should be should be strings and numbers as much as possible.
- *
- *
- *
- * Class Entry
- *
- * @package FireflyIII\Export
- */
-class Entry
-{
-    /** @var  string */
-    public $amount;
-    /** @var  int */
-    public $billId;
-    /** @var  string */
-    public $billName;
-    /** @var  int */
-    public $budgetId;
-    /** @var  string */
-    public $budgetName;
-    /** @var  int */
-    public $categoryId;
-    /** @var  string */
-    public $categoryName;
-    /** @var  string */
-    public $date;
-    /** @var  string */
-    public $description;
-    /** @var  string */
-    public $fromAccountIban;
-    /** @var  int */
-    public $fromAccountId;
-    /** @var  string */
-    public $fromAccountName;
-    /** @var  int */
-    public $fromAccountNumber;
-    /** @var  string */
-    public $fromAccountType;
-    /** @var  string */
-    public $toAccountIban;
-    /** @var  int */
-    public $toAccountId;
-    /** @var  string */
-    public $toAccountName;
-    public $toAccountNumber;
-    /** @var  string */
-    public $toAccountType;
-
-    /**
-     * @param TransactionJournal $journal
-     *
-     * @return Entry
-     */
-    public static function fromJournal(TransactionJournal $journal)
-    {
-
-        $entry = new self;
-        $entry->setDescription($journal->description);
-        $entry->setDate($journal->date->format('Y-m-d'));
-        $entry->setAmount(TransactionJournal::amount($journal));
-
-        /** @var Budget $budget */
-        $budget = $journal->budgets->first();
-        if (!is_null($budget)) {
-            $entry->setBudgetId($budget->id);
-            $entry->setBudgetName($budget->name);
-        }
-
-        /** @var Category $category */
-        $category = $journal->categories->first();
-        if (!is_null($category)) {
-            $entry->setCategoryId($category->id);
-            $entry->setCategoryName($category->name);
-        }
-
-        if (!is_null($journal->bill_id)) {
-            $entry->setBillId($journal->bill_id);
-            $entry->setBillName($journal->bill->name);
-        }
-
-        /** @var Account $sourceAccount */
-        $sourceAccount = TransactionJournal::sourceAccount($journal);
-        $entry->setFromAccountId($sourceAccount->id);
-        $entry->setFromAccountName($sourceAccount->name);
-        $entry->setFromAccountIban($sourceAccount->iban);
-        $entry->setFromAccountType($sourceAccount->accountType->type);
-        $entry->setFromAccountNumber($sourceAccount->getMeta('accountNumber'));
-
-
-        /** @var Account $destination */
-        $destination = TransactionJournal::destinationAccount($journal);
-        $entry->setToAccountId($destination->id);
-        $entry->setToAccountName($destination->name);
-        $entry->setToAccountIban($destination->iban);
-        $entry->setToAccountType($destination->accountType->type);
-        $entry->setToAccountNumber($destination->getMeta('accountNumber'));
-
-        return $entry;
-
-    }
-
-    /**
-     * @return array
-     */
-    public static function getTypes(): array
-    {
-        // key = field name (see top of class)
-        // value = field type (see csv.php under 'roles')
-        return [
-            'amount'            => 'amount',
-            'date'              => 'date-transaction',
-            'description'       => 'description',
-            'billId'            => 'bill-id',
-            'billName'          => 'bill-name',
-            'budgetId'          => 'budget-id',
-            'budgetName'        => 'budget-name',
-            'categoryId'        => 'category-id',
-            'categoryName'      => 'category-name',
-            'fromAccountId'     => 'account-id',
-            'fromAccountNumber' => 'account-number',
-            'fromAccountName'   => 'account-name',
-            'fromAccountIban'   => 'account-iban',
-            'fromAccountType'   => '_ignore', // no, Firefly cannot import what it exports. I know :D
-            'toAccountId'       => 'opposing-id',
-            'toAccountNumber'   => 'account-number',
-            'toAccountName'     => 'opposing-name',
-            'toAccountIban'     => 'opposing-iban',
-            'toAccountType'     => '_ignore',
-        ];
-    }
-
-    /**
-     * @return string
-     */
-    public function getAmount(): string
-    {
-        return $this->amount;
-    }
-
-    /**
-     * @param string $amount
-     */
-    public function setAmount(string $amount)
-    {
-        $this->amount = $amount;
-    }
-
-    /**
-     * @return int
-     */
-    public function getBillId(): int
-    {
-        return $this->billId;
-    }
-
-    /**
-     * @param int $billId
-     */
-    public function setBillId(int $billId)
-    {
-        $this->billId = $billId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBillName(): string
-    {
-        return $this->billName;
-    }
-
-    /**
-     * @param string $billName
-     */
-    public function setBillName(string $billName)
-    {
-        $this->billName = $billName;
-    }
-
-    /**
-     * @return int
-     */
-    public function getBudgetId(): int
-    {
-        return $this->budgetId;
-    }
-
-    /**
-     * @param int $budgetId
-     */
-    public function setBudgetId(int $budgetId)
-    {
-        $this->budgetId = $budgetId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getBudgetName(): string
-    {
-        return $this->budgetName;
-    }
-
-    /**
-     * @param string $budgetName
-     */
-    public function setBudgetName(string $budgetName)
-    {
-        $this->budgetName = $budgetName;
-    }
-
-    /**
-     * @return int
-     */
-    public function getCategoryId(): int
-    {
-        return $this->categoryId;
-    }
-
-    /**
-     * @param int $categoryId
-     */
-    public function setCategoryId(int $categoryId)
-    {
-        $this->categoryId = $categoryId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCategoryName(): string
-    {
-        return $this->categoryName;
-    }
-
-    /**
-     * @param string $categoryName
-     */
-    public function setCategoryName(string $categoryName)
-    {
-        $this->categoryName = $categoryName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDate(): string
-    {
-        return $this->date;
-    }
-
-    /**
-     * @param string $date
-     */
-    public function setDate(string $date)
-    {
-        $this->date = $date;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * @param string $description
-     */
-    public function setDescription(string $description)
-    {
-        $this->description = $description;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFromAccountIban(): string
-    {
-        return $this->fromAccountIban;
-    }
-
-    /**
-     * @param string $fromAccountIban
-     */
-    public function setFromAccountIban(string $fromAccountIban)
-    {
-        $this->fromAccountIban = $fromAccountIban;
-    }
-
-    /**
-     * @return int
-     */
-    public function getFromAccountId():int
-    {
-        return $this->fromAccountId;
-    }
-
-    /**
-     * @param int $fromAccountId
-     */
-    public function setFromAccountId(int $fromAccountId)
-    {
-        $this->fromAccountId = $fromAccountId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFromAccountName(): string
-    {
-        return $this->fromAccountName;
-    }
-
-    /**
-     * @param string $fromAccountName
-     */
-    public function setFromAccountName(string $fromAccountName)
-    {
-        $this->fromAccountName = $fromAccountName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFromAccountNumber(): string
-    {
-        return $this->fromAccountNumber;
-    }
-
-    /**
-     * @param string $fromAccountNumber
-     */
-    public function setFromAccountNumber(string $fromAccountNumber)
-    {
-        $this->fromAccountNumber = $fromAccountNumber;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFromAccountType(): string
-    {
-        return $this->fromAccountType;
-    }
-
-    /**
-     * @param string $fromAccountType
-     */
-    public function setFromAccountType(string $fromAccountType)
-    {
-        $this->fromAccountType = $fromAccountType;
-    }
-
-    /**
-     * @return string
-     */
-    public function getToAccountIban(): string
-    {
-        return $this->toAccountIban;
-    }
-
-    /**
-     * @param string $toAccountIban
-     */
-    public function setToAccountIban(string $toAccountIban)
-    {
-        $this->toAccountIban = $toAccountIban;
-    }
-
-    /**
-     * @return int
-     */
-    public function getToAccountId(): int
-    {
-        return $this->toAccountId;
-    }
-
-    /**
-     * @param int $toAccountId
-     */
-    public function setToAccountId(int $toAccountId)
-    {
-        $this->toAccountId = $toAccountId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getToAccountName(): string
-    {
-        return $this->toAccountName;
-    }
-
-    /**
-     * @param string $toAccountName
-     */
-    public function setToAccountName(string $toAccountName)
-    {
-        $this->toAccountName = $toAccountName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getToAccountNumber(): string
-    {
-        return $this->toAccountNumber;
-    }
-
-    /**
-     * @param string $toAccountNumber
-     */
-    public function setToAccountNumber(string $toAccountNumber)
-    {
-        $this->toAccountNumber = $toAccountNumber;
-    }
-
-    /**
-     * @return string
-     */
-    public function getToAccountType(): string
-    {
-        return $this->toAccountType;
-    }
-
-    /**
-     * @param string $toAccountType
-     */
-    public function setToAccountType(string $toAccountType)
-    {
-        $this->toAccountType = $toAccountType;
-    }
-
-
-}

app/Export/Entry/Entry.php

@@ -0,0 +1,130 @@
+<?php
+/**
+ * Entry.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\TransactionJournal;
+use Illuminate\Support\Collection;
+
+/**
+ * To extend the exported object, in case of new features in Firefly III for example,
+ * do the following:
+ *
+ * - Add the field(s) to this class. If you add more than one related field, add a new object.
+ * - Make sure the "fromJournal"-routine fills these fields.
+ * - Add them to the static function that returns its type (key=value. Remember that the only
+ *   valid types can be found in config/csv.php (under "roles").
+ *
+ * These new entries should be should be strings and numbers as much as possible.
+ *
+ *
+ *
+ * Class Entry
+ *
+ * @package FireflyIII\Export\Entry
+ */
+final class Entry
+{
+    /** @var  string */
+    public $amount;
+    /** @var  EntryBill */
+    public $bill;
+    /** @var  EntryBudget */
+    public $budget;
+    /** @var  EntryCategory */
+    public $category;
+    /** @var  string */
+    public $date;
+    /** @var  string */
+    public $description;
+    /** @var  EntryAccount */
+    public $destinationAccount;
+    /** @var  Collection */
+    public $destinationAccounts;
+    /** @var  EntryAccount */
+    public $sourceAccount;
+    /** @var  Collection */
+    public $sourceAccounts;
+
+    /**
+     * Entry constructor.
+     */
+    private function __construct()
+    {
+        $this->sourceAccounts      = new Collection;
+        $this->destinationAccounts = new Collection;
+    }
+
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return Entry
+     */
+    public static function fromJournal(TransactionJournal $journal)
+    {
+
+        $entry              = new self;
+        $entry->description = $journal->description;
+        $entry->date        = $journal->date->format('Y-m-d');
+        $entry->amount      = TransactionJournal::amount($journal);
+
+        $entry->budget   = new EntryBudget($journal->budgets->first());
+        $entry->category = new EntryCategory($journal->categories->first());
+        $entry->bill     = new EntryBill($journal->bill);
+
+        $sources                   = TransactionJournal::sourceAccountList($journal);
+        $destinations              = TransactionJournal::destinationAccountList($journal);
+        $entry->sourceAccount      = new EntryAccount($sources->first());
+        $entry->destinationAccount = new EntryAccount($destinations->first());
+
+        foreach ($sources as $source) {
+            $entry->sourceAccounts->push(new EntryAccount($source));
+        }
+
+        foreach ($destinations as $destination) {
+            $entry->destinationAccounts->push(new EntryAccount($destination));
+        }
+
+        return $entry;
+
+    }
+
+    /**
+     * @return array
+     */
+    public static function getFieldsAndTypes(): array
+    {
+        // key = field name (see top of class)
+        // value = field type (see csv.php under 'roles')
+        return [
+            'description'                => 'description',
+            'amount'                     => 'amount',
+            'date'                       => 'date-transaction',
+            'source_account_id'          => 'account-id',
+            'source_account_name'        => 'account-name',
+            'source_account_iban'        => 'account-iban',
+            'source_account_type'        => '_ignore',
+            'source_account_number'      => 'account-number',
+            'destination_account_id'     => 'opposing-id',
+            'destination_account_name'   => 'opposing-name',
+            'destination_account_iban'   => 'opposing-iban',
+            'destination_account_type'   => '_ignore',
+            'destination_account_number' => 'account-number',
+            'budget_id'                  => 'budget-id',
+            'budget_name'                => 'budget-name',
+            'category_id'                => 'category-id',
+            'category_name'              => 'category-name',
+            'bill_id'                    => 'bill-id',
+            'bill_name'                  => 'bill-name',
+        ];
+    }
+
+}

app/Export/Entry/EntryAccount.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * EntryAccount.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\Account;
+
+/**
+ * Class EntryAccount
+ *
+ * @package FireflyIII\Export\Entry
+ */
+class EntryAccount
+{
+    /** @var  int */
+    public $accountId;
+    /** @var  string */
+    public $iban;
+    /** @var  string */
+    public $name;
+    /** @var  string */
+    public $number;
+    /** @var  string */
+    public $type;
+
+    /**
+     * EntryAccount constructor.
+     *
+     * @param Account $account
+     */
+    public function __construct(Account $account)
+    {
+        $this->accountId = $account->id;
+        $this->name      = $account->name;
+        $this->iban      = $account->iban;
+        $this->type      = $account->accountType->type;
+        $this->number    = $account->getMeta('accountNumber');
+    }
+}

app/Export/Entry/EntryBill.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * EntryBill.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\Bill;
+
+/**
+ * Class EntryBill
+ *
+ * @package FireflyIII\Export\Entry
+ */
+class EntryBill
+{
+    /** @var  int */
+    public $billId = '';
+    /** @var  string */
+    public $name = '';
+
+    /**
+     * EntryBill constructor.
+     *
+     * @param Bill $bill
+     */
+    public function __construct(Bill $bill = null)
+    {
+        if (!is_null($bill)) {
+            $this->billId = $bill->id;
+            $this->name   = $bill->name;
+        }
+    }
+
+}

app/Export/Entry/EntryBudget.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * EntryBudget.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\Budget;
+
+/**
+ * Class EntryBudget
+ *
+ * @package FireflyIII\Export\Entry
+ */
+class EntryBudget
+{
+    /** @var  int */
+    public $budgetId = '';
+    /** @var  string */
+    public $name = '';
+
+    /**
+     * EntryBudget constructor.
+     *
+     * @param Budget $budget
+     */
+    public function __construct(Budget $budget = null)
+    {
+        if (!is_null($budget)) {
+            $this->budgetId = $budget->id;
+            $this->name     = $budget->name;
+        }
+    }
+
+}

app/Export/Entry/EntryCategory.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * EntryCategory.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Export\Entry;
+
+use FireflyIII\Models\Category;
+
+/**
+ * Class EntryCategory
+ *
+ * @package FireflyIII\Export\Entry
+ */
+class EntryCategory
+{
+    /** @var  int */
+    public $categoryId = '';
+    /** @var  string */
+    public $name = '';
+
+    /**
+     * EntryCategory constructor.
+     *
+     * @param Category $category
+     */
+    public function __construct(Category $category = null)
+    {
+        if (!is_null($category)) {
+            $this->categoryId = $category->id;
+            $this->name       = $category->name;
+        }
+    }
+}

app/Export/Exporter/BasicExporter.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * BasicExporter.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Export\Exporter;
 
 

app/Export/Exporter/CsvExporter.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * CsvExporter.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,10 +7,14 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Export\Exporter;
 
-use FireflyIII\Export\Entry;
+use FireflyIII\Export\Entry\Entry;
+use FireflyIII\Export\Entry\EntryAccount;
 use FireflyIII\Models\ExportJob;
+use Illuminate\Support\Collection;
 use League\Csv\Writer;
 use SplFileObject;
 
@@ -54,27 +57,114 @@ class CsvExporter extends BasicExporter implements ExporterInterface
 
         // necessary for CSV writer:
         $fullPath = storage_path('export') . DIRECTORY_SEPARATOR . $this->fileName;
+        $writer   = Writer::createFromPath(new SplFileObject($fullPath, 'a+'), 'w');
+        $rows     = [];
 
-        // create CSV writer:
-        $writer = Writer::createFromPath(new SplFileObject($fullPath, 'a+'), 'w');
-
-        // all rows:
-        $rows = [];
-
-        // add header:
-        $first  = $this->getEntries()->first();
-        $rows[] = array_keys(get_object_vars($first));
-
-        // then the rest:
+        // Count the maximum number of sources and destinations each entry has. May need to expand the number of export fields:
+        $maxSourceAccounts = 1;
+        $maxDestAccounts   = 1;
         /** @var Entry $entry */
         foreach ($this->getEntries() as $entry) {
-            $rows[] = array_values(get_object_vars($entry));
+            $sources           = $entry->sourceAccounts->count();
+            $destinations      = $entry->destinationAccounts->count();
+            $maxSourceAccounts = max($maxSourceAccounts, $sources);
+            $maxDestAccounts   = max($maxDestAccounts, $destinations);
+        }
+        $rows[] = array_keys($this->getFieldsAndTypes($maxSourceAccounts, $maxDestAccounts));
 
+        /** @var Entry $entry */
+        foreach ($this->getEntries() as $entry) {
+            // order is defined in Entry::getFieldsAndTypes.
+            $current    = [$entry->description, $entry->amount, $entry->date];
+            $sourceData = $this->getAccountData($maxSourceAccounts, $entry->sourceAccounts);
+            $current    = array_merge($current, $sourceData);
+            $destData   = $this->getAccountData($maxDestAccounts, $entry->destinationAccounts);
+            $current    = array_merge($current, $destData);
+            $rest       = [$entry->budget->budgetId, $entry->budget->name, $entry->category->categoryId, $entry->category->name, $entry->bill->billId,
+                           $entry->bill->name];
+            $current    = array_merge($current, $rest);
+            $rows[]     = $current;
         }
         $writer->insertAll($rows);
+
         return true;
     }
 
+    /**
+     * @param int        $max
+     * @param Collection $accounts
+     *
+     * @return array
+     */
+    private function getAccountData(int $max, Collection $accounts): array
+    {
+        $current = [];
+        for ($i = 0; $i < $max; $i++) {
+            /** @var EntryAccount $source */
+            $source        = $accounts->get($i);
+            $currentId     = '';
+            $currentName   = '';
+            $currentIban   = '';
+            $currentType   = '';
+            $currentNumber = '';
+            if ($source) {
+                $currentId     = $source->accountId;
+                $currentName   = $source->name;
+                $currentIban   = $source->iban;
+                $currentType   = $source->type;
+                $currentNumber = $source->number;
+            }
+            $current[] = $currentId;
+            $current[] = $currentName;
+            $current[] = $currentIban;
+            $current[] = $currentType;
+            $current[] = $currentNumber;
+        }
+        unset($source);
+
+        return $current;
+    }
+
+    /**
+     * @param int $sources
+     * @param int $destinations
+     *
+     * @return array
+     */
+    private function getFieldsAndTypes(int $sources, int $destinations): array
+    {
+        // key = field name (see top of class)
+        // value = field type (see csv.php under 'roles')
+        $array = [
+            'description' => 'description',
+            'amount'      => 'amount',
+            'date'        => 'date-transaction',
+        ];
+        for ($i = 0; $i < $sources; $i++) {
+            $array['source_account_' . $i . '_id']     = 'account-id';
+            $array['source_account_' . $i . '_name']   = 'account-name';
+            $array['source_account_' . $i . '_iban']   = 'account-iban';
+            $array['source_account_' . $i . '_type']   = '_ignore';
+            $array['source_account_' . $i . '_number'] = 'account-number';
+        }
+        for ($i = 0; $i < $destinations; $i++) {
+            $array['destination_account_' . $i . '_id']     = 'account-id';
+            $array['destination_account_' . $i . '_name']   = 'account-name';
+            $array['destination_account_' . $i . '_iban']   = 'account-iban';
+            $array['destination_account_' . $i . '_type']   = '_ignore';
+            $array['destination_account_' . $i . '_number'] = 'account-number';
+        }
+
+        $array['budget_id']     = 'budget-id';
+        $array['budget_name']   = 'budget-name';
+        $array['category_id']   = 'category-id';
+        $array['category_name'] = 'category-name';
+        $array['bill_id']       = 'bill-id';
+        $array['bill_name']     = 'bill-name';
+
+        return $array;
+    }
+
     private function tempFile()
     {
         $this->fileName = $this->job->key . '-records.csv';

app/Export/Exporter/ExporterInterface.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ExporterInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Export\Exporter;
 
 use Illuminate\Support\Collection;

app/Export/Processor.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * Processor.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,16 +7,19 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Export;
 
-use Auth;
-use Config;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Export\Collector\AttachmentCollector;
+use FireflyIII\Export\Collector\UploadCollector;
+use FireflyIII\Export\Entry\Entry;
 use FireflyIII\Models\ExportJob;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Repositories\Journal\JournalCollector;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
+use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Support\Collection;
-use Log;
 use Storage;
 use ZipArchive;
 
@@ -78,9 +80,11 @@ class Processor
      */
     public function collectAttachments(): bool
     {
-        $attachmentCollector = app('FireflyIII\Export\Collector\AttachmentCollector', [$this->job]);
+        /** @var AttachmentCollector $attachmentCollector */
+        $attachmentCollector = app(AttachmentCollector::class, [$this->job]);
         $attachmentCollector->run();
         $this->files = $this->files->merge($attachmentCollector->getFiles());
+
         return true;
     }
 
@@ -89,17 +93,10 @@ class Processor
      */
     public function collectJournals(): bool
     {
-        $args             = [$this->accounts, Auth::user(), $this->settings['startDate'], $this->settings['endDate']];
-        /** @var JournalCollector $journalCollector */
-        $journalCollector = app('FireflyIII\Repositories\Journal\JournalCollector', $args);
-        $this->journals   = $journalCollector->collect();
-        Log::debug(
-            'Collected ' .
-            $this->journals->count() . ' journals (between ' .
-            $this->settings['startDate']->format('Y-m-d') . ' and ' .
-            $this->settings['endDate']->format('Y-m-d')
-            . ').'
-        );
+        /** @var JournalRepositoryInterface $repository */
+        $repository     = app(JournalRepositoryInterface::class);
+        $this->journals = $repository->getJournalsInRange($this->accounts, $this->settings['startDate'], $this->settings['endDate']);
+
         return true;
     }
 
@@ -108,10 +105,12 @@ class Processor
      */
     public function collectOldUploads(): bool
     {
-        $uploadCollector = app('FireflyIII\Export\Collector\UploadCollector', [$this->job]);
+        /** @var UploadCollector $uploadCollector */
+        $uploadCollector = app(UploadCollector::class, [$this->job]);
         $uploadCollector->run();
 
         $this->files = $this->files->merge($uploadCollector->getFiles());
+
         return true;
     }
 
@@ -126,7 +125,7 @@ class Processor
             $this->exportEntries->push(Entry::fromJournal($journal));
             $count++;
         }
-        Log::debug('Converted ' . $count . ' journals to "Entry" objects.');
+
         return true;
     }
 
@@ -135,8 +134,9 @@ class Processor
      */
     public function createConfigFile(): bool
     {
-        $this->configurationMaker = app('FireflyIII\Export\ConfigurationFile', [$this->job]);
+        $this->configurationMaker = app(ConfigurationFile::class, [$this->job]);
         $this->files->push($this->configurationMaker->make());
+
         return true;
     }
 
@@ -149,7 +149,6 @@ class Processor
         $zip      = new ZipArchive;
         $file     = $this->job->key . '.zip';
         $fullPath = storage_path('export') . '/' . $file;
-        Log::debug('Will create zip file at ' . $fullPath);
 
         if ($zip->open($fullPath, ZipArchive::CREATE) !== true) {
             throw new FireflyException('Cannot store zip file.');
@@ -159,20 +158,14 @@ class Processor
         foreach ($this->getFiles() as $entry) {
             // is part of this job?
             $zipFileName = str_replace($this->job->key . '-', '', $entry);
-            $result      = $zip->addFromString($zipFileName, $disk->get($entry));
-            if (!$result) {
-                Log::error('Could not add "' . $entry . '" into zip file as "' . $zipFileName . '".');
-            }
+            $zip->addFromString($zipFileName, $disk->get($entry));
         }
 
         $zip->close();
 
         // delete the files:
-        foreach ($this->getFiles() as $file) {
-            Log::debug('Will now delete file "' . $file . '".');
-            $disk->delete($file);
-        }
-        Log::debug('Done!');
+        $this->deleteFiles($disk);
+
         return true;
     }
 
@@ -181,13 +174,12 @@ class Processor
      */
     public function exportJournals(): bool
     {
-        $exporterClass = Config::get('firefly.export_formats.' . $this->exportFormat);
+        $exporterClass = config('firefly.export_formats.' . $this->exportFormat);
         $exporter      = app($exporterClass, [$this->job]);
-        Log::debug('Going to export ' . $this->exportEntries->count() . ' export entries into ' . $this->exportFormat . ' format.');
         $exporter->setEntries($this->exportEntries);
         $exporter->run();
         $this->files->push($exporter->getFileName());
-        Log::debug('Added "' . $exporter->getFileName() . '" to the list of files to include in the zip.');
+
         return true;
     }
 
@@ -198,4 +190,14 @@ class Processor
     {
         return $this->files;
     }
+
+    /**
+     * @param FilesystemAdapter $disk
+     */
+    private function deleteFiles(FilesystemAdapter $disk)
+    {
+        foreach ($this->getFiles() as $file) {
+            $disk->delete($file);
+        }
+    }
 }

app/Generator/Chart/Account/AccountChartGeneratorInterface.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AccountChartGeneratorInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Generator\Chart\Account;
 
 use Carbon\Carbon;
@@ -42,10 +43,10 @@ interface AccountChartGeneratorInterface
 
     /**
      * @param Account $account
-     * @param Carbon  $start
-     * @param Carbon  $end
+     * @param array   $labels
+     * @param array   $dataSet
      *
      * @return array
      */
-    public function single(Account $account, Carbon $start, Carbon $end): array;
+    public function single(Account $account, array $labels, array $dataSet): array;
 }

app/Generator/Chart/Account/ChartJsAccountChartGenerator.php

@@ -1,11 +1,18 @@
 <?php
+/**
+ * ChartJsAccountChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Generator\Chart\Account;
 
 use Carbon\Carbon;
 use FireflyIII\Models\Account;
 use Illuminate\Support\Collection;
-use Steam;
 
 /**
  * Class ChartJsAccountChartGenerator
@@ -29,28 +36,6 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
             'labels' => [], 'datasets' => [[
                                                'label' => trans('firefly.spent'),
                                                'data'  => []]]];
-
-        $start->subDay();
-        $ids           = $this->getIdsFromCollection($accounts);
-        $startBalances = Steam::balancesById($ids, $start);
-        $endBalances   = Steam::balancesById($ids, $end);
-
-        $accounts->each(
-            function (Account $account) use ($startBalances, $endBalances) {
-                $id                  = $account->id;
-                $startBalance        = $this->isInArray($startBalances, $id);
-                $endBalance          = $this->isInArray($endBalances, $id);
-                $diff                = bcsub($endBalance, $startBalance);
-                $account->difference = round($diff, 2);
-            }
-        );
-
-        $accounts = $accounts->sortByDesc(
-            function (Account $account) {
-                return $account->difference;
-            }
-        );
-
         foreach ($accounts as $account) {
             if ($account->difference > 0) {
                 $data['labels'][]              = $account->name;
@@ -80,7 +65,7 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
         }
 
         foreach ($accounts as $account) {
-            $set      = [
+            $data['datasets'][] = [
                 'label'                => $account->name,
                 'fillColor'            => 'rgba(220,220,220,0.2)',
                 'strokeColor'          => 'rgba(220,220,220,1)',
@@ -88,20 +73,8 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
                 'pointStrokeColor'     => '#fff',
                 'pointHighlightFill'   => '#fff',
                 'pointHighlightStroke' => 'rgba(220,220,220,1)',
-                'data'                 => [],
+                'data'                 => $account->balances,
             ];
-            $current  = clone $start;
-            $range    = Steam::balanceInRange($account, $start, clone $end);
-            $previous = round(array_values($range)[0], 2);
-            while ($current <= $end) {
-                $format  = $current->format('Y-m-d');
-                $balance = isset($range[$format]) ? round($range[$format], 2) : $previous;
-
-                $set['data'][] = $balance;
-                $previous      = $balance;
-                $current->addDay();
-            }
-            $data['datasets'][] = $set;
         }
         $data['count'] = count($data['datasets']);
 
@@ -110,71 +83,25 @@ class ChartJsAccountChartGenerator implements AccountChartGeneratorInterface
 
     /**
      * @param Account $account
-     * @param Carbon  $start
-     * @param Carbon  $end
+     * @param array   $labels
+     * @param array   $dataSet
      *
      * @return array
      */
-    public function single(Account $account, Carbon $start, Carbon $end): array
+    public function single(Account $account, array $labels, array $dataSet): array
     {
-        // language:
-        $format = (string)trans('config.month_and_day');
-
-        $data     = [
+        $data = [
             'count'    => 1,
-            'labels'   => [],
+            'labels'   => $labels,
             'datasets' => [
                 [
                     'label' => $account->name,
-                    'data'  => [],
+                    'data'  => $dataSet,
                 ],
             ],
         ];
-        $range    = Steam::balanceInRange($account, $start, $end);
-        $current  = clone $start;
-        $previous = array_values($range)[0];
-
-        while ($end >= $current) {
-            $theDate = $current->format('Y-m-d');
-            $balance = $range[$theDate] ?? $previous;
-
-            $data['labels'][]              = $current->formatLocalized($format);
-            $data['datasets'][0]['data'][] = $balance;
-            $previous                      = $balance;
-            $current->addDay();
-        }
 
         return $data;
     }
 
-    /**
-     * @param Collection $collection
-     *
-     * @return array
-     */
-    protected function getIdsFromCollection(Collection $collection): array
-    {
-        $ids = [];
-        foreach ($collection as $entry) {
-            $ids[] = $entry->id;
-        }
-
-        return array_unique($ids);
-
-    }
-
-    /**
-     * @param $array
-     * @param $entryId
-     *
-     * @return string
-     */
-    protected function isInArray($array, $entryId): string
-    {
-        if (isset($array[$entryId])) {
-            return $array[$entryId];
-        }
-
-        return '0';
-    }
 }

app/Generator/Chart/Bill/BillChartGeneratorInterface.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * BillChartGeneratorInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Generator\Chart\Bill;
 
 

app/Generator/Chart/Bill/ChartJsBillChartGenerator.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ChartJsBillChartGenerator.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Generator\Chart\Bill;
 
 use FireflyIII\Models\Bill;
@@ -54,11 +55,7 @@ class ChartJsBillChartGenerator implements BillChartGeneratorInterface
     public function single(Bill $bill, Collection $entries): array
     {
         $format       = (string)trans('config.month');
-        $data         = [
-            'count'    => 3,
-            'labels'   => [],
-            'datasets' => [],
-        ];
+        $data         = ['count' => 3, 'labels' => [], 'datasets' => [],];
         $minAmount    = [];
         $maxAmount    = [];
         $actualAmount = [];
@@ -67,9 +64,7 @@ class ChartJsBillChartGenerator implements BillChartGeneratorInterface
             $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
-             */
+            // journalAmount has been collected in BillRepository::getJournals
             $actualAmount[] = round(TransactionJournal::amountPositive($entry), 2);
         }
 

app/Generator/Chart/Budget/BudgetChartGeneratorInterface.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * BudgetChartGeneratorInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Generator\Chart\Budget;
 
 use Illuminate\Support\Collection;
@@ -19,19 +20,14 @@ use Illuminate\Support\Collection;
  */
 interface BudgetChartGeneratorInterface
 {
-    /**
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function budget(Collection $entries): array;
 
     /**
      * @param Collection $entries
+     * @param string     $dateFormat
      *
      * @return array
      */
-    public function budgetLimit(Collection $entries): array;
+    public function budgetLimit(Collection $entries, string $dateFormat): array;
 
     /**
      * @param Collection $entries
@@ -47,6 +43,14 @@ interface BudgetChartGeneratorInterface
      */
     public function multiYear(Collection $entries): array;
 
+    /**
+     * @param Collection $entries
+     * @param string     $viewRange
+     *
+     * @return array
+     */
+    public function period(Collection $entries, string $viewRange) : array;
+
     /**
      * @param Collection $budgets
      * @param Collection $entries

app/Generator/Chart/Budget/ChartJsBudgetChartGenerator.php

@@ -1,11 +1,18 @@
 <?php
+/**
+ * ChartJsBudgetChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Generator\Chart\Budget;
 
 
-use Config;
 use Illuminate\Support\Collection;
-use Preferences;
+use Navigation;
 
 /**
  * Class ChartJsBudgetChartGenerator
@@ -14,20 +21,17 @@ use Preferences;
  */
 class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
 {
-
     /**
+     *
      * @param Collection $entries
      * @param string     $dateFormat
      *
      * @return array
      */
-    public function budget(Collection $entries, $dateFormat = 'month'): array
+    public function budgetLimit(Collection $entries, string $dateFormat = 'month_and_day'): array
     {
-        // language:
-        $language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
-        $format   = Config::get('firefly.' . $dateFormat . '.' . $language);
-
-        $data = [
+        $format = strval(trans('config.' . $dateFormat));
+        $data   = [
             'labels'   => [],
             'datasets' => [
                 [
@@ -49,17 +53,6 @@ class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
         return $data;
     }
 
-    /**
-     *
-     * @param Collection $entries
-     *
-     * @return array
-     */
-    public function budgetLimit(Collection $entries): array
-    {
-        return $this->budget($entries, 'monthAndDay');
-    }
-
     /**
      * @param Collection $entries
      *
@@ -139,6 +132,42 @@ class ChartJsBudgetChartGenerator implements BudgetChartGeneratorInterface
 
     }
 
+    /**
+     * @param Collection $entries
+     * @param string     $viewRange
+     *
+     * @return array
+     */
+    public function period(Collection $entries, string $viewRange) : array
+    {
+        $data = [
+            'labels'   => [],
+            'datasets' => [
+                0 => [
+                    'label' => trans('firefly.budgeted'),
+                    'data'  => [],
+                ],
+                1 => [
+                    'label' => trans('firefly.spent'),
+                    'data'  => [],
+                ],
+            ],
+            'count'    => 2,
+        ];
+        foreach ($entries as $entry) {
+            $label            = Navigation::periodShow($entry['date'], $viewRange);
+            $data['labels'][] = $label;
+            // 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 Collection $budgets
      * @param Collection $entries

app/Generator/Chart/Category/CategoryChartGeneratorInterface.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * CategoryChartGeneratorInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Generator\Chart\Category;
 
 use Illuminate\Support\Collection;

app/Generator/Chart/Category/ChartJsCategoryChartGenerator.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * ChartJsCategoryChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Generator\Chart\Category;
 
@@ -20,8 +28,6 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
      */
     public function all(Collection $entries): array
     {
-
-
         $data = [
             'count'    => 2,
             'labels'   => [],
@@ -42,8 +48,8 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
             $spent            = $entry[2];
             $earned           = $entry[3];
 
-            $data['datasets'][0]['data'][] = bccomp($spent, '0') === 0 ? null : bcmul($spent, '-1');
-            $data['datasets'][1]['data'][] = bccomp($earned, '0') === 0 ? null : $earned;
+            $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;
@@ -116,18 +122,9 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
      */
     public function multiYear(Collection $entries): array
     {
-        // dataset:
-        $data = [
-            'count'    => 0,
-            'labels'   => [],
-            'datasets' => [],
-        ];
         // get labels from one of the categories (assuming there's at least one):
         $first = $entries->first();
-        $keys  = array_keys($first['spent']);
-        foreach ($keys as $year) {
-            $data['labels'][] = strval($year);
-        }
+        $data  = ['count' => 0, 'labels' => array_keys($first['spent']), 'datasets' => [],];
 
         // then, loop all entries and create datasets:
         foreach ($entries as $entry) {
@@ -144,7 +141,6 @@ class ChartJsCategoryChartGenerator implements CategoryChartGeneratorInterface
         $data['count'] = count($data['datasets']);
 
         return $data;
-
     }
 
     /**

app/Generator/Chart/PiggyBank/ChartJsPiggyBankChartGenerator.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * ChartJsPiggyBankChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Generator\Chart\PiggyBank;
 
@@ -36,9 +44,9 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGeneratorInterface
             ],
         ];
         $sum  = '0';
-        foreach ($set as $entry) {
-            $date                          = new Carbon($entry->date);
-            $sum                           = bcadd($sum, $entry->sum);
+        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);
         }

app/Generator/Chart/PiggyBank/PiggyBankChartGeneratorInterface.php

@@ -1,13 +1,14 @@
 <?php
-declare(strict_types = 1);
 /**
- * PiggyBankChartGenerator.php
+ * PiggyBankChartGeneratorInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Generator\Chart\PiggyBank;
 
 use Illuminate\Support\Collection;

app/Generator/Chart/Report/ChartJsReportChartGenerator.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * ChartJsReportChartGenerator.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Generator\Chart\Report;
 

app/Generator/Chart/Report/ReportChartGeneratorInterface.php

@@ -1,13 +1,14 @@
 <?php
-declare(strict_types = 1);
 /**
- * ReportChartGenerator.php
+ * ReportChartGeneratorInterface.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Generator\Chart\Report;
 
 use Illuminate\Support\Collection;

app/Handlers/Events/AttachUserRole.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AttachUserRole.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,12 +7,13 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Handlers\Events;
 
 
 use FireflyIII\Events\UserRegistration;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
-use Log;
 
 /**
  * Class AttachUserRole
@@ -38,13 +38,11 @@ class AttachUserRole
      */
     public function handle(UserRegistration $event)
     {
-        Log::debug('Trigger attachuserrole');
         /** @var UserRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\User\UserRepositoryInterface');
+        $repository = app(UserRepositoryInterface::class);
 
         // first user ever?
         if ($repository->count() == 1) {
-            Log::debug('Will attach role.');
             $repository->attachRole($event->user, 'owner');
         }
     }

app/Handlers/Events/BudgetLimitEventHandler.php

@@ -0,0 +1,107 @@
+<?php
+/**
+ * BudgetLimitEventHandler.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\BudgetLimitStored;
+use FireflyIII\Events\BudgetLimitUpdated;
+use FireflyIII\Models\LimitRepetition;
+use Illuminate\Database\QueryException;
+use Log;
+
+/**
+ * Class BudgetLimitEventHandler
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class BudgetLimitEventHandler
+{
+    /**
+     * Create the event listener.
+     *
+     */
+    public function __construct()
+    {
+
+    }
+
+    /**
+     * In a perfect world, the store() routine should be different from the update()
+     * routine. It would not have to check count() == 0 because there could be NO
+     * limit repetitions at this point. However, the database can be wrong so we check.
+     *
+     * @param BudgetLimitStored $event
+     */
+    public function store(BudgetLimitStored $event)
+    {
+        $budgetLimit = $event->budgetLimit;
+        $end         = $event->end;
+        $set         = $budgetLimit->limitrepetitions()
+                                   ->where('startdate', $budgetLimit->startdate->format('Y-m-d 00:00:00'))
+                                   ->where('enddate', $end->format('Y-m-d 00:00:00'))
+                                   ->get();
+        if ($set->count() == 0) {
+            $repetition            = new LimitRepetition;
+            $repetition->startdate = $budgetLimit->startdate;
+            $repetition->enddate   = $end;
+            $repetition->amount    = $budgetLimit->amount;
+            $repetition->budgetLimit()->associate($budgetLimit);
+
+            try {
+                $repetition->save();
+            } catch (QueryException $e) {
+                Log::error('Trying to save new LimitRepetition failed: ' . $e->getMessage());
+            }
+        }
+
+        if ($set->count() == 1) {
+            $repetition         = $set->first();
+            $repetition->amount = $budgetLimit->amount;
+            $repetition->save();
+
+        }
+
+    }
+
+    /**
+     * @param BudgetLimitUpdated $event
+     */
+    public function update(BudgetLimitUpdated $event)
+    {
+        $budgetLimit = $event->budgetLimit;
+        $end         = $event->end;
+        $set         = $budgetLimit->limitrepetitions()
+                                   ->where('startdate', $budgetLimit->startdate->format('Y-m-d 00:00:00'))
+                                   ->where('enddate', $end->format('Y-m-d 00:00:00'))
+                                   ->get();
+        if ($set->count() == 0) {
+            $repetition            = new LimitRepetition;
+            $repetition->startdate = $budgetLimit->startdate;
+            $repetition->enddate   = $end;
+            $repetition->amount    = $budgetLimit->amount;
+            $repetition->budgetLimit()->associate($budgetLimit);
+
+            try {
+                $repetition->save();
+            } catch (QueryException $e) {
+                Log::error('Trying to save new LimitRepetition failed: ' . $e->getMessage());
+            }
+        }
+
+        if ($set->count() == 1) {
+            $repetition         = $set->first();
+            $repetition->amount = $budgetLimit->amount;
+            $repetition->save();
+
+        }
+    }
+
+}

app/Handlers/Events/ConnectJournalToPiggyBank.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * ConnectJournalToPiggyBank.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 
 namespace FireflyIII\Handlers\Events;
@@ -44,7 +52,8 @@ class ConnectJournalToPiggyBank
 
         $amount = TransactionJournal::amountPositive($journal);
         // if piggy account matches source account, the amount is positive
-        if ($piggyBank->account_id == TransactionJournal::sourceAccount($journal)->id) {
+        $sources = TransactionJournal::sourceAccountList($journal)->pluck('id')->toArray();
+        if (in_array($piggyBank->account_id, $sources)) {
             $amount = bcmul($amount, '-1');
         }
 

app/Handlers/Events/ConnectTransactionToPiggyBank.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * ConnectTransactionToPiggyBank.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Handlers\Events;
+
+use FireflyIII\Events\TransactionStored;
+use FireflyIII\Models\PiggyBankEvent;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+
+/**
+ * Class ConnectTransactionToPiggyBank
+ *
+ * @package FireflyIII\Handlers\Events
+ */
+class ConnectTransactionToPiggyBank
+{
+
+    /**
+     * Connect a new transaction journal to any related piggy banks.
+     *
+     * @param  TransactionStored $event
+     *
+     * @return bool
+     */
+    public function handle(TransactionStored $event): bool
+    {
+        echo '<pre>';
+        /** @var PiggyBankRepositoryInterface $repository */
+        $repository  = app(PiggyBankRepositoryInterface::class);
+        $transaction = $event->transaction;
+        $piggyBank   = $repository->find($transaction['piggy_bank_id']);
+
+        // valid piggy:
+        if (is_null($piggyBank->id)) {
+            return true;
+        }
+        $amount = strval($transaction['amount']);
+        // piggy bank account something with amount:
+        if ($transaction['source_account_id'] == $piggyBank->account_id) {
+            // if the source of this transaction is the same as the piggy bank,
+            // the money is being removed from the piggy bank. So the
+            // amount must be negative:
+            $amount = bcmul($amount, '-1');
+        }
+
+        $repetition = $piggyBank->currentRelevantRep();
+        // add or remove the money from the piggy bank:
+        $newAmount                 = bcadd(strval($repetition->currentamount), $amount);
+        $repetition->currentamount = $newAmount;
+        $repetition->save();
+
+        // now generate a piggy bank event:
+        PiggyBankEvent::create(['piggy_bank_id' => $piggyBank->id, 'date' => $transaction['date'], 'amount' => $newAmount]);
+
+        return true;
+    }
+
+
+}

app/Handlers/Events/FireRulesForStore.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * FireRulesForStore.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Handlers\Events;
 
 
@@ -17,7 +18,6 @@ use FireflyIII\Models\RuleGroup;
 use FireflyIII\Rules\Processor;
 use FireflyIII\User;
 use Illuminate\Support\Facades\Auth;
-use Log;
 
 /**
  * Class FireRulesForStore
@@ -36,7 +36,6 @@ class FireRulesForStore
      */
     public function handle(TransactionJournalStored $event): bool
     {
-        Log::debug('Now running FireRulesForStore because TransactionJournalStored fired.');
         // get all the user's rule groups, with the rules, order by 'order'.
         /** @var User $user */
         $user   = Auth::user();
@@ -44,7 +43,6 @@ class FireRulesForStore
         //
         /** @var RuleGroup $group */
         foreach ($groups as $group) {
-            Log::debug('Now processing group "' . $group->title . '".');
             $rules = $group->rules()
                            ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
                            ->where('rule_triggers.trigger_type', 'user_action')
@@ -54,7 +52,6 @@ class FireRulesForStore
             /** @var Rule $rule */
             foreach ($rules as $rule) {
 
-                Log::debug('Now handling rule #' . $rule->id . ' (' . $rule->title . ')');
                 $processor = Processor::make($rule);
                 $processor->handleTransactionJournal($event->journal);
 

app/Handlers/Events/FireRulesForUpdate.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * FireRulesForUpdate.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Handlers\Events;
 
 use Auth;
@@ -16,7 +17,6 @@ use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Rules\Processor;
 use FireflyIII\User;
-use Log;
 
 /**
  * Class FireRulesForUpdate
@@ -34,7 +34,6 @@ class FireRulesForUpdate
      */
     public function handle(TransactionJournalUpdated $event): bool
     {
-        Log::debug('Now running FireRulesForUpdate because TransactionJournalUpdated fired.');
         // get all the user's rule groups, with the rules, order by 'order'.
         /** @var User $user */
         $user   = Auth::user();
@@ -42,7 +41,6 @@ class FireRulesForUpdate
         //
         /** @var RuleGroup $group */
         foreach ($groups as $group) {
-            Log::debug('Now processing group "' . $group->title . '".');
             $rules = $group->rules()
                            ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
                            ->where('rule_triggers.trigger_type', 'user_action')
@@ -51,9 +49,6 @@ class FireRulesForUpdate
                            ->get(['rules.*']);
             /** @var Rule $rule */
             foreach ($rules as $rule) {
-                Log::debug('Now handling rule #' . $rule->id . ' (' . $rule->title . ')');
-
-                Log::debug('Now handling rule #' . $rule->id . ' (' . $rule->title . ')');
                 $processor = Processor::make($rule);
                 $processor->handleTransactionJournal($event->journal);
 

app/Handlers/Events/ScanForBillsAfterStore.php

@@ -1,13 +1,14 @@
 <?php
-declare(strict_types = 1);
 /**
- * RescanJournalAfterStore.php
+ * ScanForBillsAfterStore.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\TransactionJournalStored;

app/Handlers/Events/ScanForBillsAfterUpdate.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * ScanForBillsAfterUpdate.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Handlers\Events;
 
 use FireflyIII\Events\TransactionJournalUpdated;

app/Handlers/Events/SendRegistrationMail.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * SendRegistrationMail.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Handlers\Events;
 
 
@@ -60,6 +61,7 @@ class SendRegistrationMail
         } catch (Swift_TransportException $e) {
             Log::error($e->getMessage());
         }
+
         return true;
     }
 }

app/Handlers/Events/UpdateJournalConnection.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * UpdateJournalConnection.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Handlers\Events;
 

app/Handlers/Events/UserConfirmation.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * UserConfirmation.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Handlers\Events;
 
 
@@ -47,6 +48,7 @@ class UserConfirmation
         $user      = $event->user;
         $ipAddress = $event->ipAddress;
         $this->doConfirm($user, $ipAddress);
+
         return true;
     }
 
@@ -62,6 +64,7 @@ class UserConfirmation
         $user      = $event->user;
         $ipAddress = $event->ipAddress;
         $this->doConfirm($user, $ipAddress);
+
         return true;
     }
 
@@ -71,35 +74,21 @@ class UserConfirmation
      */
     private function doConfirm(User $user, string $ipAddress)
     {
-        Log::debug('Trigger UserConfirmation::doConfirm');
-
-        // if user must confirm account, send email
         $confirmAccount = env('MUST_CONFIRM_ACCOUNT', false);
-
-        // otherwise, auto-confirm:
         if ($confirmAccount === false) {
-            Log::debug('Confirm account is false, so user will be auto-confirmed.');
             Preferences::setForUser($user, 'user_confirmed', true);
             Preferences::setForUser($user, 'user_confirmed_last_mail', 0);
             Preferences::mark();
 
             return;
         }
-
-        // send email message:
         $email = $user->email;
         $code  = str_random(16);
         $route = route('do_confirm_account', [$code]);
-
-        // set preferences:
         Preferences::setForUser($user, 'user_confirmed', false);
         Preferences::setForUser($user, 'user_confirmed_last_mail', time());
         Preferences::setForUser($user, 'user_confirmed_code', $code);
-        Log::debug('Set preferences for user.');
-
-        // send email.
         try {
-            Log::debug('Now in try block for user email message thing to ' . $email . '.');
             Mail::send(
                 ['emails.confirm-account-html', 'emails.confirm-account'], ['route' => $route, 'ip' => $ipAddress],
                 function (Message $message) use ($email) {
@@ -107,13 +96,10 @@ class UserConfirmation
                 }
             );
         } catch (Swift_TransportException $e) {
-
             Log::error($e->getMessage());
         } catch (Exception $e) {
-            Log::debug('Caught general exception.');
             Log::error($e->getMessage());
         }
-        Log::debug('Finished mail handling for activation.');
 
         return;
     }

app/Handlers/Events/UserEventListener.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * UserEventListener.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -8,6 +7,8 @@ declare(strict_types = 1);
  * of the MIT license.  See the LICENSE file for details.
  */
 
+declare(strict_types = 1);
+
 namespace FireflyIII\Handlers\Events;
 
 use Session;
@@ -21,7 +22,7 @@ class UserEventListener
 {
     /**
      * Handle user logout events.
-     * 
+     *
      * @return bool
      */
     public function onUserLogout(): bool

app/Helpers/Attachments/AttachmentHelper.php

@@ -1,9 +1,16 @@
 <?php
+/**
+ * AttachmentHelper.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Attachments;
 
 use Auth;
-use Config;
 use Crypt;
 use FireflyIII\Models\Attachment;
 use Illuminate\Database\Eloquent\Model;
@@ -39,8 +46,8 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     public function __construct()
     {
-        $this->maxUploadSize = Config::get('firefly.maxUploadSize');
-        $this->allowedMimes  = Config::get('firefly.allowedMimes');
+        $this->maxUploadSize = config('firefly.maxUploadSize');
+        $this->allowedMimes  = config('firefly.allowedMimes');
         $this->errors        = new MessageBag;
         $this->messages      = new MessageBag;
         $this->uploadDisk    = Storage::disk('upload');
@@ -81,26 +88,14 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     public function saveAttachmentsForModel(Model $model): bool
     {
-        $files = null;
-        try {
-            if (Input::hasFile('attachments')) {
-                $files = Input::file('attachments');
-            }
-        } catch (TypeError $e) {
-            // Log it, do nothing else.
-            Log::error($e->getMessage());
+        $files = $this->getFiles();
+
+        if (!is_null($files) && !is_array($files)) {
+            $this->processFile($files, $model);
         }
 
         if (is_array($files)) {
-            foreach ($files as $entry) {
-                if (!is_null($entry)) {
-                    $this->processFile($entry, $model);
-                }
-            }
-        } else {
-            if (!is_null($files)) {
-                $this->processFile($files, $model);
-            }
+            $this->processFiles($files, $model);
         }
 
         return true;
@@ -234,5 +229,39 @@ class AttachmentHelper implements AttachmentHelperInterface
         return true;
     }
 
+    /**
+     * @return array|null|UploadedFile
+     */
+    private function getFiles()
+    {
+        $files = null;
+        try {
+            if (Input::hasFile('attachments')) {
+                $files = Input::file('attachments');
+            }
+        } catch (TypeError $e) {
+            // Log it, do nothing else.
+            Log::error($e->getMessage());
+        }
+
+        return $files;
+    }
+
+    /**
+     * @param array $files
+     *
+     * @return bool
+     */
+    private function processFiles(array $files, Model $model): bool
+    {
+        foreach ($files as $entry) {
+            if (!is_null($entry)) {
+                $this->processFile($entry, $model);
+            }
+        }
+
+        return true;
+    }
+
 
 }

app/Helpers/Attachments/AttachmentHelperInterface.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * AttachmentHelperInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Attachments;
 

app/Helpers/Collection/Account.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Account.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 

app/Helpers/Collection/Balance.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Balance.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 
@@ -59,5 +67,13 @@ class Balance
         return $this->balanceLines;
     }
 
+    /**
+     * @param Collection $balanceLines
+     */
+    public function setBalanceLines(Collection $balanceLines)
+    {
+        $this->balanceLines = $balanceLines;
+    }
+
 
 }

app/Helpers/Collection/BalanceEntry.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BalanceEntry.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 

app/Helpers/Collection/BalanceHeader.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BalanceHeader.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 

app/Helpers/Collection/BalanceLine.php

@@ -1,7 +1,16 @@
 <?php
+/**
+ * BalanceLine.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 
+use Carbon\Carbon;
 use FireflyIII\Models\Budget as BudgetModel;
 use Illuminate\Support\Collection;
 
@@ -24,6 +33,11 @@ class BalanceLine
     /** @var BudgetModel */
     protected $budget;
 
+    /** @var  Carbon */
+    protected $startDate;
+    /** @var  Carbon */
+    protected $endDate;
+
     /** @var int */
     protected $role = self::ROLE_DEFAULTROLE;
 
@@ -113,6 +127,39 @@ class BalanceLine
         return '';
     }
 
+    /**
+     * @return Carbon
+     */
+    public function getStartDate()
+    {
+        return $this->startDate;
+    }
+
+    /**
+     * @param Carbon $startDate
+     */
+    public function setStartDate($startDate)
+    {
+        $this->startDate = $startDate;
+    }
+
+    /**
+     * @return Carbon
+     */
+    public function getEndDate()
+    {
+        return $this->endDate;
+    }
+
+    /**
+     * @param Carbon $endDate
+     */
+    public function setEndDate($endDate)
+    {
+        $this->endDate = $endDate;
+    }
+
+
     /**
      * If a BalanceLine has a budget/repetition, each BalanceEntry in this BalanceLine
      * should have a "spent" value, which is the amount of money that has been spent

app/Helpers/Collection/Bill.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Bill.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 

app/Helpers/Collection/BillLine.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillLine.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 
@@ -141,5 +149,4 @@ class BillLine
         $this->hit = $hit;
     }
 
-
 }

app/Helpers/Collection/Budget.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Budget.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 

app/Helpers/Collection/BudgetLine.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BudgetLine.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 

app/Helpers/Collection/Category.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Category.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 

app/Helpers/Collection/Expense.php

@@ -1,8 +1,15 @@
 <?php
+/**
+ * Expense.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 
-use Crypt;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Support\Collection;
 use stdClass;
@@ -33,26 +40,32 @@ class Expense
      */
     public function addOrCreateExpense(TransactionJournal $entry)
     {
+        // add each account individually:
+        $destinations = TransactionJournal::destinationTransactionList($entry);
 
-        $accountId = $entry->account_id;
-        $amount    = strval(round($entry->journalAmount, 2));
-        if (bccomp('0', $amount) === -1) {
-            $amount = bcmul($amount, '-1');
+        foreach ($destinations as $transaction) {
+            $amount  = strval($transaction->amount);
+            $account = $transaction->account;
+            if (bccomp('0', $amount) === -1) {
+                $amount = bcmul($amount, '-1');
+            }
+
+            $object         = new stdClass;
+            $object->amount = $amount;
+            $object->name   = $account->name;
+            $object->count  = 1;
+            $object->id     = $account->id;
+
+            // overrule some properties:
+            if ($this->expenses->has($account->id)) {
+                $object         = $this->expenses->get($account->id);
+                $object->amount = bcadd($object->amount, $amount);
+                $object->count++;
+            }
+            $this->expenses->put($account->id, $object);
         }
 
-        if (!$this->expenses->has($accountId)) {
-            $newObject         = new stdClass;
-            $newObject->amount = $amount;
-            $newObject->name   = Crypt::decrypt($entry->account_name);
-            $newObject->count  = 1;
-            $newObject->id     = $accountId;
-            $this->expenses->put($accountId, $newObject);
-        } else {
-            $existing         = $this->expenses->get($accountId);
-            $existing->amount = bcadd($existing->amount, $amount);
-            $existing->count++;
-            $this->expenses->put($accountId, $existing);
-        }
+
     }
 
     /**
@@ -60,8 +73,6 @@ class Expense
      */
     public function addToTotal(string $add)
     {
-
-
         $add = strval(round($add, 2));
         if (bccomp('0', $add) === -1) {
             $add = bcmul($add, '-1');

app/Helpers/Collection/Income.php

@@ -1,8 +1,15 @@
 <?php
+/**
+ * Income.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Collection;
 
-use Crypt;
 use FireflyIII\Models\TransactionJournal;
 use Illuminate\Support\Collection;
 use stdClass;
@@ -34,21 +41,29 @@ class Income
      */
     public function addOrCreateIncome(TransactionJournal $entry)
     {
+        // add each account individually:
+        $sources = TransactionJournal::sourceTransactionList($entry);
 
-        $accountId = $entry->account_id;
-        if (!$this->incomes->has($accountId)) {
-            $newObject         = new stdClass;
-            $newObject->amount = strval(round($entry->journalAmount, 2));
-            $newObject->name   = Crypt::decrypt($entry->account_name);
-            $newObject->count  = 1;
-            $newObject->id     = $accountId;
-            $this->incomes->put($accountId, $newObject);
-        } else {
-            $existing         = $this->incomes->get($accountId);
-            $existing->amount = bcadd($existing->amount, $entry->journalAmount);
-            $existing->count++;
-            $this->incomes->put($accountId, $existing);
+        foreach ($sources as $transaction) {
+            $amount  = strval($transaction->amount);
+            $account = $transaction->account;
+            $amount  = bcmul($amount, '-1');
+
+            $object         = new stdClass;
+            $object->amount = $amount;
+            $object->name   = $account->name;
+            $object->count  = 1;
+            $object->id     = $account->id;
+
+            // overrule some properties:
+            if ($this->incomes->has($account->id)) {
+                $object         = $this->incomes->get($account->id);
+                $object->amount = bcadd($object->amount, $amount);
+                $object->count++;
+            }
+            $this->incomes->put($account->id, $object);
         }
+
     }
 
     /**

app/Helpers/Csv/Converter/AccountId.php

@@ -1,9 +1,16 @@
 <?php
+/**
+ * AccountId.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 
 /**
  * Class AccountId
@@ -18,17 +25,10 @@ class AccountId extends BasicConverter implements ConverterInterface
      */
     public function convert(): Account
     {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
 
-        // is mapped? Then it's easy!
-        if (isset($this->mapped[$this->index][$this->value])) {
-            /** @var Account $account */
-            $account = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            /** @var Account $account */
-            $account = $repository->find($this->value);
-        }
+        $crud    = app('FireflyIII\Crud\Account\AccountCrudInterface');
+        $var     = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
+        $account = $crud->find($var);
 
         return $account;
     }

app/Helpers/Csv/Converter/Amount.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Amount.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 

app/Helpers/Csv/Converter/AmountComma.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * AmountComma.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 

app/Helpers/Csv/Converter/AssetAccountIban.php

@@ -1,12 +1,20 @@
 <?php
+/**
+ * AssetAccountIban.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use Auth;
 use Carbon\Carbon;
+use FireflyIII\Crud\Account\AccountCrudInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use Log;
+use FireflyIII\Models\AccountType;
 
 /**
  * Class AssetAccountIban
@@ -21,52 +29,61 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
      */
     public function convert(): Account
     {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $crud = app('FireflyIII\Crud\Account\AccountCrudInterface');
 
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
-            $account = $repository->find(intval($this->mapped[$this->index][$this->value]));
-            Log::debug('Found mapped account for value "' . $this->value . '". It is account #' . $account->id);
+            $account = $crud->find(intval($this->mapped[$this->index][$this->value]));
 
             return $account;
         }
 
+
         if (strlen($this->value) > 0) {
-            // find or create new account:
-            $set = $repository->getAccounts(['Default account', 'Asset account']);
-            /** @var Account $entry */
-            foreach ($set as $entry) {
-                if ($entry->iban == $this->value) {
-                    Log::debug('Found an account with the same IBAN ("' . $this->value . '"). It is account #' . $entry->id);
-
-                    return $entry;
-                }
-            }
-
-            Log::debug('Found no account with the same IBAN ("' . $this->value . '"), so will create a new one.');
-
-            // create it if doesn't exist.
-            $accountData = [
-                'name'                   => $this->value,
-                'accountType'            => 'asset',
-                'virtualBalance'         => 0,
-                'virtualBalanceCurrency' => 1, // hard coded.
-                'active'                 => true,
-                'user'                   => Auth::user()->id,
-                'iban'                   => $this->value,
-                'accountNumber'          => $this->value,
-                'accountRole'            => null,
-                'openingBalance'         => 0,
-                'openingBalanceDate'     => new Carbon,
-                'openingBalanceCurrency' => 1, // hard coded.
-            ];
-
-            $account = $repository->store($accountData);
+            $account = $this->searchOrCreate($crud);
 
             return $account;
         }
 
         return new Account;
     }
+
+    /**
+     * @param AccountCrudInterface $crud
+     *
+     * @return Account
+     */
+    private function searchOrCreate(AccountCrudInterface $crud)
+    {
+        // find or create new account:
+        $set = $crud->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        /** @var Account $entry */
+        foreach ($set as $entry) {
+            if ($entry->iban == $this->value) {
+
+                return $entry;
+            }
+        }
+
+
+        // create it if doesn't exist.
+        $accountData = [
+            'name'                   => $this->value,
+            'accountType'            => 'asset',
+            'virtualBalance'         => 0,
+            'virtualBalanceCurrency' => 1, // hard coded.
+            'active'                 => true,
+            'user'                   => Auth::user()->id,
+            'iban'                   => $this->value,
+            'accountNumber'          => $this->value,
+            'accountRole'            => null,
+            'openingBalance'         => 0,
+            'openingBalanceDate'     => new Carbon,
+            'openingBalanceCurrency' => 1, // hard coded.
+        ];
+
+        $account = $crud->store($accountData);
+
+        return $account;
+    }
 }

app/Helpers/Csv/Converter/AssetAccountName.php

@@ -1,11 +1,19 @@
 <?php
+/**
+ * AssetAccountName.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use Auth;
 use Carbon\Carbon;
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Models\AccountType;
 
 /**
  * Class AssetAccountName
@@ -20,27 +28,21 @@ class AssetAccountName extends BasicConverter implements ConverterInterface
      */
     public function convert(): Account
     {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $crud = app('FireflyIII\Crud\Account\AccountCrudInterface');
 
-        // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
-            $account = $repository->find(intval($this->mapped[$this->index][$this->value]));
+            $account = $crud->find(intval($this->mapped[$this->index][$this->value]));
 
             return $account;
         }
 
-
-        // find or create new account:
-        $set = $repository->getAccounts(['Default account', 'Asset account']);
+        $set = $crud->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
         /** @var Account $entry */
         foreach ($set as $entry) {
             if ($entry->name == $this->value) {
                 return $entry;
             }
         }
-
-        // create it if doesnt exist.
         $accountData = [
             'name'                   => $this->value,
             'accountType'            => 'asset',
@@ -54,10 +56,9 @@ class AssetAccountName extends BasicConverter implements ConverterInterface
             'openingBalance'         => 0,
             'openingBalanceDate'     => new Carbon,
             'openingBalanceCurrency' => 1, // hard coded.
-
         ];
 
-        $account = $repository->store($accountData);
+        $account = $crud->store($accountData);
 
         return $account;
     }

app/Helpers/Csv/Converter/AssetAccountNumber.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * AssetAccountNumber.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -14,7 +13,7 @@ namespace FireflyIII\Helpers\Csv\Converter;
 use Auth;
 use Carbon\Carbon;
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Models\AccountType;
 
 /**
  * Class AssetAccountNumber
@@ -29,12 +28,11 @@ class AssetAccountNumber extends BasicConverter implements ConverterInterface
      */
     public function convert(): Account
     {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $crud = app('FireflyIII\Crud\Account\AccountCrudInterface');
 
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
-            $account = $repository->find(intval($this->mapped[$this->index][$this->value]));
+            $account = $crud->find(intval($this->mapped[$this->index][$this->value]));
 
             return $account;
         }
@@ -42,7 +40,7 @@ class AssetAccountNumber extends BasicConverter implements ConverterInterface
         $value = $this->value ?? '';
         if (strlen($value) > 0) {
             // find or create new account:
-            $set = $repository->getAccounts(['Default account', 'Asset account']);
+            $set = $crud->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
             /** @var Account $entry */
             foreach ($set as $entry) {
                 $accountNumber = $entry->getMeta('accountNumber');
@@ -68,7 +66,7 @@ class AssetAccountNumber extends BasicConverter implements ConverterInterface
 
             ];
 
-            $account = $repository->store($accountData);
+            $account = $crud->store($accountData);
 
             return $account;
         }

app/Helpers/Csv/Converter/BasicConverter.php

@@ -1,10 +1,20 @@
 <?php
+/**
+ * BasicConverter.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
 /**
  * Class BasicConverter
  *
+ *
+ * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @package FireflyIII\Helpers\Csv\Converter
  */
 class BasicConverter

app/Helpers/Csv/Converter/BillId.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillId.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
@@ -19,14 +27,9 @@ class BillId extends BasicConverter implements ConverterInterface
     public function convert(): Bill
     {
         /** @var BillRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
-
-        // is mapped? Then it's easy!
-        if (isset($this->mapped[$this->index][$this->value])) {
-            $bill = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            $bill = $repository->find($this->value);
-        }
+        $repository = app(BillRepositoryInterface::class);
+        $value      = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
+        $bill       = $repository->find($value);
 
         return $bill;
     }

app/Helpers/Csv/Converter/BillName.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BillName.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
@@ -19,22 +27,21 @@ class BillName extends BasicConverter implements ConverterInterface
     public function convert(): Bill
     {
         /** @var BillRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
+        $repository = app(BillRepositoryInterface::class);
 
-        $bill = new Bill;
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
-            $bill = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            $bills = $repository->getBills();
-            /** @var Bill $bill */
-            foreach ($bills as $bill) {
-                if ($bill->name == $this->value) {
-                    return $bill;
-                }
+            return $repository->find($this->mapped[$this->index][$this->value]);
+        }
+        $bills = $repository->getBills();
+
+        /** @var Bill $bill */
+        foreach ($bills as $bill) {
+            if ($bill->name == $this->value) {
+                return $bill;
             }
         }
 
-        return $bill;
+        return new Bill;
     }
 }

app/Helpers/Csv/Converter/BudgetId.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BudgetId.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
@@ -19,15 +27,9 @@ class BudgetId extends BasicConverter implements ConverterInterface
     public function convert(): Budget
     {
         /** @var BudgetRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
-
-
-        // is mapped? Then it's easy!
-        if (isset($this->mapped[$this->index][$this->value])) {
-            $budget = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            $budget = $repository->find($this->value);
-        }
+        $repository = app(BudgetRepositoryInterface::class);
+        $value      = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
+        $budget     = $repository->find($value);
 
         return $budget;
     }

app/Helpers/Csv/Converter/BudgetName.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * BudgetName.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
@@ -20,14 +28,16 @@ class BudgetName extends BasicConverter implements ConverterInterface
     public function convert(): Budget
     {
         /** @var BudgetRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
+        $repository = app(BudgetRepositoryInterface::class);
 
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
             $budget = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            $budget = $repository->store(['name' => $this->value, 'user' => Auth::user()->id]);
+
+            return $budget;
         }
+        $budget = $repository->store(['name' => $this->value, 'user' => Auth::user()->id]);
+
 
         return $budget;
     }

app/Helpers/Csv/Converter/CategoryId.php

@@ -1,9 +1,17 @@
 <?php
+/**
+ * CategoryId.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use FireflyIII\Models\Category;
-use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 
 /**
  * Class CategoryId
@@ -18,15 +26,10 @@ class CategoryId extends BasicConverter implements ConverterInterface
      */
     public function convert(): Category
     {
-        /** @var SingleCategoryRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
-
-        // is mapped? Then it's easy!
-        if (isset($this->mapped[$this->index][$this->value])) {
-            $category = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            $category = $repository->find($this->value);
-        }
+        /** @var CategoryRepositoryInterface $repository */
+        $repository = app(CategoryRepositoryInterface::class);
+        $value      = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
+        $category   = $repository->find($value);
 
         return $category;
     }

app/Helpers/Csv/Converter/CategoryName.php

@@ -1,10 +1,18 @@
 <?php
+/**
+ * CategoryName.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use Auth;
 use FireflyIII\Models\Category;
-use FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface;
+use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
 
 /**
  * Class CategoryName
@@ -19,22 +27,23 @@ class CategoryName extends BasicConverter implements ConverterInterface
      */
     public function convert(): Category
     {
-        /** @var SingleCategoryRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
+        /** @var CategoryRepositoryInterface $repository */
+        $repository = app(CategoryRepositoryInterface::class);
 
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
             $category = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
 
-            $data = [
-                'name' => $this->value,
-                'user' => Auth::user()->id,
-            ];
-
-            $category = $repository->store($data);
+            return $category;
         }
 
+        $data = [
+            'name' => $this->value,
+            'user' => Auth::user()->id,
+        ];
+
+        $category = $repository->store($data);
+
         return $category;
     }
 }

app/Helpers/Csv/Converter/ConverterInterface.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * ConverterInterface.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 

app/Helpers/Csv/Converter/CurrencyCode.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * CurrencyCode.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
@@ -19,15 +27,17 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
     public function convert(): TransactionCurrency
     {
         /** @var CurrencyRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
-
+        $repository = app(CurrencyRepositoryInterface::class);
 
         if (isset($this->mapped[$this->index][$this->value])) {
-            $currency = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            $currency = $repository->findByCode($this->value);
+            $currency = $repository->find(intval($this->mapped[$this->index][$this->value]));
+
+            return $currency;
         }
 
+        $currency = $repository->findByCode($this->value);
+
+
         return $currency;
     }
 }

app/Helpers/Csv/Converter/CurrencyId.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * CurrencyId.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
@@ -19,13 +27,9 @@ class CurrencyId extends BasicConverter implements ConverterInterface
     public function convert(): TransactionCurrency
     {
         /** @var CurrencyRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
-
-        if (isset($this->mapped[$this->index][$this->value])) {
-            $currency = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            $currency = $repository->find($this->value);
-        }
+        $repository = app(CurrencyRepositoryInterface::class);
+        $value      = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
+        $currency   = $repository->find($value);
 
         return $currency;
     }

app/Helpers/Csv/Converter/CurrencyName.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * CurrencyName.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
@@ -19,14 +27,15 @@ class CurrencyName extends BasicConverter implements ConverterInterface
     public function convert(): TransactionCurrency
     {
         /** @var CurrencyRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
+        $repository = app(CurrencyRepositoryInterface::class);
 
         if (isset($this->mapped[$this->index][$this->value])) {
-
             $currency = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            $currency = $repository->findByName($this->value);
+
+            return $currency;
         }
+        $currency = $repository->findByName($this->value);
+
 
         return $currency;
     }

app/Helpers/Csv/Converter/CurrencySymbol.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * CurrencySymbol.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
@@ -19,14 +27,17 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
     public function convert(): TransactionCurrency
     {
         /** @var CurrencyRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
+        $repository = app(CurrencyRepositoryInterface::class);
 
         if (isset($this->mapped[$this->index][$this->value])) {
             $currency = $repository->find($this->mapped[$this->index][$this->value]);
-        } else {
-            $currency = $repository->findBySymbol($this->value);
+
+            return $currency;
         }
 
+        $currency = $repository->findBySymbol($this->value);
+
+
         return $currency;
     }
 }

app/Helpers/Csv/Converter/Date.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Date.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 

app/Helpers/Csv/Converter/Description.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Description.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 

app/Helpers/Csv/Converter/INGDebetCredit.php

@@ -1,5 +1,4 @@
 <?php
-declare(strict_types = 1);
 /**
  * INGDebetCredit.php
  * Copyright (C) 2016 thegrumpydictator@gmail.com

app/Helpers/Csv/Converter/Ignore.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * Ignore.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 

app/Helpers/Csv/Converter/OpposingAccountIban.php

@@ -1,9 +1,17 @@
 <?php
+/**
+ * OpposingAccountIban.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
+use FireflyIII\Crud\Account\AccountCrudInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 
 /**
  * Class OpposingAccountIban
@@ -20,28 +28,37 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
      */
     public function convert()
     {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $crud = app('FireflyIII\Crud\Account\AccountCrudInterface');
 
         if (isset($this->mapped[$this->index][$this->value])) {
-            $account = $repository->find($this->mapped[$this->index][$this->value]);
+            $account = $crud->find($this->mapped[$this->index][$this->value]);
 
             return $account;
-        } else {
-            if (strlen($this->value) > 0) {
+        }
 
-                $set = $repository->getAccounts([]);
-                /** @var Account $account */
-                foreach ($set as $account) {
-                    if ($account->iban == $this->value) {
+        return $this->findAccount($crud);
+    }
 
-                        return $account;
-                    }
+    /**
+     * @param AccountCrudInterface $crud
+     *
+     * @return Account|string
+     */
+    private function findAccount(AccountCrudInterface $crud)
+    {
+        if (strlen($this->value) > 0) {
+
+            $set = $crud->getAccountsByType([]);
+            /** @var Account $account */
+            foreach ($set as $account) {
+                if ($account->iban == $this->value) {
+
+                    return $account;
                 }
             }
-
-            return $this->value;
         }
+
+        return $this->value;
     }
 
 }

app/Helpers/Csv/Converter/OpposingAccountId.php

@@ -1,9 +1,16 @@
 <?php
+/**
+ * OpposingAccountId.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 
 /**
  * Class OpposingAccountId
@@ -19,17 +26,10 @@ class OpposingAccountId extends BasicConverter implements ConverterInterface
      */
     public function convert(): Account
     {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
-
-        if (isset($this->mapped[$this->index][$this->value])) {
-            $account = $repository->find($this->mapped[$this->index][$this->value]);
-
-        } else {
-            $account = $repository->find($this->value);
-        }
+        $crud    = app('FireflyIII\Crud\Account\AccountCrudInterface');
+        $value   = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
+        $account = $crud->find($value);
 
         return $account;
-
     }
 }

app/Helpers/Csv/Converter/OpposingAccountName.php

@@ -1,9 +1,16 @@
 <?php
+/**
+ * OpposingAccountName.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
 use FireflyIII\Models\Account;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 
 /**
  * Class OpposingAccountName
@@ -20,15 +27,15 @@ class OpposingAccountName extends BasicConverter implements ConverterInterface
      */
     public function convert()
     {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $crud = app('FireflyIII\Crud\Account\AccountCrudInterface');
 
         if (isset($this->mapped[$this->index][$this->value])) {
-            $account = $repository->find($this->mapped[$this->index][$this->value]);
+            $account = $crud->find($this->mapped[$this->index][$this->value]);
 
             return $account;
-        } else {
-            return $this->value;
         }
+
+        return $this->value;
+
     }
 }

app/Helpers/Csv/Converter/RabobankDebetCredit.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * RabobankDebetCredit.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 

app/Helpers/Csv/Converter/TagsComma.php

@@ -1,4 +1,12 @@
 <?php
+/**
+ * TagsComma.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
 declare(strict_types = 1);
 namespace FireflyIII\Helpers\Csv\Converter;
 
@@ -19,7 +27,7 @@ class TagsComma extends BasicConverter implements ConverterInterface
     public function convert(): Collection
     {
         /** @var TagRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface');
+        $repository = app(TagRepositoryInterface::class);
         $tags       = new Collection;
 
         $strings = explode(',', $this->value);
@@ -33,8 +41,10 @@ class TagsComma extends BasicConverter implements ConverterInterface
                 'zoomLevel'   => null,
                 'tagMode'     => 'nothing',
             ];
-            $tag  = $repository->store($data); // should validate first?
-            $tags->push($tag);
+            if (strlen($string) > 0) {
+                $tag = $repository->store($data); // should validate first?
+                $tags->push($tag);
+            }
         }
         $tags = $tags->merge($this->data['tags']);