kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-21 11:48:53 +00:00
Code Issues Projects Releases Wiki Activity

Moved all references.

Browse Source
This commit is contained in:
James Cole
2014-12-13 22:54:52 +01:00
parent 21a0a5d573
commit 4b4ad7f1a8
23 changed files with 175 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/AccountController.php
View File

@@ -1,6 +1,6 @@
<?php <?php
use FireflyIII\Database\Account as AccountRepository; use FireflyIII\Database\Account\Account as AccountRepository;
use FireflyIII\Exception\FireflyException; use FireflyIII\Exception\FireflyException;
/** /**
@@ -101,7 +101,7 @@ class AccountController extends BaseController
Session::flash('success', 'The ' . $typeName . ' account "' . e($name) . '" was deleted.'); Session::flash('success', 'The ' . $typeName . ' account "' . e($name) . '" was deleted.');
return Redirect::route('accounts.index', $type); return Redirect::route('accounts.index', $typeName);
} }
/** /**
@@ -210,6 +210,7 @@ class AccountController extends BaseController
$data = Input::except('_token'); $data = Input::except('_token');
$data['what'] = $this->_shortNamesByFullName[$account->accountType->type]; $data['what'] = $this->_shortNamesByFullName[$account->accountType->type];
// always validate: // always validate:
$messages = $this->_repository->validate($data); $messages = $this->_repository->validate($data);

6
app/controllers/BudgetController.php
View File

@@ -1,7 +1,7 @@
<?php <?php
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Database\Budget as BudgetRepository; use FireflyIII\Database\Budget\Budget as BudgetRepository;
use FireflyIII\Shared\Preferences\PreferencesInterface as Pref; use FireflyIII\Shared\Preferences\PreferencesInterface as Pref;
/** /**
@@ -148,13 +148,13 @@ class BudgetController extends BaseController
*/ */
public function show(Budget $budget, LimitRepetition $repetition = null) public function show(Budget $budget, LimitRepetition $repetition = null)
{ {
if (!is_null($repetition) && $repetition->budgetlimit->budget->id != $budget->id) { if (!is_null($repetition) && $repetition->budgetLimit->budget->id != $budget->id) {
App::abort(500); App::abort(500);
} }
$hideBudget = true; // used in transaction list. $hideBudget = true; // used in transaction list.
$journals = $this->_repository->getJournals($budget, $repetition); $journals = $this->_repository->getJournals($budget, $repetition);
$limits = $repetition ? [$repetition->limit] : $budget->budgetlimits()->orderBy('startdate', 'DESC')->get(); $limits = $repetition ? [$repetition->budgetLimit] : $budget->budgetLimits()->orderBy('startdate', 'DESC')->get();
$subTitle = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name); $subTitle = $repetition ? e($budget->name) . ' in ' . $repetition->startdate->format('F Y') : e($budget->name);
return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget')); return View::make('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle', 'hideBudget'));

2
app/controllers/CategoryController.php
View File

@@ -1,5 +1,5 @@
<?php <?php
use FireflyIII\Database\Category as CategoryRepository; use FireflyIII\Database\Category\Category as CategoryRepository;
use FireflyIII\Exception\FireflyException; use FireflyIII\Exception\FireflyException;
/** /**

36
app/controllers/GoogleChartController.php
View File

@@ -75,8 +75,8 @@ class GoogleChartController extends BaseController
$preferences = App::make('FireflyIII\Shared\Preferences\Preferences'); $preferences = App::make('FireflyIII\Shared\Preferences\Preferences');
$pref = $preferences->get('frontpageAccounts', []); $pref = $preferences->get('frontpageAccounts', []);
/** @var \FireflyIII\Database\Account $acct */ /** @var \FireflyIII\Database\Account\Account $acct */
$acct = App::make('FireflyIII\Database\Account'); $acct = App::make('FireflyIII\Database\Account\Account');
if (count($pref->data) > 0) { if (count($pref->data) > 0) {
$accounts = $acct->getByIds($pref->data); $accounts = $acct->getByIds($pref->data);
} else { } else {
@@ -124,8 +124,8 @@ class GoogleChartController extends BaseController
$this->_chart->addColumn('Budgeted', 'number'); $this->_chart->addColumn('Budgeted', 'number');
$this->_chart->addColumn('Spent', 'number'); $this->_chart->addColumn('Spent', 'number');
/** @var \FireflyIII\Database\Budget $bdt */ /** @var \FireflyIII\Database\Budget\Budget $bdt */
$bdt = App::make('FireflyIII\Database\Budget'); $bdt = App::make('FireflyIII\Database\Budget\Budget');
$budgets = $bdt->get(); $budgets = $bdt->get();
/* /*
@@ -194,8 +194,8 @@ class GoogleChartController extends BaseController
$chart->addColumn('Category', 'string'); $chart->addColumn('Category', 'string');
$chart->addColumn('Spent', 'number'); $chart->addColumn('Spent', 'number');
/** @var \FireflyIII\Database\TransactionJournal $tj */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $tj */
$tj = App::make('FireflyIII\Database\TransactionJournal'); $tj = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
/* /*
* Get the journals: * Get the journals:
@@ -279,8 +279,8 @@ class GoogleChartController extends BaseController
/** @var \Grumpydictator\Gchart\GChart $chart */ /** @var \Grumpydictator\Gchart\GChart $chart */
$chart = App::make('gchart'); $chart = App::make('gchart');
/** @var \FireflyIII\Database\Budget $bdt */ /** @var \FireflyIII\Database\Budget\Budget $bdt */
$bdt = App::make('FireflyIII\Database\Budget'); $bdt = App::make('FireflyIII\Database\Budget\Budget');
$budgets = $bdt->get(); $budgets = $bdt->get();
$chart->addColumn('Month', 'date'); $chart->addColumn('Month', 'date');
@@ -335,11 +335,11 @@ class GoogleChartController extends BaseController
} }
if ($component->class == 'Budget') { if ($component->class == 'Budget') {
/** @var \FireflyIII\Database\Budget $repos */ /** @var \FireflyIII\Database\Budget\Budget $repos */
$repos = App::make('FireflyIII\Database\Budget'); $repos = App::make('FireflyIII\Database\Budget\Budget');
} else { } else {
/** @var \FireflyIII\Database\Category $repos */ /** @var \FireflyIII\Database\Category\Category $repos */
$repos = App::make('FireflyIII\Database\Category'); $repos = App::make('FireflyIII\Database\Category\Category');
} }
/** @var \Grumpydictator\Gchart\GChart $chart */ /** @var \Grumpydictator\Gchart\GChart $chart */
@@ -457,8 +457,8 @@ class GoogleChartController extends BaseController
$chart->addColumn('Name', 'string'); $chart->addColumn('Name', 'string');
$chart->addColumn('Amount', 'number'); $chart->addColumn('Amount', 'number');
/** @var \FireflyIII\Database\Recurring $rcr */ /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $rcr */
$rcr = App::make('FireflyIII\Database\Recurring'); $rcr = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$recurring = $rcr->get(); $recurring = $rcr->get();
@@ -537,8 +537,8 @@ class GoogleChartController extends BaseController
$chart->addColumn('Income', 'number'); $chart->addColumn('Income', 'number');
$chart->addColumn('Expenses', 'number'); $chart->addColumn('Expenses', 'number');
/** @var \FireflyIII\Database\TransactionJournal $tj */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $tj */
$tj = App::make('FireflyIII\Database\TransactionJournal'); $tj = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
$end = clone $start; $end = clone $start;
$end->endOfYear(); $end->endOfYear();
@@ -577,8 +577,8 @@ class GoogleChartController extends BaseController
$chart->addColumn('Income', 'number'); $chart->addColumn('Income', 'number');
$chart->addColumn('Expenses', 'number'); $chart->addColumn('Expenses', 'number');
/** @var \FireflyIII\Database\TransactionJournal $tj */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $tj */
$tj = App::make('FireflyIII\Database\TransactionJournal'); $tj = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
$end = clone $start; $end = clone $start;
$end->endOfYear(); $end->endOfYear();

8
app/controllers/HomeController.php
View File

@@ -23,11 +23,11 @@ class HomeController extends BaseController
public function index() public function index()
{ {
// count, maybe Firefly needs some introducing text to show: // count, maybe Firefly needs some introducing text to show:
/** @var \FireflyIII\Database\Account $acct */ /** @var \FireflyIII\Database\Account\Account $acct */
$acct = App::make('FireflyIII\Database\Account'); $acct = App::make('FireflyIII\Database\Account\Account');
/** @var \FireflyIII\Database\TransactionJournal $jrnls */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $jrnls */
$jrnls = App::make('FireflyIII\Database\TransactionJournal'); $jrnls = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
/** @var \FireflyIII\Shared\Preferences\PreferencesInterface $preferences */ /** @var \FireflyIII\Shared\Preferences\PreferencesInterface $preferences */
$preferences = App::make('FireflyIII\Shared\Preferences\PreferencesInterface'); $preferences = App::make('FireflyIII\Shared\Preferences\PreferencesInterface');

12
app/controllers/JsonController.php
View File

@@ -14,8 +14,8 @@ class JsonController extends BaseController
*/ */
public function categories() public function categories()
{ {
/** @var \FireflyIII\Database\Category $categories */ /** @var \FireflyIII\Database\Category\Category $categories */
$categories = App::make('FireflyIII\Database\Category'); $categories = App::make('FireflyIII\Database\Category\Category');
$list = $categories->get(); $list = $categories->get();
$return = []; $return = [];
foreach ($list as $entry) { foreach ($list as $entry) {
@@ -34,8 +34,8 @@ class JsonController extends BaseController
*/ */
public function expenseAccounts() public function expenseAccounts()
{ {
/** @var \FireflyIII\Database\Account $accounts */ /** @var \FireflyIII\Database\Account\Account $accounts */
$accounts = App::make('FireflyIII\Database\Account'); $accounts = App::make('FireflyIII\Database\Account\Account');
$list = $accounts->getExpenseAccounts(); $list = $accounts->getExpenseAccounts();
$return = []; $return = [];
foreach ($list as $entry) { foreach ($list as $entry) {
@@ -51,8 +51,8 @@ class JsonController extends BaseController
*/ */
public function revenueAccounts() public function revenueAccounts()
{ {
/** @var \FireflyIII\Database\Account $accounts */ /** @var \FireflyIII\Database\Account\Account $accounts */
$accounts = App::make('FireflyIII\Database\Account'); $accounts = App::make('FireflyIII\Database\Account\Account');
$list = $accounts->getRevenueAccounts(); $list = $accounts->getRevenueAccounts();
$return = []; $return = [];
foreach ($list as $entry) { foreach ($list as $entry) {

32
app/controllers/PiggybankController.php
View File

@@ -27,8 +27,8 @@ class PiggybankController extends BaseController
*/ */
public function add(Piggybank $piggybank) public function add(Piggybank $piggybank)
{ {
/** @var \FireflyIII\Database\Piggybank $repos */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */
$repos = App::make('FireflyIII\Database\Piggybank'); $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
$leftOnAccount = $repos->leftOnAccount($piggybank->account); $leftOnAccount = $repos->leftOnAccount($piggybank->account);
$savedSoFar = $piggybank->currentRelevantRep()->currentamount; $savedSoFar = $piggybank->currentRelevantRep()->currentamount;
@@ -45,8 +45,8 @@ class PiggybankController extends BaseController
public function create() public function create()
{ {
/** @var \FireflyIII\Database\Account $acct */ /** @var \FireflyIII\Database\Account\Account $acct */
$acct = App::make('FireflyIII\Database\Account'); $acct = App::make('FireflyIII\Database\Account\Account');
$periods = Config::get('firefly.piggybank_periods'); $periods = Config::get('firefly.piggybank_periods');
@@ -77,8 +77,8 @@ class PiggybankController extends BaseController
*/ */
public function destroy(Piggybank $piggyBank) public function destroy(Piggybank $piggyBank)
{ {
/** @var \FireflyIII\Database\Piggybank $acct */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $acct */
$repos = App::make('FireflyIII\Database\Piggybank'); $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
$repos->destroy($piggyBank); $repos->destroy($piggyBank);
Session::flash('success', 'Piggy bank deleted.'); Session::flash('success', 'Piggy bank deleted.');
@@ -93,8 +93,8 @@ class PiggybankController extends BaseController
public function edit(Piggybank $piggybank) public function edit(Piggybank $piggybank)
{ {
/** @var \FireflyIII\Database\Account $acct */ /** @var \FireflyIII\Database\Account\Account $acct */
$acct = App::make('FireflyIII\Database\Account'); $acct = App::make('FireflyIII\Database\Account\Account');
$periods = Config::get('firefly.piggybank_periods'); $periods = Config::get('firefly.piggybank_periods');
@@ -122,8 +122,8 @@ class PiggybankController extends BaseController
*/ */
public function index() public function index()
{ {
/** @var \FireflyIII\Database\Piggybank $repos */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */
$repos = App::make('FireflyIII\Database\Piggybank'); $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
/** @var Collection $piggybanks */ /** @var Collection $piggybanks */
$piggybanks = $repos->get(); $piggybanks = $repos->get();
@@ -164,8 +164,8 @@ class PiggybankController extends BaseController
{ {
$amount = round(floatval(Input::get('amount')), 2); $amount = round(floatval(Input::get('amount')), 2);
/** @var \FireflyIII\Database\Piggybank $acct */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $acct */
$repos = App::make('FireflyIII\Database\Piggybank'); $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
$leftOnAccount = $repos->leftOnAccount($piggybank->account); $leftOnAccount = $repos->leftOnAccount($piggybank->account);
$savedSoFar = $piggybank->currentRelevantRep()->currentamount; $savedSoFar = $piggybank->currentRelevantRep()->currentamount;
@@ -261,8 +261,8 @@ class PiggybankController extends BaseController
{ {
$data = Input::all(); $data = Input::all();
$data['repeats'] = 0; $data['repeats'] = 0;
/** @var \FireflyIII\Database\Piggybank $repos */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */
$repos = App::make('FireflyIII\Database\Piggybank'); $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
switch ($data['post_submit_action']) { switch ($data['post_submit_action']) {
default: default:
@@ -315,8 +315,8 @@ class PiggybankController extends BaseController
public function update(Piggybank $piggyBank) public function update(Piggybank $piggyBank)
{ {
/** @var \FireflyIII\Database\Piggybank $repos */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */
$repos = App::make('FireflyIII\Database\Piggybank'); $repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
$data = Input::except('_token'); $data = Input::except('_token');
switch (Input::get('post_submit_action')) { switch (Input::get('post_submit_action')) {

4
app/controllers/PreferencesController.php
View File

@@ -21,8 +21,8 @@ class PreferencesController extends BaseController
*/ */
public function index() public function index()
{ {
/** @var \FireflyIII\Database\Account $acct */ /** @var \FireflyIII\Database\Account\Account $acct */
$acct = App::make('FireflyIII\Database\Account'); $acct = App::make('FireflyIII\Database\Account\Account');
/** @var \FireflyIII\Shared\Preferences\Preferences $preferences */ /** @var \FireflyIII\Shared\Preferences\Preferences $preferences */
$preferences = App::make('FireflyIII\Shared\Preferences\Preferences'); $preferences = App::make('FireflyIII\Shared\Preferences\Preferences');

20
app/controllers/RecurringController.php
View File

@@ -49,8 +49,8 @@ class RecurringController extends BaseController
{ {
//Event::fire('recurring.destroy', [$recurringTransaction]); //Event::fire('recurring.destroy', [$recurringTransaction]);
/** @var \FireflyIII\Database\Recurring $repository */ /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repository */
$repository = App::make('FireflyIII\Database\Recurring'); $repository = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$result = $repository->destroy($recurringTransaction); $result = $repository->destroy($recurringTransaction);
if ($result === true) { if ($result === true) {
@@ -82,8 +82,8 @@ class RecurringController extends BaseController
*/ */
public function index() public function index()
{ {
/** @var \FireflyIII\Database\Recurring $repos */ /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
$repos = App::make('FireflyIII\Database\Recurring'); $repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$recurring = $repos->get(); $recurring = $repos->get();
@@ -103,8 +103,8 @@ class RecurringController extends BaseController
return Redirect::back(); return Redirect::back();
} }
/** @var \FireflyIII\Database\Recurring $repos */ /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
$repos = App::make('FireflyIII\Database\Recurring'); $repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$repos->scanEverything($recurringTransaction); $repos->scanEverything($recurringTransaction);
Session::flash('success', 'Rescanned everything.'); Session::flash('success', 'Rescanned everything.');
@@ -135,8 +135,8 @@ class RecurringController extends BaseController
public function store() public function store()
{ {
$data = Input::except('_token'); $data = Input::except('_token');
/** @var \FireflyIII\Database\Recurring $repos */ /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
$repos = App::make('FireflyIII\Database\Recurring'); $repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
switch ($data['post_submit_action']) { switch ($data['post_submit_action']) {
default: default:
@@ -183,8 +183,8 @@ class RecurringController extends BaseController
*/ */
public function update(RecurringTransaction $recurringTransaction) public function update(RecurringTransaction $recurringTransaction)
{ {
/** @var \FireflyIII\Database\Recurring $repos */ /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repos */
$repos = App::make('FireflyIII\Database\Recurring'); $repos = App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$data = Input::except('_token'); $data = Input::except('_token');
switch (Input::get('post_submit_action')) { switch (Input::get('post_submit_action')) {

16
app/controllers/RepeatedExpenseController.php
View File

@@ -23,8 +23,8 @@ class RepeatedExpenseController extends BaseController
*/ */
public function create() public function create()
{ {
/** @var \FireflyIII\Database\Account $acct */ /** @var \FireflyIII\Database\Account\Account $acct */
$acct = App::make('FireflyIII\Database\Account'); $acct = App::make('FireflyIII\Database\Account\Account');
$periods = Config::get('firefly.piggybank_periods'); $periods = Config::get('firefly.piggybank_periods');
@@ -44,8 +44,8 @@ class RepeatedExpenseController extends BaseController
$subTitle = 'Overview'; $subTitle = 'Overview';
/** @var \FireflyIII\Database\RepeatedExpense $repository */ /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repository */
$repository = App::make('FireflyIII\Database\RepeatedExpense'); $repository = App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
$expenses = $repository->get(); $expenses = $repository->get();
$expenses->each( $expenses->each(
@@ -67,8 +67,8 @@ class RepeatedExpenseController extends BaseController
$subTitle = $piggyBank->name; $subTitle = $piggyBank->name;
$today = Carbon::now(); $today = Carbon::now();
/** @var \FireflyIII\Database\RepeatedExpense $repository */ /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repository */
$repository = App::make('FireflyIII\Database\RepeatedExpense'); $repository = App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
$repetitions = $piggyBank->piggybankrepetitions()->get(); $repetitions = $piggyBank->piggybankrepetitions()->get();
$repetitions->each( $repetitions->each(
@@ -88,8 +88,8 @@ class RepeatedExpenseController extends BaseController
{ {
$data = Input::all(); $data = Input::all();
$data['repeats'] = 1; $data['repeats'] = 1;
/** @var \FireflyIII\Database\RepeatedExpense $repository */ /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repository */
$repository = App::make('FireflyIII\Database\RepeatedExpense'); $repository = App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
switch ($data['post_submit_action']) { switch ($data['post_submit_action']) {
default: default:

46
app/controllers/ReportController.php
View File

@@ -1,9 +1,8 @@
<?php <?php
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Database\Account as AccountRepository; use FireflyIII\Database\Account\Account as AccountRepository;
use FireflyIII\Database\Report as ReportRepository; use FireflyIII\Database\TransactionJournal\TransactionJournal as TransactionJournalRepository;
use FireflyIII\Database\TransactionJournal as TransactionJournalRepository; use FireflyIII\Report\ReportInterface as Report;
use FireflyIII\Report\ReportInterface as ReportHelper;
/** /**
* @SuppressWarnings("CamelCase") * @SuppressWarnings("CamelCase")
@@ -18,23 +17,18 @@ class ReportController extends BaseController
/** @var TransactionJournalRepository */ /** @var TransactionJournalRepository */
protected $_journals; protected $_journals;
/** @var ReportHelper */ /** @var Report */
protected $_reports;
/** @var ReportRepository */
protected $_repository; protected $_repository;
/** /**
* @param AccountRepository $accounts * @param AccountRepository $accounts
* @param TransactionJournalRepository $journals * @param TransactionJournalRepository $journals
* @param ReportHelper $reports * @param Report $repository
* @param ReportRepository $repository
*/ */
public function __construct(AccountRepository $accounts, TransactionJournalRepository $journals, ReportHelper $reports, ReportRepository $repository) public function __construct(AccountRepository $accounts, TransactionJournalRepository $journals, Report $repository)
{ {
$this->_accounts = $accounts; $this->_accounts = $accounts;
$this->_journals = $journals; $this->_journals = $journals;
$this->_reports = $reports;
$this->_repository = $repository; $this->_repository = $repository;
} }
@@ -62,11 +56,11 @@ class ReportController extends BaseController
// get a list of all budgets and expenses. // get a list of all budgets and expenses.
/** @var \FireflyIII\Database\Budget $budgetRepository */ /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
$budgetRepository = App::make('FireflyIII\Database\Budget'); $budgetRepository = App::make('FireflyIII\Database\Budget\Budget');
/** @var \FireflyIII\Database\Account $accountRepository */ /** @var \FireflyIII\Database\Account\Account $accountRepository */
$accountRepository = App::make('FireflyIII\Database\Account'); $accountRepository = App::make('FireflyIII\Database\Account\Account');
$budgets = $budgetRepository->get(); $budgets = $budgetRepository->get();
@@ -76,8 +70,8 @@ class ReportController extends BaseController
function (Budget $budget) use ($start, $end, $budgetRepository) { function (Budget $budget) use ($start, $end, $budgetRepository) {
$limitRepetitions = $budget->limitrepetitions()->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d'))->where( $limitRepetitions = $budget->limitrepetitions()->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d'))->where(
'enddate', '<=', $end->format( 'enddate', '<=', $end->format(
'Y-m-d' 'Y-m-d'
) )
)->get(); )->get();
$repInfo = []; $repInfo = [];
/** @var LimitRepetition $repetition */ /** @var LimitRepetition $repetition */
@@ -94,7 +88,7 @@ class ReportController extends BaseController
} }
$pctDisplay = $spent / floatval($repetition->amount) * 100; $pctDisplay = $spent / floatval($repetition->amount) * 100;
$repInfo[] = [ $repInfo[] = [
'date' => DateKit::periodShow($repetition->startdate, $repetition->limit->repeat_freq), 'date' => DateKit::periodShow($repetition->startdate, $repetition->budgetLimit->repeat_freq),
'spent' => $spent, 'spent' => $spent,
'budgeted' => floatval($repetition->amount), 'budgeted' => floatval($repetition->amount),
'left' => floatval($repetition->amount) - $spent, 'left' => floatval($repetition->amount) - $spent,
@@ -148,8 +142,8 @@ class ReportController extends BaseController
public function index() public function index()
{ {
$start = $this->_journals->firstDate(); $start = $this->_journals->firstDate();
$months = $this->_reports->listOfMonths(clone $start); $months = $this->_repository->listOfMonths(clone $start);
$years = $this->_reports->listOfYears(clone $start); $years = $this->_repository->listOfYears(clone $start);
$title = 'Reports'; $title = 'Reports';
$mainTitleIcon = 'fa-line-chart'; $mainTitleIcon = 'fa-line-chart';
@@ -177,8 +171,8 @@ class ReportController extends BaseController
$subTitleIcon = 'fa-bar-chart'; $subTitleIcon = 'fa-bar-chart';
$end->endOfMonth(); $end->endOfMonth();
/** @var \FireflyIII\Database\TransactionJournal $journalRepository */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $journalRepository */
$journalRepository = App::make('FireflyIII\Database\TransactionJournal'); $journalRepository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
/* /*
* Get all journals from this month: * Get all journals from this month:
@@ -255,9 +249,9 @@ class ReportController extends BaseController
$subTitleIcon = 'fa-bar-chart'; $subTitleIcon = 'fa-bar-chart';
$mainTitleIcon = 'fa-line-chart'; $mainTitleIcon = 'fa-line-chart';
$balances = $this->_reports->yearBalanceReport($date); $balances = $this->_repository->yearBalanceReport($date);
$groupedIncomes = $this->_reports->revenueGroupedByAccount($date, $end, 15); $groupedIncomes = $this->_repository->revenueGroupedByAccount($date, $end, 15);
$groupedExpenses = $this->_reports->expensesGroupedByAccount($date, $end, 15); $groupedExpenses = $this->_repository->expensesGroupedByAccount($date, $end, 15);
return View::make( return View::make(
'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon') 'reports.year', compact('date', 'groupedIncomes', 'groupedExpenses', 'year', 'balances', 'title', 'subTitle', 'subTitleIcon', 'mainTitleIcon')

56
app/controllers/TransactionController.php
View File

@@ -47,8 +47,8 @@ class TransactionController extends BaseController
$unique = array_unique($ids); $unique = array_unique($ids);
if (count($unique) > 0) { if (count($unique) > 0) {
/** @var \FireflyIII\Database\TransactionJournal $repository */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
$repository = App::make('FireflyIII\Database\TransactionJournal'); $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
$set = $repository->getByIds($unique); $set = $repository->getByIds($unique);
$set->each( $set->each(
function (TransactionJournal $journal) { function (TransactionJournal $journal) {
@@ -75,17 +75,17 @@ class TransactionController extends BaseController
* The repositories we need: * The repositories we need:
*/ */
/** @var \FireflyIII\Database\Account $accountRepository */ /** @var \FireflyIII\Database\Account\Account $accountRepository */
$accountRepository = App::make('FireflyIII\Database\Account'); $accountRepository = App::make('FireflyIII\Database\Account\Account');
/** @var \FireflyIII\Database\Budget $budgetRepository */ /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
$budgetRepository = App::make('FireflyIII\Database\Budget'); $budgetRepository = App::make('FireflyIII\Database\Budget\Budget');
/** @var \FireflyIII\Database\Piggybank $piggyRepository */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $piggyRepository */
$piggyRepository = App::make('FireflyIII\Database\Piggybank'); $piggyRepository = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
/** @var \FireflyIII\Database\RepeatedExpense $repRepository */ /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repRepository */
$repRepository = App::make('FireflyIII\Database\RepeatedExpense'); $repRepository = App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
// get asset accounts with names and id's . // get asset accounts with names and id's .
$assetAccounts = FFForm::makeSelectList($accountRepository->getAssetAccounts()); $assetAccounts = FFForm::makeSelectList($accountRepository->getAssetAccounts());
@@ -143,8 +143,8 @@ class TransactionController extends BaseController
{ {
$type = $transactionJournal->transactionType->type; $type = $transactionJournal->transactionType->type;
/** @var \FireflyIII\Database\TransactionJournal $repository */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
$repository = App::make('FireflyIII\Database\TransactionJournal'); $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
$repository->destroy($transactionJournal); $repository->destroy($transactionJournal);
$return = 'withdrawal'; $return = 'withdrawal';
@@ -172,8 +172,8 @@ class TransactionController extends BaseController
$id = intval(Input::get('id')); $id = intval(Input::get('id'));
$sister = intval(Input::get('relateTo')); $sister = intval(Input::get('relateTo'));
/** @var \FireflyIII\Database\TransactionJournal $repository */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
$repository = App::make('FireflyIII\Database\TransactionJournal'); $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
$journal = $repository->find($id); $journal = $repository->find($id);
$sis = $repository->find($sister); $sis = $repository->find($sister);
@@ -207,14 +207,14 @@ class TransactionController extends BaseController
* All the repositories we need: * All the repositories we need:
*/ */
/** @var \FireflyIII\Database\Account $accountRepository */ /** @var \FireflyIII\Database\Account\Account $accountRepository */
$accountRepository = App::make('FireflyIII\Database\Account'); $accountRepository = App::make('FireflyIII\Database\Account\Account');
/** @var \FireflyIII\Database\Budget $budgetRepository */ /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
$budgetRepository = App::make('FireflyIII\Database\Budget'); $budgetRepository = App::make('FireflyIII\Database\Budget\Budget');
/** @var \FireflyIII\Database\Piggybank $piggyRepository */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $piggyRepository */
$piggyRepository = App::make('FireflyIII\Database\Piggybank'); $piggyRepository = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
// type is useful for display: // type is useful for display:
@@ -335,8 +335,8 @@ class TransactionController extends BaseController
public function index($what) public function index($what)
{ {
/** @var \FireflyIII\Database\TransactionJournal $repository */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
$repository = App::make('FireflyIII\Database\TransactionJournal'); $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
switch ($what) { switch ($what) {
case 'expenses': case 'expenses':
@@ -396,8 +396,8 @@ class TransactionController extends BaseController
{ {
$search = e(trim(Input::get('searchValue'))); $search = e(trim(Input::get('searchValue')));
/** @var \FireflyIII\Database\TransactionJournal $repository */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
$repository = App::make('FireflyIII\Database\TransactionJournal'); $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
$result = $repository->searchRelated($search, $journal); $result = $repository->searchRelated($search, $journal);
$result->each( $result->each(
@@ -456,8 +456,8 @@ class TransactionController extends BaseController
$data['what'] = $what; $data['what'] = $what;
$data['currency'] = 'EUR'; $data['currency'] = 'EUR';
/** @var \FireflyIII\Database\TransactionJournal $repository */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repository */
$repository = App::make('FireflyIII\Database\TransactionJournal'); $repository = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
switch ($data['post_submit_action']) { switch ($data['post_submit_action']) {
default: default:
@@ -549,8 +549,8 @@ class TransactionController extends BaseController
*/ */
public function update(TransactionJournal $journal) public function update(TransactionJournal $journal)
{ {
/** @var \FireflyIII\Database\TransactionJournal $repos */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $repos */
$repos = App::make('FireflyIII\Database\TransactionJournal'); $repos = App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
$data = Input::except('_token'); $data = Input::except('_token');
$data['currency'] = 'EUR'; $data['currency'] = 'EUR';

8
app/lib/FireflyIII/Database/Account/Account.php
View File

@@ -495,8 +495,8 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
*/ */
public function firstExpenseAccountOrCreate($name) public function firstExpenseAccountOrCreate($name)
{ {
/** @var \FireflyIII\Database\AccountType $accountTypeRepos */ /** @var \FireflyIII\Database\AccountType\AccountType $accountTypeRepos */
$accountTypeRepos = \App::make('FireflyIII\Database\AccountType'); $accountTypeRepos = \App::make('FireflyIII\Database\AccountType\AccountType');
$accountType = $accountTypeRepos->findByWhat('expense'); $accountType = $accountTypeRepos->findByWhat('expense');
@@ -524,8 +524,8 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
*/ */
public function firstRevenueAccountOrCreate($name) public function firstRevenueAccountOrCreate($name)
{ {
/** @var \FireflyIII\Database\AccountType $accountTypeRepos */ /** @var \FireflyIII\Database\AccountType\AccountType $accountTypeRepos */
$accountTypeRepos = \App::make('FireflyIII\Database\AccountType'); $accountTypeRepos = \App::make('FireflyIII\Database\AccountType\AccountType');
$accountType = $accountTypeRepos->findByWhat('revenue'); $accountType = $accountTypeRepos->findByWhat('revenue');

4
app/lib/FireflyIII/Database/Budget/Budget.php
View File

@@ -330,7 +330,7 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
$limit = $this->limitOnStartingOnDate($budget, $date); $limit = $this->limitOnStartingOnDate($budget, $date);
if (!$limit) { if (!$limit) {
// create one! // create one!
$limit = new \Limit; $limit = new \BudgetLimit;
$limit->budget()->associate($budget); $limit->budget()->associate($budget);
$limit->startdate = $date; $limit->startdate = $date;
$limit->amount = $amount; $limit->amount = $amount;
@@ -367,6 +367,6 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
*/ */
public function limitOnStartingOnDate(\Budget $budget, Carbon $date) public function limitOnStartingOnDate(\Budget $budget, Carbon $date)
{ {
return $budget->limits()->where('startdate', $date->format('Y-m-d'))->first(); return $budget->budgetLimits()->where('startdate', $date->format('Y-m-d'))->first();
} }
} }

4
app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php
View File

@@ -321,8 +321,8 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac
// get all journals that (may) be relevant. // get all journals that (may) be relevant.
// this is usually almost all of them. // this is usually almost all of them.
/** @var \FireflyIII\Database\TransactionJournal $journalRepository */ /** @var \FireflyIII\Database\TransactionJournal\TransactionJournal $journalRepository */
$journalRepository = \App::make('FireflyIII\Database\TransactionJournal'); $journalRepository = \App::make('FireflyIII\Database\TransactionJournal\TransactionJournal');
$set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $recurring->amount_min)->where('amount', '<=', $recurring->amount_max) $set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $recurring->amount_min)->where('amount', '<=', $recurring->amount_max)
->get(['transaction_journal_id']); ->get(['transaction_journal_id']);

44
app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
View File

@@ -62,17 +62,17 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
*/ */
public function store(array $data) public function store(array $data)
{ {
/** @var \FireflyIII\Database\TransactionType $typeRepository */ /** @var \FireflyIII\Database\TransactionType\TransactionType $typeRepository */
$typeRepository = \App::make('FireflyIII\Database\TransactionType'); $typeRepository = \App::make('FireflyIII\Database\TransactionType\TransactionType');
/** @var \FireflyIII\Database\Account $accountRepository */ /** @var \FireflyIII\Database\Account\Account $accountRepository */
$accountRepository = \App::make('FireflyIII\Database\Account'); $accountRepository = \App::make('FireflyIII\Database\Account\Account');
/** @var \FireflyIII\Database\TransactionCurrency $currencyRepository */ /** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencyRepository */
$currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency'); $currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
/** @var \FireflyIII\Database\Transaction $transactionRepository */ /** @var \FireflyIII\Database\Transaction\Transaction $transactionRepository */
$transactionRepository = \App::make('FireflyIII\Database\Transaction'); $transactionRepository = \App::make('FireflyIII\Database\Transaction\Transaction');
$journalType = $typeRepository->findByWhat($data['what']); $journalType = $typeRepository->findByWhat($data['what']);
$currency = $currencyRepository->findByCode($data['currency']); $currency = $currencyRepository->findByCode($data['currency']);
@@ -143,16 +143,16 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
* Store the budget. * Store the budget.
*/ */
if (isset($data['budget_id']) && intval($data['budget_id']) > 0) { if (isset($data['budget_id']) && intval($data['budget_id']) > 0) {
/** @var \FireflyIII\Database\Budget $budgetRepository */ /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
$budgetRepository = \App::make('FireflyIII\Database\Budget'); $budgetRepository = \App::make('FireflyIII\Database\Budget\Budget');
$budget = $budgetRepository->find(intval($data['budget_id'])); $budget = $budgetRepository->find(intval($data['budget_id']));
if ($budget) { if ($budget) {
$journal->budgets()->save($budget); $journal->budgets()->save($budget);
} }
} }
if (isset($data['category']) && strlen($data['category']) > 0) { if (isset($data['category']) && strlen($data['category']) > 0) {
/** @var \FireflyIII\Database\Category $categoryRepository */ /** @var \FireflyIII\Database\Category\Category $categoryRepository */
$categoryRepository = \App::make('FireflyIII\Database\Category'); $categoryRepository = \App::make('FireflyIII\Database\Category\Category');
$category = $categoryRepository->firstOrCreate($data['category']); $category = $categoryRepository->firstOrCreate($data['category']);
if ($category) { if ($category) {
$journal->categories()->save($category); $journal->categories()->save($category);
@@ -179,14 +179,14 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
*/ */
public function update(\Eloquent $model, array $data) public function update(\Eloquent $model, array $data)
{ {
/** @var \FireflyIII\Database\TransactionType $typeRepository */ /** @var \FireflyIII\Database\TransactionType\TransactionType $typeRepository */
$typeRepository = \App::make('FireflyIII\Database\TransactionType'); $typeRepository = \App::make('FireflyIII\Database\TransactionType\TransactionType');
/** @var \FireflyIII\Database\Account $accountRepository */ /** @var \FireflyIII\Database\Account\Account $accountRepository */
$accountRepository = \App::make('FireflyIII\Database\Account'); $accountRepository = \App::make('FireflyIII\Database\Account\Account');
/** @var \FireflyIII\Database\TransactionCurrency $currencyRepository */ /** @var \FireflyIII\Database\TransactionCurrency\TransactionCurrency $currencyRepository */
$currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency'); $currencyRepository = \App::make('FireflyIII\Database\TransactionCurrency\TransactionCurrency');
$journalType = $typeRepository->findByWhat($data['what']); $journalType = $typeRepository->findByWhat($data['what']);
$currency = $currencyRepository->findByCode($data['currency']); $currency = $currencyRepository->findByCode($data['currency']);
@@ -236,16 +236,16 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData
*/ */
$components = []; $components = [];
if (isset($data['budget_id']) && intval($data['budget_id']) > 0) { if (isset($data['budget_id']) && intval($data['budget_id']) > 0) {
/** @var \FireflyIII\Database\Budget $budgetRepository */ /** @var \FireflyIII\Database\Budget\Budget $budgetRepository */
$budgetRepository = \App::make('FireflyIII\Database\Budget'); $budgetRepository = \App::make('FireflyIII\Database\Budget\Budget');
$budget = $budgetRepository->find(intval($data['budget_id'])); $budget = $budgetRepository->find(intval($data['budget_id']));
if ($budget) { if ($budget) {
$components[] = $budget->id; $components[] = $budget->id;
} }
} }
if (strlen($data['category']) > 0) { if (strlen($data['category']) > 0) {
/** @var \FireflyIII\Database\Category $categoryRepository */ /** @var \FireflyIII\Database\Category\Category $categoryRepository */
$categoryRepository = \App::make('FireflyIII\Database\Category'); $categoryRepository = \App::make('FireflyIII\Database\Category\Category');
$category = $categoryRepository->firstOrCreate($data['category']); $category = $categoryRepository->firstOrCreate($data['category']);
if ($category) { if ($category) {
$components[] = $category->id; $components[] = $category->id;

16
app/lib/FireflyIII/Event/Piggybank.php
View File

@@ -43,8 +43,8 @@ class Piggybank
{ {
if ($journal->piggybankevents()->count() > 0) { if ($journal->piggybankevents()->count() > 0) {
/** @var \FireflyIII\Database\Piggybank $repository */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
$repository = \App::make('FireflyIII\Database\Piggybank'); $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
/** @var \Piggybank $piggyBank */ /** @var \Piggybank $piggyBank */
$piggyBank = $journal->piggybankevents()->first()->piggybank()->first(); $piggyBank = $journal->piggybankevents()->first()->piggybank()->first();
@@ -127,8 +127,8 @@ class Piggybank
if ($piggybankId == 0 || is_null($piggybankId)) { if ($piggybankId == 0 || is_null($piggybankId)) {
return; return;
} }
/** @var \FireflyIII\Database\Piggybank $repository */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
$repository = \App::make('FireflyIII\Database\Piggybank'); $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
/** @var \Piggybank $piggyBank */ /** @var \Piggybank $piggyBank */
$piggyBank = $repository->find($piggybankId); $piggyBank = $repository->find($piggybankId);
@@ -222,8 +222,8 @@ class Piggybank
if(!\Auth::check()) { if(!\Auth::check()) {
return; return;
} }
/** @var \FireflyIII\Database\RepeatedExpense $repository */ /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repository */
$repository = \App::make('FireflyIII\Database\RepeatedExpense'); $repository = \App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
$list = $repository->get(); $list = $repository->get();
$today = Carbon::now(); $today = Carbon::now();
@@ -290,8 +290,8 @@ class Piggybank
$event = $journal->piggybankevents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->first(); $event = $journal->piggybankevents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->first();
$eventSum = floatval($journal->piggybankevents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->sum('amount')); $eventSum = floatval($journal->piggybankevents()->orderBy('date', 'DESC')->orderBy('id', 'DESC')->sum('amount'));
/** @var \FireflyIII\Database\Piggybank $repository */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
$repository = \App::make('FireflyIII\Database\Piggybank'); $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
/** @var \Piggybank $piggyBank */ /** @var \Piggybank $piggyBank */
$piggyBank = $journal->piggybankevents()->first()->piggybank()->first(); $piggyBank = $journal->piggybankevents()->first()->piggybank()->first();

8
app/lib/FireflyIII/Event/TransactionJournal.php
View File

@@ -18,8 +18,8 @@ class TransactionJournal
*/ */
public function store(\TransactionJournal $journal) public function store(\TransactionJournal $journal)
{ {
/** @var \FireflyIII\Database\Recurring $repository */ /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repository */
$repository = \App::make('FireflyIII\Database\Recurring'); $repository = \App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$set = $repository->get(); $set = $repository->get();
@@ -44,8 +44,8 @@ class TransactionJournal
*/ */
public function update(\TransactionJournal $journal) public function update(\TransactionJournal $journal)
{ {
/** @var \FireflyIII\Database\Recurring $repository */ /** @var \FireflyIII\Database\RecurringTransaction\RecurringTransaction $repository */
$repository = \App::make('FireflyIII\Database\Recurring'); $repository = \App::make('FireflyIII\Database\RecurringTransaction\RecurringTransaction');
$set = $repository->get(); $set = $repository->get();
$journal->recurring_transaction_id = null; $journal->recurring_transaction_id = null;
$journal->save(); $journal->save();

2
app/lib/FireflyIII/Form/Form.php
View File

@@ -297,7 +297,7 @@ class Form
case 'update': case 'update':
$store = '<div class="form-group"><label for="' . $name . 'update" class="col-sm-4 control-label">Store</label>'; $store = '<div class="form-group"><label for="' . $name . 'update" class="col-sm-4 control-label">Store</label>';
$store .= '<div class="col-sm-8"><div class="radio"><label>'; $store .= '<div class="col-sm-8"><div class="radio"><label>';
$store .= \Form::radio('post_submit_action', 'update', $previousValue == 'update', ['id' => $name . '_update']); $store .= \Form::radio('post_submit_action', 'update', $previousValue == 'update' || $previousValue == 'store', ['id' => $name . '_update']);
$store .= 'Update ' . $name . '</label></div></div></div>'; $store .= 'Update ' . $name . '</label></div></div></div>';
break; break;
default: default:

5
app/lib/FireflyIII/Report/Report.php
View File

@@ -4,6 +4,7 @@ namespace FireflyIII\Report;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Database\Account\Account as AccountRepository; use FireflyIII\Database\Account\Account as AccountRepository;
use FireflyIII\Database\SwitchUser;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
// todo add methods to itnerface // todo add methods to itnerface
@@ -17,6 +18,9 @@ use Illuminate\Support\Collection;
*/ */
class Report implements ReportInterface class Report implements ReportInterface
{ {
use SwitchUser;
/** @var AccountRepository */ /** @var AccountRepository */
protected $_accounts; protected $_accounts;
@@ -198,7 +202,6 @@ class Report implements ReportInterface
return $report; return $report;
} }
use SwitchUser;
/** /**

8
app/lib/FireflyIII/Shared/Toolkit/Reminders.php
View File

@@ -68,11 +68,11 @@ class Reminders
/* /*
* Reminder capable objects are (so far) only piggy banks. * Reminder capable objects are (so far) only piggy banks.
*/ */
/** @var \FireflyIII\Database\Piggybank $repository */ /** @var \FireflyIII\Database\PiggyBank\PiggyBank $repository */
$repository = \App::make('FireflyIII\Database\Piggybank'); $repository = \App::make('FireflyIII\Database\PiggyBank\PiggyBank');
/** @var \FireflyIII\Database\Piggybank $repeatedRepository */ /** @var \FireflyIII\Database\PiggyBank\RepeatedExpense $repeatedRepository */
$repeatedRepository = \App::make('FireflyIII\Database\RepeatedExpense'); $repeatedRepository = \App::make('FireflyIII\Database\PiggyBank\RepeatedExpense');
/** @var Collection $piggybanks */ /** @var Collection $piggybanks */
$piggybanks = $repository->get()->merge($repeatedRepository->get()); $piggybanks = $repository->get()->merge($repeatedRepository->get());

6
app/models/LimitRepetition.php
View File

@@ -11,7 +11,7 @@ class LimitRepetition extends Eloquent
use ValidatingTrait; use ValidatingTrait;
public static $rules public static $rules
= [ = [
'budgetlimit_id' => 'required|exists:budgetlimits,id', 'budget_limit_id' => 'required|exists:budgetlimits,id',
'startdate' => 'required|date', 'startdate' => 'required|date',
'enddate' => 'required|date', 'enddate' => 'required|date',
'amount' => 'numeric|required|min:0.01', 'amount' => 'numeric|required|min:0.01',
@@ -54,8 +54,8 @@ class LimitRepetition extends Eloquent
$sum = \DB::table('transactions')->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->leftJoin( $sum = \DB::table('transactions')->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->leftJoin(
'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id' 'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'
)->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id')->leftJoin( )->leftJoin('components', 'components.id', '=', 'component_transaction_journal.component_id')->leftJoin(
'budgetlimits', 'budgetlimits.component_id', '=', 'components.id' 'budget_limits', 'budget_limits.component_id', '=', 'components.id'
)->leftJoin('limit_repetitions', 'limit_repetitions.limit_id', '=', 'budgetlimits.id')->where( )->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id')->where(
'transaction_journals.date', '>=', $this->startdate->format('Y-m-d') 'transaction_journals.date', '>=', $this->startdate->format('Y-m-d')
)->where('transaction_journals.date', '<=', $this->enddate->format('Y-m-d'))->where('transactions.amount', '>', 0)->where( )->where('transaction_journals.date', '<=', $this->enddate->format('Y-m-d'))->where('transactions.amount', '>', 0)->where(
'limit_repetitions.id', '=', $this->id 'limit_repetitions.id', '=', $this->id

4
app/routes.php
View File

@@ -99,8 +99,8 @@ Route::bind(
'limitrepetition', function ($value, $route) { 'limitrepetition', function ($value, $route) {
if (Auth::check()) { if (Auth::check()) {
return LimitRepetition:: return LimitRepetition::
where('limit_repetitions.id', $value)->leftjoin('budgetlimits', 'budgetlimits.id', '=', 'limit_repetitions.limit_id')->leftJoin( where('limit_repetitions.id', $value)->leftjoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id')->leftJoin(
'components', 'components.id', '=', 'budgetlimits.component_id' 'components', 'components.id', '=', 'budget_limits.component_id'
)->where('components.class', 'Budget')->where('components.user_id', Auth::user()->id)->first(['limit_repetitions.*']); )->where('components.class', 'Budget')->where('components.user_id', Auth::user()->id)->first(['limit_repetitions.*']);
} }