app/config/' . App::environment() . '/mail.php');
- }
-
- return View::make('user.register');
- }
-
- /**
- * Show form to help user get a new password.
- *
- * @return \Illuminate\View\View
- */
- public function remindMe()
- {
- return View::make('user.remindMe');
- }
-
- /**
- * Send a user a password based on his reset code.
- *
- * @param $reset
- *
- * @return $this|\Illuminate\View\View
- */
- public function reset($reset)
- {
-
- /** @var \FireflyIII\Database\User\User $repository */
- $repository = App::make('FireflyIII\Database\User\User');
-
- /** @var \FireflyIII\Shared\Mail\RegistrationInterface $email */
- $email = App::make('FireflyIII\Shared\Mail\RegistrationInterface');
-
- $user = $repository->findByReset($reset);
- if ($user) {
- $email->sendPasswordMail($user);
-
- return View::make('user.registered');
- }
-
- return View::make('error')->with('message', 'No reset code found!');
- }
-
-}
diff --git a/app/database/migrations/2014_06_27_163259_create_accounts_table.php b/app/database/migrations/2014_06_27_163259_create_accounts_table.php
deleted file mode 100644
index 3fb5541655..0000000000
--- a/app/database/migrations/2014_06_27_163259_create_accounts_table.php
+++ /dev/null
@@ -1,54 +0,0 @@
-increments('id');
- $table->timestamps();
- $table->softDeletes();
- $table->integer('user_id')->unsigned();
- $table->integer('account_type_id')->unsigned();
- $table->string('name', 100);
- $table->boolean('active');
-
- // connect accounts to users
- $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-
- // connect accounts to account_types
- $table->foreign('account_type_id')->references('id')->on('account_types')->onDelete('cascade');
-
- // for a user, the account name must be unique.
- $table->unique(['user_id', 'account_type_id', 'name']);
- }
- );
- }
-
-}
diff --git a/app/database/migrations/2014_06_27_163818_create_piggybanks_table.php b/app/database/migrations/2014_06_27_163818_create_piggybanks_table.php
deleted file mode 100644
index 67d527a66d..0000000000
--- a/app/database/migrations/2014_06_27_163818_create_piggybanks_table.php
+++ /dev/null
@@ -1,60 +0,0 @@
-increments('id');
- $table->timestamps();
- $table->integer('account_id')->unsigned();
- $table->string('name', 100);
- $table->decimal('targetamount', 10, 2);
- $table->date('startdate')->nullable();
- $table->date('targetdate')->nullable();
- $table->boolean('repeats');
- $table->enum('rep_length', ['day', 'week', 'quarter', 'month', 'year'])->nullable();
- $table->smallInteger('rep_every')->unsigned();
- $table->smallInteger('rep_times')->unsigned()->nullable();
- $table->enum('reminder', ['day', 'week', 'quarter', 'month', 'year'])->nullable();
- $table->smallInteger('reminder_skip')->unsigned();
- $table->boolean('remind_me');
- $table->integer('order')->unsigned();
-
- // connect account to piggy bank.
- $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
-
- // for an account, the name must be unique.
- $table->unique(['account_id', 'name']);
-
- }
- );
- }
-
-}
diff --git a/app/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php b/app/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php
deleted file mode 100644
index 724059c859..0000000000
--- a/app/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php
+++ /dev/null
@@ -1,59 +0,0 @@
-increments('id');
- $table->timestamps();
- $table->integer('user_id')->unsigned();
- $table->string('name', 50);
- $table->string('match', 255);
- $table->decimal('amount_min', 10, 2);
- $table->decimal('amount_max', 10, 2);
- $table->date('date');
- $table->boolean('active');
-
- $table->boolean('automatch');
- $table->enum('repeat_freq', ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly']);
- $table->smallInteger('skip')->unsigned();
-
- // connect user id to users
- $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-
- // for a user, the name must be unique
- $table->unique(['user_id', 'name']);
-
-
- }
- );
- }
-
-}
diff --git a/app/database/migrations/2014_06_27_164620_create_transaction_journals_table.php b/app/database/migrations/2014_06_27_164620_create_transaction_journals_table.php
deleted file mode 100644
index 44ede35eb0..0000000000
--- a/app/database/migrations/2014_06_27_164620_create_transaction_journals_table.php
+++ /dev/null
@@ -1,62 +0,0 @@
-increments('id');
- $table->timestamps();
- $table->softDeletes();
- $table->integer('user_id')->unsigned();
- $table->integer('transaction_type_id')->unsigned();
- $table->integer('recurring_transaction_id')->unsigned()->nullable();
- $table->integer('transaction_currency_id')->unsigned();
- $table->string('description', 255)->nullable();
- $table->boolean('completed');
- $table->date('date');
-
- // connect users
- $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-
- // connect transaction journals to transaction types
- $table->foreign('transaction_type_id')->references('id')->on('transaction_types')->onDelete('cascade');
-
- // connect transaction journals to recurring transactions
- $table->foreign('recurring_transaction_id')->references('id')->on('recurring_transactions')->onDelete('set null');
-
- // connect transaction journals to transaction currencies
- $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade');
-
-
- }
- );
- }
-
-}
diff --git a/app/database/migrations/2014_06_27_164836_create_transactions_table.php b/app/database/migrations/2014_06_27_164836_create_transactions_table.php
deleted file mode 100644
index 66b2772534..0000000000
--- a/app/database/migrations/2014_06_27_164836_create_transactions_table.php
+++ /dev/null
@@ -1,60 +0,0 @@
-increments('id');
- $table->timestamps();
- $table->softDeletes();
- $table->integer('account_id')->unsigned();
- $table->integer('piggybank_id')->nullable()->unsigned();
- $table->integer('transaction_journal_id')->unsigned();
- $table->string('description', 255)->nullable();
- $table->decimal('amount', 10, 2);
-
- // connect account id:
- $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
-
- // connect piggy banks
- $table->foreign('piggybank_id')->references('id')->on('piggybanks')->onDelete('set null');
-
- // connect transactions to transaction journals
- $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade');
-
-
-
-
-
- }
- );
- }
-
-}
diff --git a/app/database/migrations/2014_08_18_100330_create_piggybank_events_table.php b/app/database/migrations/2014_08_18_100330_create_piggybank_events_table.php
deleted file mode 100644
index 8eebf01388..0000000000
--- a/app/database/migrations/2014_08_18_100330_create_piggybank_events_table.php
+++ /dev/null
@@ -1,51 +0,0 @@
-increments('id');
- $table->timestamps();
- $table->integer('piggybank_id')->unsigned();
- $table->integer('transaction_journal_id')->unsigned()->nullable();
-
- $table->date('date');
- $table->decimal('amount', 10, 2);
-
- // connect instance to piggybank.
- $table->foreign('piggybank_id')->references('id')->on('piggybanks')->onDelete('cascade');
-
- // connect to journal:
- $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('set null');
- }
- );
- }
-
-}
diff --git a/app/database/migrations/2014_08_23_113221_create_reminders_table.php b/app/database/migrations/2014_08_23_113221_create_reminders_table.php
deleted file mode 100644
index 1aaa49fb0a..0000000000
--- a/app/database/migrations/2014_08_23_113221_create_reminders_table.php
+++ /dev/null
@@ -1,50 +0,0 @@
-increments('id');
- $table->timestamps();
- $table->integer('user_id')->unsigned();
- $table->date('startdate');
- $table->date('enddate')->nullable();
- $table->boolean('active');
- $table->boolean('notnow')->default(0);
- $table->integer('remindersable_id')->unsigned()->nullable();
- $table->string('remindersable_type')->nullable();
-
- // connect reminders to users
- $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
- }
- );
- }
-
-}
diff --git a/app/database/seeds/TransactionCurrencySeeder.php b/app/database/seeds/TransactionCurrencySeeder.php
deleted file mode 100644
index 6bf2eb7010..0000000000
--- a/app/database/seeds/TransactionCurrencySeeder.php
+++ /dev/null
@@ -1,18 +0,0 @@
-delete();
-
- TransactionCurrency::create(['code' => 'EUR','name' => 'Euro','symbol' => '€']);
- TransactionCurrency::create(['code' => 'USD','name' => 'US Dollar','symbol' => '$']);
- TransactionCurrency::create(['code' => 'HUF','name' => 'Hungarian forint','symbol' => 'Ft']);
- }
-
-}
diff --git a/app/filters.php b/app/filters.php
deleted file mode 100644
index 27e9264440..0000000000
--- a/app/filters.php
+++ /dev/null
@@ -1,104 +0,0 @@
-with('message', 'Not possible');
- }
-}
-);
diff --git a/app/lang/en/reminders.php b/app/lang/en/reminders.php
deleted file mode 100644
index a416c65cb5..0000000000
--- a/app/lang/en/reminders.php
+++ /dev/null
@@ -1,24 +0,0 @@
- "Passwords must be at least six characters and match the confirmation.",
-
- "user" => "We can't find a user with that e-mail address.",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "Password reminder sent!",
-
-];
diff --git a/app/lib/FireflyIII/Chart/Chart.php b/app/lib/FireflyIII/Chart/Chart.php
deleted file mode 100644
index 6d01ddaecd..0000000000
--- a/app/lib/FireflyIII/Chart/Chart.php
+++ /dev/null
@@ -1,76 +0,0 @@
-on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('amount', '>', 0);
- }
- )
- ->leftJoin(
- 'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
- )
- ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id')
- ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
- ->before($end)
- ->after($start)
- ->where('transaction_types.type', 'Withdrawal')
- ->groupBy('categories.id')
- ->orderBy('sum', 'DESC')
- ->get(['categories.id', 'categories.name', \DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
- }
-
- /**
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function getBillsSummary(Carbon $start, Carbon $end)
- {
- return \Bill::
- leftJoin(
- 'transaction_journals', function (JoinClause $join) use ($start, $end) {
- $join->on('bills.id', '=', 'transaction_journals.bill_id')
- ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
- ->where('transaction_journals.date', '<=', $end->format('Y-m-d'));
- }
- )
- ->leftJoin(
- 'transactions', function (JoinClause $join) {
- $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '>', 0);
- }
- )
- ->where('active', 1)
- ->groupBy('bills.id')
- ->get(
- ['bills.id', 'bills.name', 'transaction_journals.description',
- 'transaction_journals.encrypted',
- 'transaction_journals.id as journalId',
- \DB::Raw('SUM(`bills`.`amount_min` + `bills`.`amount_max`) / 2 as `averageAmount`'),
- 'transactions.amount AS actualAmount']
- );
- }
-}
diff --git a/app/lib/FireflyIII/Chart/ChartInterface.php b/app/lib/FireflyIII/Chart/ChartInterface.php
deleted file mode 100644
index 62a2efa868..0000000000
--- a/app/lib/FireflyIII/Chart/ChartInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-setUser(\Auth::user());
- }
-
- /**
- * @param array $types
- *
- * @return int
- */
- public function countAccountsByType(array $types)
- {
- return $this->getUser()->accounts()->accountTypeIn($types)->count();
- }
-
- /**
- * @param array $types
- *
- * @return Collection
- */
- public function getAccountsByType(array $types)
- {
- /*
- * Basic query:
- */
- $query = $this->getUser()->accounts()->accountTypeIn($types)->withMeta()->orderBy('name', 'ASC');;
- $set = $query->get(['accounts.*', 'account_meta.data as accountRole']);
-
- $set->each(
- function (\Account $account) {
- /*
- * Get last activity date.
- */
- $account->lastActivityDate = $this->getLastActivity($account);
- $account->accountRole = \Config::get('firefly.accountRoles.' . json_decode($account->accountRole));
- }
- );
-
- return $set;
- }
-
- /**
- * @param \Account $account
- *
- * @return \TransactionJournal|null
- */
- public function openingBalanceTransaction(\Account $account)
- {
-
- $first = \TransactionJournal::withRelevantData()->accountIs($account)
- ->orderBy('transaction_journals.date', 'ASC')
- ->orderBy('created_at', 'ASC')
- ->first(['transaction_journals.*']);
- $initial = strpos(strtolower($first->description), 'initial');
- $opening = strpos(strtolower($first->description), 'opening');
- if ($initial === false && $opening === false) {
- return null;
- }
-
- return $first;
-
- }
-
- /**
- * @param \Account $account
- * @param array $data
- *
- * @return bool
- */
- public function storeInitialBalance(\Account $account, array $data)
- {
- /** @var \FireflyIII\Database\TransactionType\TransactionType $typeRepository */
- $typeRepository = \App::make('FireflyIII\Database\TransactionType\TransactionType');
-
- /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $journals */
- $journals = \App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
-
- // some initial variables:
- $balance = floatval($data['openingBalance']);
- $date = new Carbon($data['openingBalanceDate']);
-
- // some dynamic variables:
- if ($balance < 0) {
- $opposingType = 'expense';
- $transactionType = $typeRepository->findByWhat('withdrawal');
- $toAccount = $this->store(['name' => $account->name . ' Initial Balance Account', 'active' => 1, 'what' => $opposingType]);
- $fromAccount = $account;
- } else {
- $opposingType = 'revenue';
- $transactionType = $typeRepository->findByWhat('deposit');
- $fromAccount = $this->store(['name' => $account->name . ' Initial Balance Account', 'active' => 1, 'what' => $opposingType]);
- $toAccount = $account;
- }
-
- // data for transaction journal:
- $balance = $balance < 0 ? $balance * -1 : $balance;
- $currency = $journals->getJournalCurrencyById(intval($data['balance_currency_id']));
- $opening = [
- 'transaction_type_id' => $transactionType->id,
- 'transaction_currency_id' => $currency->id,
- 'amount' => $balance,
- 'what' => 'opening',
- 'from' => $fromAccount,
- 'completed' => 0,
- 'to' => $toAccount,
- 'date' => $date,
- 'description' => 'Opening balance for new account ' . $account->name
- ];
-
- $validation = $journals->validate($opening);
- if ($validation['errors']->count() == 0) {
- $journals->store($opening);
-
- return true;
- } else {
- \Log::error('Initial balance created is not valid (Database/Account)');
- \Log::error($validation['errors']->all());
- \App::abort(500);
- }
-
- return false;
- }
-
- /**
- * @param \Account $account
- *
- * @return int
- */
- public function getLastActivity(\Account $account)
- {
- $lastActivityKey = 'account.' . $account->id . '.lastActivityDate';
- if (\Cache::has($lastActivityKey)) {
- return \Cache::get($lastActivityKey);
- }
-
- $transaction = $account->transactions()
- ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
- ->orderBy('transaction_journals.date', 'DESC')->first();
- if ($transaction) {
- $date = $transaction->transactionJournal->date;
- } else {
- $date = 0;
- }
- \Cache::forever($lastActivityKey, $date);
-
- return $date;
- }
-
- /**
- * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot make it shorter because of query.
- * @param Eloquent $model
- *
- * @return bool
- */
- public function destroy(Eloquent $model)
- {
- $journals = \TransactionJournal::whereIn(
- 'id', function (QueryBuilder $query) use ($model) {
- $query->select('transaction_journal_id')
- ->from('transactions')
- ->whereIn(
- 'account_id', function (QueryBuilder $query) use ($model) {
- $query
- ->select('accounts.id')
- ->from('accounts')
- ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
- ->where(
- function (QueryBuilder $q) use ($model) {
- $q->where('accounts.id', $model->id);
- $q->orWhere(
- function (QueryBuilder $q) use ($model) {
- $q->where('accounts.name', 'LIKE', '%' . $model->name . '%');
- $q->where('account_types.type', 'Initial balance account');
- $q->where('accounts.active', 0);
- }
- );
- }
- )->where('accounts.user_id', $this->getUser()->id);
- }
- )->get();
- }
- )->get();
- $transactions = [];
- /** @var \TransactionJournal $journal */
- foreach ($journals as $journal) {
- /** @var \Transaction $t */
- foreach ($journal->transactions as $t) {
- $transactions[] = intval($t->id);
- }
- $journal->delete();
- }
- if (count($transactions) > 0) {
- \Transaction::whereIn('id', $transactions)->delete();
- }
- \Event::fire('account.destroy', [$model]);
-
- // get account type:
- /** @var \FireflyIII\Database\AccountType\AccountType $acctType */
- $acctType = \App::make('FireflyIII\Database\AccountType\AccountType');
-
- $accountType = $acctType->findByWhat('initial');
-
- //$q->where('account_types.type', '');
-
- \Account::where(
- function (EloquentBuilder $q) use ($model, $accountType) {
- $q->where('id', $model->id);
- $q->orWhere(
- function (EloquentBuilder $q) use ($model, $accountType) {
- $q->where('accounts.name', 'LIKE', '%' . $model->name . '%');
- $q->where('accounts.account_type_id', $accountType->id);
- $q->where('accounts.active', 0);
- }
- );
- }
- )->delete();
-
- return true;
-
- }
-
- /**
- * @param array $data
- *
- * @return \Eloquent
- */
- public function store(array $data)
- {
-
- /** @var \FireflyIII\Database\AccountType\AccountType $acctType */
- $acctType = \App::make('FireflyIII\Database\AccountType\AccountType');
-
- $accountType = $acctType->findByWhat($data['what']);
-
- $data['user_id'] = $this->getUser()->id;
- $data['account_type_id'] = $accountType->id;
- $data['active'] = isset($data['active']) && intval($data['active']) === 1 ? 1 : 0;
-
- $data = array_except($data, ['_token', 'what']);
- $account = new \Account($data);
- if (!$account->isValid()) {
- \Log::error('Account created is not valid (Database/Account)');
- \Log::error($account->getErrors()->all());
- \App::abort(500);
- }
- $account->save();
- if (isset($data['openingBalance']) && floatval($data['openingBalance']) != 0) {
- $this->storeInitialBalance($account, $data);
- }
-
- switch ($account->accountType->type) {
- case 'Asset account':
- case 'Default account':
- $account->updateMeta('accountRole', $data['account_role']);
- break;
- }
-
-
- /* Tell transaction journal to store a new one.*/
- \Event::fire('account.store', [$account]);
-
-
- return $account;
-
- }
-
- /**
- * @param Eloquent $model
- * @param array $data
- *
- * @return bool
- */
- public function update(Eloquent $model, array $data)
- {
- $model->name = $data['name'];
- $model->active = isset($data['active']) ? intval($data['active']) : 0;
-
- switch ($model->accountType->type) {
- case 'Asset account':
- case 'Default account':
- $model->updateMeta('accountRole', $data['account_role']);
- break;
- }
-
- $model->save();
-
- if (isset($data['openingBalance']) && isset($data['openingBalanceDate']) && strlen($data['openingBalanceDate']) > 0) {
- $this->updateInitialBalance($model, $data);
-
- }
- \Event::fire('account.update', [$model]);
-
- return true;
- }
-
- /**
- * Validates a model. Returns an array containing MessageBags
- * errors/warnings/successes.
- *
- * @param array $model
- *
- * @return array
- */
- public function validate(array $model)
- {
- $model['active'] = !isset($model['active']) ? false : $model['active'];
- $successes = new MessageBag;
- $account = new \Account($model);
- $account->isValid('form_input', false);
- $errors = $account->getErrors();
-
- if (isset($model['account_role']) && !in_array($model['account_role'], array_keys(\Config::get('firefly.accountRoles')))) {
- $errors->add('account_role', 'Invalid account role');
- }
- /*
- * Opening balance and opening balance date.
- */
- if (isset($model['what']) && $model['what'] == 'asset') {
- if (isset($model['openingBalance']) && strlen($model['openingBalance']) > 0 && !is_numeric($model['openingBalance'])) {
- $errors->add('openingBalance', 'This is not a number.');
- }
- if (isset($model['openingBalanceDate']) && strlen($model['openingBalanceDate']) > 0) {
- try {
- new Carbon($model['openingBalanceDate']);
- } catch (\Exception $e) {
- $errors->add('openingBalanceDate', 'This date is invalid.');
- }
- }
- }
- $fields = ['name', 'openingBalance', 'openingBalanceDate', 'active', 'account_role'];
- foreach ($fields as $field) {
- if (!$errors->has($field)) {
- $successes->add($field, 'OK');
- }
- }
-
- return ['errors' => $errors, 'successes' => $successes];
- }
-
- /**
- * @param Eloquent $model
- * @param array $data
- */
- public function updateInitialBalance(Eloquent $model, array $data)
- {
- /** @noinspection PhpParamsInspection */
- $openingBalance = $this->openingBalanceTransaction($model);
- if (is_null($openingBalance)) {
- $this->storeInitialBalance($model, $data);
- } else {
- $openingBalance->date = new Carbon($data['openingBalanceDate']);
- $openingBalance->save();
- $amount = floatval($data['openingBalance']);
- /** @var \Transaction $transaction */
- foreach ($openingBalance->transactions as $transaction) {
- if ($transaction->account_id == $model->id) {
- $transaction->amount = $amount;
- } else {
- $transaction->amount = $amount * -1;
- }
- $transaction->save();
- }
- }
- }
-
- /**
- * Returns an object with id $id.
- *
- * @param int $objectId
- *
- * @return \Eloquent
- */
- public function find($objectId)
- {
- return $this->getUser()->accounts()->find($objectId);
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- * @codeCoverageIgnore
- *
- * @param $what
- *
- * @throws NotImplementedException
- * @return \AccountType|null
- */
- public function findByWhat($what)
- {
- throw new NotImplementedException;
- }
-
- /**
- * Returns all objects.
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function get()
- {
- throw new NotImplementedException;
- }
-
- /**
- * @param array $ids
- *
- * @return Collection
- */
- public function getByIds(array $ids)
- {
- return $this->getUser()->accounts()->whereIn('id', $ids)->get();
- }
-
- /**
- * @param $name
- *
- * @return static
- * @throws \FireflyIII\Exception\FireflyException
- */
- public function firstExpenseAccountOrCreate($name)
- {
- /** @var \FireflyIII\Database\AccountType\AccountType $typeRepository */
- $typeRepository = \App::make('FireflyIII\Database\AccountType\AccountType');
-
- $accountType = $typeRepository->findByWhat('expense');
-
- // if name is "", find cash account:
- if (strlen($name) == 0) {
- $cashAccountType = $typeRepository->findByWhat('cash');
-
- // find or create cash account:
- return \Account::firstOrCreate(
- ['name' => 'Cash account', 'account_type_id' => $cashAccountType->id, 'active' => 0, 'user_id' => $this->getUser()->id,]
- );
- }
-
- $data = ['user_id' => $this->getUser()->id, 'account_type_id' => $accountType->id, 'name' => $name, 'active' => 1];
-
- return \Account::firstOrCreate($data);
-
- }
-
- /**
- * @param $name
- *
- * @return static
- * @throws \FireflyIII\Exception\FireflyException
- */
- public function firstRevenueAccountOrCreate($name)
- {
- /** @var \FireflyIII\Database\AccountType\AccountType $typeRepository */
- $typeRepository = \App::make('FireflyIII\Database\AccountType\AccountType');
-
- $accountType = $typeRepository->findByWhat('revenue');
-
- // if name is "", find cash account:
- if (strlen($name) == 0) {
- $cashAccountType = $typeRepository->findByWhat('cash');
-
- // find or create cash account:
- return \Account::firstOrCreate(
- ['name' => 'Cash account', 'account_type_id' => $cashAccountType->id, 'active' => 0, 'user_id' => $this->getUser()->id,]
- );
- }
-
- $data = ['user_id' => $this->getUser()->id, 'account_type_id' => $accountType->id, 'name' => $name, 'active' => 1];
-
- return \Account::firstOrCreate($data);
-
- }
-
- /**
- * @param \Account $account
- * @param int $limit
- * @param string $range
- *
- * @return \Illuminate\Pagination\Paginator
- */
- public function getTransactionJournals(\Account $account, $limit = 50, $range = 'session')
- {
- $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0;
- $items = [];
- $query = $this->getUser()
- ->transactionJournals()
- ->withRelevantData()
- ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
- ->where('transactions.account_id', $account->id)
- ->orderBy('date', 'DESC');
-
- if ($range == 'session') {
- $query->before(\Session::get('end', Carbon::now()->startOfMonth()));
- $query->after(\Session::get('start', Carbon::now()->startOfMonth()));
- }
- $count = $query->count();
- $set = $query->take($limit)->offset($offset)->get(['transaction_journals.*']);
-
- foreach ($set as $entry) {
- $items[] = $entry;
- }
-
- return \Paginator::make($items, $count, $limit);
-
-
- }
-
-}
diff --git a/app/lib/FireflyIII/Database/Account/AccountInterface.php b/app/lib/FireflyIII/Database/Account/AccountInterface.php
deleted file mode 100644
index c9d21ba229..0000000000
--- a/app/lib/FireflyIII/Database/Account/AccountInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
- 'Expense account',
- 'asset' => 'Asset account',
- 'revenue' => 'Revenue account',
- 'cash' => 'Cash account',
- 'initial' => 'Initial balance account',
- ];
- if (isset($typeMap[$what])) {
- return \AccountType::whereType($typeMap[$what])->first();
- }
- throw new FireflyException('Cannot find account type described as "' . e($what) . '".');
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Returns all objects.
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function get()
- {
- throw new NotImplementedException;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @param array $ids
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function getByIds(array $ids)
- {
- throw new NotImplementedException;
- }
-}
diff --git a/app/lib/FireflyIII/Database/Bill/Bill.php b/app/lib/FireflyIII/Database/Bill/Bill.php
deleted file mode 100644
index 642f5163a4..0000000000
--- a/app/lib/FireflyIII/Database/Bill/Bill.php
+++ /dev/null
@@ -1,356 +0,0 @@
-setUser(\Auth::user());
- }
-
- /**
- * @param Eloquent $model
- *
- * @return bool
- */
- public function destroy(Eloquent $model)
- {
- $model->delete();
-
- return true;
- }
-
- /**
- * @param array $data
- *
- * @return \Eloquent
- */
- public function store(array $data)
- {
- $bill = new \Bill;
- $bill->user()->associate($this->getUser());
- $bill->name = $data['name'];
- $bill->match = $data['match'];
- $bill->amount_max = floatval($data['amount_max']);
- $bill->amount_min = floatval($data['amount_min']);
-
- $date = new Carbon($data['date']);
-
-
- $bill->active = intval($data['active']);
- $bill->automatch = intval($data['automatch']);
- $bill->repeat_freq = $data['repeat_freq'];
-
- /*
- * Jump to the start of the period.
- */
- $date = \DateKit::startOfPeriod($date, $data['repeat_freq']);
- $bill->date = $date;
- $bill->skip = intval($data['skip']);
-
- $bill->save();
-
- return $bill;
- }
-
- /**
- * @param Eloquent $model
- * @param array $data
- *
- * @return bool
- */
- public function update(Eloquent $model, array $data)
- {
- $model->name = $data['name'];
- $model->match = $data['match'];
- $model->amount_max = floatval($data['amount_max']);
- $model->amount_min = floatval($data['amount_min']);
-
- $date = new Carbon($data['date']);
-
- $model->date = $date;
- $model->active = intval($data['active']);
- $model->automatch = intval($data['automatch']);
- $model->repeat_freq = $data['repeat_freq'];
- $model->skip = intval($data['skip']);
- $model->save();
-
- return true;
- }
-
- /**
- * Validates an array. Returns an array containing MessageBags
- * errors/warnings/successes.
- *
- * ignored because this method will be gone soon.
- *
- * @param array $model
- *
- * @return array
- */
- public function validate(array $model)
- {
- $warnings = new MessageBag;
- $successes = new MessageBag;
- $errors = new MessageBag;
- if (floatval($model['amount_min']) > floatval($model['amount_max'])) {
- $errors->add('amount_max', 'Maximum amount can not be less than minimum amount.');
- $errors->add('amount_min', 'Minimum amount can not be more than maximum amount.');
- }
- $object = new \Bill($model);
- $object->isValid();
- $errors->merge($object->getErrors());
-
- $set = ['name', 'match', 'amount_min', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active'];
- foreach ($set as $entry) {
- if (!$errors->has($entry)) {
- $successes->add($entry, 'OK');
- }
- }
-
- return ['errors' => $errors, 'warnings' => $warnings, 'successes' => $successes];
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Returns an object with id $id.
- *
- * @param int $objectId
- *
- * @return \Eloquent
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function find($objectId)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
- *
- * @param $what
- *
- * @return \AccountType|null
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function findByWhat($what)
- {
- throw new NotImplementedException;
- }
-
- /**
- * Returns all objects.
- *
- * @return Collection
- */
- public function get()
- {
- return $this->getUser()->bills()->orderBy('name')->get();
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- * @param array $ids
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function getByIds(array $ids)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @param \Bill $bill
- *
- * @return Carbon|null
- */
- public function lastFoundMatch(\Bill $bill)
- {
- $last = $bill->transactionjournals()->orderBy('date', 'DESC')->first();
- if ($last) {
- return $last->date;
- }
-
- return null;
- }
-
- /**
- * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
- *
- * @param \Bill $bill
- *
- * @return Carbon|null
- */
- public function nextExpectedMatch(\Bill $bill)
- {
- $finalDate = null;
- if ($bill->active == 0) {
- return $finalDate;
- }
-
- /*
- * $today is the start of the next period, to make sure FF3 won't miss anything
- * when the current period has a transaction journal.
- */
- $today = \DateKit::addPeriod(new Carbon, $bill->repeat_freq, 0);
-
- $skip = $bill->skip + 1;
- $start = \DateKit::startOfPeriod(new Carbon, $bill->repeat_freq);
- /*
- * go back exactly one month/week/etc because FF3 does not care about 'next'
- * bills if they're too far into the past.
- */
-
- $counter = 0;
- while ($start <= $today) {
- if (($counter % $skip) == 0) {
- // do something.
- $end = \DateKit::endOfPeriod(clone $start, $bill->repeat_freq);
- $journalCount = $bill->transactionjournals()->before($end)->after($start)->count();
- if ($journalCount == 0) {
- $finalDate = clone $start;
- break;
- }
- }
-
- // add period for next round!
- $start = \DateKit::addPeriod($start, $bill->repeat_freq, 0);
- $counter++;
- }
-
- return $finalDate;
- }
-
- /**
- * @param \Bill $bill
- * @param \TransactionJournal $journal
- *
- * @return bool
- */
- public function scan(\Bill $bill, \TransactionJournal $journal)
- {
- /*
- * Match words.
- */
- $wordMatch = false;
- $matches = explode(',', $bill->match);
- $description = strtolower($journal->description);
-
- /*
- * Attach expense account to description for more narrow matching.
- */
- if (count($journal->transactions) < 2) {
- $transactions = $journal->transactions()->get();
- } else {
- $transactions = $journal->transactions;
- }
- /** @var \Transaction $transaction */
- foreach ($transactions as $transaction) {
- /** @var \Account $account */
- $account = $transaction->account()->first();
- /** @var \AccountType $type */
- $type = $account->accountType()->first();
- if ($type->type == 'Expense account' || $type->type == 'Beneficiary account') {
- $description .= ' ' . strtolower($account->name);
- }
- }
- \Log::debug('Final description: ' . $description);
- \Log::debug('Matches searched: ' . join(':', $matches));
-
- $count = 0;
- foreach ($matches as $word) {
- if (!(strpos($description, strtolower($word)) === false)) {
- $count++;
- }
- }
- if ($count >= count($matches)) {
- $wordMatch = true;
- \Log::debug('word match is true');
- }
-
-
- /*
- * Match amount.
- */
-
- $amountMatch = false;
- if (count($transactions) > 1) {
-
- $amount = max(floatval($transactions[0]->amount), floatval($transactions[1]->amount));
- $min = floatval($bill->amount_min);
- $max = floatval($bill->amount_max);
- if ($amount >= $min && $amount <= $max) {
- $amountMatch = true;
- \Log::debug('Amount match is true!');
- }
- }
-
- /*
- * If both, update!
- */
- if ($wordMatch && $amountMatch) {
- $journal->bill()->associate($bill);
- $journal->save();
- }
- }
-
- /**
- * @param \Bill $bill
- *
- * @return bool
- */
- public function scanEverything(\Bill $bill)
- {
- // get all journals that (may) be relevant.
- // this is usually almost all of them.
-
- /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $journalRepository */
- $journalRepository = \App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
-
- $set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $bill->amount_min)->where('amount', '<=', $bill->amount_max)
- ->get(['transaction_journal_id']);
- $ids = [];
-
- /** @var \Transaction $entry */
- foreach ($set as $entry) {
- $ids[] = intval($entry->transaction_journal_id);
- }
- if (count($ids) > 0) {
- $journals = $journalRepository->getByIds($ids);
- /** @var \TransactionJournal $journal */
- foreach ($journals as $journal) {
- $this->scan($bill, $journal);
- }
- }
-
- return true;
- }
-}
diff --git a/app/lib/FireflyIII/Database/Bill/BillInterface.php b/app/lib/FireflyIII/Database/Bill/BillInterface.php
deleted file mode 100644
index ec75dd1167..0000000000
--- a/app/lib/FireflyIII/Database/Bill/BillInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-setUser(\Auth::user());
- }
-
- /**
- * @param Eloquent $model
- *
- * @return bool
- */
- public function destroy(Eloquent $model)
- {
- $model->delete();
-
- return true;
- }
-
- /**
- * @param array $data
- *
- * @return \Eloquent
- * @throws FireflyException
- */
- public function store(array $data)
- {
- $budget = new \Budget($data);
-
- if (!$budget->isValid()) {
- \Log::error('Could not store budget: ' . $budget->getErrors()->toJson());
- throw new FireflyException($budget->getErrors()->first());
- }
- $budget->save();
-
- return $budget;
- }
-
- /**
- * @param Eloquent $model
- * @param array $data
- *
- * @return bool
- */
- public function update(Eloquent $model, array $data)
- {
- $model->name = $data['name'];
- $model->save();
-
- return true;
- }
-
- /**
- * Validates an array. Returns an array containing MessageBags
- * errors/warnings/successes.
- *
- * @param array $model
- *
- * @return array
- */
- public function validate(array $model)
- {
- $warnings = new MessageBag;
- $successes = new MessageBag;
- $budget = new \Budget($model);
- $budget->isValid();
- $errors = $budget->getErrors();
-
- if (!$errors->has('name')) {
- $successes->add('name', 'OK');
- }
-
- return ['errors' => $errors, 'warnings' => $warnings, 'successes' => $successes];
- }
-
- /**
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function expenseNoBudget(Carbon $start, Carbon $end)
- {
- // Add expenses that have no budget:
- return $this->getUser()
- ->transactionjournals()
- ->whereNotIn(
- 'transaction_journals.id', function (QueryBuilder $query) use ($start, $end) {
- $query
- ->select('transaction_journals.id')
- ->from('transaction_journals')
- ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
- ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00'))
- ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00'));
- }
- )
- ->before($end)
- ->after($start)
- ->lessThan(0)
- ->transactionTypes(['Withdrawal'])
- ->get();
- }
-
- /**
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function journalsNoBudget(Carbon $start, Carbon $end)
- {
- $set = $this->getUser()
- ->transactionjournals()
- ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
- ->whereNull('budget_transaction_journal.id')
- ->before($end)
- ->after($start)
- ->orderBy('transaction_journals.date')
- ->get(['transaction_journals.*']);
-
- return $set;
- }
-
- /**
- * This method includes the time because otherwise, SQLite does not understand it.
- *
- * @param \Budget $budget
- * @param Carbon $date
- *
- * @return \LimitRepetition|null
- */
- public function repetitionOnStartingOnDate(\Budget $budget, Carbon $date)
- {
- return \LimitRepetition::
- leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
- ->where('limit_repetitions.startdate', $date->format('Y-m-d 00:00:00'))
- ->where('budget_limits.budget_id', $budget->id)
- ->first(['limit_repetitions.*']);
- }
-
- /**
- * Returns an object with id $id.
- *
- * @param int $objectId
- *
- * @return \Eloquent
- */
- public function find($objectId)
- {
- return $this->getUser()->budgets()->find($objectId);
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
- *
- * @param $what
- *
- * @return \AccountType|null
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function findByWhat($what)
- {
- throw new NotImplementedException;
- }
-
- /**
- * Returns all objects.
- *
- * @return Collection
- */
- public function get()
- {
- $budgets = $this->getUser()->budgets()->get();
-
- return $budgets;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @param array $ids
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function getByIds(array $ids)
- {
- throw new NotImplementedException;
- }
-
- /**
- * Returns all the transaction journals for a limit, possibly limited by a limit repetition.
- *
- * @param \Budget $budget
- * @param \LimitRepetition $repetition
- * @param int $take
- *
- * @return \Illuminate\Pagination\Paginator
- */
- public function getJournals(\Budget $budget, \LimitRepetition $repetition = null, $take = 50)
- {
- $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $take : 0;
-
-
- $setQuery = $budget->transactionJournals()->withRelevantData()->take($take)->offset($offset)->orderBy('date', 'DESC');
- $countQuery = $budget->transactionJournals();
-
-
- if (!is_null($repetition)) {
- $setQuery->after($repetition->startdate)->before($repetition->enddate);
- $countQuery->after($repetition->startdate)->before($repetition->enddate);
- }
-
-
- $set = $setQuery->get(['transaction_journals.*']);
- $count = $countQuery->count();
- $items = [];
- foreach ($set as $entry) {
- $items[] = $entry;
- }
-
- return \Paginator::make($items, $count, $take);
- }
-
- /**
- * @param \Budget $budget
- * @param Carbon $date
- *
- * @return \LimitRepetition
- */
- public function getRepetitionByDate(\Budget $budget, Carbon $date)
- {
- return $budget->limitrepetitions()->where('limit_repetitions.startdate', $date)->first(['limit_repetitions.*']);
- }
-
- /**
- * @param \Budget $budget
- * @param Carbon $date
- *
- * @return float
- */
- public function spentInMonth(\Budget $budget, Carbon $date)
- {
- $end = clone $date;
- $date->startOfMonth();
- $end->endOfMonth();
- $sum = floatval($budget->transactionjournals()->before($end)->after($date)->lessThan(0)->sum('amount')) * -1;
-
- return $sum;
- }
-
- /**
- * This method updates the amount (envelope) for the given date and budget. This results in a (new) limit (aka an envelope)
- * for that budget. Returned to the user is the new limit repetition.
- *
- * @param \Budget $budget
- * @param Carbon $date
- * @param $amount
- *
- * @return \LimitRepetition
- * @throws \Exception
- */
- public function updateLimitAmount(\Budget $budget, Carbon $date, $amount)
- {
- /** @var \BudgetLimit $limit */
- $limit = $this->limitOnStartingOnDate($budget, $date);
- if (!$limit) {
- // create one!
- $limit = new \BudgetLimit;
- $limit->budget()->associate($budget);
- $limit->startdate = $date;
- $limit->amount = $amount;
- $limit->repeat_freq = 'monthly';
- $limit->repeats = 0;
- $limit->save();
- \Log::info('ID: ' . $limit->id);
- /*
- * A newly stored limit also created a limit repetition.
- */
- \Event::fire('limits.store', [$limit]);
- } else {
- if ($amount > 0) {
- $limit->amount = $amount;
- $limit->save();
- /*
- * An updated limit also updates the associated limit repetitions.
- */
- \Event::fire('limits.update', [$limit]);
- } else {
- $limit->delete();
- }
- }
-
- return $limit->limitrepetitions()->first();
-
-
- }
-
- /**
- * @param \Budget $budget
- * @param Carbon $date
- *
- * @return \BudgetLimit
- */
- public function limitOnStartingOnDate(\Budget $budget, Carbon $date)
- {
- return $budget->budgetLimits()->where('startdate', $date->format('Y-m-d 00:00:00'))->first();
-
-
- }
-}
diff --git a/app/lib/FireflyIII/Database/Budget/BudgetInterface.php b/app/lib/FireflyIII/Database/Budget/BudgetInterface.php
deleted file mode 100644
index b81b786c85..0000000000
--- a/app/lib/FireflyIII/Database/Budget/BudgetInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-setUser(\Auth::user());
- }
-
- /**
- * @param Eloquent $model
- *
- * @return bool
- */
- public function destroy(Eloquent $model)
- {
- $model->delete();
-
- return true;
- }
-
- /**
- * @param array $data
- *
- * @return \Eloquent
- * @throws FireflyException
- */
- public function store(array $data)
- {
- $category = new \Category;
- $category->name = $data['name'];
- $category->user()->associate($this->getUser());
- if (!$category->isValid()) {
- \Log::error('Could not store category: ' . $category->getErrors()->toJson());
- throw new FireflyException($category->getErrors()->first());
- }
- $category->save();
-
- return $category;
- }
-
- /**
- * @param Eloquent $model
- * @param array $data
- *
- * @return bool
- * @throws FireflyException
- */
- public function update(Eloquent $model, array $data)
- {
- $model->name = $data['name'];
- $model->save();
-
- return true;
- }
-
- /**
- * Validates an array. Returns an array containing MessageBags
- * errors/warnings/successes.
- *
- * @param array $model
- *
- * @return array
- */
- public function validate(array $model)
- {
- $warnings = new MessageBag;
- $successes = new MessageBag;
- $category = new \Category($model);
- $category->isValid();
- $errors = $category->getErrors();
-
- if (!$errors->has('name')) {
- $successes->add('name', 'OK');
- }
-
- return ['errors' => $errors, 'warnings' => $warnings, 'successes' => $successes];
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Returns an object with id $id.
- *
- * @param int $objectId
- *
- * @return \Eloquent
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function find($objectId)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
- *
- * @param $what
- *
- * @return \AccountType|null
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function findByWhat($what)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Returns all objects.
- *
- * @return Collection
- */
- public function get()
- {
- return $this->getUser()->categories()->orderBy('name', 'ASC')->get();
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @param array $ids
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function getByIds(array $ids)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @param $name
- *
- * @return \Category
- */
- public function firstOrCreate($name)
- {
- return \Category::firstOrCreate(['user_id' => $this->getUser()->id, 'name' => $name]);
- }
-
- /**
- * @param \Category $category
- * @param int $limit
- *
- * @return \Illuminate\Pagination\Paginator
- */
- public function getTransactionJournals(\Category $category, $limit = 50)
- {
- $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $limit : 0;
- $set = $category->transactionJournals()->withRelevantData()->take($limit)->offset($offset)->orderBy('date', 'DESC')->get(['transaction_journals.*']);
- $count = $category->transactionJournals()->count();
- $items = [];
- foreach ($set as $entry) {
- $items[] = $entry;
- }
-
- return \Paginator::make($items, $count, $limit);
-
- }
-
- /**
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function journalsNoCategory(Carbon $start, Carbon $end)
- {
- $set = $this->getUser()
- ->transactionjournals()
- ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
- ->whereNull('category_transaction_journal.id')
- ->before($end)
- ->after($start)
- ->orderBy('transaction_journals.date')
- ->get(['transaction_journals.*']);
-
- return $set;
- }
-
- /**
- * @param \Category $category
- * @param Carbon $date
- *
- * @return float
- */
- public function spentInMonth(\Category $category, Carbon $date)
- {
- $end = clone $date;
- $date->startOfMonth();
- $end->endOfMonth();
- $sum = floatval($category->transactionjournals()->before($end)->after($date)->lessThan(0)->sum('amount')) * -1;
-
- return $sum;
- }
-}
diff --git a/app/lib/FireflyIII/Database/CommonDatabaseCallsInterface.php b/app/lib/FireflyIII/Database/CommonDatabaseCallsInterface.php
deleted file mode 100644
index 6fbf57c68b..0000000000
--- a/app/lib/FireflyIII/Database/CommonDatabaseCallsInterface.php
+++ /dev/null
@@ -1,47 +0,0 @@
-piggyBankRepetitions()->get();
- if ($reps->count() == 1) {
- return $reps->first();
- }
- // should filter the one we need:
- $repetitions = $reps->filter(
- function (\PiggyBankRepetition $rep) use ($date) {
- if ($date->between($rep->startdate, $rep->targetdate)) {
- return $rep;
- }
-
- return null;
- }
- );
- if ($repetitions->count() == 0) {
- return null;
- }
-
- return $repetitions->first();
- }
-
- /**
- * Returns all objects.
- *
- * @return Collection
- */
- public function get()
- {
- return $this->getUser()->piggyBanks()->where('repeats', 0)->orderBy('name')->get();
- }
-}
diff --git a/app/lib/FireflyIII/Database/PiggyBank/PiggyBankShared.php b/app/lib/FireflyIII/Database/PiggyBank/PiggyBankShared.php
deleted file mode 100644
index be969c4259..0000000000
--- a/app/lib/FireflyIII/Database/PiggyBank/PiggyBankShared.php
+++ /dev/null
@@ -1,186 +0,0 @@
-setUser(\Auth::user());
- }
-
- /**
- * @param Eloquent $model
- *
- * @return bool
- */
- public function destroy(Eloquent $model)
- {
- $reminders = \Reminder::where('remindersable_id', $model->id)->get();
- /** @var \Reminder $reminder */
- foreach ($reminders as $reminder) {
- $reminder->delete();
- }
- $model->delete();
-
- }
-
- /**
- * Returns an object with id $id.
- *
- * @param int $objectId
- *
- * @return \Eloquent
- */
- public function find($objectId)
- {
- return \PiggyBank::
- leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('piggy_banks.id', '=', $objectId)->where(
- 'accounts.user_id', $this->getUser()->id
- )
- ->first(['piggy_banks.*']);
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
- *
- * @param $what
- *
- * @return \AccountType|null
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function findByWhat($what)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @param array $ids
- *
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function getByIds(array $ids)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @param \Account $account
- *
- * @return float
- */
- public function leftOnAccount(\Account $account)
- {
- \Log::debug('Now in leftOnAccount() for account #' . $account->id . ' (' . $account->name . ')');
- $balance = \Steam::balance($account);
- \Log::debug('Steam says: ' . $balance);
- /** @var \PiggyBank $p */
- foreach ($account->piggyBanks()->get() as $p) {
- $balance -= $p->currentRelevantRep()->currentamount;
- }
-
- return $balance;
-
- }
-
- /**
- * @param array $data
- *
- * @return \Eloquent
- */
- public function store(array $data)
- {
- if (!isset($data['remind_me']) || (isset($data['remind_me']) && $data['remind_me'] == 0)) {
- $data['reminder'] = null;
- }
- $piggyBank = new \PiggyBank($data);
- $piggyBank->save();
-
- return $piggyBank;
- }
-
-
- /**
- * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
- *
- * @param Eloquent $model
- * @param array $data
- *
- * @return bool
- */
- public function update(Eloquent $model, array $data)
- {
- /** @var \PiggyBank $model */
- $model->name = $data['name'];
- $model->account_id = intval($data['account_id']);
- $model->targetamount = floatval($data['targetamount']);
- $model->targetdate = isset($data['targetdate']) && $data['targetdate'] != '' ? $data['targetdate'] : null;
- $model->rep_every = intval($data['rep_every']);
- $model->reminder_skip = intval($data['reminder_skip']);
- $model->order = intval($data['order']);
- $model->remind_me = intval($data['remind_me']);
- $model->reminder = isset($data['reminder']) ? $data['reminder'] : 'month';
-
- if ($model->remind_me == 0) {
- $model->reminder = null;
- }
-
- $model->save();
-
- return true;
- }
-
- /**
- * Validates an array. Returns an array containing MessageBags
- * errors/warnings/successes.
- *
- * Ignore PHPMD rules because Laravel 5.0 will make this method superfluous anyway.
- *
- * @param array $model
- *
- * @return array
- */
- public function validate(array $model)
- {
- $warnings = new MessageBag;
- $successes = new MessageBag;
- $model = new \PiggyBank($model);
- $model->isValid();
- $errors = $model->getErrors();
-
- // add ok messages.
- $list = ['name', 'account_id', 'targetamount', 'targetdate', 'remind_me', 'reminder'];
- foreach ($list as $entry) {
- if (!$errors->has($entry) && !$warnings->has($entry)) {
- $successes->add($entry, 'OK');
- }
- }
-
-
- return ['errors' => $errors, 'warnings' => $warnings, 'successes' => $successes];
- }
-
-}
diff --git a/app/lib/FireflyIII/Database/PiggyBank/PiggybankInterface.php b/app/lib/FireflyIII/Database/PiggyBank/PiggybankInterface.php
deleted file mode 100644
index 3c26f1c969..0000000000
--- a/app/lib/FireflyIII/Database/PiggyBank/PiggybankInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-_user;
- }
-
- /**
- * @param $user
- */
- public function setUser($user)
- {
- $this->_user = $user;
- }
-}
diff --git a/app/lib/FireflyIII/Database/Transaction/Transaction.php b/app/lib/FireflyIII/Database/Transaction/Transaction.php
deleted file mode 100644
index d8c2ea909d..0000000000
--- a/app/lib/FireflyIII/Database/Transaction/Transaction.php
+++ /dev/null
@@ -1,156 +0,0 @@
-account()->associate($data['account']);
- $transaction->transactionJournal()->associate($data['transaction_journal']);
- $transaction->amount = floatval($data['amount']);
- if (isset($data['piggyBank'])) {
- $transaction->piggyBank()->associate($data['piggyBank']);
- }
- if (isset($data['description'])) {
- $transaction->description = $data['description'];
- }
- if ($transaction->isValid()) {
- $transaction->save();
- } else {
- throw new FireflyException($transaction->getErrors()->first());
- }
-
- return $transaction;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @param Eloquent $model
- * @param array $data
- *
- * @return bool
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function update(Eloquent $model, array $data)
- {
- throw new NotImplementedException;
- }
-
- /**
- * Validates an array. Returns an array containing MessageBags
- * errors/warnings/successes.
- *
- * @param array $model
- *
- * @return MessageBag
- */
- public function validate(array $model)
- {
- $errors = new MessageBag;
- if (is_null($model['account'])) {
- $errors->add('account', 'No account present');
- }
- if (is_null($model['transaction_journal'])) {
- $errors->add('transaction_journal', 'No valid transaction journal present');
- }
-
- return $errors;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Returns an object with id $id.
- *
- * @param int $objectId
- *
- * @return \Eloquent
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function find($objectId)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
- *
- * @param $what
- *
- * @return \AccountType|null
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function findByWhat($what)
- {
- throw new NotImplementedException;
- }
-
- /**
- * Returns all objects.
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function get()
- {
- throw new NotImplementedException;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @param array $ids
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function getByIds(array $ids)
- {
- throw new NotImplementedException;
- }
-}
diff --git a/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php b/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php
deleted file mode 100644
index 3eeb6eb5f9..0000000000
--- a/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php
+++ /dev/null
@@ -1,154 +0,0 @@
-delete();
- }
-
- /**
- * @param array $data
- *
- * @return Eloquent
- */
- public function store(array $data)
- {
- $currency = new \TransactionCurrency($data);
- $currency->save();
-
- return $currency;
- }
-
- /**
- * @param Eloquent $model
- * @param array $data
- *
- * @return bool
- */
- public function update(Eloquent $model, array $data)
- {
- $model->symbol = $data['symbol'];
- $model->code = $data['code'];
- $model->name = $data['name'];
- $model->save();
-
- return true;
- }
-
- /**
- * Validates an array. Returns an array containing MessageBags
- * errors/warnings/successes.
- *
- * @param array $model
- *
- * @return array
- */
- public function validate(array $model)
- {
- $warnings = new MessageBag;
- $successes = new MessageBag;
- \Log::debug('Now in TransactionCurrency::validate()');
-
- $currency = new \TransactionCurrency($model);
- $currency->isValid();
- $errors = $currency->getErrors();
-
- \Log::debug('Data: ' . json_encode($model));
- \Log::debug('Error-content: ' . json_encode($errors->all()));
- \Log::debug('Error count is: ' . $errors->count());
-
- $fields = ['name', 'code', 'symbol'];
- foreach ($fields as $field) {
- if (!$errors->has($field)) {
- $successes->add($field, 'OK');
- }
- }
-
- return ['errors' => $errors, 'warnings' => $warnings, 'successes' => $successes];
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Returns an object with id $id.
- *
- * @param int $objectId
- *
- * @return \Eloquent
- */
- public function find($objectId)
- {
- return \TransactionCurrency::find($objectId);
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
- *
- * @param $what
- * @throws NotImplementedException
- * @codeCoverageIgnore
- *
- * @return \AccountType|null
- */
- public function findByWhat($what)
- {
- throw new NotImplementedException;
- }
-
- /**
- * Returns all objects.
- *
- * @return Collection
- */
- public function get()
- {
- return \TransactionCurrency::orderBy('code', 'ASC')->get();
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @param array $objectIds
- * @throws NotImplementedException
- * @codeCoverageIgnore
- *
- * @return Collection
- */
- public function getByIds(array $objectIds)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @param string $code
- *
- * @return \TransactionCurrency|null
- */
- public function findByCode($code)
- {
- return \TransactionCurrency::whereCode($code)->first();
- }
-}
diff --git a/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrencyInterface.php b/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrencyInterface.php
deleted file mode 100644
index bd2c0a159d..0000000000
--- a/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrencyInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-setUser(\Auth::user());
- }
-
- /**
- * @param Eloquent $model
- *
- * @return bool
- */
- public function destroy(Eloquent $model)
- {
- /*
- * Trigger deletion.
- */
- \Event::fire('transactionJournal.destroy', [$model]); // new and used.
- /*
- * Since this event will also destroy both transactions, trigger on those as
- * well because we might want to update some caches and what-not.
- */
- /** @var Transaction $transaction */
- foreach ($model->transactions as $transaction) {
- \Event::fire('transaction.destroy', [$transaction]);
- }
-
- $model->delete();
-
- return true;
- }
-
- /**
- * @param array $data
- *
- * @return \Eloquent
- * @throws FireflyException
- */
- public function store(array $data)
- {
- $journal = new \TransactionJournal(
- [
- 'transaction_type_id' => $data['transaction_type_id'],
- 'transaction_currency_id' => $data['transaction_currency_id'],
- 'user_id' => $this->getUser()->id,
- 'description' => $data['description'],
- 'date' => $data['date'], 'completed' => 0]
- );
- $journal->save();
-
- list($fromAccount, $toAccount) = $this->storeAccounts($data);
-
-
- $this->storeTransaction(
- ['account_id' => $fromAccount->id, 'account' => $fromAccount, 'transaction_journal' => $journal, 'transaction_journal_id' => $journal->id,
- 'amount' => floatval($data['amount'] * -1)]
- );
- $this->storeTransaction(
- ['account_id' => $toAccount->id, 'account' => $toAccount, 'transaction_journal' => $journal, 'transaction_journal_id' => $journal->id,
- 'amount' => floatval($data['amount'])]
- );
- $this->storeBudget($data, $journal);
- $this->storeCategory($data, $journal);
-
- $journal->completed = 1;
- $journal->save();
-
- return $journal;
- }
-
- /**
- * @param Eloquent $model
- * @param array $data
- *
- * @return bool
- * @throws FireflyException
- */
- public function update(Eloquent $model, array $data)
- {
- $journalType = $this->getJournalType($data['what']);
- $currency = $this->getJournalCurrencyById($data['transaction_currency_id']);
- $model->description = $data['description'];
- $model->date = $data['date'];
-
- $model->transactionType()->associate($journalType);
- $model->transactionCurrency()->associate($currency);
- $model->user()->associate($this->getUser());
- $model->save();
-
- list($fromAccount, $toAccount) = $this->storeAccounts($data);
-
- /** @noinspection PhpParamsInspection */
- $this->storeBudget($data, $model);
- $this->storeCategory($data, $model);
-
- $amount = floatval($data['amount']);
- /** @var \Transaction $transaction */
- foreach ($model->transactions()->get() as $transaction) {
- if (floatval($transaction->amount) > 0) {
- // the TO transaction.
- $transaction->account()->associate($toAccount);
- $transaction->amount = $amount;
- } else {
- $transaction->account()->associate($fromAccount);
- $transaction->amount = $amount * -1;
- }
- if (!$transaction->isValid()) {
- throw new FireflyException('Could not validate transaction while saving.');
- }
- $transaction->save();
- }
-
- return true;
- }
-
- /**
- * Validates an array. Returns an array containing MessageBags
- * errors/warnings/successes.
- *
- * ignored because this method will be gone soon.
- *
- * @param array $model
- *
- * @return array
- * @throws FireflyException
- */
- public function validate(array $model)
- {
-
- $warnings = new MessageBag;
- $successes = new MessageBag;
-
- $journal = new \TransactionJournal($model);
- $journal->isValid();
- $errors = $journal->getErrors();
-
- if (!isset($model['what']) && !isset($model['transaction_type_id'])) {
- $errors->add('description', 'Internal error: need to know type of transaction!');
- }
- if (strlen($model['description']) == 0) {
- $errors->add('description', 'The description field is required.');
- }
- $errors = $errors->merge($this->_validateAmount($model));
- $errors = $errors->merge($this->_validateBudget($model));
- $errors = $errors->merge($this->_validateAccount($model));
-
- $list = ['date', 'description', 'amount', 'budget_id', 'from', 'to', 'account_from_id', 'account_to_id', 'category', 'account_id', 'expense_account',
- 'revenue_account'];
- foreach ($list as $entry) {
- if (!$errors->has($entry)) {
- $successes->add($entry, 'OK');
- }
- }
-
- return ['errors' => $errors, 'warnings' => $warnings, 'successes' => $successes];
-
-
- }
-
- /**
- * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
- *
- * @param array $data
- *
- * @return array
- * @throws FireflyException
- */
- public function storeAccounts(array $data)
- {
- /** @var \FireflyIII\Database\Account\Account $accountRepository */
- $accountRepository = \App::make('FireflyIII\Database\Account\Account');
- $fromAccount = null;
- $toAccount = null;
-
- switch ($data['what']) {
- case 'withdrawal':
- $fromAccount = $accountRepository->find($data['account_id']);
- $toAccount = $accountRepository->firstExpenseAccountOrCreate($data['expense_account']);
- break;
- case 'opening':
- $fromAccount = $data['from'];
- $toAccount = $data['to'];
- break;
- case 'deposit':
- $fromAccount = $accountRepository->firstRevenueAccountOrCreate($data['revenue_account']);
- $toAccount = $accountRepository->find($data['account_id']);
- break;
- case 'transfer':
- $fromAccount = $accountRepository->find($data['account_from_id']);
- $toAccount = $accountRepository->find($data['account_to_id']);
- break;
-
- default:
- throw new FireflyException('Cannot save transaction journal with accounts based on $what "' . $data['what'] . '".');
- break;
- }
-
- return [$fromAccount, $toAccount];
- }
-
- /**
- * @param array $data
- *
- * @return \Eloquent
- * @throws FireflyException
- */
- public function storeTransaction($data)
- {
-
- /** @var \FireflyIII\Database\Transaction\Transaction $repository */
- $repository = \App::make('FireflyIII\Database\Transaction\Transaction');
-
- $errors = $repository->validate($data);
- if ($errors->count() > 0) {
- \Log::error('Could not store transaction: ' . $errors->toJson());
- throw new FireflyException('store() transaction failed, but it should not!');
- }
-
- return $repository->store($data);
- }
-
- /**
- * @param array $data
- * @param \TransactionJournal|\Eloquent $journal
- */
- public function storeBudget($data, \TransactionJournal $journal)
- {
- if (isset($data['budget_id']) && intval($data['budget_id']) > 0) {
- /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
- $budgetRepository = \App::make('FireflyIII\Database\Budget\Budget');
- $budget = $budgetRepository->find(intval($data['budget_id']));
- if ($budget) {
- $journal->budgets()->sync([$budget->id]);
- }
- }
- }
-
- /**
- * @param array $data
- * @param \TransactionJournal|\Eloquent $journal
- */
- public function storeCategory(array $data, \TransactionJournal $journal)
- {
- if (isset($data['category']) && strlen($data['category']) > 0) {
- /** @var \FireflyIII\Database\Category\Category $categoryRepository */
- $categoryRepository = \App::make('FireflyIII\Database\Category\Category');
- $category = $categoryRepository->firstOrCreate($data['category']);
- if ($category) {
- $journal->categories()->sync([$category->id]);
- }
-
- return;
- }
- $journal->categories()->sync([]);
-
- return;
- }
-
- /**
- * @param $type
- *
- * @return \TransactionType|null
- * @throws FireflyException
- */
- public function getJournalType($type)
- {
- /** @var \FireflyIII\Database\TransactionType\TransactionType $typeRepository */
- $typeRepository = \App::make('FireflyIII\Database\TransactionType\TransactionType');
-
- return $typeRepository->findByWhat($type);
- }
-
- /**
- * @param int $currencyId
- *
- * @return null|\TransactionCurrency
- */
- public function getJournalCurrencyById($currencyId)
- {
- /** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencyRepository */
- $currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
-
- return $currencyRepository->find($currencyId);
- }
-
- /**
- * @SuppressWarnings("CamelCase") // I'm fine with this.
- *
- * @param array $model
- *
- * @return MessageBag
- */
- protected function _validateAmount(array $model)
- {
- $errors = new MessageBag;
- if (isset($model['amount']) && floatval($model['amount']) < 0.01) {
- $errors->add('amount', 'Amount must be > 0.01');
- } else {
- if (!isset($model['amount'])) {
- $errors->add('amount', 'Amount must be set!');
- }
- }
-
- return $errors;
- }
-
- /**
- * @SuppressWarnings("CamelCase") // I'm fine with this.
- *
- * @param array $model
- *
- * @return MessageBag
- */
- protected function _validateBudget(array $model)
- {
- /*
- * Budget (is not in rules)
- */
- $errors = new MessageBag;
- if (isset($model['budget_id']) && !ctype_digit($model['budget_id'])) {
- $errors->add('budget_id', 'Invalid budget');
- }
-
- return $errors;
- }
-
- /**
- * @SuppressWarnings("CamelCase") // I'm fine with this.
- *
- * @param array $model
- *
- * @return MessageBag
- * @throws FireflyException
- */
- protected function _validateAccount(array $model)
- {
- $errors = new MessageBag;
- switch (true) {
- // this combination is often seen in withdrawals.
- case (isset($model['account_id']) && isset($model['expense_account'])):
- if (intval($model['account_id']) < 1) {
- $errors->add('account_id', 'Invalid account.');
- }
- break;
- // often seen in deposits
- case (isset($model['account_id']) && isset($model['revenue_account'])):
- if (intval($model['account_id']) < 1) {
- $errors->add('account_id', 'Invalid account.');
- }
- break;
- // often seen in transfers
- case (isset($model['account_from_id']) && isset($model['account_to_id'])):
- if (intval($model['account_from_id']) < 1 || intval($model['account_from_id']) < 1) {
- $errors->add('account_from_id', 'Invalid account selected.');
- $errors->add('account_to_id', 'Invalid account selected.');
-
- } else {
- if (intval($model['account_from_id']) == intval($model['account_to_id'])) {
- $errors->add('account_to_id', 'Cannot be the same as "from" account.');
- $errors->add('account_from_id', 'Cannot be the same as "to" account.');
- }
- }
- break;
- case (isset($model['from']) && isset($model['to'])):
- break;
- default:
- throw new FireflyException('Cannot validate accounts for transaction journal.');
- break;
- }
-
- return $errors;
- }
-
- /**
- * Returns an object with id $id.
- *
- * @param int $objectId
- *
- * @codeCoverageIgnore
- * @throws NotImplementedException
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @return \Eloquent
- */
- public function find($objectId)
- {
- throw new NotImplementedException;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc.
- *
- * @param $what
- *
- * @return \AccountType|null
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function findByWhat($what)
- {
- throw new NotImplementedException;
- }
-
- /**
- * Returns all objects.
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function get()
- {
- throw new NotImplementedException;
- }
-
- /**
- * @param array $ids
- *
- * @return Collection
- */
- public function getByIds(array $ids)
- {
- return $this->getUser()->transactionjournals()->with('transactions')->whereIn('id', $ids)->orderBy('date', 'ASC')->get();
- }
-
- /**
- * @return Carbon
- */
- public function firstDate()
- {
- $journal = $this->first();
- if ($journal) {
- return $journal->date;
- }
-
- return Carbon::now();
- }
-
- /**
- * @return TransactionJournal
- */
- public function first()
- {
- return $this->getUser()->transactionjournals()->orderBy('date', 'ASC')->first();
- }
-
- /**
- * @param Carbon $date
- *
- * @return float
- */
- public function getSumOfExpensesByMonth(Carbon $date)
- {
- /** @var \FireflyIII\Report\ReportInterface $reportRepository */
- $reportRepository = \App::make('FireflyIII\Report\ReportInterface');
-
- $set = $reportRepository->getExpenseGroupedForMonth($date, 200);
- $sum = 0;
- foreach ($set as $entry) {
- $sum += $entry['amount'];
- }
-
-
- return $sum;
- }
-
- /**
- * @param Carbon $date
- *
- * @return float
- */
- public function getSumOfIncomesByMonth(Carbon $date)
- {
- /** @var \FireflyIII\Report\ReportInterface $reportRepository */
- $reportRepository = \App::make('FireflyIII\Report\ReportInterface');
-
- $incomes = $reportRepository->getIncomeForMonth($date);
- $totalIn = 0;
- /** @var \TransactionJournal $entry */
- foreach ($incomes as $entry) {
- $totalIn += $entry->getAmount();
- }
-
- return $totalIn;
- }
-
- /**
- * @param int $limit
- *
- * @return \Illuminate\Pagination\Paginator
- */
- public function getDepositsPaginated($limit = 50)
- {
- $offset = intval(\Input::get('page')) > 0 ? (intval(\Input::get('page')) - 1) * $limit : 0;
-
- $set = $this->getUser()->transactionJournals()->transactionTypes(['Deposit'])->withRelevantData()->take($limit)->offset($offset)->orderBy(
- 'date', 'DESC'
- )->get(['transaction_journals.*']);
- $count = $this->getUser()->transactionJournals()->transactionTypes(['Deposit'])->count();
- $items = [];
- foreach ($set as $entry) {
- $items[] = $entry;
- }
-
- return \Paginator::make($items, $count, $limit);
- }
-
- /**
- * @param \Account $account
- * @param Carbon $start
- * @param Carbon $end
- * @param int $count
- *
- * @return Collection
- */
- public function getInDateRangeAccount(\Account $account, Carbon $start, Carbon $end, $count = 20)
- {
-
- $accountID = $account->id;
- $query = $this->_user->transactionjournals()->with(['transactions', 'transactioncurrency', 'transactiontype'])->leftJoin(
- 'transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id'
- )->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $accountID)->where(
- 'date', '>=', $start->format('Y-m-d')
- )->where('date', '<=', $end->format('Y-m-d'))->orderBy('transaction_journals.date', 'DESC')->orderBy('transaction_journals.id', 'DESC')->take(
- $count
- )->get(['transaction_journals.*']);
-
- return $query;
- }
-
- /**
- * @param $currency
- *
- * @return null|\TransactionCurrency
- */
- public function getJournalCurrency($currency)
- {
- /** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencyRepository */
- $currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
-
- return $currencyRepository->findByCode($currency);
- }
-
- /**
- * @param int $limit
- *
- * @return \Illuminate\Pagination\Paginator
- */
- public function getTransfersPaginated($limit = 50)
- {
- $offset = intval(\Input::get('page')) > 0 ? (intval(\Input::get('page')) - 1) * $limit : 0;
-
- $set = $this->getUser()->transactionJournals()->transactionTypes(['Transfer'])->withRelevantData()->take($limit)->offset($offset)->orderBy(
- 'date', 'DESC'
- )->get(['transaction_journals.*']);
- $count = $this->getUser()->transactionJournals()->transactionTypes(['Transfer'])->count();
- $items = [];
- foreach ($set as $entry) {
- $items[] = $entry;
- }
-
- return \Paginator::make($items, $count, $limit);
- }
-
- /**
- * @param int $limit
- *
- * @return \Illuminate\Pagination\Paginator
- */
- public function getWithdrawalsPaginated($limit = 50)
- {
- $offset = intval(\Input::get('page')) > 0 ? (intval(\Input::get('page')) - 1) * $limit : 0;
-
- $set = $this->getUser()->transactionJournals()->transactionTypes(['Withdrawal'])->withRelevantData()->take($limit)->offset($offset)->orderBy(
- 'date', 'DESC'
- )->get(['transaction_journals.*']);
- $count = $this->getUser()->transactionJournals()->transactionTypes(['Withdrawal'])->count();
- $items = [];
- foreach ($set as $entry) {
- $items[] = $entry;
- }
-
- return \Paginator::make($items, $count, $limit);
- }
-}
diff --git a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournalInterface.php b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournalInterface.php
deleted file mode 100644
index 264aeb5200..0000000000
--- a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournalInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
- 'Opening balance',
- 'transfer' => 'Transfer',
- 'withdrawal' => 'Withdrawal',
- 'deposit' => 'Deposit',
- ];
- if (!isset($translation[$what])) {
- throw new FireflyException('Cannot find transaction type described as "' . e($what) . '".');
- }
-
- return \TransactionType::whereType($translation[$what])->first();
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * Returns all objects.
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function get()
- {
- throw new NotImplementedException;
- }
-
- /**
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @param array $ids
- *
- * @return Collection
- * @throws NotImplementedException
- * @codeCoverageIgnore
- */
- public function getByIds(array $ids)
- {
- throw new NotImplementedException;
- }
-}
diff --git a/app/lib/FireflyIII/Database/User/User.php b/app/lib/FireflyIII/Database/User/User.php
deleted file mode 100644
index f60bfc3037..0000000000
--- a/app/lib/FireflyIII/Database/User/User.php
+++ /dev/null
@@ -1,73 +0,0 @@
-first();
- }
-
- /**
- * @param $reset
- *
- * @return null|User
- */
- public function findByReset($reset)
- {
- return \User::where('reset', $reset)->first();
- }
-
- /**
- * @param array $data
- *
- * @return bool|\User
- */
- public function register(array $data)
- {
- $user = new \User;
- $user->email = isset($data['email']) ? $data['email'] : null;
- $user->reset = \Str::random(32);
- $user->password = \Hash::make(\Str::random(12));
-
- // validate user:
- if (!$user->isValid()) {
- \Log::error('Invalid user with data: ' . isset($data['email']) ? $data['email'] : '(no email!)');
- \Session::flash('error', 'Input invalid, please try again: ' . $user->getErrors()->first());
-
- return false;
- }
- $user->save();
-
- return $user;
-
- }
-
- /**
- * @param \User $user
- * @param $password
- *
- * @return bool
- */
- public function updatePassword(\User $user, $password)
- {
- $user->password = $password;
- $user->forceSave();
-
- return true;
- }
-
-}
diff --git a/app/lib/FireflyIII/Event/Account.php b/app/lib/FireflyIII/Event/Account.php
deleted file mode 100644
index 6890d5b1e1..0000000000
--- a/app/lib/FireflyIII/Event/Account.php
+++ /dev/null
@@ -1,53 +0,0 @@
-id . '.latestBalance');
- \Cache::forget('account.' . $account->id . '.lastActivityDate');
- }
-
- /**
- * @param \Account $account
- */
- public function store(\Account $account)
- {
-
- \Cache::forget('account.' . $account->id . '.latestBalance');
- \Cache::forget('account.' . $account->id . '.lastActivityDate');
- }
-
- /**
- * @param Dispatcher $events
- */
- public function subscribe(Dispatcher $events)
- {
- // triggers when others are updated.
- $events->listen('account.store', 'FireflyIII\Event\Account@store');
- $events->listen('account.update', 'FireflyIII\Event\Account@update');
- $events->listen('account.destroy', 'FireflyIII\Event\Account@destroy');
- }
-
- /**
- * @param \Account $account
- */
- public function update(\Account $account)
- {
- \Cache::forget('account.' . $account->id . '.latestBalance');
- \Cache::forget('account.' . $account->id . '.lastActivityDate');
- }
-}
diff --git a/app/lib/FireflyIII/Event/Budget.php b/app/lib/FireflyIII/Event/Budget.php
deleted file mode 100644
index 940f87d887..0000000000
--- a/app/lib/FireflyIII/Event/Budget.php
+++ /dev/null
@@ -1,67 +0,0 @@
-startdate, $budgetLimit->repeat_freq, 0);
- $end->subDay();
-
- $set = $budgetLimit->limitrepetitions()->where('startdate', $budgetLimit->startdate->format('Y-m-d'))->where('enddate', $end->format('Y-m-d'))->get();
- /*
- * Create new LimitRepetition:
- */
- 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!');
- \Log::error($e->getMessage());
- }
- } else {
- if ($set->count() == 1) {
- /*
- * Update existing one.
- */
- $repetition = $set->first();
- $repetition->amount = $budgetLimit->amount;
- $repetition->save();
-
- }
- }
-
- }
-
- /**
- * @param Dispatcher $events
- */
- public function subscribe(Dispatcher $events)
- {
- $events->listen('limits.store', 'FireflyIII\Event\Budget@storeOrUpdateLimit');
- $events->listen('limits.update', 'FireflyIII\Event\Budget@storeOrUpdateLimit');
-
- }
-}
diff --git a/app/lib/FireflyIII/Event/Event.php b/app/lib/FireflyIII/Event/Event.php
deleted file mode 100644
index 34980e5a8d..0000000000
--- a/app/lib/FireflyIII/Event/Event.php
+++ /dev/null
@@ -1,45 +0,0 @@
-piggyBanks()->get();
-
- // get reminders for each
- /** @var \PiggyBank $piggyBank */
- foreach ($piggies as $piggyBank) {
- $reminders = $piggyBank->reminders()->get();
- /** @var \Reminder $reminder */
- foreach ($reminders as $reminder) {
- $reminder->delete();
- }
- }
- }
-
-
- /**
- * @param Dispatcher $events
- */
- public function subscribe(Dispatcher $events)
- {
- // triggers when others are updated.
- $events->listen('account.destroy', 'FireflyIII\Event\Event@deleteAccount');
- }
-}
diff --git a/app/lib/FireflyIII/Event/Piggybank.php b/app/lib/FireflyIII/Event/Piggybank.php
deleted file mode 100644
index 9273f5c600..0000000000
--- a/app/lib/FireflyIII/Event/Piggybank.php
+++ /dev/null
@@ -1,293 +0,0 @@
- 0) {
- $event = new \PiggyBankEvent;
- $event->piggyBank()->associate($piggyBank);
- $event->amount = floatval($amount);
- $event->date = new Carbon;
- if (!$event->isValid()) {
- \Log::error($event->getErrors());
- \App::abort(500);
- }
- $event->save();
- }
- }
-
- /**
- * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
- *
- * @param \TransactionJournal $journal
- *
- * @throws \FireflyIII\Exception\FireflyException
- * @throws \FireflyIII\Exception\NotImplementedException
- */
- public function destroyTransfer(\TransactionJournal $journal)
- {
- if ($journal->piggyBankEvents()->count() > 0) {
-
- /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
- $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
-
- /** @var \PiggyBank $piggyBank */
- $piggyBank = $journal->piggyBankEvents()->first()->piggyBank()->first();
-
- /** @var \PiggyBankRepetition $repetition */
- $repetition = $repository->findRepetitionByDate($piggyBank, $journal->date);
-
- $relevantTransaction = null;
- /** @var \Transaction $transaction */
- foreach ($journal->transactions as $transaction) {
- if ($transaction->account_id == $piggyBank->account_id) {
- $relevantTransaction = $transaction;
- }
- }
- if (is_null($relevantTransaction)) {
- return;
- }
-
- $repetition->currentamount += floatval($relevantTransaction->amount * -1);
- $repetition->save();
-
-
- $event = new \PiggyBankEvent;
- $event->piggyBank()->associate($piggyBank);
- $event->amount = floatval($relevantTransaction->amount * -1);
- $event->date = new Carbon;
- $event->save();
- }
- }
-
- /**
- * @param \PiggyBank $piggyBank
- * @param float $amount
- */
- public function removeMoney(\PiggyBank $piggyBank, $amount = 0.0)
- {
- $amount = $amount * -1;
- if ($amount < 0) {
- $event = new \PiggyBankEvent;
- $event->piggyBank()->associate($piggyBank);
- $event->amount = floatval($amount);
- $event->date = new Carbon;
- $event->save();
- }
- }
-
- /**
- * @param \PiggyBank $piggyBank
- */
- public function storePiggyBank(\PiggyBank $piggyBank)
- {
- $repetition = new \PiggyBankRepetition;
- $repetition->piggyBank()->associate($piggyBank);
- $repetition->startdate = $piggyBank->startdate;
- $repetition->targetdate = $piggyBank->targetdate;
- $repetition->currentamount = 0;
- $repetition->save();
- }
-
- /*
- *
- */
-
- /**
- * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
- *
- * @param \TransactionJournal $journal
- * @param int $piggyBankId
- */
- public function storeTransfer(\TransactionJournal $journal, $piggyBankId = 0)
- {
- if (intval($piggyBankId) == 0) {
- return;
- }
- /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
- $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
-
- /** @var \PiggyBank $piggyBank */
- $piggyBank = $repository->find($piggyBankId);
-
- if ($journal->transactions()->where('account_id', $piggyBank->account_id)->count() == 0) {
- return;
- }
- /** @var \PiggyBankRepetition $repetition */
- $repetition = $repository->findRepetitionByDate($piggyBank, $journal->date);
- $amount = floatval($piggyBank->targetamount);
- $leftToSave = $amount - floatval($repetition->currentamount);
- $transaction = $journal->transactions()->where('account_id', $piggyBank->account_id)->first();
- // must be in range of journal. Continue determines if we can move it.
- if (floatval($transaction->amount < 0)) {
- // amount removed from account, so removed from piggy bank.
- $continue = ($transaction->amount * -1 <= floatval($repetition->currentamount));
- } else {
- // amount added
- $continue = $transaction->amount <= $leftToSave;
- }
- if ($continue) {
- \Log::debug('Update repetition.');
- $repetition->currentamount += floatval($transaction->amount);
- $repetition->save();
- $event = new \PiggyBankEvent;
- $event->piggyBank()->associate($piggyBank);
- $event->transactionjournal()->associate($journal);
- $event->amount = floatval($transaction->amount);
- $event->date = new Carbon;
- $event->save();
- }
- }
-
- /**
- * @param Dispatcher $events
- */
- public function subscribe(Dispatcher $events)
- {
- // triggers on piggy bank events:
- $events->listen('piggy_bank.addMoney', 'FireflyIII\Event\PiggyBank@addMoney');
- $events->listen('piggy_bank.removeMoney', 'FireflyIII\Event\PiggyBank@removeMoney');
- $events->listen('piggy_bank.store', 'FireflyIII\Event\PiggyBank@storePiggyBank');
- $events->listen('piggy_bank.update', 'FireflyIII\Event\PiggyBank@updatePiggyBank');
-
- \App::before(
- function () {
- $this->validateRepeatedExpenses();
- }
- );
-
- // triggers when others are updated.
- $events->listen('transactionJournal.store', 'FireflyIII\Event\PiggyBank@storeTransfer');
- $events->listen('transactionJournal.update', 'FireflyIII\Event\PiggyBank@updateTransfer');
- $events->listen('transactionJournal.destroy', 'FireflyIII\Event\PiggyBank@destroyTransfer');
- }
-
- /**
- * @SuppressWarnings("CyclomaticComplexity") // It's 6. More than 5 but alright.
- *
- * Validates the presence of repetitions for all repeated expenses!
- */
- public function validateRepeatedExpenses()
- {
- if (!\Auth::check()) {
- return;
- }
- /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repository */
- $repository = \App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
- $list = $repository->get();
- $today = Carbon::now();
- /** @var \PiggyBank $entry */
- foreach ($list as $entry) {
- $count = $entry->piggyBankrepetitions()->starts($entry->startdate)->targets($entry->targetdate)->count();
- if ($count == 0) {
- $repetition = new \PiggyBankRepetition;
- $repetition->piggyBank()->associate($entry);
- $repetition->startdate = $entry->startdate;
- $repetition->targetdate = $entry->targetdate;
- $repetition->currentamount = 0;
- $repetition->save();
- }
- $currentTarget = clone $entry->startdate;
- $currentStart = null;
- while ($currentTarget < $today) {
- $currentStart = \DateKit::subtractPeriod($currentTarget, $entry->rep_length, 0);
- $currentTarget = \DateKit::addPeriod($currentTarget, $entry->rep_length, 0);
- $count = $entry->piggyBankRepetitions()->starts($currentStart)->targets($currentTarget)->count();
- if ($count == 0) {
- $repetition = new \PiggyBankRepetition;
- $repetition->piggyBank()->associate($entry);
- $repetition->startdate = $currentStart;
- $repetition->targetdate = $currentTarget;
- $repetition->currentamount = 0;
- $repetition->save();
- }
-
- }
- }
- }
-
- /**
- * @param \PiggyBank $piggyBank
- */
- public function updatePiggyBank(\PiggyBank $piggyBank)
- {
- // get the repetition:
- $repetition = $piggyBank->currentRelevantRep();
- $repetition->startdate = $piggyBank->startdate;
- $repetition->targetdate = $piggyBank->targetdate;
- $repetition->save();
- }
-
- /**
- * @param \TransactionJournal $journal
- *
- * @throws \FireflyIII\Exception\FireflyException
- * @throws \FireflyIII\Exception\NotImplementedException
- */
- public function updateTransfer(\TransactionJournal $journal)
- {
-
- if ($journal->piggyBankEvents()->count() > 0) {
-
- $event = $journal->piggyBankEvents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->first();
- $eventSum = floatval($journal->piggyBankEvents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->sum('amount'));
-
- /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
- $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
-
- /** @var \PiggyBank $piggyBank */
- $piggyBank = $journal->piggyBankEvents()->first()->piggyBank()->first();
-
- /** @var \PiggyBankRepetition $repetition */
- $repetition = $repository->findRepetitionByDate($piggyBank, $journal->date);
-
- $relevantTransaction = null;
- /** @var \Transaction $transaction */
- foreach ($journal->transactions as $transaction) {
- if ($transaction->account_id == $piggyBank->account_id) {
- $relevantTransaction = $transaction;
- }
- }
- if (is_null($relevantTransaction)) {
- return;
- }
-
- $diff = floatval($relevantTransaction->amount) - floatval($eventSum);
- /*
- * Create an event to remove /add the difference from the piggy
- */
- $repetition->currentamount += $diff;
- $repetition->save();
-
-
- $event = new \PiggyBankEvent;
- $event->piggyBank()->associate($piggyBank);
- $event->transactionJournal()->associate($journal);
- $event->amount = $diff;
- $event->date = new Carbon;
- if (!$event->isValid()) {
- \Log::error($event->getErrors());
- \App::abort(500);
- }
- $event->save();
- }
-
- }
-}
diff --git a/app/lib/FireflyIII/Event/Transaction.php b/app/lib/FireflyIII/Event/Transaction.php
deleted file mode 100644
index 9c96070cd0..0000000000
--- a/app/lib/FireflyIII/Event/Transaction.php
+++ /dev/null
@@ -1,55 +0,0 @@
-account_id . '.latestBalance');
- \Cache::forget('account.' . $transaction->account_id . '.lastActivityDate');
-
- // delete transaction:
- $transaction->delete();
- }
-
- /**
- * @param \Transaction $transaction
- */
- public function store(\Transaction $transaction)
- {
- \Cache::forget('account.' . $transaction->account_id . '.latestBalance');
- \Cache::forget('account.' . $transaction->account_id . '.lastActivityDate');
- }
-
- /**
- * @param Dispatcher $events
- */
- public function subscribe(Dispatcher $events)
- {
- // triggers when others are updated.
- $events->listen('transaction.store', 'FireflyIII\Event\Transaction@store');
- $events->listen('transaction.update', 'FireflyIII\Event\Transaction@update');
- $events->listen('transaction.destroy', 'FireflyIII\Event\Transaction@destroy');
- }
-
- /**
- * @param \Transaction $transaction
- */
- public function update(\Transaction $transaction)
- {
- \Cache::forget('account.' . $transaction->account_id . '.latestBalance');
- \Cache::forget('account.' . $transaction->account_id . '.lastActivityDate');
- }
-}
diff --git a/app/lib/FireflyIII/Event/TransactionJournal.php b/app/lib/FireflyIII/Event/TransactionJournal.php
deleted file mode 100644
index c7cabb911c..0000000000
--- a/app/lib/FireflyIII/Event/TransactionJournal.php
+++ /dev/null
@@ -1,57 +0,0 @@
-get();
-
-
- /** @var \Bill $entry */
- foreach ($set as $entry) {
- $repository->scan($entry, $journal);
- }
- }
-
- /**
- * @param Dispatcher $events
- */
- public function subscribe(Dispatcher $events)
- {
- // triggers when others are updated.
- $events->listen('transactionJournal.store', 'FireflyIII\Event\TransactionJournal@store');
- $events->listen('transactionJournal.update', 'FireflyIII\Event\TransactionJournal@update');
- }
-
- /**
- * @param \TransactionJournal $journal
- */
- public function update(\TransactionJournal $journal)
- {
- /** @var \FireflyIII\Database\Bill\Bill $repository */
- $repository = \App::make('FireflyIII\Database\Bill\Bill');
- $set = $repository->get();
- $journal->bill_id = null;
- $journal->save();
-
- /** @var \Bill $entry */
- foreach ($set as $entry) {
- $repository->scan($entry, $journal);
- }
- }
-}
diff --git a/app/lib/FireflyIII/FF3ServiceProvider.php b/app/lib/FireflyIII/FF3ServiceProvider.php
deleted file mode 100644
index ade2e75683..0000000000
--- a/app/lib/FireflyIII/FF3ServiceProvider.php
+++ /dev/null
@@ -1,134 +0,0 @@
-app->validator->resolver(
- function ($translator, $data, $rules, $messages) {
- return new FireflyValidator($translator, $data, $rules, $messages);
- }
- );
- }
-
- /**
- * Return the services bla bla.
- *
- * @codeCoverageIgnore
- * @return array
- */
- public function provides()
- {
- // @codeCoverageIgnoreStart
- return ['reminders', 'filters', 'datekit', 'navigation'];
- // @codeCoverageIgnoreEnd
- }
-
- /**
- * Triggered automatically by Laravel
- */
- public function register()
- {
- $this->registerFacades();
- $this->registerInterfaces();
- $this->registerAliases();
-
-
- }
-
- public function registerFacades()
- {
- $this->app->bind(
- 'reminders', function () {
- return new Reminders;
- }
- );
- $this->app->bind(
- 'filter', function () {
- return new Filter;
- }
- );
- $this->app->bind(
- 'datekit', function () {
- return new Date;
- }
- );
- $this->app->bind(
- 'navigation', function () {
- return new Navigation;
- }
- );
- $this->app->bind(
- 'ffform', function () {
- return new Form;
- }
- );
- $this->app->bind(
- 'steam', function () {
- return new Steam;
- }
- );
- $this->app->bind(
- 'amount', function () {
- return new Amount;
- }
- );
- }
-
- public function registerInterfaces()
- {
- // preferences
- $this->app->bind('FireflyIII\Shared\Preferences\PreferencesInterface', 'FireflyIII\Shared\Preferences\Preferences');
-
- // registration and user mail
- $this->app->bind('FireflyIII\Shared\Mail\RegistrationInterface', 'FireflyIII\Shared\Mail\Registration');
-
- // reports
- $this->app->bind('FireflyIII\Report\ReportInterface', 'FireflyIII\Report\Report');
- $this->app->bind('FireflyIII\Report\ReportQueryInterface', 'FireflyIII\Report\ReportQuery');
- $this->app->bind('FireflyIII\Report\ReportHelperInterface', 'FireflyIII\Report\ReportHelper');
-
- $this->app->bind('FireflyIII\Helper\Related\RelatedInterface', 'FireflyIII\Helper\Related\Related');
-
- $this->app->bind('FireflyIII\Helper\TransactionJournal\HelperInterface', 'FireflyIII\Helper\TransactionJournal\Helper');
-
- // chart
- $this->app->bind('FireflyIII\Chart\ChartInterface', 'FireflyIII\Chart\Chart');
- }
-
- public function registerAliases()
- {
- // Shortcut so developers don't need to add an Alias in app/config/app.php
- $this->app->booting(
- function () {
- $loader = AliasLoader::getInstance();
- $loader->alias('Reminders', 'FireflyIII\Shared\Facade\Reminders');
- $loader->alias('Filter', 'FireflyIII\Shared\Facade\Filter');
- $loader->alias('DateKit', 'FireflyIII\Shared\Facade\DateKit');
- $loader->alias('Navigation', 'FireflyIII\Shared\Facade\Navigation');
- $loader->alias('FFForm', 'FireflyIII\Shared\Facade\FFForm');
- $loader->alias('Steam', 'FireflyIII\Shared\Facade\Steam');
- $loader->alias('Amount', 'FireflyIII\Shared\Facade\Amount');
- }
- );
- }
-
-}
diff --git a/app/lib/FireflyIII/Form/Form.php b/app/lib/FireflyIII/Form/Form.php
deleted file mode 100644
index 0396a0a33d..0000000000
--- a/app/lib/FireflyIII/Form/Form.php
+++ /dev/null
@@ -1,290 +0,0 @@
-get();
- $html = \View::make('form.amount', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
-
- return $html;
-
- }
-
- /**
- * @param $name
- * @param $options
- *
- * @return string
- */
- public static function label($name, $options)
- {
- if (isset($options['label'])) {
- return $options['label'];
- }
- $labels = ['amount_min' => 'Amount (min)', 'amount_max' => 'Amount (max)', 'match' => 'Matches on', 'repeat_freq' => 'Repetition',
- 'account_from_id' => 'Account from', 'account_to_id' => 'Account to', 'account_id' => 'Asset account', 'budget_id' => 'Budget'
- , 'piggy_bank_id' => 'Piggy bank'];
-
-
- return isset($labels[$name]) ? $labels[$name] : str_replace('_', ' ', ucfirst($name));
-
- }
-
- /**
- * @param $name
- * @param $label
- * @param array $options
- *
- * @return array
- */
- public static function expandOptionArray($name, $label, array $options)
- {
- $options['class'] = 'form-control';
- $options['id'] = 'ffInput_' . $name;
- $options['autocomplete'] = 'off';
- $options['placeholder'] = ucfirst($label);
-
- return $options;
- }
-
- /**
- * @param $name
- *
- * @return string
- */
- public static function getHolderClasses($name)
- {
- /*
- * Get errors, warnings and successes from session:
- */
- /** @var MessageBag $errors */
- $errors = \Session::get('errors');
-
- /** @var MessageBag $successes */
- $successes = \Session::get('successes');
-
- switch (true) {
- case (!is_null($errors) && $errors->has($name)):
- $classes = 'form-group has-error has-feedback';
- break;
- case (!is_null($successes) && $successes->has($name)):
- $classes = 'form-group has-success has-feedback';
- break;
- default:
- $classes = 'form-group';
- break;
- }
-
- return $classes;
- }
-
- /**
- * @param $name
- * @param $value
- *
- * @return mixed
- */
- public static function fillFieldValue($name, $value)
- {
- if (\Session::has('preFilled')) {
- $preFilled = \Session::get('preFilled');
- $value = isset($preFilled[$name]) && is_null($value) ? $preFilled[$name] : $value;
- }
- if (!is_null(\Input::old($name))) {
- $value = \Input::old($name);
- }
-
- return $value;
- }
-
- /**
- * @param $name
- * @param null $value
- * @param array $options
- *
- * @return string
- * @throws FireflyException
- */
- public static function ffBalance($name, $value = null, array $options = [])
- {
- $label = self::label($name, $options);
- $options = self::expandOptionArray($name, $label, $options);
- $classes = self::getHolderClasses($name);
- $value = self::fillFieldValue($name, $value);
- $options['step'] = 'any';
- $defaultCurrency = isset($options['currency']) ? $options['currency'] : \Amount::getDefaultCurrency();
- $currencies = \TransactionCurrency::orderBy('code', 'ASC')->get();
- $html = \View::make('form.balance', compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
-
- return $html;
- }
-
- /**
- * @param $name
- * @param int $value
- * @param null $checked
- * @param array $options
- *
- * @return string
- * @throws FireflyException
- */
- public static function ffCheckbox($name, $value = 1, $checked = null, $options = [])
- {
- $options['checked'] = $checked === true ? true : null;
- $label = self::label($name, $options);
- $options = self::expandOptionArray($name, $label, $options);
- $classes = self::getHolderClasses($name);
- $value = self::fillFieldValue($name, $value);
-
- unset($options['placeholder'], $options['autocomplete'], $options['class']);
-
- $html = \View::make('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render();
-
- return $html;
- }
-
- /**
- * @param $name
- * @param null $value
- * @param array $options
- *
- * @return string
- * @throws FireflyException
- */
- public static function ffDate($name, $value = null, array $options = [])
- {
- $label = self::label($name, $options);
- $options = self::expandOptionArray($name, $label, $options);
- $classes = self::getHolderClasses($name);
- $value = self::fillFieldValue($name, $value);
- $html = \View::make('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
-
- return $html;
- }
-
- /**
- * @param $name
- * @param null $value
- * @param array $options
- *
- * @return string
- * @throws FireflyException
- */
- public static function ffInteger($name, $value = null, array $options = [])
- {
- $label = self::label($name, $options);
- $options = self::expandOptionArray($name, $label, $options);
- $classes = self::getHolderClasses($name);
- $value = self::fillFieldValue($name, $value);
- $options['step'] = '1';
- $html = \View::make('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
-
- return $html;
-
- }
-
- /**
- * Return buttons for update/validate/return.
- *
- * @param $type
- * @param $name
- *
- * @return string
- * @throws FireflyException
- */
- public static function ffOptionsList($type, $name)
- {
- $previousValue = \Input::old('post_submit_action');
- $previousValue = is_null($previousValue) ? 'store' : $previousValue;
- $html = \View::make('form.options', compact('type', 'name', 'previousValue'))->render();
-
- return $html;
- }
-
- /**
- * @param $name
- * @param array $list
- * @param null $selected
- * @param array $options
- *
- * @return string
- */
- public static function ffSelect($name, array $list = [], $selected = null, array $options = [])
- {
- $label = self::label($name, $options);
- $options = self::expandOptionArray($name, $label, $options);
- $classes = self::getHolderClasses($name);
- $selected = self::fillFieldValue($name, $selected);
- $html = \View::make('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
-
- return $html;
- }
-
- /**
- * @param $name
- * @param null $value
- * @param array $options
- *
- * @return string
- * @throws FireflyException
- */
- public static function ffTags($name, $value = null, array $options = [])
- {
- $label = self::label($name, $options);
- $options = self::expandOptionArray($name, $label, $options);
- $classes = self::getHolderClasses($name);
- $value = self::fillFieldValue($name, $value);
- $options['data-role'] = 'tagsinput';
- $html = \View::make('form.tags', compact('classes', 'name', 'label', 'value', 'options'))->render();
-
- return $html;
- }
-
- /**
- * @param $name
- * @param null $value
- * @param array $options
- *
- * @return string
- * @throws FireflyException
- */
- public static function ffText($name, $value = null, array $options = [])
- {
- $label = self::label($name, $options);
- $options = self::expandOptionArray($name, $label, $options);
- $classes = self::getHolderClasses($name);
- $value = self::fillFieldValue($name, $value);
- $html = \View::make('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render();
-
- return $html;
-
- }
-}
diff --git a/app/lib/FireflyIII/Helper/Related/Related.php b/app/lib/FireflyIII/Helper/Related/Related.php
deleted file mode 100644
index 06e1047858..0000000000
--- a/app/lib/FireflyIII/Helper/Related/Related.php
+++ /dev/null
@@ -1,88 +0,0 @@
-setUser(\Auth::user());
- }
-
- /**
- * @param array $objectIds
- *
- * @return Collection
- */
- public function getJournalsByIds(array $objectIds)
- {
- /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
- $repository = \App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
-
- return $repository->getByIds($objectIds);
- }
-
- /**
- * @param string $query
- * @param \TransactionJournal $journal
- *
- * @return Collection
- */
- public function search($query, \TransactionJournal $journal)
- {
- $start = clone $journal->date;
- $end = clone $journal->date;
- $start->startOfMonth();
- $end->endOfMonth();
-
- // get already related transactions:
- $exclude = [$journal->id];
- foreach ($journal->transactiongroups()->get() as $group) {
- foreach ($group->transactionjournals()->get() as $current) {
- $exclude[] = $current->id;
- }
- }
- $exclude = array_unique($exclude);
-
- /** @var Collection $collection */
- $collection = $this->getUser()->transactionjournals()
- ->withRelevantData()
- ->before($end)->after($start)->where('encrypted', 0)
- ->whereNotIn('id', $exclude)
- ->where('description', 'LIKE', '%' . $query . '%')
- ->get();
-
- // manually search encrypted entries:
- /** @var Collection $encryptedCollection */
- $encryptedCollection = $this->getUser()->transactionjournals()
- ->withRelevantData()
- ->before($end)->after($start)
- ->where('encrypted', 1)
- ->whereNotIn('id', $exclude)
- ->get();
- $encrypted = $encryptedCollection->filter(
- function (\TransactionJournal $journal) use ($query) {
- $strPos = strpos(strtolower($journal->description), strtolower($query));
- if ($strPos !== false) {
- return $journal;
- }
-
- return null;
- }
- );
-
- return $collection->merge($encrypted);
- }
-}
diff --git a/app/lib/FireflyIII/Helper/Related/RelatedInterface.php b/app/lib/FireflyIII/Helper/Related/RelatedInterface.php
deleted file mode 100644
index f2072cf823..0000000000
--- a/app/lib/FireflyIII/Helper/Related/RelatedInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-account->id);
- }
-
- // otherwise (its a deposit), it's been paid into account #0.
- return intval($transactions[0]->account->id);
- }
-
- /**
- * @return Collection
- */
- public function getAssetAccounts()
- {
- /** @var \FireflyIII\Database\Account\Account $accountRepository */
- $accountRepository = \App::make('FireflyIII\Database\Account\Account');
-
- /** @var Collection $list */
- $list = $accountRepository->getAccountsByType(['Default account', 'Asset account']);
- $filtered = $list->filter(
- function (\Account $account) {
- if (intval($account->active) === 1) {
- return $account;
- }
- return null;
- }
- );
-
- return $filtered;
- }
-
- /**
- * @return Collection
- */
- public function getBudgets()
- {
- /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
- $budgetRepository = \App::make('FireflyIII\Database\Budget\Budget');
-
- return $budgetRepository->get();
-
- }
-
- /**
- * @return Collection
- */
- public function getPiggyBanks()
- {
- /** @var \FireflyIII\Database\PiggyBank\PiggyBank $piggyRepository */
- $piggyRepository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
-
- return $piggyRepository->get();
-
-
- }
-
- /**
- * @return Collection
- */
- public function getRepeatedExpenses()
- {
- /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repRepository */
- $repRepository = \App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
-
- return $repRepository->get();
-
-
- }
-
-
-}
diff --git a/app/lib/FireflyIII/Helper/TransactionJournal/HelperInterface.php b/app/lib/FireflyIII/Helper/TransactionJournal/HelperInterface.php
deleted file mode 100644
index 06bcac0de7..0000000000
--- a/app/lib/FireflyIII/Helper/TransactionJournal/HelperInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-_accounts = $accounts;
- $this->_journals = $journals;
- $this->_queries = \App::make('FireflyIII\Report\ReportQueryInterface');
- $this->_helper = \App::make('FireflyIII\Report\ReportHelperInterface');
-
-
- }
-
- /**
- * This methods fails to take in account transfers FROM shared accounts.
- *
- * @param Carbon $start
- * @param Carbon $end
- * @param int $limit
- *
- * @return Collection
- */
- public function expensesGroupedByAccount(Carbon $start, Carbon $end, $limit = 15)
- {
- $result = $this->_queries->journalsByExpenseAccount($start, $end);
- $array = $this->_helper->makeArray($result);
- $limited = $this->_helper->limitArray($array, $limit);
-
- return $limited;
-
- }
-
- /**
- * Gets all the users shared and non-shared accounts combined with various meta-data
- * to display the amount of money spent that month compared to what's been spend within
- * budgets.
- *
- * @param Carbon $date
- *
- * @return Collection
- */
- public function getAccountListBudgetOverview(Carbon $date)
- {
- $start = clone $date;
- $start->startOfMonth();
- $end = clone $date;
- $end->endOfMonth();
- $start->subDay();
- $accounts = $this->_queries->getAllAccounts($start, $end);
-
- $accounts->each(
- function (\Account $account) use ($start, $end) {
- $budgets = $this->_queries->getBudgetSummary($account, $start, $end);
- $balancedAmount = $this->_queries->balancedTransactionsSum($account, $start, $end);
- $array = [];
- foreach ($budgets as $budget) {
- $id = intval($budget->id);
- $data = $budget->toArray();
- $array[$id] = $data;
- }
- $account->budgetInformation = $array;
- $account->balancedAmount = $balancedAmount;
-
- }
- );
-
- return $accounts;
-
- }
-
- /**
- * @param Carbon $date
- *
- * @return array
- */
- public function getAccountsForMonth(Carbon $date)
- {
- $start = clone $date;
- $start->startOfMonth()->subDay();
- $end = clone $date;
- $end->endOfMonth();
- \Log::debug('Monthly report account dates: start:[' . $start->format('Y-m-d') . '] and end:[' . $end->format('Y-m-d') . ']');
- $list = $this->_queries->accountList();
- $accounts = [];
- /** @var \Account $account */
- foreach ($list as $account) {
- $id = intval($account->id);
- /** @noinspection PhpParamsInspection */
- $accounts[$id] = [
- 'name' => $account->name,
- 'startBalance' => \Steam::balance($account, $start),
- 'endBalance' => \Steam::balance($account, $end)
- ];
-
- $accounts[$id]['difference'] = $accounts[$id]['endBalance'] - $accounts[$id]['startBalance'];
- }
-
- return $accounts;
- }
-
- /**
- * @param Carbon $date
- *
- * @return Collection
- */
- public function getBudgetsForMonth(Carbon $date)
- {
- $start = clone $date;
- $start->startOfMonth();
- $end = clone $date;
- $end->endOfMonth();
- // all budgets
- $set = $this->_queries->getAllBudgets($date);
- $budgets = $this->_helper->makeArray($set);
- $amountSet = $this->_queries->journalsByBudget($start, $end);
- $amounts = $this->_helper->makeArray($amountSet);
- $combined = $this->_helper->mergeArrays($budgets, $amounts);
- $combined[0]['spent'] = isset($combined[0]['spent']) ? $combined[0]['spent'] : 0.0;
- $combined[0]['amount'] = isset($combined[0]['amount']) ? $combined[0]['amount'] : 0.0;
- $combined[0]['name'] = 'No budget';
-
- // find transactions to shared expense accounts, which are without a budget by default:
- $transfers = $this->_queries->sharedExpenses($start, $end);
- foreach ($transfers as $transfer) {
- $combined[0]['spent'] += floatval($transfer->amount) * -1;
- }
-
- return $combined;
- }
-
- /**
- * @param Carbon $date
- * @param int $limit
- *
- * @return array
- */
- public function getCategoriesForMonth(Carbon $date, $limit = 15)
- {
- $start = clone $date;
- $start->startOfMonth();
- $end = clone $date;
- $end->endOfMonth();
- // all categories.
- $result = $this->_queries->journalsByCategory($start, $end);
- $categories = $this->_helper->makeArray($result);
-
- // all transfers
- $result = $this->_queries->sharedExpensesByCategory($start, $end);
- $transfers = $this->_helper->makeArray($result);
- $merged = $this->_helper->mergeArrays($categories, $transfers);
-
- // sort.
- $sorted = $this->_helper->sortNegativeArray($merged);
-
- // limit to $limit:
- $cut = $this->_helper->limitArray($sorted, $limit);
-
- return $cut;
- }
-
- /**
- * @param Carbon $date
- * @param int $limit
- *
- * @return Collection
- */
- public function getExpenseGroupedForMonth(Carbon $date, $limit = 15)
- {
- $start = clone $date;
- $start->startOfMonth();
- $end = clone $date;
- $end->endOfMonth();
-
- $set = $this->_queries->journalsByExpenseAccount($start, $end);
- $expenses = $this->_helper->makeArray($set);
-
-// $alt = $this->_queries->sharedExpenses($start, $end);
-// $transfers = $this->_helper->makeArray($alt);
-//
-// $expenses[-1] = [
-// 'amount' => 0,
-// 'name' => 'Transfers to shared',
-// 'spent' => 0
-// ];
-//
-// foreach ($transfers as $transfer) {
-// $expenses[-1]['amount'] += $transfer['amount'];
-// }
-
- $expenses = $this->_helper->sortArray($expenses);
- $limited = $this->_helper->limitArray($expenses, $limit);
-
- return $limited;
-
- }
-
- /**
- * This method gets all incomes (journals) in a list.
- *
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- *
- * @param Carbon $date
- * @param bool $shared
- *
- * @return Collection
- */
- public function getIncomeForMonth(Carbon $date, $shared = false)
- {
- $start = clone $date;
- $start->startOfMonth();
- $end = clone $date;
- $end->endOfMonth();
-
- return $this->_queries->incomeByPeriod($start, $end);
-
-
- }
-
- /**
- * @param Carbon $date
- *
- * @return Collection
- */
- public function getPiggyBanksForMonth(Carbon $date)
- {
- $start = clone $date;
- $start->startOfMonth();
- $end = clone $date;
- $end->endOfMonth();
-
- \PiggyBank::
- leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
- ->where('accounts.user_id', \Auth::user()->id)
- ->where('repeats', 0)
- ->where(
- function (Builder $query) use ($start, $end) {
- $query->whereNull('piggy_banks.deleted_at');
- $query->orWhere(
- function (Builder $query) use ($start, $end) {
- $query->whereNotNull('piggy_banks.deleted_at');
- $query->where('piggy_banks.deleted_at', '>=', $start->format('Y-m-d 00:00:00'));
- $query->where('piggy_banks.deleted_at', '<=', $end->format('Y-m-d 00:00:00'));
- }
- );
- }
- )
- ->get(['piggy_banks.*']);
-
-
- }
-
- /**
- * @param Carbon $start
- *
- * @return array
- */
- public function listOfMonths(Carbon $start)
- {
- $end = Carbon::now();
- $months = [];
- while ($start <= $end) {
- $months[] = [
- 'formatted' => $start->format('F Y'),
- 'month' => intval($start->format('m')),
- 'year' => intval($start->format('Y')),
- ];
- $start->addMonth();
- }
-
- return $months;
- }
-
- /**
- * @param Carbon $start
- *
- * @return array
- */
- public function listOfYears(Carbon $start)
- {
- $end = Carbon::now();
- $years = [];
- while ($start <= $end) {
- $years[] = $start->format('Y');
- $start->addYear();
- }
-
- return $years;
- }
-
- /**
- *
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function revenueGroupedByAccount(Carbon $start, Carbon $end)
- {
- return $this->_queries->journalsByRevenueAccount($start, $end);
-
-
- }
-
- /**
- * @param Carbon $date
- *
- * @return array
- */
- public function yearBalanceReport(Carbon $date)
- {
- $start = clone $date;
- $end = clone $date;
- $sharedAccounts = [];
- $sharedCollection = \Auth::user()->accounts()
- ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
- ->where('account_meta.name', '=', 'accountRole')
- ->where('account_meta.data', '=', json_encode('sharedExpense'))
- ->get(['accounts.id']);
-
- foreach ($sharedCollection as $account) {
- $sharedAccounts[] = $account->id;
- }
-
- $accounts = $this->_accounts->getAccountsByType(['Default account', 'Asset account'])->filter(
- function (\Account $account) use ($sharedAccounts) {
- if (!in_array($account->id, $sharedAccounts)) {
- return $account;
- }
-
- return null;
- }
- );
- $report = [];
- $start->startOfYear()->subDay();
- $end->endOfYear();
-
- foreach ($accounts as $account) {
- $report[] = [
- 'start' => \Steam::balance($account, $start),
- 'end' => \Steam::balance($account, $end),
- 'account' => $account,
- 'shared' => $account->accountRole == 'sharedExpense'
- ];
- }
-
- return $report;
- }
-
-}
diff --git a/app/lib/FireflyIII/Report/ReportHelperInterface.php b/app/lib/FireflyIII/Report/ReportHelperInterface.php
deleted file mode 100644
index 828e322603..0000000000
--- a/app/lib/FireflyIII/Report/ReportHelperInterface.php
+++ /dev/null
@@ -1,64 +0,0 @@
-accounts()
- ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
- ->leftJoin(
- 'account_meta', function (JoinClause $join) {
- $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', "accountRole");
- }
- )
- ->whereIn('account_types.type', ['Default account', 'Cash account', 'Asset account'])
- ->where('active', 1)
- ->where(
- function (Builder $query) {
- $query->where('account_meta.data', '!=', '"sharedExpense"');
- $query->orWhereNull('account_meta.data');
- }
- )
- ->get(['accounts.*']);
- }
-
- /**
- * This method will get a list of all expenses in a certain time period that have no budget
- * and are balanced by a transfer to make up for it.
- *
- * @param \Account $account
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function balancedTransactionsList(\Account $account, Carbon $start, Carbon $end)
- {
-
- $set = \TransactionJournal::
- leftJoin('transaction_group_transaction_journal', 'transaction_group_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
- ->leftJoin(
- 'transaction_group_transaction_journal as otherFromGroup', function (JoinClause $join) {
- $join->on('otherFromGroup.transaction_group_id', '=', 'transaction_group_transaction_journal.transaction_group_id')
- ->on('otherFromGroup.transaction_journal_id', '!=', 'transaction_journals.id');
- }
- )
- ->leftJoin('transaction_journals as otherJournals', 'otherJournals.id', '=', 'otherFromGroup.transaction_journal_id')
- ->leftJoin('transaction_types', 'transaction_types.id', '=', 'otherJournals.transaction_type_id')
- ->leftJoin(
- 'transactions', function (JoinClause $join) {
- $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('amount', '>', 0);
- }
- )
- ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'otherJournals.id')
- ->before($end)->after($start)
- ->where('transaction_types.type', 'Withdrawal')
- ->where('transaction_journals.user_id', \Auth::user()->id)
- ->whereNull('budget_transaction_journal.budget_id')->whereNull('transaction_journals.deleted_at')
- ->whereNull('otherJournals.deleted_at')
- ->where('transactions.account_id', $account->id)
- ->whereNotNull('transaction_group_transaction_journal.transaction_group_id')->groupBy('transaction_journals.id')
- ->get(
- [
- 'transaction_journals.id as transferId',
- 'transaction_journals.description as transferDescription',
- 'transaction_group_transaction_journal.transaction_group_id as groupId',
- 'otherFromGroup.transaction_journal_id as expenseId',
- 'otherJournals.description as expenseDescription',
- 'transactions.amount'
- ]
- );
-
- return $set;
- }
-
- /**
- * This method will sum up all expenses in a certain time period that have no budget
- * and are balanced by a transfer to make up for it.
- *
- * @param \Account $account
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return float
- */
- public function balancedTransactionsSum(\Account $account, Carbon $start, Carbon $end)
- {
- $list = $this->balancedTransactionsList($account, $start, $end);
- $sum = 0;
- foreach ($list as $entry) {
- $sum += floatval($entry->amount);
- }
-
- return $sum;
- }
-
- /**
- * Get a users accounts combined with various meta-data related to the start and end date.
- *
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function getAllAccounts(Carbon $start, Carbon $end)
- {
- $set = \Auth::user()->accounts()
- ->accountTypeIn(['Default account', 'Asset account', 'Cash account'])
- ->leftJoin(
- 'account_meta', function (JoinClause $join) {
- $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
- }
- )
- ->where(
- function (Builder $query) {
- $query->where('account_meta.data', '!=', '"sharedExpense"');
- $query->orWhereNull('account_meta.data');
- }
- )
- ->get(['accounts.*']);
- $set->each(
- function (\Account $account) use ($start, $end) {
- /** @noinspection PhpParamsInspection */
- $account->startBalance = \Steam::balance($account, $start);
- $account->endBalance = \Steam::balance($account, $end);
- }
- );
-
- return $set;
- }
-
- /**
- * Gets a list of all budgets and if present, the amount of the current BudgetLimit
- * as well
- *
- * @param Carbon $date
- *
- * @return Collection
- */
- public function getAllBudgets(Carbon $date)
- {
- return \Auth::user()->budgets()
- ->leftJoin(
- 'budget_limits', function (JoinClause $join) use ($date) {
- $join->on('budget_limits.budget_id', '=', 'budgets.id')->where('budget_limits.startdate', '=', $date->format('Y-m-d'));
- }
- )
- ->get(['budgets.*', 'budget_limits.amount as amount']);
- }
-
- /**
- * Grabs a summary of all expenses grouped by budget, related to the account.
- *
- * @param \Account $account
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return mixed
- */
- public function getBudgetSummary(\Account $account, Carbon $start, Carbon $end)
- {
- $set = \TransactionJournal::
- leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
- ->leftJoin('budgets', 'budgets.id', '=', 'budget_transaction_journal.budget_id')
- ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
- ->leftJoin(
- 'transactions', function (JoinClause $join) {
- $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '<', 0);
- }
- )
- ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
- ->before($end)
- ->after($start)
- ->where('accounts.id', $account->id)
- ->where('transaction_journals.user_id', \Auth::user()->id)
- ->where('transaction_types.type', 'Withdrawal')
- ->groupBy('budgets.id')
- ->orderBy('budgets.id')
- ->get(['budgets.id', 'budgets.name', \DB::Raw('SUM(`transactions`.`amount`) as `amount`')]);
-
- return $set;
-
-
- }
-
- /**
- * This method returns all "income" journals in a certain period, which are both transfers from a shared account
- * and "ordinary" deposits. The query used is almost equal to ReportQueryInterface::journalsByRevenueAccount but it does
- * not group and returns different fields.
- *
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function incomeByPeriod(Carbon $start, Carbon $end)
- {
- return \TransactionJournal::
- leftJoin(
- 'transactions as t_from', function (JoinClause $join) {
- $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0);
- }
- )
- ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id')
- ->leftJoin(
- 'account_meta as acm_from', function (JoinClause $join) {
- $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole');
- }
- )
- ->leftJoin(
- 'transactions as t_to', function (JoinClause $join) {
- $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0);
- }
- )
- ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id')
- ->leftJoin(
- 'account_meta as acm_to', function (JoinClause $join) {
- $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole');
- }
- )
- ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
- ->where(
- function ($query) {
- $query->where(
- function ($q) {
- $q->where('transaction_types.type', 'Deposit');
- $q->where('acm_to.data', '!=', '"sharedExpense"');
- }
- );
- $query->orWhere(
- function ($q) {
- $q->where('transaction_types.type', 'Transfer');
- $q->where('acm_from.data', '=', '"sharedExpense"');
- }
- );
- }
- )
- ->before($end)->after($start)
- ->where('transaction_journals.user_id', \Auth::user()->id)
- ->groupBy('t_from.account_id')->orderBy('transaction_journals.date')
- ->get(
- ['transaction_journals.id',
- 'transaction_journals.description',
- 'transaction_types.type',
- 't_to.amount', 'transaction_journals.date', 't_from.account_id as account_id',
- 'ac_from.name as name']
- );
- }
-
- /**
- * Gets a list of expenses grouped by the budget they were filed under.
- *
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function journalsByBudget(Carbon $start, Carbon $end)
- {
- return \Auth::user()->transactionjournals()
- ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
- ->leftJoin('budgets', 'budget_transaction_journal.budget_id', '=', 'budgets.id')
- ->leftJoin(
- 'transactions', function (JoinClause $join) {
- $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '<', 0);
- }
- )
- ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
- ->leftJoin(
- 'account_meta', function (JoinClause $join) {
- $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
- }
- )
- ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
- ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
- ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
- ->where('account_meta.data', '!=', '"sharedExpense"')
- ->where('transaction_types.type', 'Withdrawal')
- ->groupBy('budgets.id')
- ->orderBy('budgets.name', 'ASC')
- ->get(['budgets.id', 'budgets.name', \DB::Raw('SUM(`transactions`.`amount`) AS `spent`')]);
- }
-
- /**
- * Gets a list of categories and the expenses therein, grouped by the relevant category.
- * This result excludes transfers to shared accounts which are expenses, technically.
- *
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function journalsByCategory(Carbon $start, Carbon $end)
- {
- return \Auth::user()->transactionjournals()
- ->leftJoin(
- 'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
- )
- ->leftJoin('categories', 'category_transaction_journal.category_id', '=', 'categories.id')
- ->leftJoin(
- 'transactions', function (JoinClause $join) {
- $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('transactions.amount', '<', 0);
- }
- )
- ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
- ->leftJoin(
- 'account_meta', function (JoinClause $join) {
- $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
- }
- )
- ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
- ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
- ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
- ->where('account_meta.data', '!=', '"sharedExpense"')
- ->where('transaction_types.type', 'Withdrawal')
- ->groupBy('categories.id')
- ->orderBy('amount')
- ->get(['categories.id', 'categories.name', \DB::Raw('SUM(`transactions`.`amount`) AS `amount`')]);
-
- }
-
- /**
- * Gets a list of expense accounts and the expenses therein, grouped by that expense account.
- * This result excludes transfers to shared accounts which are expenses, technically.
- *
- * So now it will include them!
- *
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function journalsByExpenseAccount(Carbon $start, Carbon $end)
- {
- return \TransactionJournal::
- leftJoin(
- 'transactions as t_from', function (JoinClause $join) {
- $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0);
- }
- )
- ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id')
- ->leftJoin(
- 'account_meta as acm_from', function (JoinClause $join) {
- $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole');
- }
- )
- ->leftJoin(
- 'transactions as t_to', function (JoinClause $join) {
- $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0);
- }
- )
- ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id')
- ->leftJoin(
- 'account_meta as acm_to', function (JoinClause $join) {
- $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole');
- }
- )
- ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
-
- ->where(
- function ($query) {
- $query->where(
- function ($q) {
- $q->where('transaction_types.type', 'Withdrawal');
- $q->where('acm_from.data', '!=', '"sharedExpense"');
- }
- );
- $query->orWhere(
- function ($q) {
- $q->where('transaction_types.type', 'Transfer');
- $q->where('acm_to.data', '=', '"sharedExpense"');
- }
- );
- }
- )
-
-
- ->before($end)
- ->after($start)
- ->where('transaction_journals.user_id', \Auth::user()->id)
- ->groupBy('t_to.account_id')
- ->orderBy('amount', 'DESC')
- ->get(['t_to.account_id as id', 'ac_to.name as name', \DB::Raw('SUM(t_to.amount) as `amount`')]);
- }
-
- /**
- * This method returns all deposits into asset accounts, grouped by the revenue account,
- *
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function journalsByRevenueAccount(Carbon $start, Carbon $end)
- {
- return \TransactionJournal::
- leftJoin(
- 'transactions as t_from', function (JoinClause $join) {
- $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0);
- }
- )
- ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id')
- ->leftJoin(
- 'account_meta as acm_from', function (JoinClause $join) {
- $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole');
- }
- )
- ->leftJoin(
- 'transactions as t_to', function (JoinClause $join) {
- $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0);
- }
- )
- ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id')
- ->leftJoin(
- 'account_meta as acm_to', function (JoinClause $join) {
- $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole');
- }
- )
- ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
- ->where(
- function ($query) {
- $query->where(
- function ($q) {
- $q->where('transaction_types.type', 'Deposit');
- $q->where('acm_to.data', '!=', '"sharedExpense"');
- }
- );
- $query->orWhere(
- function ($q) {
- $q->where('transaction_types.type', 'Transfer');
- $q->where('acm_from.data', '=', '"sharedExpense"');
- }
- );
- }
- )
- ->before($end)->after($start)
- ->where('transaction_journals.user_id', \Auth::user()->id)
- ->groupBy('t_from.account_id')->orderBy('amount')
- ->get(['t_from.account_id as account_id', 'ac_from.name as name', \DB::Raw('SUM(t_from.amount) as `amount`')]);
- }
-
- /**
- * With an equally misleading name, this query returns are transfers to shared accounts. These are considered
- * expenses.
- *
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function sharedExpenses(Carbon $start, Carbon $end)
- {
- return \TransactionJournal::
- leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
- ->leftJoin(
- 'transactions', function (JoinClause $join) {
- $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where(
- 'transactions.amount', '>', 0
- );
- }
- )
- ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
- ->leftJoin(
- 'account_meta', function (JoinClause $join) {
- $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
- }
- )
- ->where('account_meta.data', '"sharedExpense"')
- ->after($start)
- ->before($end)
- ->where('transaction_types.type', 'Transfer')
- ->where('transaction_journals.user_id', \Auth::user()->id)
- ->get(
- ['transaction_journals.id', 'transaction_journals.description', 'transactions.account_id', 'accounts.name',
- 'transactions.amount']
- );
-
- }
-
- /**
- * With a slightly misleading name, this query returns all transfers to shared accounts
- * which are technically expenses, since it won't be just your money that gets spend.
- *
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return Collection
- */
- public function sharedExpensesByCategory(Carbon $start, Carbon $end)
- {
- return \TransactionJournal::
- leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
- ->leftJoin(
- 'transactions', function (JoinClause $join) {
- $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where(
- 'transactions.amount', '>', 0
- );
- }
- )
- ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
- ->leftJoin(
- 'account_meta', function (JoinClause $join) {
- $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');
- }
- )
- ->leftJoin(
- 'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
- )
- ->leftJoin('categories', 'category_transaction_journal.category_id', '=', 'categories.id')
- ->where('account_meta.data', '"sharedExpense"')
- ->after($start)
- ->before($end)
- ->where('transaction_types.type', 'Transfer')
- ->where('transaction_journals.user_id', \Auth::user()->id)
- ->groupBy('categories.name')
- ->get(
- [
- 'categories.id',
- 'categories.name as name',
- \DB::Raw('SUM(`transactions`.`amount`) * -1 AS `amount`')
- ]
- );
- }
-}
diff --git a/app/lib/FireflyIII/Shared/Facade/DateKit.php b/app/lib/FireflyIII/Shared/Facade/DateKit.php
deleted file mode 100644
index afe493b866..0000000000
--- a/app/lib/FireflyIII/Shared/Facade/DateKit.php
+++ /dev/null
@@ -1,24 +0,0 @@
-password = $password;
- $user->reset = \Str::random(32); // new one.
- $user->forceSave();
- $email = $user->email;
-
-
- $data = ['password' => $password];
- try {
- \Mail::send(
- ['emails.user.register-html', 'emails.user.register-text'], $data, function (Message $message) use ($email) {
-
- $message->to($email, $email)->subject('Welcome to Firefly!');
- }
- );
- } catch (Swift_RfcComplianceException $e) {
- }
- }
-
- /**
- * @param \User $user
- *
- * @return mixed|void
- */
- public function sendResetVerification(\User $user)
- {
- $reset = \Str::random(32);
- $user->reset = $reset;
- $user->forceSave();
- $email = $user->email;
-
- $data = ['reset' => $reset];
- try {
- \Mail::send(
- ['emails.user.remindMe-html', 'emails.user.remindMe-text'], $data, function (Message $message) use ($email) {
- $message->to($email, $email)->subject('Forgot your password?');
- }
- );
- } catch (Swift_RfcComplianceException $e) {
- \Log::error($e->getMessage());
- return false;
- } catch(Swift_TransportException $e) {
- \Log::error($e->getMessage());
- return false;
- } catch(\Exception $e) {
- \Log::error($e->getMessage());
- return false;
- }
- return true;
-
-
- }
-
- /**
- * @param \User $user
- *
- * @return mixed|void
- */
- public function sendVerificationMail(\User $user)
- {
-
- $reset = \Str::random(32);
- $user->reset = $reset;
- $user->forceSave();
- $email = $user->email;
- $data = ['reset' => $reset];
-
- try {
- \Mail::send(
- ['emails.user.verify-html', 'emails.user.verify-text'], $data, function (Message $message) use ($email) {
-
- $message->to($email, $email)->subject('Verify your e-mail address.');
- }
- );
- } catch (Swift_RfcComplianceException $e) {
- \Log::error($e->getMessage());
- return false;
- } catch(Swift_TransportException $e) {
- \Log::error($e->getMessage());
- return false;
- } catch(\Exception $e) {
- \Log::error($e->getMessage());
- return false;
- }
- return true;
- }
-
-}
diff --git a/app/lib/FireflyIII/Shared/Mail/RegistrationInterface.php b/app/lib/FireflyIII/Shared/Mail/RegistrationInterface.php
deleted file mode 100644
index df104cc50a..0000000000
--- a/app/lib/FireflyIII/Shared/Mail/RegistrationInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-getCurrencySymbol();
-
- return $this->formatWithSymbol($currencySymbol, $amount, $coloured);
-
-
- }
-
- /**
- * @return string
- */
- public function getCurrencySymbol()
- {
- if (defined('FFCURRENCYSYMBOL')) {
- return FFCURRENCYSYMBOL;
- }
- if (\Cache::has('FFCURRENCYSYMBOL')) {
- define('FFCURRENCYSYMBOL', \Cache::get('FFCURRENCYSYMBOL'));
-
- return FFCURRENCYSYMBOL;
- }
-
- /** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencies */
- $currencies = \App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
-
- /** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
- $preferences = \App::make('FireflyIII\Shared\Preferences\Preferences');
-
- $currencyPreference = $preferences->get('currencyPreference', 'EUR');
- $currency = $currencies->findByCode($currencyPreference->data);
-
- \Cache::forever('FFCURRENCYSYMBOL', $currency->symbol);
-
- define('FFCURRENCYSYMBOL', $currency->symbol);
-
- return $currency->symbol;
- }
-
- /**
- * @param string $symbol
- * @param float $amount
- * @param bool $coloured
- *
- * @return string
- */
- protected function formatWithSymbol($symbol, $amount, $coloured = true)
- {
- $amount = floatval($amount);
- $amount = round($amount, 2);
- $string = number_format($amount, 2, ',', '.');
-
- if ($coloured === true) {
- if ($amount === 0.0) {
- return '' . $symbol . ' ' . $string . '';
- }
- if ($amount > 0) {
- return '' . $symbol . ' ' . $string . '';
- }
-
- return '' . $symbol . ' ' . $string . '';
- }
-
- // €
- return $symbol . ' ' . $string;
- }
-
- /**
- * @param \TransactionJournal $journal
- * @param float $amount
- * @param bool $coloured
- *
- * @return string
- */
- public function formatJournal(\TransactionJournal $journal, $amount, $coloured = true)
- {
- $symbol = $journal->transactionCurrency->symbol;
-
- return $this->formatWithSymbol($symbol, $amount, $coloured);
-
-
- }
-
- /**
- * @param \Transaction $transaction
- * @param bool $coloured
- *
- * @return string
- */
- public function formatTransaction(\Transaction $transaction, $coloured = true)
- {
- $symbol = $transaction->transactionJournal->transactionCurrency->symbol;
- $amount = floatval($transaction->amount);
-
- return $this->formatWithSymbol($symbol, $amount, $coloured);
-
-
- }
-
- /**
- * @return string
- */
- public function getCurrencyCode()
- {
- if (defined('FFCURRENCYCODE')) {
- return FFCURRENCYCODE;
- }
- if (\Cache::has('FFCURRENCYCODE')) {
- define('FFCURRENCYCODE', \Cache::get('FFCURRENCYCODE'));
-
- return FFCURRENCYCODE;
- }
-
- /** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencies */
- $currencies = \App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
-
- /** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
- $preferences = \App::make('FireflyIII\Shared\Preferences\Preferences');
-
- $currencyPreference = $preferences->get('currencyPreference', 'EUR');
- $currency = $currencies->findByCode($currencyPreference->data);
-
- \Cache::forever('FFCURRENCYCODE', $currency->code);
-
- define('FFCURRENCYCODE', $currency->code);
-
- return $currency->code;
- }
-
- /**
- * @return string
- */
- public function getDefaultCurrency()
- {
- /** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencies */
- $currencies = \App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
-
- /** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
- $preferences = \App::make('FireflyIII\Shared\Preferences\Preferences');
-
- $currencyPreference = $preferences->get('currencyPreference', 'EUR');
- $currency = $currencies->findByCode($currencyPreference->data);
-
- return $currency;
- }
-
-}
diff --git a/app/lib/FireflyIII/Shared/Toolkit/Filter.php b/app/lib/FireflyIII/Shared/Toolkit/Filter.php
deleted file mode 100644
index 0602b72624..0000000000
--- a/app/lib/FireflyIII/Shared/Toolkit/Filter.php
+++ /dev/null
@@ -1,253 +0,0 @@
-setSessionRangeValue();
- $start = \Session::has('start') ? \Session::get('start') : new Carbon;
- $start = $this->updateStartDate($range, $start);
- $end = $this->updateEndDate($range, $start);
- $period = $this->periodName($range, $start);
- $prev = $this->previous($range, clone $start);
- $next = $this->next($range, clone $start);
-
- \Session::put('start', $start);
- \Session::put('end', $end);
- \Session::put('range', $range);
- \Session::put('period', $period);
- \Session::put('prev', $this->periodName($range, $prev));
- \Session::put('next', $this->periodName($range, $next));
-
- return null;
-
- }
-
- /**
- * Checks and sets the currently set 'range' or defaults to a session
- * and if that fails, defaults to 1M. Always returns the final value.
- *
- * @return string
- */
- public function setSessionRangeValue()
- {
- if (!is_null(\Session::get('range'))) {
- // @codeCoverageIgnoreStart
- $range = \Session::get('range');
- // @codeCoverageIgnoreEnd
- } else {
- /** @var \FireflyIII\Shared\Preferences\PreferencesInterface $preferences */
- $preferences = \App::make('FireflyIII\Shared\Preferences\PreferencesInterface');
- $viewRange = $preferences->get('viewRange', '1M');
-
- // default range:
- $range = $viewRange->data;
- \Session::put('range', $range);
- }
-
- return $range;
-
- }
-
- /**
- * @param $range
- * @param Carbon $start
- *
- * @return Carbon
- * @throws FireflyException
- * @codeCoverageIgnore
- */
- protected function updateStartDate($range, Carbon $start)
- {
- $functionMap = [
- '1D' => 'startOfDay',
- '1W' => 'startOfWeek',
- '1M' => 'startOfMonth',
- '3M' => 'firstOfQuarter',
- '1Y' => 'startOfYear',
- ];
- if (isset($functionMap[$range])) {
- $function = $functionMap[$range];
- $start->$function();
-
- return $start;
- }
- if ($range == '6M') {
- if (intval($start->format('m')) >= 7) {
- $start->startOfYear()->addMonths(6);
- } else {
- $start->startOfYear();
- }
-
- return $start;
- }
- throw new FireflyException('updateStartDate cannot handle $range ' . $range);
- }
-
- /**
- * @param $range
- * @param Carbon $start
- *
- * @return Carbon
- * @throws FireflyException
- * @codeCoverageIgnore
- */
- protected function updateEndDate($range, Carbon $start)
- {
- $functionMap = [
- '1D' => 'endOfDay',
- '1W' => 'endOfWeek',
- '1M' => 'endOfMonth',
- '3M' => 'lastOfQuarter',
- '1Y' => 'endOfYear',
- ];
- $end = clone $start;
-
- if (isset($functionMap[$range])) {
- $function = $functionMap[$range];
- $end->$function();
-
- return $end;
- }
- if ($range == '6M') {
- if (intval($start->format('m')) >= 7) {
- $end->endOfYear();
- } else {
- $end->startOfYear()->addMonths(6);
- }
-
- return $end;
- }
- throw new FireflyException('updateEndDate cannot handle $range ' . $range);
- }
-
- /**
- * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
- *
- * @param $range
- * @param Carbon $date
- *
- * @return string
- * @throws FireflyException
- * @codeCoverageIgnore
- */
- protected function periodName($range, Carbon $date)
- {
- $formatMap = [
- '1D' => 'jS F Y',
- '1W' => '\w\e\ek W, Y',
- '1M' => 'F Y',
- '1Y' => 'Y',
- ];
- if (isset($formatMap[$range])) {
- return $date->format($formatMap[$range]);
- }
- if ($range == '3M') {
- $month = intval($date->format('m'));
-
- return 'Q' . ceil(($month / 12) * 4) . ' ' . $date->format('Y');
- }
- if ($range == '6M') {
- $month = intval($date->format('m'));
- $half = ceil(($month / 12) * 2);
- $halfName = $half == 1 ? 'first' : 'second';
-
- return $halfName . ' half of ' . $date->format('d-m-Y');
- }
- throw new FireflyException('No _periodName() for range "' . $range . '"');
- }
-
- /**
- * @param $range
- * @param Carbon $date
- *
- * @return Carbon
- * @throws FireflyException
- */
- public function previous($range, Carbon $date)
- {
- $functionMap = [
- '1D' => 'Day',
- '1W' => 'Week',
- '1M' => 'Month',
- '1Y' => 'Year'
- ];
-
- if (isset($functionMap[$range])) {
- $startFunction = 'startOf' . $functionMap[$range];
- $subFunction = 'sub' . $functionMap[$range];
- $date->$startFunction()->$subFunction();
-
- return $date;
- }
- if ($range == '3M') {
- $date->firstOfQuarter()->subMonths(3)->firstOfQuarter();
-
- return $date;
- }
- if ($range == '6M') {
- $month = intval($date->format('m'));
- $date->startOfYear();
- if ($month <= 6) {
- $date->subMonths(6);
- }
-
- return $date;
- }
- throw new FireflyException('Cannot do _previous() on ' . $range);
- }
-
- /**
- * @param $range
- * @param Carbon $date
- *
- * @return Carbon
- * @throws FireflyException
- */
- public function next($range, Carbon $date)
- {
- switch ($range) {
- case '1D':
- $date->endOfDay()->addDay();
- break;
- case '1W':
- $date->endOfWeek()->addDay()->startOfWeek();
- break;
- case '1M':
- $date->endOfMonth()->addDay()->startOfMonth();
- break;
- case '3M':
- $date->lastOfQuarter()->addDay();
- break;
- case '6M':
- if (intval($date->format('m')) >= 7) {
- $date->startOfYear()->addYear();
- } else {
- $date->startOfYear()->addMonths(6);
- }
- break;
- case '1Y':
- $date->startOfYear()->addYear();
- break;
- default:
- throw new FireflyException('Cannot do _next() on ' . $range);
- break;
- }
-
- return $date;
- }
-}
diff --git a/app/lib/FireflyIII/Shared/Toolkit/Form.php b/app/lib/FireflyIII/Shared/Toolkit/Form.php
deleted file mode 100644
index 1f51fe357a..0000000000
--- a/app/lib/FireflyIII/Shared/Toolkit/Form.php
+++ /dev/null
@@ -1,47 +0,0 @@
-id);
- $title = null;
-
- foreach ($fields as $field) {
- if (isset($entry->$field)) {
- $title = $entry->$field;
- }
- }
- $selectList[$id] = $title;
- }
-
-
- return $selectList;
- }
-}
diff --git a/app/lib/FireflyIII/Shared/Toolkit/Navigation.php b/app/lib/FireflyIII/Shared/Toolkit/Navigation.php
deleted file mode 100644
index ce99351190..0000000000
--- a/app/lib/FireflyIII/Shared/Toolkit/Navigation.php
+++ /dev/null
@@ -1,69 +0,0 @@
-setSessionRangeValue();
- $start = \Session::get('start', Carbon::now()->startOfMonth());
-
- /*
- * Add some period to $start.
- */
- $next = $filter->next($range, clone $start);
-
- /*
- * Save in session:
- */
- \Session::put('start', $next);
-
- return true;
- }
-
- /**
- * @return bool
- * @throws FireflyException
- */
- public function prev()
- {
- /*
- * Get the start date and the range from the session
- */
- $filter = new Filter;
-
- $range = $filter->setSessionRangeValue();
- $start = \Session::get('start', Carbon::now()->startOfMonth());
-
- /*
- * Subtract some period to $start.
- */
- $prev = $filter->previous($range, clone $start);
-
- /*
- * Save in session:
- */
- \Session::put('start', $prev);
-
- return true;
- }
-}
diff --git a/app/lib/FireflyIII/Shared/Toolkit/Reminders.php b/app/lib/FireflyIII/Shared/Toolkit/Reminders.php
deleted file mode 100644
index 11b75259e1..0000000000
--- a/app/lib/FireflyIII/Shared/Toolkit/Reminders.php
+++ /dev/null
@@ -1,106 +0,0 @@
-remindersable)) {
-
- case 'PiggyBank':
- $start = new Carbon;
- $end = !is_null($reminder->remindersable->targetdate) ? clone $reminder->remindersable->targetdate : new Carbon;
- $reminders = 0;
- while ($start <= $end) {
- $reminders++;
- $start = \DateKit::addPeriod($start, $reminder->remindersable->reminder, $reminder->remindersable->reminder_skip);
- }
- /*
- * Now find amount yet to save.
- */
- $repetition = $reminder->remindersable->currentRelevantRep();
- $leftToSave = floatval($reminder->remindersable->targetamount) - floatval($repetition->currentamount);
- $reminders = $reminders == 0 ? 1 : $reminders;
-
- return $leftToSave / $reminders;
- break;
- default:
- throw new FireflyException('Cannot handle class ' . get_class($reminder->remindersable) . ' in amountForReminder.');
- break;
- }
- }
-
- /**
- *
- */
- public function getReminders()
- {
- $reminders = \Auth::user()->reminders()
- ->where('active', 1)
- ->where('startdate', '<=', Carbon::now()->format('Y-m-d'))
- ->where('enddate', '>=', Carbon::now()->format('Y-m-d'))
- ->get();
-
- return $reminders;
- }
-
- /**
- * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind.
- */
- public function updateReminders()
- {
- /** @var Collection $set */
- $set = \PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
- ->where('accounts.user_id', \Auth::user()->id)
- ->whereNotNull('reminder')->get(['piggy_banks.*']);
-
-
- $today = Carbon::now();
-
- /** @var \PiggyBank $piggyBank */
- foreach ($set as $piggyBank) {
- /** @var \PiggyBankRepetition $repetition */
- $repetition = $piggyBank->currentRelevantRep();
- $start = \DateKit::startOfPeriod($today, $piggyBank->reminder);
- if ($repetition->targetdate && $repetition->targetdate <= $today) {
- // break when no longer relevant:
- continue;
- }
- $end = \DateKit::endOfPeriod(clone $start, $piggyBank->reminder);
- // should have a reminder for this period:
- /** @var Collection $reminders */
- $reminders = $piggyBank->reminders()->dateIs($start, $end)->get();
- if ($reminders->count() == 0) {
- // create new!
- $reminder = new \Reminder;
- $reminder->startdate = $start;
- $reminder->enddate = $end;
- $reminder->active = 1;
- $reminder->user()->associate(\Auth::getUser());
- $reminder->remindersable_id = $piggyBank->id;
- $reminder->remindersable_type = 'PiggyBank';
- $reminder->save();
- }
- }
- }
-}
diff --git a/app/lib/FireflyIII/Shared/Toolkit/Steam.php b/app/lib/FireflyIII/Shared/Toolkit/Steam.php
deleted file mode 100644
index 584fa13ee8..0000000000
--- a/app/lib/FireflyIII/Shared/Toolkit/Steam.php
+++ /dev/null
@@ -1,85 +0,0 @@
-transactions()->leftJoin(
- 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
- )->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->sum('transactions.amount')
- );
-
- return $balance;
- }
-
- /**
- * @codeCoverageIgnore
- * @param $boolean
- *
- * @return string
- */
- public function boolString($boolean)
- {
- if ($boolean === true) {
- return 'BOOLEAN TRUE';
- }
- if ($boolean === false) {
- return 'BOOLEAN FALSE';
- }
-
- return 'NO BOOLEAN: ' . $boolean;
- }
-
- /**
- * @param \PiggyBank $piggyBank
- * @param \PiggyBankRepetition $repetition
- *
- * @return int
- */
- public function percentage(\PiggyBank $piggyBank, \PiggyBankRepetition $repetition)
- {
- $pct = $repetition->currentamount / $piggyBank->targetamount * 100;
- if ($pct > 100) {
- // @codeCoverageIgnoreStart
- return 100;
- // @codeCoverageIgnoreEnd
- } else {
- return floor($pct);
- }
- }
-
- /**
- * @codeCoverageIgnore
- * @throws \Exception
- */
- public function removeEmptyBudgetLimits()
- {
- $user = \Auth::user();
- if ($user) {
- \BudgetLimit::where('amount', 0)->delete();
- }
- }
-
-}
diff --git a/app/lib/FireflyIII/Shared/Validation/FireflyValidator.php b/app/lib/FireflyIII/Shared/Validation/FireflyValidator.php
deleted file mode 100644
index 33795d563b..0000000000
--- a/app/lib/FireflyIII/Shared/Validation/FireflyValidator.php
+++ /dev/null
@@ -1,31 +0,0 @@
-app->validator->resolver(
- function ($translator, $data, $rules, $messages) {
- return new FireflyValidator($translator, $data, $rules, $messages);
- }
- );
- }
-
- public function register()
- {
- }
-}
diff --git a/app/models/Account.php b/app/models/Account.php
deleted file mode 100644
index 9bf3bbe4a9..0000000000
--- a/app/models/Account.php
+++ /dev/null
@@ -1,156 +0,0 @@
- [
- 'name' => 'required|between:1,100',
- 'user_id' => 'required|exists:users,id',
- 'account_type_id' => 'required|exists:account_types,id',
- 'active' => 'required|boolean'
- ],
- 'form_input' => [
- 'name' => 'required|between:1,100',
- 'active' => 'required|boolean',
- ]
- ];
-
- /**
- * Account type.
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function accountType()
- {
- return $this->belongsTo('AccountType');
- }
-
- /**
- *
- * @param $fieldName
- *
- * @return mixed
- */
- public function getMeta($fieldName)
- {
- foreach ($this->accountMeta as $meta) {
- if ($meta->name == $fieldName) {
- return $meta->data;
- }
- }
-
- return null;
-
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function piggyBanks()
- {
- return $this->hasMany('PiggyBank');
- }
-
- /**
- *
- * @param EloquentBuilder $query
- * @param array $types
- */
- public function scopeAccountTypeIn(EloquentBuilder $query, array $types)
- {
- if (is_null($this->joinedAccountTypes)) {
- $query->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id');
- $this->joinedAccountTypes = true;
- }
- $query->whereIn('account_types.type', $types);
- }
-
- /**
- *
- * @param EloquentBuilder $query
- * @param string $field
- */
- public function scopeWithMeta(EloquentBuilder $query, $field = 'accountRole')
- {
- $query->leftJoin(
- 'account_meta', function (JoinClause $join) use ($field) {
- $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', $field);
- }
- );
- }
-
- /**
- * Transactions.
- *
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function transactions()
- {
- return $this->hasMany('Transaction');
- }
-
- /**
- * @param $fieldName
- * @param $fieldValue
- *
- * @return AccountMeta
- */
- public function updateMeta($fieldName, $fieldValue)
- {
- $meta = $this->accountMeta()->get();
- /** @var AccountMeta $entry */
- foreach ($meta as $entry) {
- if ($entry->name == $fieldName) {
- $entry->data = $fieldValue;
- $entry->save();
-
- return $entry;
- }
- }
- $meta = new AccountMeta;
- $meta->account()->associate($this);
- $meta->name = $fieldName;
- $meta->data = $fieldValue;
- $meta->save();
-
- return $meta;
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function accountMeta()
- {
- return $this->hasMany('AccountMeta');
- }
-
- /**
- * User
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function user()
- {
- return $this->belongsTo('User');
- }
-
-
-}
diff --git a/app/models/AccountType.php b/app/models/AccountType.php
deleted file mode 100644
index eb3f495e87..0000000000
--- a/app/models/AccountType.php
+++ /dev/null
@@ -1,25 +0,0 @@
- ['required', 'between:1,50', 'alphabasic'],
- 'editable' => 'required|boolean',
-
- ];
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function accounts()
- {
- return $this->hasMany('Account');
- }
-}
diff --git a/app/models/Bill.php b/app/models/Bill.php
deleted file mode 100644
index bc5500ebe2..0000000000
--- a/app/models/Bill.php
+++ /dev/null
@@ -1,49 +0,0 @@
- 'required|exists:users,id',
- 'name' => 'required|between:1,255|min:1',
- 'match' => 'required',
- 'amount_max' => 'required|between:0,65536',
- 'amount_min' => 'required|between:0,65536',
- 'date' => 'required|date',
- 'active' => 'between:0,1',
- 'automatch' => 'between:0,1',
- 'repeat_freq' => 'required|in:daily,weekly,monthly,quarterly,half-year,yearly',
- 'skip' => 'required|between:0,31',];
- protected $fillable = ['user_id', 'name', 'match', 'amount_min', 'amount_max', 'date', 'repeat_freq', 'skip', 'active', 'automatch'];
- /**
- * @return array
- */
- public function getDates()
- {
- return ['created_at', 'updated_at', 'date'];
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function transactionjournals()
- {
- return $this->hasMany('TransactionJournal');
- }
-
-
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function user()
- {
- return $this->belongsTo('User');
- }
-}
diff --git a/app/models/Budget.php b/app/models/Budget.php
deleted file mode 100644
index 83368d9143..0000000000
--- a/app/models/Budget.php
+++ /dev/null
@@ -1,50 +0,0 @@
- 'exists:users,id|required',
- 'name' => 'required|between:1,100|alphabasic',
- ];
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
- */
- public function limitrepetitions()
- {
- return $this->hasManyThrough('LimitRepetition', 'BudgetLimit', 'budget_id');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function budgetlimits()
- {
- return $this->hasMany('BudgetLimit');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
- */
- public function transactionjournals()
- {
- return $this->belongsToMany('TransactionJournal', 'budget_transaction_journal', 'budget_id');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function user()
- {
- return $this->belongsTo('User');
- }
-
-}
diff --git a/app/models/BudgetLimit.php b/app/models/BudgetLimit.php
deleted file mode 100644
index 192639fda8..0000000000
--- a/app/models/BudgetLimit.php
+++ /dev/null
@@ -1,49 +0,0 @@
- 'required|exists:budgets,id',
- 'startdate' => 'required|date',
- 'amount' => 'numeric|required|min:0.01',
- 'repeats' => 'required|boolean',
- 'repeat_freq' => 'required|in:daily,weekly,monthly,quarterly,half-year,yearly'
-
- ];
-
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function budget()
- {
- return $this->belongsTo('Budget');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function limitrepetitions()
- {
- return $this->hasMany('LimitRepetition');
- }
-
-
- /**
- * @return array
- */
- public function getDates()
- {
- return ['created_at', 'updated_at', 'startdate', 'enddate'];
- }
-
-
-}
diff --git a/app/models/Category.php b/app/models/Category.php
deleted file mode 100644
index dab2639a0b..0000000000
--- a/app/models/Category.php
+++ /dev/null
@@ -1,49 +0,0 @@
- 'exists:users,id|required',
- 'name' => 'required|between:1,100|alphabasic',
- ];
-
- /**
- * remove this method in favour of something in the FireflyIII libraries.
- *
- * @return Carbon
- */
- public function lastActionDate()
- {
- $transaction = $this->transactionjournals()->orderBy('updated_at', 'DESC')->first();
- if (is_null($transaction)) {
- return null;
- }
-
- return $transaction->date;
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
- */
- public function transactionjournals()
- {
- return $this->belongsToMany('TransactionJournal', 'category_transaction_journal', 'category_id');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function user()
- {
- return $this->belongsTo('User');
- }
-}
diff --git a/app/models/Component.php b/app/models/Component.php
deleted file mode 100644
index e09edbe19b..0000000000
--- a/app/models/Component.php
+++ /dev/null
@@ -1,20 +0,0 @@
- 'exists:users,id|required',
- 'name' => 'required|between:1,100|alphabasic',
- 'class' => 'required',
- ];
- protected $dates = ['deleted_at', 'created_at', 'updated_at'];
- protected $fillable = ['name', 'user_id','class'];
- protected $table = 'components';
- use ValidatingTrait;
-}
diff --git a/app/models/LimitRepetition.php b/app/models/LimitRepetition.php
deleted file mode 100644
index afb0b3c439..0000000000
--- a/app/models/LimitRepetition.php
+++ /dev/null
@@ -1,54 +0,0 @@
- 'required|exists:budgetlimits,id',
- 'startdate' => 'required|date',
- 'enddate' => 'required|date',
- 'amount' => 'numeric|required|min:0.01',
- ];
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function budgetLimit()
- {
- return $this->belongsTo('BudgetLimit');
- }
-
- /**
- * @return array
- */
- public function getDates()
- {
- return ['created_at', 'updated_at', 'startdate', 'enddate'];
- }
-
- /**
- *
- * @return float
- */
- public function spentInRepetition()
- {
- $sum = \DB::table('transactions')
- ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
- ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
- ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id')
- ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')
- ->where('transaction_journals.date', '>=', $this->startdate->format('Y-m-d'))
- ->where('transaction_journals.date', '<=', $this->enddate->format('Y-m-d'))
- ->where('transactions.amount', '>', 0)
- ->where('limit_repetitions.id', '=', $this->id)
- ->sum('transactions.amount');
-
- return floatval($sum);
- }
-}
diff --git a/app/models/PiggybankEvent.php b/app/models/PiggybankEvent.php
deleted file mode 100644
index 1861c45319..0000000000
--- a/app/models/PiggybankEvent.php
+++ /dev/null
@@ -1,42 +0,0 @@
- 'required|exists:piggy_banks,id',
- 'date' => 'required|date',
- 'amount' => 'required|numeric'
- ];
- use ValidatingTrait;
-
- /**
- * @return array
- */
- public function getDates()
- {
- return ['created_at', 'updated_at', 'date'];
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function piggyBank()
- {
- return $this->belongsTo('PiggyBank');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function transactionJournal()
- {
- return $this->belongsTo('TransactionJournal');
- }
-
-}
diff --git a/app/models/PiggybankRepetition.php b/app/models/PiggybankRepetition.php
deleted file mode 100644
index e38eabd4b4..0000000000
--- a/app/models/PiggybankRepetition.php
+++ /dev/null
@@ -1,54 +0,0 @@
- 'required|exists:piggy_banks,id',
- 'targetdate' => 'date',
- 'startdate' => 'date',
- 'currentamount' => 'required|numeric'];
-
- /**
- * @return array
- */
- public function getDates()
- {
- return ['created_at', 'updated_at', 'targetdate', 'startdate'];
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function piggyBank()
- {
- return $this->belongsTo('PiggyBank');
- }
-
- /**
- * @param EloquentBuilder $query
- * @param Carbon $date
- */
- public function scopeStarts(EloquentBuilder $query, Carbon $date)
- {
- $query->where('startdate', $date->format('Y-m-d 00:00:00'));
- }
-
- /**
- * @param EloquentBuilder $query
- * @param Carbon $date
- */
- public function scopeTargets(EloquentBuilder $query, Carbon $date)
- {
- $query->where('targetdate', $date->format('Y-m-d 00:00:00'));
- }
-
-
-}
diff --git a/app/models/Reminder.php b/app/models/Reminder.php
deleted file mode 100644
index b9c7b326b8..0000000000
--- a/app/models/Reminder.php
+++ /dev/null
@@ -1,58 +0,0 @@
-morphTo();
- }
-
- /**
- * @param EloquentBuilder $query
- * @param Carbon $start
- * @param Carbon $end
- *
- * @return mixed
- */
- public function scopeDateIs(EloquentBuilder $query, Carbon $start, Carbon $end)
- {
- return $query->where('startdate', $start->format('Y-m-d 00:00:00'))->where('enddate', $end->format('Y-m-d 00:00:00'));
- }
-
- /**
- * User
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function user()
- {
- return $this->belongsTo('User');
- }
-
-
-}
diff --git a/app/models/Transaction.php b/app/models/Transaction.php
deleted file mode 100644
index bb5c423bec..0000000000
--- a/app/models/Transaction.php
+++ /dev/null
@@ -1,114 +0,0 @@
- 'numeric|required|exists:accounts,id',
- 'transaction_journal_id' => 'numeric|required|exists:transaction_journals,id',
- 'description' => 'between:1,255',
- 'amount' => 'required|between:-65536,65536|not_in:0,0.00',];
-
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function account()
- {
- return $this->belongsTo('Account');
- }
-
- /**
- * @param EloquentBuilder $query
- * @param Account $account
- */
- public function scopeAccountIs(EloquentBuilder $query, Account $account)
- {
- $query->where('transactions.account_id', $account->id);
- }
-
- /**
- * @param EloquentBuilder $query
- * @param Carbon $date
- */
- public function scopeAfter(EloquentBuilder $query, Carbon $date)
- {
- if (is_null($this->joinedJournals)) {
- $query->leftJoin(
- 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
- );
- $this->joinedJournals = true;
- }
- $query->where('transaction_journals.date', '>=', $date->format('Y-m-d'));
- }
-
- /**
- * @param EloquentBuilder $query
- * @param Carbon $date
- */
- public function scopeBefore(EloquentBuilder $query, Carbon $date)
- {
- if (is_null($this->joinedJournals)) {
- $query->leftJoin(
- 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
- );
- $this->joinedJournals = true;
- }
- $query->where('transaction_journals.date', '<=', $date->format('Y-m-d'));
- }
-
- /**
- * @param EloquentBuilder $query
- * @param $amount
- */
- public function scopeLessThan(EloquentBuilder $query, $amount)
- {
- $query->where('amount', '<', $amount);
- }
-
- /**
- * @param EloquentBuilder $query
- * @param $amount
- */
- public function scopeMoreThan(EloquentBuilder $query, $amount)
- {
- $query->where('amount', '>', $amount);
- }
-
- /**
- * @param EloquentBuilder $query
- * @param array $types
- */
- public function scopeTransactionTypes(EloquentBuilder $query, array $types)
- {
- if (is_null($this->joinedJournals)) {
- $query->leftJoin(
- 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
- );
- $this->joinedJournals = true;
- }
- if (is_null($this->joinedTransactionTypes)) {
- $query->leftJoin(
- 'transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'
- );
- $this->joinedTransactionTypes = true;
- }
- $query->whereIn('transaction_types.type', $types);
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function transactionJournal()
- {
- return $this->belongsTo('TransactionJournal');
- }
-}
diff --git a/app/models/TransactionCurrency.php b/app/models/TransactionCurrency.php
deleted file mode 100644
index a72d8168df..0000000000
--- a/app/models/TransactionCurrency.php
+++ /dev/null
@@ -1,29 +0,0 @@
- 'required|alpha|between:3,3|min:3|max:3',
- 'name' => 'required|between:3,48|min:3|max:48',
- 'symbol' => 'required|between:1,8|min:1|max:8',
- ];
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function transactionJournals()
- {
- return $this->hasMany('TransactionJournal');
- }
-
-}
diff --git a/app/models/TransactionGroup.php b/app/models/TransactionGroup.php
deleted file mode 100644
index dea100af17..0000000000
--- a/app/models/TransactionGroup.php
+++ /dev/null
@@ -1,45 +0,0 @@
- 'required|in:balance'
- ];
-
- /**
- * @return array
- */
- public function getDates()
- {
- return ['created_at', 'updated_at'];
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function transactionjournals()
- {
- return $this->belongsToMany('TransactionJournal');
- }
-
- /**
- * User
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
- */
- public function user()
- {
- return $this->belongsTo('User');
- }
-
-
-}
diff --git a/app/models/TransactionRelation.php b/app/models/TransactionRelation.php
deleted file mode 100644
index cd34f354e9..0000000000
--- a/app/models/TransactionRelation.php
+++ /dev/null
@@ -1,10 +0,0 @@
-hasMany('TransactionJournal');
- }
-
-}
diff --git a/app/models/User.php b/app/models/User.php
deleted file mode 100644
index a3dc1a47ce..0000000000
--- a/app/models/User.php
+++ /dev/null
@@ -1,102 +0,0 @@
- 'required|email|unique:users,email',
- 'password' => 'required|between:60,60',
- 'reset' => 'between:32,32',
- ];
- protected $table = 'users';
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function accounts()
- {
- return $this->hasMany('Account');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function bills()
- {
- return $this->hasMany('Bill');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function budgets()
- {
- return $this->hasMany('Budget');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function categories()
- {
- return $this->hasMany('Category');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
- */
- public function piggyBanks()
- {
- return $this->hasManyThrough('PiggyBank', 'Account');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function preferences()
- {
- return $this->hasMany('Preference');
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function reminders()
- {
- return $this->hasMany('Reminder');
- }
-
- /**
- * @param $value
- */
- public function setPasswordAttribute($value)
- {
- $this->attributes['password'] = Hash::make($value);
- }
-
- /**
- * @return \Illuminate\Database\Eloquent\Relations\HasMany
- */
- public function transactionjournals()
- {
- return $this->hasMany('TransactionJournal');
- }
-
-
-}
diff --git a/app/start/artisan.php b/app/start/artisan.php
deleted file mode 100644
index 8e36314924..0000000000
--- a/app/start/artisan.php
+++ /dev/null
@@ -1,14 +0,0 @@
-prepareForTests();
-
- }
-
- static public function setupBeforeClass()
- {
- f::loadFactories(__DIR__ . '/factories');
- }
-
- public function tearDown()
- {
- //m::close();
- }
-
- /**
- * Migrates the database and set the mailer to 'pretend'.
- * This will cause the tests to run quickly.
- *
- */
- private function prepareForTests()
- {
- Artisan::call('migrate');
- Mail::pretend(true);
- }
-}
diff --git a/app/tests/factories/Account.php b/app/tests/factories/Account.php
deleted file mode 100644
index 3d4032b4d1..0000000000
--- a/app/tests/factories/Account.php
+++ /dev/null
@@ -1,10 +0,0 @@
- 'factory|User',
- 'account_type_id' => 'factory|AccountType',
- 'name' => 'word',
- 'active' => 'boolean',
- ]
-);
diff --git a/app/tests/factories/AccountMeta.php b/app/tests/factories/AccountMeta.php
deleted file mode 100644
index a282aa9748..0000000000
--- a/app/tests/factories/AccountMeta.php
+++ /dev/null
@@ -1,9 +0,0 @@
- 'factory|Account',
- 'name' => 'word',
- 'data' => 'text'
- ]
-);
diff --git a/app/tests/factories/AccountType.php b/app/tests/factories/AccountType.php
deleted file mode 100644
index e893ea89af..0000000000
--- a/app/tests/factories/AccountType.php
+++ /dev/null
@@ -1,8 +0,0 @@
- 'word',
- 'editable' => 'boolean'
- ]
-);
diff --git a/app/tests/factories/Budget.php b/app/tests/factories/Budget.php
deleted file mode 100644
index 1975cf53b0..0000000000
--- a/app/tests/factories/Budget.php
+++ /dev/null
@@ -1,8 +0,0 @@
- 'word',
- 'user_id' => 'factory|User'
- ]
-);
diff --git a/app/tests/factories/PiggyBank.php b/app/tests/factories/PiggyBank.php
deleted file mode 100644
index aaab88cd71..0000000000
--- a/app/tests/factories/PiggyBank.php
+++ /dev/null
@@ -1,38 +0,0 @@
- 'factory|Account',
- 'name' => 'word',
- 'targetamount' => function () {
- return rand(1, 400);
- },
- 'startdate' => 'date|Y-m-d',
- 'targetdate' => 'date|Y-m-d',
- 'repeats' => 'boolean',
- 'rep_length' => function () {
- $set = ['day', 'week', 'quarter', 'month', 'year'];
-
- return $set[rand(0, count($set) - 1)];
- },
- 'rep_every' => function () {
- return rand(0, 3);
- },
- 'rep_times' => function () {
- return rand(0, 3);
- },
- 'reminder' => function () {
- $set = ['day', 'week', 'quarter', 'month', 'year'];
-
- return $set[rand(0, count($set) - 1)];
- },
- 'reminder_skip' => function () {
- return rand(0, 3);
- },
- 'remind_me' => 'boolean',
- 'order' => function () {
- return rand(0, 10);
- },
-
- ]
-);
diff --git a/app/tests/factories/PiggyBankRepetition.php b/app/tests/factories/PiggyBankRepetition.php
deleted file mode 100644
index a266af2283..0000000000
--- a/app/tests/factories/PiggyBankRepetition.php
+++ /dev/null
@@ -1,13 +0,0 @@
- 'factory|PiggyBank',
- 'startdate' => 'date|Y-m-d',
- 'targetdate' => 'date|Y-m-d',
- 'currentamount' => function () {
- return rand(0, 100);
- },
-
- ]
-);
diff --git a/app/tests/factories/Preference.php b/app/tests/factories/Preference.php
deleted file mode 100644
index 89a26f5812..0000000000
--- a/app/tests/factories/Preference.php
+++ /dev/null
@@ -1,9 +0,0 @@
- 'factory|User',
- 'name' => 'word',
- 'data' => 'sentence',
- ]
-);
diff --git a/app/tests/factories/Reminder.php b/app/tests/factories/Reminder.php
deleted file mode 100644
index 62f2a3d513..0000000000
--- a/app/tests/factories/Reminder.php
+++ /dev/null
@@ -1,13 +0,0 @@
- 'factory|User',
- 'startdate' => 'date|Y-m-d',
- 'enddate' => 'date|Y-m-d',
- 'active' => 'boolean',
- 'notnow' => 'boolean',
- 'remindersable_id' => 0,
- 'remindersable_type' => '',
- ]
-);
diff --git a/app/tests/factories/Transaction.php b/app/tests/factories/Transaction.php
deleted file mode 100644
index 39f50f7ca5..0000000000
--- a/app/tests/factories/Transaction.php
+++ /dev/null
@@ -1,12 +0,0 @@
- 'factory|Account',
- 'transaction_journal_id' => 'factory|TransactionJournal',
- 'description' => 'sentence',
- 'amount' => function () {
- return round(rand(100, 10000) / 100, 2);
- }
- ]
-);
diff --git a/app/tests/factories/TransactionCurrency.php b/app/tests/factories/TransactionCurrency.php
deleted file mode 100644
index cfb3b685b0..0000000000
--- a/app/tests/factories/TransactionCurrency.php
+++ /dev/null
@@ -1,30 +0,0 @@
- function () {
- $code = '';
- for ($i = 0; $i < 3; $i++) {
- $code .= chr(rand(65, 90));
- }
-
- return $code;
- },
- 'name' => function () {
- $code = '';
- for ($i = 0; $i < 8; $i++) {
- $code .= chr(rand(65, 90));
- }
-
- return $code;
- },
- 'symbol' => function () {
- $code = '';
- for ($i = 0; $i < 2; $i++) {
- $code .= chr(rand(65, 90));
- }
-
- return $code;
- }
- ]
-);
diff --git a/app/tests/factories/TransactionGroup.php b/app/tests/factories/TransactionGroup.php
deleted file mode 100644
index 74e917a8ae..0000000000
--- a/app/tests/factories/TransactionGroup.php
+++ /dev/null
@@ -1,8 +0,0 @@
- 'factory|User',
- 'relation' => 'balance',
- ]
-);
diff --git a/app/tests/factories/TransactionJournal.php b/app/tests/factories/TransactionJournal.php
deleted file mode 100644
index 58fd89d200..0000000000
--- a/app/tests/factories/TransactionJournal.php
+++ /dev/null
@@ -1,12 +0,0 @@
- 'factory|TransactionType',
- 'transaction_currency_id' => 'factory|TransactionCurrency',
- 'description' => 'text',
- 'date' => 'date|Y-m-d',
- 'completed' => 'boolean',
- 'user_id' => 'factory|User'
- ]
-);
diff --git a/app/tests/factories/TransactionType.php b/app/tests/factories/TransactionType.php
deleted file mode 100644
index 0876277d2c..0000000000
--- a/app/tests/factories/TransactionType.php
+++ /dev/null
@@ -1,7 +0,0 @@
- 'word',
- ]
-);
diff --git a/app/tests/factories/User.php b/app/tests/factories/User.php
deleted file mode 100644
index 92efe04843..0000000000
--- a/app/tests/factories/User.php
+++ /dev/null
@@ -1,7 +0,0 @@
- 'email',
- 'password' => 'empty'
- ]
-);
diff --git a/app/views/budgets/edit.blade.php b/app/views/budgets/edit.blade.php
deleted file mode 100644
index 94061cd926..0000000000
--- a/app/views/budgets/edit.blade.php
+++ /dev/null
@@ -1,42 +0,0 @@
-@extends('layouts.default')
-@section('content')
-{{ Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $budget) }}
-Use budgets to organize and limit your expenses.
-- -
-- Firefly III supports various currencies which you can set and enable here. -
-- Hi! -
-- Here's the password you need to login at Firefly: {{$password}} -
-- Cya! -
- - - diff --git a/app/views/emails/user/register-text.blade.php b/app/views/emails/user/register-text.blade.php deleted file mode 100644 index 0993031a88..0000000000 --- a/app/views/emails/user/register-text.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -Hi! - -Here's the password you need to login at Firefly: {{$password}} - -Cya! diff --git a/app/views/emails/user/verify-html.blade.php b/app/views/emails/user/verify-html.blade.php deleted file mode 100644 index 90b477e351..0000000000 --- a/app/views/emails/user/verify-html.blade.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - - -- Hi! -
-- To verify your registration, please verify your e-mail address. -
-- Cya! -
- - - diff --git a/app/views/emails/user/verify-text.blade.php b/app/views/emails/user/verify-text.blade.php deleted file mode 100644 index 27f1d553a0..0000000000 --- a/app/views/emails/user/verify-text.blade.php +++ /dev/null @@ -1,7 +0,0 @@ -Hi! - -To verify your registration, please verify your e-mail address: - -{{route('reset',$reset)}} - -Cya! diff --git a/app/views/help/show.blade.php b/app/views/help/show.blade.php deleted file mode 100644 index e864585fd5..0000000000 --- a/app/views/help/show.blade.php +++ /dev/null @@ -1,14 +0,0 @@ -| - {{{$journal->description}}} - | -- transactions[1]->amount);?> - @if($journal->transactiontype->type == 'Withdrawal') - {{Amount::formatTransaction($journal->transactions[1],false)}} - @endif - @if($journal->transactiontype->type == 'Deposit') - {{Amount::formatTransaction($journal->transactions[1],false)}} - @endif - @if($journal->transactiontype->type == 'Transfer') - {{Amount::formatTransaction($journal->transactions[1],false)}} - @endif - | -- {{$journal->date->format('j F Y')}} - | -- @foreach($journal->transactions as $t) - @if(floatval($t->amount < 0)) - @if($t->account->accounttype->description == 'Cash account') - (cash) - @else - {{{$t->account->name}}} - @endif - @endif - @endforeach - | -
| Sum | -{{Amount::format($tableSum)}} | - -||
- -
-{{$errors->first('reminder')}}
- @else - Enter a number and a period and Firefly will remind you to add money - to this piggy bank every now and then. - @endif -- -
-{{$errors->first('reminder')}}
- @else - Enter a number and a period and Firefly will remind you to add money - to this piggy bank every now and then. - @endif -- @if(get_class($reminder->remindersable) == 'Piggybank') - Somewhere between {{$reminder->startdate->format('j F Y')}} and {{$reminder->enddate->format('j F Y')}} you - should deposit {{Amount::format($amount)}} in piggy bank {{{$reminder->remindersable->name}}} - in order to make your goal of saving {{Amount::format($reminder->remindersable->targetamount)}} on {{$reminder->remindersable->targetdate->format('j F Y')}} - - @endif -
-- I want to do this - I already did this - Not this time - -
-- -
-{{$errors->first('reminder')}}
- @else - Enter a number and a period and Firefly will remind you to add money - to this piggy bank every now and then. - @endif -- -
-{{$errors->first('reminder')}}
- @else - Enter a number and a period and Firefly will remind you to add money - to this piggy bank every now and then. - @endif -- -
-- Registering an account on Firefly requires an e-mail address. - All instructions will be sent to you. -
- {{Form::open(['id' => 'register'])}} -- -
- {{Form::close()}} - - - -- You're about to get an e-mail. Use the contents to log in. -
-- Hi! -
-- To get a new password, please verify your e-mail address. -
-- Cya! -
- - - diff --git a/app/views/user/remindMe-text.blade.php b/app/views/user/remindMe-text.blade.php deleted file mode 100644 index 8d1980a3e4..0000000000 --- a/app/views/user/remindMe-text.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -Hi! - -To get a new password, please verify your e-mail address: {{route('reset',$reset)}} - -Cya! diff --git a/app/views/user/remindMe.blade.php b/app/views/user/remindMe.blade.php deleted file mode 100644 index 18b48954ac..0000000000 --- a/app/views/user/remindMe.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@extends('layouts.guest') -@section('content') -- -
- {{Form::close()}} - -- You're about to get an e-mail. Please follow its instructions. -
-| t |
+ Registering an account on Firefly requires an e-mail address. +
+ @if (count($errors) > 0) +@@ -32,9 +32,9 @@ Optional fields
@@ -26,7 +26,7 @@ Options
Use budgets to organize and limit your expenses.
++ +
+{{{Session::get('errors')->first($name)}}}
+{{{$errors->first($name)}}}
@endif @if(Session::has('warnings') && Session::get('warnings')->has($name)) diff --git a/app/views/form/integer.blade.php b/resources/views/form/integer.blade.php similarity index 78% rename from app/views/form/integer.blade.php rename to resources/views/form/integer.blade.php index fd10ca6ca6..cfd93a09c2 100644 --- a/app/views/form/integer.blade.php +++ b/resources/views/form/integer.blade.php @@ -2,7 +2,7 @@| @if($journal->transactiontype->type == 'Withdrawal') - {{Amount::formatTransaction($journal->transactions[1],false)}} + {{Amount::formatTransaction($journal->transactions[0],false)}} @endif @if($journal->transactiontype->type == 'Deposit') - {{Amount::formatTransaction($journal->transactions[1],false)}} + {{Amount::formatTransaction($journal->transactions[1],false)}} @endif @if($journal->transactiontype->type == 'Transfer') - {{Amount::formatTransaction($journal->transactions[1],false)}} + {{Amount::formatTransaction($journal->transactions[1],false)}} @endif | @@ -115,6 +115,6 @@ @endforeach |