From 2e2c12d6a421c3a81953072088c597b369bed491 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 12 Nov 2014 22:21:48 +0100 Subject: [PATCH] General clean up. --- app/controllers/BudgetController.php | 10 +- app/controllers/GoogleTableController.php | 1 - app/controllers/PiggybankController.php | 2 - .../Piggybanks/EloquentPiggybankTrigger.php | 11 -- app/lib/FireflyIII/Database/Account.php | 79 ++++----- app/lib/FireflyIII/Database/AccountType.php | 31 ++-- app/lib/FireflyIII/Database/Budget.php | 138 ++++++++-------- app/lib/FireflyIII/Database/Category.php | 141 ++++++++-------- app/lib/FireflyIII/Database/Piggybank.php | 146 +++++++++-------- app/lib/FireflyIII/Database/Recurring.php | 52 +++--- .../Database/RecurringTransaction.php | 29 ++-- app/lib/FireflyIII/Database/Transaction.php | 111 +++++++------ .../Database/TransactionCurrency.php | 75 +++++---- .../Database/TransactionJournal.php | 72 +++++---- .../FireflyIII/Database/TransactionType.php | 153 +++++++++--------- app/lib/FireflyIII/Database/User.php | 6 +- 16 files changed, 562 insertions(+), 495 deletions(-) diff --git a/app/controllers/BudgetController.php b/app/controllers/BudgetController.php index 02a108a14e..99522d1ef2 100644 --- a/app/controllers/BudgetController.php +++ b/app/controllers/BudgetController.php @@ -51,13 +51,19 @@ class BudgetController extends BaseController $limit->repeat_freq = 'monthly'; $limit->repeats = 0; $limit->save(); - Event::fire('limits.store', [$limit]); + /* + * A newly stored limit also created a limit repetition. + */ + Event::fire('limits.store', [$limit]); // Still in use. } else { if ($amount > 0) { $limit->amount = $amount; $limit->save(); - Event::fire('limits.update', [$limit]); + /* + * An updated limit also updates the associated limit repetitions. + */ + Event::fire('limits.update', [$limit]); // Still in use. } else { $limit->delete(); } diff --git a/app/controllers/GoogleTableController.php b/app/controllers/GoogleTableController.php index a3a26d673e..18c45283d5 100644 --- a/app/controllers/GoogleTableController.php +++ b/app/controllers/GoogleTableController.php @@ -264,7 +264,6 @@ class GoogleTableController extends BaseController $date = $journal->date; $descriptionURL = route('transactions.show', $journal->id); $description = $journal->description; - $amount = floatval(-0.01); // TODO $id = $journal->id; diff --git a/app/controllers/PiggybankController.php b/app/controllers/PiggybankController.php index c497a8c6d3..c1e728b063 100644 --- a/app/controllers/PiggybankController.php +++ b/app/controllers/PiggybankController.php @@ -60,8 +60,6 @@ class PiggybankController extends BaseController */ public function destroy(Piggybank $piggyBank) { - Event::fire('piggybanks.destroy', [$piggyBank]); - /** @var \FireflyIII\Database\Piggybank $acct */ $repos = App::make('FireflyIII\Database\Piggybank'); $repos->destroy($piggyBank); diff --git a/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php b/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php index 09e3943099..dec66c2dcf 100644 --- a/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php +++ b/app/lib/Firefly/Trigger/Piggybanks/EloquentPiggybankTrigger.php @@ -107,16 +107,6 @@ class EloquentPiggybankTrigger return true; } - /** - * @param \Piggybank $piggyBank - * - * @return bool - */ - public function destroy(\Piggybank $piggyBank) - { - return true; - } - /** * @param \Piggybank $piggyBank * @param $amount @@ -175,7 +165,6 @@ class EloquentPiggybankTrigger */ public function subscribe(Dispatcher $events) { - $events->listen('piggybanks.destroy', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@destroy'); $events->listen( 'piggybanks.modifyAmountAdd', 'Firefly\Trigger\Piggybanks\EloquentPiggybankTrigger@modifyAmountAdd' ); diff --git a/app/lib/FireflyIII/Database/Account.php b/app/lib/FireflyIII/Database/Account.php index 015ed63cf1..e345a1c6d0 100644 --- a/app/lib/FireflyIII/Database/Account.php +++ b/app/lib/FireflyIII/Database/Account.php @@ -6,6 +6,7 @@ use Carbon\Carbon; use FireflyIII\Database\Ifaces\AccountInterface; use FireflyIII\Database\Ifaces\CommonDatabaseCalls; use FireflyIII\Database\Ifaces\CUD; +use FireflyIII\Exception\NotImplementedException; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use LaravelBook\Ardent\Ardent; @@ -198,16 +199,6 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface return $this->getAccountsByType(['Expense account', 'Beneficiary account'], $parameters); } - /** - * Get all default accounts. - * - * @return Collection - */ - public function getDefaultAccounts() - { - // TODO: Implement getDefaultAccounts() method. - } - /** * Returns an object with id $id. * @@ -237,16 +228,6 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface } - /** - * Returns all objects. - * - * @return Collection - */ - public function get() - { - // TODO: Implement get() method. - } - /** * Counts the number of total revenue accounts. Useful for DataTables. * @@ -281,19 +262,6 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface } - /** - * Validates a model. Returns an array containing MessageBags - * errors/warnings/successes. - * - * @param Ardent $model - * - * @return array - */ - public function validateObject(Ardent $model) - { - die('No impl'); - } - /** * Validates a model. Returns an array containing MessageBags * errors/warnings/successes. @@ -462,6 +430,38 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface return false; } + /** + * @param array $ids + * + * @return Collection + */ + public function getByIds(array $ids) + { + return $this->getUser()->accounts()->whereIn('id', $ids)->get(); + } + + /** + * Get all default accounts. + * + * @return Collection + */ + public function getDefaultAccounts() + { + // TODO: Implement getDefaultAccounts() method. + throw new NotImplementedException; + } + + /** + * Returns all objects. + * + * @return Collection + */ + public function get() + { + // TODO: Implement get() method. + throw new NotImplementedException; + } + /** * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. * @@ -472,15 +472,20 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface public function findByWhat($what) { // TODO: Implement findByWhat() method. + throw new NotImplementedException; } /** - * @param array $ids + * Validates a model. Returns an array containing MessageBags + * errors/warnings/successes. * - * @return Collection + * @param Ardent $model + * + * @return array */ - public function getByIds(array $ids) + public function validateObject(Ardent $model) { - return $this->getUser()->accounts()->whereIn('id', $ids)->get(); + // TODO: Implement validateObject() method. + throw new NotImplementedException; } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/AccountType.php b/app/lib/FireflyIII/Database/AccountType.php index 8a4e13f1dc..5d101c1653 100644 --- a/app/lib/FireflyIII/Database/AccountType.php +++ b/app/lib/FireflyIII/Database/AccountType.php @@ -3,6 +3,7 @@ namespace FireflyIII\Database; use Firefly\Exception\FireflyException; +use FireflyIII\Exception\NotImplementedException; use Illuminate\Support\Collection; use LaravelBook\Ardent\Ardent; use FireflyIII\Database\Ifaces\AccountTypeInterface; @@ -56,6 +57,7 @@ class AccountType implements AccountTypeInterface, CUD, CommonDatabaseCalls public function destroy(Ardent $model) { // TODO: Implement destroy() method. + throw new NotImplementedException; } /** @@ -69,6 +71,7 @@ class AccountType implements AccountTypeInterface, CUD, CommonDatabaseCalls public function validateObject(Ardent $model) { // TODO: Implement validateObject() method. + throw new NotImplementedException; } /** @@ -82,6 +85,7 @@ class AccountType implements AccountTypeInterface, CUD, CommonDatabaseCalls public function validate(array $model) { // TODO: Implement validate() method. + throw new NotImplementedException; } /** @@ -92,6 +96,19 @@ class AccountType implements AccountTypeInterface, CUD, CommonDatabaseCalls public function store(array $data) { // TODO: Implement store() method. + throw new NotImplementedException; + } + + /** + * @param Ardent $model + * @param array $data + * + * @return bool + */ + public function update(Ardent $model, array $data) + { + // TODO: Implement update() method. + throw new NotImplementedException; } /** @@ -104,6 +121,7 @@ class AccountType implements AccountTypeInterface, CUD, CommonDatabaseCalls public function find($id) { // TODO: Implement find() method. + throw new NotImplementedException; } /** @@ -114,6 +132,7 @@ class AccountType implements AccountTypeInterface, CUD, CommonDatabaseCalls public function get() { // TODO: Implement get() method. + throw new NotImplementedException; } /** @@ -124,16 +143,6 @@ class AccountType implements AccountTypeInterface, CUD, CommonDatabaseCalls public function getByIds(array $ids) { // TODO: Implement getByIds() method. - } - - /** - * @param Ardent $model - * @param array $data - * - * @return bool - */ - public function update(Ardent $model, array $data) - { - // TODO: Implement update() method. + throw new NotImplementedException; } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/Budget.php b/app/lib/FireflyIII/Database/Budget.php index 934941adf7..0d0eda4be3 100644 --- a/app/lib/FireflyIII/Database/Budget.php +++ b/app/lib/FireflyIII/Database/Budget.php @@ -2,13 +2,13 @@ namespace FireflyIII\Database; use Carbon\Carbon; -use FireflyIII\Exception\NotImplementedException; -use Illuminate\Support\MessageBag; -use LaravelBook\Ardent\Ardent; -use Illuminate\Support\Collection; +use FireflyIII\Database\Ifaces\BudgetInterface; use FireflyIII\Database\Ifaces\CommonDatabaseCalls; use FireflyIII\Database\Ifaces\CUD; -use FireflyIII\Database\Ifaces\BudgetInterface; +use FireflyIII\Exception\NotImplementedException; +use Illuminate\Support\Collection; +use Illuminate\Support\MessageBag; +use LaravelBook\Ardent\Ardent; /** * Class Budget @@ -29,7 +29,7 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface /** * @param \Budget $budget - * @param Carbon $date + * @param Carbon $date * * @return \LimitRepetition|null */ @@ -54,18 +54,6 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface return true; } - /** - * Validates a model. Returns an array containing MessageBags - * errors/warnings/successes. - * - * @param Ardent $model - * - * @return array - */ - public function validateObject(Ardent $model) - { - // TODO: Implement validateObject() method. - } /** * Validates an array. Returns an array containing MessageBags @@ -77,9 +65,9 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface */ public function validate(array $model) { - $warnings = new MessageBag; + $warnings = new MessageBag; $successes = new MessageBag; - $errors = new MessageBag; + $errors = new MessageBag; if (isset($model['name'])) { if (strlen($model['name']) < 1) { @@ -104,8 +92,8 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface } return [ - 'errors' => $errors, - 'warnings' => $warnings, + 'errors' => $errors, + 'warnings' => $warnings, 'successes' => $successes ]; } @@ -119,7 +107,7 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface { $data['user_id'] = $this->getUser()->id; - $budget = new \Budget($data); + $budget = new \Budget($data); $budget->class = 'Budget'; if (!$budget->validate()) { @@ -130,18 +118,6 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface return $budget; } - /** - * Returns an object with id $id. - * - * @param int $id - * - * @return Ardent - */ - public function find($id) - { - // TODO: Implement find() method. - } - /** * Returns all objects. * @@ -156,7 +132,7 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface /** * @param \Budget $budget - * @param Carbon $date + * @param Carbon $date * * @return float */ @@ -169,27 +145,6 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface return $sum; } - /** - * @param array $ids - * - * @return Collection - */ - public function getByIds(array $ids) - { - // TODO: Implement getByIds() method. - } - - /** - * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. - * - * @param $what - * - * @return \AccountType|null - */ - public function findByWhat($what) - { - // TODO: Implement findByWhat() method. - } /** * @param Carbon $start @@ -203,21 +158,21 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface return \Auth::user()->transactionjournals()->whereNotIn( 'transaction_journals.id', function ($query) use ($start, $end) { $query->select('transaction_journals.id')->from('transaction_journals') - ->leftJoin( - 'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=', - 'transaction_journals.id' - ) - ->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id') - ->where('transaction_journals.date', '>=', $start->format('Y-m-d')) - ->where('transaction_journals.date', '<=', $end->format('Y-m-d')) - ->where('components.class', 'Budget'); + ->leftJoin( + 'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=', + 'transaction_journals.id' + ) + ->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id') + ->where('transaction_journals.date', '>=', $start->format('Y-m-d')) + ->where('transaction_journals.date', '<=', $end->format('Y-m-d')) + ->where('components.class', 'Budget'); } )->before($end)->after($start)->lessThan(0)->transactionTypes(['Withdrawal'])->get(); } /** * @param Ardent $model - * @param array $data + * @param array $data * * @return bool */ @@ -234,4 +189,55 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface return true; } + + /** + * Validates a model. Returns an array containing MessageBags + * errors/warnings/successes. + * + * @param Ardent $model + * + * @return array + */ + public function validateObject(Ardent $model) + { + // TODO: Implement validateObject() method. + throw new NotImplementedException; + } + + /** + * Returns an object with id $id. + * + * @param int $id + * + * @return Ardent + */ + public function find($id) + { + // TODO: Implement find() method. + throw new NotImplementedException; + } + + /** + * @param array $ids + * + * @return Collection + */ + public function getByIds(array $ids) + { + // TODO: Implement getByIds() method. + throw new NotImplementedException; + } + + /** + * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. + * + * @param $what + * + * @return \AccountType|null + */ + public function findByWhat($what) + { + // TODO: Implement findByWhat() method. + throw new NotImplementedException; + } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/Category.php b/app/lib/FireflyIII/Database/Category.php index 7599acfe57..5c378a2704 100644 --- a/app/lib/FireflyIII/Database/Category.php +++ b/app/lib/FireflyIII/Database/Category.php @@ -2,13 +2,13 @@ namespace FireflyIII\Database; use Carbon\Carbon; -use FireflyIII\Exception\NotImplementedException; -use Illuminate\Support\MessageBag; -use LaravelBook\Ardent\Ardent; -use Illuminate\Support\Collection; +use FireflyIII\Database\Ifaces\CategoryInterface; use FireflyIII\Database\Ifaces\CommonDatabaseCalls; use FireflyIII\Database\Ifaces\CUD; -use FireflyIII\Database\Ifaces\CategoryInterface; +use FireflyIII\Exception\NotImplementedException; +use Illuminate\Support\Collection; +use Illuminate\Support\MessageBag; +use LaravelBook\Ardent\Ardent; /** * Class Category @@ -38,18 +38,6 @@ class Category implements CUD, CommonDatabaseCalls, CategoryInterface return true; } - /** - * Validates a model. Returns an array containing MessageBags - * errors/warnings/successes. - * - * @param Ardent $model - * - * @return array - */ - public function validateObject(Ardent $model) - { - // TODO: Implement validateObject() method. - } /** * Validates an array. Returns an array containing MessageBags @@ -61,9 +49,9 @@ class Category implements CUD, CommonDatabaseCalls, CategoryInterface */ public function validate(array $model) { - $warnings = new MessageBag; + $warnings = new MessageBag; $successes = new MessageBag; - $errors = new MessageBag; + $errors = new MessageBag; if (isset($model['name'])) { if (strlen($model['name']) < 1) { @@ -88,34 +76,12 @@ class Category implements CUD, CommonDatabaseCalls, CategoryInterface } return [ - 'errors' => $errors, - 'warnings' => $warnings, + 'errors' => $errors, + 'warnings' => $warnings, 'successes' => $successes ]; } - /** - * @param array $data - * - * @return Ardent - */ - public function store(array $data) - { - // TODO: Implement store() method. - } - - /** - * Returns an object with id $id. - * - * @param int $id - * - * @return Ardent - */ - public function find($id) - { - // TODO: Implement find() method. - } - /** * Returns all objects. * @@ -126,31 +92,10 @@ class Category implements CUD, CommonDatabaseCalls, CategoryInterface return $this->getUser()->categories()->orderBy('name', 'ASC')->get(); } - /** - * @param array $ids - * - * @return Collection - */ - public function getByIds(array $ids) - { - // TODO: Implement getByIds() method. - } - - /** - * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. - * - * @param $what - * - * @return \AccountType|null - */ - public function findByWhat($what) - { - // TODO: Implement findByWhat() method. - } /** * @param \Category $budget - * @param Carbon $date + * @param Carbon $date * * @return null */ @@ -161,7 +106,7 @@ class Category implements CUD, CommonDatabaseCalls, CategoryInterface /** * @param \Category $category - * @param Carbon $date + * @param Carbon $date * * @return float */ @@ -176,7 +121,7 @@ class Category implements CUD, CommonDatabaseCalls, CategoryInterface /** * @param Ardent $model - * @param array $data + * @param array $data * * @return bool */ @@ -193,4 +138,66 @@ class Category implements CUD, CommonDatabaseCalls, CategoryInterface return true; } + + /** + * Validates a model. Returns an array containing MessageBags + * errors/warnings/successes. + * + * @param Ardent $model + * + * @return array + */ + public function validateObject(Ardent $model) + { + // TODO: Implement validateObject() method. + throw new NotImplementedException; + } + + /** + * @param array $data + * + * @return Ardent + */ + public function store(array $data) + { + // TODO: Implement store() method. + throw new NotImplementedException; + } + + /** + * Returns an object with id $id. + * + * @param int $id + * + * @return Ardent + */ + public function find($id) + { + // TODO: Implement find() method. + throw new NotImplementedException; + } + + /** + * @param array $ids + * + * @return Collection + */ + public function getByIds(array $ids) + { + // TODO: Implement getByIds() method. + throw new NotImplementedException; + } + + /** + * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. + * + * @param $what + * + * @return \AccountType|null + */ + public function findByWhat($what) + { + // TODO: Implement findByWhat() method. + throw new NotImplementedException; + } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/Piggybank.php b/app/lib/FireflyIII/Database/Piggybank.php index f99aa14040..66575fcfb3 100644 --- a/app/lib/FireflyIII/Database/Piggybank.php +++ b/app/lib/FireflyIII/Database/Piggybank.php @@ -2,13 +2,13 @@ namespace FireflyIII\Database; use Carbon\Carbon; -use FireflyIII\Exception\NotImplementedException; -use Illuminate\Support\MessageBag; -use LaravelBook\Ardent\Ardent; -use Illuminate\Support\Collection; use FireflyIII\Database\Ifaces\CommonDatabaseCalls; use FireflyIII\Database\Ifaces\CUD; use FireflyIII\Database\Ifaces\PiggybankInterface; +use FireflyIII\Exception\NotImplementedException; +use Illuminate\Support\Collection; +use Illuminate\Support\MessageBag; +use LaravelBook\Ardent\Ardent; /** * Class Piggybank @@ -19,6 +19,14 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface { use SwitchUser; + /** + * + */ + public function __construct() + { + $this->setUser(\Auth::user()); + } + /** * @param \Account $account * @@ -36,14 +44,6 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface } - /** - * - */ - public function __construct() - { - $this->setUser(\Auth::user()); - } - /** * @param Ardent $model * @@ -54,18 +54,6 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface $model->delete(); } - /** - * Validates a model. Returns an array containing MessageBags - * errors/warnings/successes. - * - * @param Ardent $model - * - * @return array - */ - public function validateObject(Ardent $model) - { - // TODO: Implement validateObject() method. - } /** * Validates an array. Returns an array containing MessageBags @@ -77,9 +65,9 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface */ public function validate(array $model) { - $warnings = new MessageBag; + $warnings = new MessageBag; $successes = new MessageBag; - $errors = new MessageBag; + $errors = new MessageBag; /* * Name validation: @@ -116,7 +104,7 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface } // check period. if (!$errors->has('reminder') && !$errors->has('targetdate') && isset($model['remind_me']) && intval($model['remind_me']) == 1) { - $today = new Carbon; + $today = new Carbon; $target = new Carbon($model['targetdate']); switch ($model['reminder']) { case 'week': @@ -148,8 +136,8 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface } return [ - 'errors' => $errors, - 'warnings' => $warnings, + 'errors' => $errors, + 'warnings' => $warnings, 'successes' => $successes ]; } @@ -161,12 +149,12 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface */ public function store(array $data) { - $data['rep_every'] = isset($data['rep_every']) ? $data['rep_every'] : 0; + $data['rep_every'] = isset($data['rep_every']) ? $data['rep_every'] : 0; $data['reminder_skip'] = isset($data['reminder_skip']) ? $data['reminder_skip'] : 0; - $data['order'] = isset($data['order']) ? $data['order'] : 0; - $data['remind_me'] = isset($data['remind_me']) ? intval($data['remind_me']) : 0; - $data['startdate'] = isset($data['startdate']) ? $data['startdate'] : Carbon::now()->format('Y-m-d'); - $data['targetdate'] = isset($data['targetdate']) && $data['targetdate'] != '' ? $data['targetdate'] : null; + $data['order'] = isset($data['order']) ? $data['order'] : 0; + $data['remind_me'] = isset($data['remind_me']) ? intval($data['remind_me']) : 0; + $data['startdate'] = isset($data['startdate']) ? $data['startdate'] : Carbon::now()->format('Y-m-d'); + $data['targetdate'] = isset($data['targetdate']) && $data['targetdate'] != '' ? $data['targetdate'] : null; $piggybank = new \Piggybank($data); @@ -179,17 +167,6 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface $piggybank->save(); } - /** - * Returns an object with id $id. - * - * @param int $id - * - * @return Ardent - */ - public function find($id) - { - // TODO: Implement find() method. - } /** * Returns all objects. @@ -201,6 +178,58 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface return $this->getUser()->piggybanks()->where('repeats', 0)->get(); } + /** + * @param Ardent $model + * @param array $data + * + * @return bool + */ + public function update(Ardent $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 = isset($data['rep_every']) ? $data['rep_every'] : 0; + $model->reminder_skip = isset($data['reminder_skip']) ? $data['reminder_skip'] : 0; + $model->order = isset($data['order']) ? $data['order'] : 0; + $model->remind_me = isset($data['remind_me']) ? intval($data['remind_me']) : 0; + if (!$model->validate()) { + var_dump($model->errors()); + exit(); + } + $model->save(); + return true; + } + + /** + * Validates a model. Returns an array containing MessageBags + * errors/warnings/successes. + * + * @param Ardent $model + * + * @return array + */ + public function validateObject(Ardent $model) + { + // TODO: Implement validateObject() method. + throw new NotImplementedException; + } + + /** + * Returns an object with id $id. + * + * @param int $id + * + * @return Ardent + */ + public function find($id) + { + // TODO: Implement find() method. + throw new NotImplementedException; + } + /** * @param array $ids * @@ -209,6 +238,7 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface public function getByIds(array $ids) { // TODO: Implement getByIds() method. + throw new NotImplementedException; } /** @@ -221,30 +251,6 @@ class Piggybank implements CUD, CommonDatabaseCalls, PiggybankInterface public function findByWhat($what) { // TODO: Implement findByWhat() method. - } - - /** - * @param Ardent $model - * @param array $data - * - * @return bool - */ - public function update(Ardent $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 = isset($data['rep_every']) ? $data['rep_every'] : 0; - $model->reminder_skip = isset($data['reminder_skip']) ? $data['reminder_skip'] : 0; - $model->order = isset($data['order']) ? $data['order'] : 0; - $model->remind_me = isset($data['remind_me']) ? intval($data['remind_me']) : 0; - if(!$model->validate()) { - var_dump($model->errors()); - exit(); - } - $model->save(); - return true; + throw new NotImplementedException; } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/Recurring.php b/app/lib/FireflyIII/Database/Recurring.php index b8cb6ba29f..410de6a3a6 100644 --- a/app/lib/FireflyIII/Database/Recurring.php +++ b/app/lib/FireflyIII/Database/Recurring.php @@ -4,6 +4,7 @@ namespace FireflyIII\Database; use Carbon\Carbon; +use FireflyIII\Exception\NotImplementedException; use Illuminate\Support\Collection; use LaravelBook\Ardent\Ardent; use FireflyIII\Database\Ifaces\CommonDatabaseCalls; @@ -40,6 +41,17 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface } + + /** + * Returns all objects. + * + * @return Collection + */ + public function get() + { + return $this->getUser()->recurringtransactions()->get(); + } + /** * @param Ardent $model * @@ -48,6 +60,7 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface public function destroy(Ardent $model) { // TODO: Implement destroy() method. + throw new NotImplementedException; } /** @@ -61,6 +74,7 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface public function validateObject(Ardent $model) { // TODO: Implement validateObject() method. + throw new NotImplementedException; } /** @@ -74,6 +88,7 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface public function validate(array $model) { // TODO: Implement validate() method. + throw new NotImplementedException; } /** @@ -84,6 +99,19 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface public function store(array $data) { // TODO: Implement store() method. + throw new NotImplementedException; + } + + /** + * @param Ardent $model + * @param array $data + * + * @return bool + */ + public function update(Ardent $model, array $data) + { + // TODO: Implement update() method. + throw new NotImplementedException; } /** @@ -96,16 +124,7 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface public function find($id) { // TODO: Implement find() method. - } - - /** - * Returns all objects. - * - * @return Collection - */ - public function get() - { - return $this->getUser()->recurringtransactions()->get(); + throw new NotImplementedException; } /** @@ -116,6 +135,7 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface public function getByIds(array $ids) { // TODO: Implement getByIds() method. + throw new NotImplementedException; } /** @@ -128,16 +148,6 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface public function findByWhat($what) { // TODO: Implement findByWhat() method. - } - - /** - * @param Ardent $model - * @param array $data - * - * @return bool - */ - public function update(Ardent $model, array $data) - { - // TODO: Implement update() method. + throw new NotImplementedException; } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/RecurringTransaction.php b/app/lib/FireflyIII/Database/RecurringTransaction.php index 8dc570c49f..6eb8cac8f1 100644 --- a/app/lib/FireflyIII/Database/RecurringTransaction.php +++ b/app/lib/FireflyIII/Database/RecurringTransaction.php @@ -2,14 +2,12 @@ namespace FireflyIII\Database; -use Carbon\Carbon; -use FireflyIII\Database\Ifaces\RecurringTransactionInterface; use FireflyIII\Database\Ifaces\CommonDatabaseCalls; use FireflyIII\Database\Ifaces\CUD; +use FireflyIII\Database\Ifaces\RecurringTransactionInterface; use FireflyIII\Exception\NotImplementedException; -use Illuminate\Support\MessageBag; -use LaravelBook\Ardent\Ardent; use Illuminate\Support\Collection; +use LaravelBook\Ardent\Ardent; /** * Class Account @@ -28,6 +26,17 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac $this->setUser(\Auth::user()); } + + /** + * Returns all objects. + * + * @return Collection + */ + public function get() + { + return $this->getUser()->recurringtransactions()->get(); + } + /** * @param Ardent $model * @@ -80,7 +89,7 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac /** * @param Ardent $model - * @param array $data + * @param array $data * * @return bool */ @@ -103,16 +112,6 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac throw new NotImplementedException; } - /** - * Returns all objects. - * - * @return Collection - */ - public function get() - { - return $this->getUser()->recurringtransactions()->get(); - } - /** * @param array $ids * diff --git a/app/lib/FireflyIII/Database/Transaction.php b/app/lib/FireflyIII/Database/Transaction.php index 744880dd73..09d88c00c5 100644 --- a/app/lib/FireflyIII/Database/Transaction.php +++ b/app/lib/FireflyIII/Database/Transaction.php @@ -3,13 +3,14 @@ namespace FireflyIII\Database; use Firefly\Exception\FireflyException; +use FireflyIII\Database\Ifaces\CommonDatabaseCalls; +use FireflyIII\Database\Ifaces\CUD; +use FireflyIII\Database\Ifaces\TransactionInterface; use FireflyIII\Exception\NotImplementedException; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use LaravelBook\Ardent\Ardent; -use FireflyIII\Database\Ifaces\CommonDatabaseCalls; -use FireflyIII\Database\Ifaces\CUD; -use FireflyIII\Database\Ifaces\TransactionInterface; + /** * Class Transaction * @@ -19,29 +20,6 @@ class Transaction implements TransactionInterface, CUD, CommonDatabaseCalls { use SwitchUser; - /** - * @param Ardent $model - * - * @return bool - */ - public function destroy(Ardent $model) - { - // TODO: Implement destroy() method. - } - - /** - * Validates a model. Returns an array containing MessageBags - * errors/warnings/successes. - * - * @param Ardent $model - * - * @return array - */ - public function validateObject(Ardent $model) - { - // TODO: Implement validateObject() method. - } - /** * Validates an array. Returns an array containing MessageBags * errors/warnings/successes. @@ -52,9 +30,9 @@ class Transaction implements TransactionInterface, CUD, CommonDatabaseCalls */ public function validate(array $model) { - $warnings = new MessageBag; + $warnings = new MessageBag; $successes = new MessageBag; - $errors = new MessageBag; + $errors = new MessageBag; if (!isset($model['account_id']) && !isset($model['account'])) { @@ -106,8 +84,8 @@ class Transaction implements TransactionInterface, CUD, CommonDatabaseCalls } return [ - 'errors' => $errors, - 'warnings' => $warnings, + 'errors' => $errors, + 'warnings' => $warnings, 'successes' => $successes ]; } @@ -119,7 +97,6 @@ class Transaction implements TransactionInterface, CUD, CommonDatabaseCalls */ public function store(array $data) { - // TODO: Implement store() method. $transaction = new \Transaction; $transaction->account()->associate($data['account']); $transaction->transactionJournal()->associate($data['transaction_journal']); @@ -138,6 +115,43 @@ class Transaction implements TransactionInterface, CUD, CommonDatabaseCalls return $transaction; } + /** + * @param Ardent $model + * + * @return bool + */ + public function destroy(Ardent $model) + { + // TODO: Implement destroy() method. + throw new NotImplementedException; + } + + /** + * Validates a model. Returns an array containing MessageBags + * errors/warnings/successes. + * + * @param Ardent $model + * + * @return array + */ + public function validateObject(Ardent $model) + { + // TODO: Implement validateObject() method. + throw new NotImplementedException; + } + + /** + * @param Ardent $model + * @param array $data + * + * @return bool + */ + public function update(Ardent $model, array $data) + { + // TODO: Implement update() method. + throw new NotImplementedException; + } + /** * Returns an object with id $id. * @@ -148,6 +162,7 @@ class Transaction implements TransactionInterface, CUD, CommonDatabaseCalls public function find($id) { // TODO: Implement find() method. + throw new NotImplementedException; } /** @@ -158,6 +173,18 @@ class Transaction implements TransactionInterface, CUD, CommonDatabaseCalls public function get() { // TODO: Implement get() method. + throw new NotImplementedException; + } + + /** + * @param array $ids + * + * @return Collection + */ + public function getByIds(array $ids) + { + // TODO: Implement getByIds() method. + throw new NotImplementedException; } /** @@ -170,26 +197,6 @@ class Transaction implements TransactionInterface, CUD, CommonDatabaseCalls public function findByWhat($what) { // TODO: Implement findByWhat() method. - } - - /** - * @param Ardent $model - * @param array $data - * - * @return bool - */ - public function update(Ardent $model, array $data) - { - // TODO: Implement update() method. - } - - /** - * @param array $ids - * - * @return Collection - */ - public function getByIds(array $ids) - { - // TODO: Implement getByIds() method. + throw new NotImplementedException; } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/TransactionCurrency.php b/app/lib/FireflyIII/Database/TransactionCurrency.php index 9e46efb207..91cb15a869 100644 --- a/app/lib/FireflyIII/Database/TransactionCurrency.php +++ b/app/lib/FireflyIII/Database/TransactionCurrency.php @@ -3,6 +3,7 @@ namespace FireflyIII\Database; +use FireflyIII\Exception\NotImplementedException; use Illuminate\Support\Collection; use LaravelBook\Ardent\Ardent; use FireflyIII\Database\Ifaces\CommonDatabaseCalls; @@ -17,6 +18,17 @@ use FireflyIII\Database\Ifaces\TransactionCurrencyInterface; class TransactionCurrency implements TransactionCurrencyInterface, CUD, CommonDatabaseCalls { + + /** + * @param string $code + * + * @return \TransactionCurrency|null + */ + public function findByCode($code) + { + return \TransactionCurrency::whereCode($code)->first(); + } + /** * @param Ardent $model * @@ -25,6 +37,7 @@ class TransactionCurrency implements TransactionCurrencyInterface, CUD, CommonDa public function destroy(Ardent $model) { // TODO: Implement destroy() method. + throw new NotImplementedException; } /** @@ -38,6 +51,7 @@ class TransactionCurrency implements TransactionCurrencyInterface, CUD, CommonDa public function validateObject(Ardent $model) { // TODO: Implement validateObject() method. + throw new NotImplementedException; } /** @@ -51,6 +65,7 @@ class TransactionCurrency implements TransactionCurrencyInterface, CUD, CommonDa public function validate(array $model) { // TODO: Implement validate() method. + throw new NotImplementedException; } /** @@ -61,6 +76,19 @@ class TransactionCurrency implements TransactionCurrencyInterface, CUD, CommonDa public function store(array $data) { // TODO: Implement store() method. + throw new NotImplementedException; + } + + /** + * @param Ardent $model + * @param array $data + * + * @return bool + */ + public function update(Ardent $model, array $data) + { + // TODO: Implement update() method. + throw new NotImplementedException; } /** @@ -73,6 +101,7 @@ class TransactionCurrency implements TransactionCurrencyInterface, CUD, CommonDa public function find($id) { // TODO: Implement find() method. + throw new NotImplementedException; } /** @@ -83,6 +112,18 @@ class TransactionCurrency implements TransactionCurrencyInterface, CUD, CommonDa public function get() { // TODO: Implement get() method. + throw new NotImplementedException; + } + + /** + * @param array $ids + * + * @return Collection + */ + public function getByIds(array $ids) + { + // TODO: Implement getByIds() method. + throw new NotImplementedException; } /** @@ -94,37 +135,7 @@ class TransactionCurrency implements TransactionCurrencyInterface, CUD, CommonDa */ public function findByWhat($what) { - // TODO: Implement get() method. - } - - /** - * @param string $code - * - * @return \TransactionCurrency|null - */ - public function findByCode($code) - { - return \TransactionCurrency::whereCode($code)->first(); - } - - /** - * @param array $ids - * - * @return Collection - */ - public function getByIds(array $ids) - { - // TODO: Implement getByIds() method. - } - - /** - * @param Ardent $model - * @param array $data - * - * @return bool - */ - public function update(Ardent $model, array $data) - { - // TODO: Implement update() method. + // TODO: Implement findByWhat() method. + throw new NotImplementedException; } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/TransactionJournal.php b/app/lib/FireflyIII/Database/TransactionJournal.php index 1603f3386d..c9291faf98 100644 --- a/app/lib/FireflyIII/Database/TransactionJournal.php +++ b/app/lib/FireflyIII/Database/TransactionJournal.php @@ -8,6 +8,7 @@ use Firefly\Exception\FireflyException; use FireflyIII\Database\Ifaces\CommonDatabaseCalls; use FireflyIII\Database\Ifaces\CUD; use FireflyIII\Database\Ifaces\TransactionJournalInterface; +use FireflyIII\Exception\NotImplementedException; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use LaravelBook\Ardent\Ardent; @@ -121,29 +122,6 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData } - /** - * @param Ardent $model - * - * @return bool - */ - public function destroy(Ardent $model) - { - // TODO: Implement destroy() method. - } - - /** - * Validates a model. Returns an array containing MessageBags - * errors/warnings/successes. - * - * @param Ardent $model - * - * @return array - */ - public function validateObject(Ardent $model) - { - // TODO: Implement validateObject() method. - } - /** * Validates an array. Returns an array containing MessageBags * errors/warnings/successes. @@ -452,25 +430,28 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData /** - * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. + * @param Ardent $model * - * @param $what - * - * @return \AccountType|null + * @return bool */ - public function findByWhat($what) + public function destroy(Ardent $model) { - // TODO: Implement findByWhat() method. + // TODO: Implement destroy() method. + throw new NotImplementedException; } /** - * @param array $ids + * Validates a model. Returns an array containing MessageBags + * errors/warnings/successes. * - * @return Collection + * @param Ardent $model + * + * @return array */ - public function getByIds(array $ids) + public function validateObject(Ardent $model) { - // TODO: Implement getByIds() method. + // TODO: Implement validateObject() method. + throw new NotImplementedException; } /** @@ -482,5 +463,30 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData public function update(Ardent $model, array $data) { // TODO: Implement update() method. + throw new NotImplementedException; + } + + /** + * @param array $ids + * + * @return Collection + */ + public function getByIds(array $ids) + { + // TODO: Implement getByIds() method. + throw new NotImplementedException; + } + + /** + * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. + * + * @param $what + * + * @return \AccountType|null + */ + public function findByWhat($what) + { + // TODO: Implement findByWhat() method. + throw new NotImplementedException; } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/TransactionType.php b/app/lib/FireflyIII/Database/TransactionType.php index 0abf5e9308..c6cc1c59dd 100644 --- a/app/lib/FireflyIII/Database/TransactionType.php +++ b/app/lib/FireflyIII/Database/TransactionType.php @@ -7,6 +7,7 @@ use FireflyIII\Database\Ifaces\CommonDatabaseCalls; use FireflyIII\Database\Ifaces\CUD; use FireflyIII\Database\Ifaces\TransactionTypeInterface; use FireflyIII\Exception\FireflyException; +use FireflyIII\Exception\NotImplementedException; use Illuminate\Support\Collection; use LaravelBook\Ardent\Ardent; @@ -18,74 +19,6 @@ use LaravelBook\Ardent\Ardent; class TransactionType implements TransactionTypeInterface, CUD, CommonDatabaseCalls { - /** - * @param Ardent $model - * - * @return bool - */ - public function destroy(Ardent $model) - { - // TODO: Implement destroy() method. - } - - /** - * Validates a model. Returns an array containing MessageBags - * errors/warnings/successes. - * - * @param Ardent $model - * - * @return array - */ - public function validateObject(Ardent $model) - { - // TODO: Implement validateObject() method. - } - - /** - * Validates an array. Returns an array containing MessageBags - * errors/warnings/successes. - * - * @param array $model - * - * @return array - */ - public function validate(array $model) - { - // TODO: Implement validate() method. - } - - /** - * @param array $data - * - * @return Ardent - */ - public function store(array $data) - { - // TODO: Implement store() method. - } - - /** - * Returns an object with id $id. - * - * @param int $id - * - * @return Ardent - */ - public function find($id) - { - // TODO: Implement find() method. - } - - /** - * Returns all objects. - * - * @return Collection - */ - public function get() - { - // TODO: Implement get() method. - } - /** * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. * @@ -115,13 +48,53 @@ class TransactionType implements TransactionTypeInterface, CUD, CommonDatabaseCa } /** - * @param array $ids + * @param Ardent $model * - * @return Collection + * @return bool */ - public function getByIds(array $ids) + public function destroy(Ardent $model) { - // TODO: Implement getByIds() method. + // TODO: Implement destroy() method. + throw new NotImplementedException; + } + + /** + * Validates a model. Returns an array containing MessageBags + * errors/warnings/successes. + * + * @param Ardent $model + * + * @return array + */ + public function validateObject(Ardent $model) + { + // TODO: Implement validateObject() method. + throw new NotImplementedException; + } + + /** + * Validates an array. Returns an array containing MessageBags + * errors/warnings/successes. + * + * @param array $model + * + * @return array + */ + public function validate(array $model) + { + // TODO: Implement validate() method. + throw new NotImplementedException; + } + + /** + * @param array $data + * + * @return Ardent + */ + public function store(array $data) + { + // TODO: Implement store() method. + throw new NotImplementedException; } /** @@ -133,5 +106,41 @@ class TransactionType implements TransactionTypeInterface, CUD, CommonDatabaseCa public function update(Ardent $model, array $data) { // TODO: Implement update() method. + throw new NotImplementedException; + } + + /** + * Returns an object with id $id. + * + * @param int $id + * + * @return Ardent + */ + public function find($id) + { + // TODO: Implement find() method. + throw new NotImplementedException; + } + + /** + * Returns all objects. + * + * @return Collection + */ + public function get() + { + // TODO: Implement get() method. + throw new NotImplementedException; + } + + /** + * @param array $ids + * + * @return Collection + */ + public function getByIds(array $ids) + { + // TODO: Implement getByIds() method. + throw new NotImplementedException; } } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/User.php b/app/lib/FireflyIII/Database/User.php index f72a26d415..1796ab8468 100644 --- a/app/lib/FireflyIII/Database/User.php +++ b/app/lib/FireflyIII/Database/User.php @@ -18,10 +18,10 @@ class User */ public function register(array $data) { - $user = new \User; - $user->email = isset($data['email']) ? $data['email'] : null; + $user = new \User; + $user->email = isset($data['email']) ? $data['email'] : null; $user->migrated = 0; - $user->reset = \Str::random(32); + $user->reset = \Str::random(32); $user->password = \Hash::make(\Str::random(12)); if (!$user->save()) {