There is no help for this route!
', + 'title' => $route, + ]; + try { + $content['text'] = file_get_contents($uri); + } catch (ErrorException $e) { + Log::error(trim($e->getMessage())); + } + if (strlen(trim($content['text'])) == 0) { + $content['text'] = 'There is no help for this route.
'; + } + $converter = new CommonMarkConverter(); + $content['text'] = $converter->convertToHtml($content['text']); + + return $content; + + } + + /** + * @return boolean + */ + public function hasRoute($route) + { + return Route::has($route); + } + + /** + * @param $title + * @param array $content + * + * @return void + */ + public function putInCache($route, array $content) + { + Cache::put('help.' . $route . '.text', $content['text'], 10080); // a week. + Cache::put('help.' . $route . '.title', $content['title'], 10080); + } + + /** + * @param $route + * + * @return bool + */ + public function inCache($route) + { + return Cache::has('help.' . $route . '.title') && Cache::has('help.' . $route . '.text'); + } +} \ No newline at end of file diff --git a/app/Helpers/Help/HelpInterface.php b/app/Helpers/Help/HelpInterface.php new file mode 100644 index 0000000000..c550a9faf5 --- /dev/null +++ b/app/Helpers/Help/HelpInterface.php @@ -0,0 +1,46 @@ +on('budget_limits.budget_id', '=', 'budgets.id')->where('budget_limits.startdate', '=', $date->format('Y-m-d')); } ) - ->get(['budgets.*', 'budget_limits.amount as amount']); + ->get(['budgets.*', 'budget_limits.amount as queryAmount']); - $budgets = Steam::makeArray($set); - $amountSet = $query->journalsByBudget($start, $end, $showSharedReports); - $amounts = Steam::makeArray($amountSet); - $budgets = Steam::mergeArrays($budgets, $amounts); - $budgets[0]['spent'] = isset($budgets[0]['spent']) ? $budgets[0]['spent'] : 0.0; - $budgets[0]['amount'] = isset($budgets[0]['amount']) ? $budgets[0]['amount'] : 0.0; - $budgets[0]['name'] = 'No budget'; + $budgets = Steam::makeArray($set); + $amountSet = $query->journalsByBudget($start, $end, $showSharedReports); + $amounts = Steam::makeArray($amountSet); + $budgets = Steam::mergeArrays($budgets, $amounts); + $budgets[0]['spent'] = isset($budgets[0]['spent']) ? $budgets[0]['spent'] : 0.0; + $budgets[0]['queryAmount'] = isset($budgets[0]['queryAmount']) ? $budgets[0]['queryAmount'] : 0.0; + $budgets[0]['name'] = 'No budget'; // find transactions to shared asset accounts, which are without a budget by default: // which is only relevant when shared asset accounts are hidden. if ($showSharedReports === false) { - $transfers = $query->sharedExpenses($start, $end); - foreach ($transfers as $transfer) { - $budgets[0]['spent'] += floatval($transfer->amount) * -1; - } + $transfers = $query->sharedExpenses($start, $end)->sum('queryAmount'); + $budgets[0]['spent'] += floatval($transfers) * -1; } return $budgets; diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index 1e00357743..f2ab84ea62 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -96,7 +96,7 @@ class ReportQuery implements ReportQueryInterface ->get( [ 'transaction_journals.*', - 'transactions.amount' + 'transactions.amount as queryAmount' ] ); @@ -111,17 +111,11 @@ class ReportQuery implements ReportQueryInterface * @param Carbon $start * @param Carbon $end * - * @return Collection + * @return float */ public function balancedTransactionsSum(Account $account, Carbon $start, Carbon $end) { - $set = $this->balancedTransactionsList($account, $start, $end); - $sum = 0; - foreach ($set as $entry) { - $sum += floatval($entry->amount); - } - - return $sum; + return floatval($this->balancedTransactionsList($account, $start, $end)->sum('queryAmount')); } /** @@ -178,7 +172,7 @@ class ReportQuery implements ReportQueryInterface { $query = $this->queryJournalsNoBudget($account, $start, $end); - return $query->get(['budgets.id', 'budgets.name', DB::Raw('SUM(`transactions`.`amount`) as `amount`')]); + return $query->get(['budgets.id', 'budgets.name', DB::Raw('SUM(`transactions`.`amount`) as `queryAmount`')]); } @@ -196,7 +190,7 @@ class ReportQuery implements ReportQueryInterface { $query = $this->queryJournalsNoBudget($account, $start, $end); - return $query->get(['budgets.name', 'transactions.amount', 'transaction_journals.*']); + return $query->get(['budgets.name', 'transactions.amount as queryAmount', 'transaction_journals.*']); } /** @@ -244,7 +238,7 @@ class ReportQuery implements ReportQueryInterface 'transaction_journals.description', 'transaction_journals.encrypted', 'transaction_types.type', - DB::Raw('SUM(`t_to`.`amount`) as `amount`'), + DB::Raw('SUM(`t_to`.`amount`) as `queryAmount`'), 'transaction_journals.date', 't_from.account_id as account_id', 'ac_from.name as name', @@ -254,7 +248,6 @@ class ReportQuery implements ReportQueryInterface $data->each( function (Model $object) { -// $object->description = intval($object->encrypted); $object->name = intval($object->account_encrypted) == 1 ? Crypt::decrypt($object->name) : $object->name; } ); @@ -335,9 +328,9 @@ class ReportQuery implements ReportQueryInterface ->where('transaction_journals.date', '<=', $end->format('Y-m-d')) ->where('transaction_types.type', 'Withdrawal') ->groupBy('categories.id') - ->orderBy('amount'); + ->orderBy('queryAmount'); - $data = $query->get(['categories.id', 'categories.encrypted', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `amount`')]); + $data = $query->get(['categories.id', 'categories.encrypted', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `queryAmount`')]); // decrypt data: $data->each( function (Model $object) { @@ -390,9 +383,9 @@ class ReportQuery implements ReportQueryInterface $query->before($end)->after($start) ->where('transaction_journals.user_id', Auth::user()->id) ->groupBy('t_to.account_id') - ->orderBy('amount', 'DESC'); + ->orderBy('queryAmount', 'DESC'); - $data = $query->get(['t_to.account_id as id', 'ac_to.name as name', 'ac_to.encrypted', DB::Raw('SUM(t_to.amount) as `amount`')]); + $data = $query->get(['t_to.account_id as id', 'ac_to.name as name', 'ac_to.encrypted', DB::Raw('SUM(t_to.amount) as `queryAmount`')]); // decrypt $data->each( @@ -441,10 +434,10 @@ class ReportQuery implements ReportQueryInterface $query->where('transaction_types.type', 'Deposit'); } - $query->groupBy('t_from.account_id')->orderBy('amount'); + $query->groupBy('t_from.account_id')->orderBy('queryAmount'); $data = $query->get( - ['t_from.account_id as account_id', 'ac_from.name as name', 'ac_from.encrypted as encrypted', DB::Raw('SUM(t_from.amount) as `amount`')] + ['t_from.account_id as account_id', 'ac_from.name as name', 'ac_from.encrypted as encrypted', DB::Raw('SUM(t_from.amount) as `queryAmount`')] ); // decrypt $data->each( @@ -489,7 +482,7 @@ class ReportQuery implements ReportQueryInterface ->where('transaction_journals.user_id', Auth::user()->id) ->get( ['transaction_journals.id', 'transaction_journals.description', 'transactions.account_id', 'accounts.name', - 'transactions.amount'] + 'transactions.amount as queryAmount'] ); } @@ -534,7 +527,7 @@ class ReportQuery implements ReportQueryInterface [ 'categories.id', 'categories.name as name', - DB::Raw('SUM(`transactions`.`amount`) * -1 AS `amount`') + DB::Raw('SUM(`transactions`.`amount`) * -1 AS `queryAmount`') ] ); } diff --git a/app/Helpers/Report/ReportQueryInterface.php b/app/Helpers/Report/ReportQueryInterface.php index c92a46ad06..47a7857707 100644 --- a/app/Helpers/Report/ReportQueryInterface.php +++ b/app/Helpers/Report/ReportQueryInterface.php @@ -43,7 +43,7 @@ interface ReportQueryInterface * @param Carbon $start * @param Carbon $end * - * @return Collection + * @return float */ public function balancedTransactionsSum(Account $account, Carbon $start, Carbon $end); diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index afacfa1b23..e5e2e8a919 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -1,6 +1,5 @@ getAccounts($types, $page); - $total = $repository->countAccounts($types); - + $accounts = $repository->getAccounts($types); // last activity: /** * HERE WE ARE */ $start = clone Session::get('start', Carbon::now()->startOfMonth()); $start->subDay(); - $set->each( + $accounts->each( function (Account $account) use ($start, $repository) { $account->lastActivityDate = $repository->getLastActivity($account); $account->startBalance = Steam::balance($account, $start); @@ -143,10 +137,6 @@ class AccountController extends Controller } ); - $accounts = new LengthAwarePaginator($set, $total, $size, $page); - $accounts->setPath(route('accounts.index', $what)); - - return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts')); } @@ -166,7 +156,6 @@ class AccountController extends Controller $journals->setPath('accounts/show/' . $account->id); - return view('accounts.show', compact('account', 'what', 'subTitleIcon', 'journals', 'subTitle')); } @@ -192,7 +181,7 @@ class AccountController extends Controller ]; $account = $repository->store($accountData); - Session::flash('success', 'New account "' . $account->name . '" stored!'); + Session::flash('success', 'New account "' . $account->name . '" stored!'); if (intval(Input::get('create_another')) === 1) { return Redirect::route('accounts.create', $request->input('what'))->withInput(); diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 6a78a4718f..d605b3d0ba 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -45,7 +45,7 @@ class BillController extends Controller $expense = null; // get users expense accounts: - $accounts = $repository->getAccounts(Config::get('firefly.accountTypesByIdentifier.expense'), -1); + $accounts = $repository->getAccounts(Config::get('firefly.accountTypesByIdentifier.expense')); foreach ($matches as $match) { $match = strtolower($match); @@ -173,7 +173,7 @@ class BillController extends Controller */ public function show(Bill $bill, BillRepositoryInterface $repository) { - $journals = $repository->getJournals($bill); + $journals = $repository->getJournals($bill); $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill); $hideBill = true; diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 105959bc54..09b7b1370d 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -136,6 +136,7 @@ class CategoryController extends Controller $set = $repository->getJournals($category, $page); $count = $repository->countJournals($category); $journals = new LengthAwarePaginator($set, $count, 50, $page); + $journals->setPath('categories/show/' . $category->id); return view('categories.show', compact('category', 'journals', 'hideCategory')); } diff --git a/app/Http/Controllers/GoogleChartController.php b/app/Http/Controllers/GoogleChartController.php index 0c0ce8138b..8b09f1aa0c 100644 --- a/app/Http/Controllers/GoogleChartController.php +++ b/app/Http/Controllers/GoogleChartController.php @@ -1,12 +1,7 @@ name); $chart->addColumn('Day of month', 'date'); - $chart->addColumn('Balance for ' . $accountName, 'number'); + $chart->addColumn('Balance for ' . $account->name, 'number'); $chart->addCertainty(1); $start = Session::get('start', Carbon::now()->startOfMonth()); @@ -73,24 +68,19 @@ class GoogleChartController extends Controller * * @return \Symfony\Component\HttpFoundation\Response */ - public function allAccountsBalanceChart(GChart $chart) + public function allAccountsBalanceChart(GChart $chart, AccountRepositoryInterface $repository) { $chart->addColumn('Day of the month', 'date'); $frontPage = Preferences::get('frontPageAccounts', []); $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); + $accounts = $repository->getFrontpageAccounts($frontPage); - if ($frontPage->data == []) { - $accounts = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Default account', 'Asset account'])->get(['accounts.*']); - } else { - $accounts = Auth::user()->accounts()->whereIn('id', $frontPage->data)->orderBy('accounts.name', 'ASC')->get(['accounts.*']); - } $index = 1; /** @var Account $account */ foreach ($accounts as $account) { - $accountName = $account->name; - $chart->addColumn('Balance for ' . $accountName, 'number'); + $chart->addColumn('Balance for ' . $account->name, 'number'); $chart->addCertainty($index); $index++; } @@ -108,7 +98,7 @@ class GoogleChartController extends Controller $current->addDay(); } $chart->generate(); - //header('Content-Type: application/json; charset=utf-8'); + return Response::json($chart->getData()); } @@ -120,22 +110,16 @@ class GoogleChartController extends Controller */ public function allBudgetsAndSpending($year, GChart $chart, BudgetRepositoryInterface $repository) { - try { - new Carbon('01-01-' . $year); - } catch (Exception $e) { - return view('error')->with('message', 'Invalid year.'); - } - $budgets = Auth::user()->budgets()->get(); - $budgets->sortBy('name'); + $budgets = $repository->getBudgets(); $chart->addColumn('Month', 'date'); foreach ($budgets as $budget) { $chart->addColumn($budget->name, 'number'); } + $start = Carbon::createFromDate(intval($year), 1, 1); $end = clone $start; $end->endOfYear(); - while ($start <= $end) { $row = [clone $start]; foreach ($budgets as $budget) { @@ -146,7 +130,6 @@ class GoogleChartController extends Controller $start->addMonth(); } - $chart->generate(); return Response::json($chart->getData()); @@ -158,73 +141,44 @@ class GoogleChartController extends Controller * * @return \Symfony\Component\HttpFoundation\Response */ - public function allBudgetsHomeChart(GChart $chart) + public function allBudgetsHomeChart(GChart $chart, BudgetRepositoryInterface $repository) { $chart->addColumn('Budget', 'string'); $chart->addColumn('Budgeted', 'number'); $chart->addColumn('Spent', 'number'); - $budgets = Auth::user()->budgets()->orderBy('name', 'DESC')->get(); - $start = Session::get('start', Carbon::now()->startOfMonth()); - $end = Session::get('end', Carbon::now()->endOfMonth()); + $budgets = $repository->getBudgets(); + $start = Session::get('start', Carbon::now()->startOfMonth()); + $end = Session::get('end', Carbon::now()->endOfMonth()); + $allEntries = new Collection; - /** @var Budget $budget */ foreach ($budgets as $budget) { - - /** @var Collection $repetitions */ - $repetitions = LimitRepetition:: - leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00')) - ->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00')) - ->where('budget_limits.budget_id', $budget->id) - ->get(['limit_repetitions.*']); - - // no results? search entire range for expenses and list those. + $repetitions = $repository->getBudgetLimitRepetitions($budget, $start, $end); if ($repetitions->count() == 0) { - $expenses = floatval($budget->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1; - if ($expenses > 0) { - $chart->addRow($budget->name, 0, $expenses); - } - } else { - // add with foreach: - /** @var LimitRepetition $repetition */ - foreach ($repetitions as $repetition) { - - $expenses - = - floatval($budget->transactionjournals()->before($repetition->enddate)->after($repetition->startdate)->lessThan(0)->sum('amount')) * -1; - if ($expenses > 0) { - $chart->addRow($budget->name . ' (' . $repetition->startdate->format('j M Y') . ')', floatval($repetition->amount), $expenses); - } - } + $expenses = $repository->sumBudgetExpensesInPeriod($budget, $start, $end); + $allEntries->push([$budget->name, 0, $expenses]); + continue; + } + /** @var LimitRepetition $repetition */ + foreach ($repetitions as $repetition) { + $expenses = $repository->sumBudgetExpensesInPeriod($budget, $repetition->startdate, $repetition->enddate); + $allEntries->push([$budget->name . ' (' . $repetition->startdate->format('j M Y') . ')', floatval($repetition->amount), $expenses]); + } + } + + $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end); + $allEntries->push(['(no budget)', 0, $noBudgetExpenses]); + + foreach ($allEntries as $entry) { + if ($entry[2] > 0) { + $chart->addRow($entry[0], $entry[1], $entry[2]); } - - } - $noBudgetSet = Auth::user() - ->transactionjournals() - ->whereNotIn( - 'transaction_journals.id', function (QueryBuilder $query) use ($start, $end) { - $query - ->select('transaction_journals.id') - ->from('transaction_journals') - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00')) - ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00')) - ->whereNotNull('budget_transaction_journal.budget_id'); - } - ) - ->before($end) - ->after($start) - ->lessThan(0) - ->transactionTypes(['Withdrawal']) - ->get(); - $sum = $noBudgetSet->sum('amount') * -1; - $chart->addRow('No budget', 0, $sum); $chart->generate(); return Response::json($chart->getData()); + } /** @@ -232,34 +186,14 @@ class GoogleChartController extends Controller * * @return \Symfony\Component\HttpFoundation\Response */ - public function allCategoriesHomeChart(GChart $chart) + public function allCategoriesHomeChart(GChart $chart, CategoryRepositoryInterface $repository) { $chart->addColumn('Category', 'string'); $chart->addColumn('Spent', 'number'); - // query! $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); - $set = TransactionJournal:: - where('transaction_journals.user_id', Auth::user()->id) - ->leftJoin( - 'transactions', - function (JoinClause $join) { - $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('amount', '>', 0); - } - ) - ->leftJoin( - 'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id' - ) - ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id') - ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') - ->before($end) - ->where('categories.user_id', Auth::user()->id) - ->after($start) - ->where('transaction_types.type', 'Withdrawal') - ->groupBy('categories.id') - ->orderBy('sum', 'DESC') - ->get(['categories.id', 'categories.encrypted', 'categories.name', \DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]); + $set = $repository->getCategoriesAndExpenses($start, $end); foreach ($set as $entry) { $isEncrypted = intval($entry->encrypted) == 1 ? true : false; @@ -275,11 +209,12 @@ class GoogleChartController extends Controller } /** - * @param Bill $bill + * @param Bill $bill + * @param GChart $chart * - * @return \Illuminate\Http\JsonResponse + * @return \Symfony\Component\HttpFoundation\Response */ - public function billOverview(Bill $bill, GChart $chart) + public function billOverview(Bill $bill, GChart $chart, BillRepositoryInterface $repository) { $chart->addColumn('Date', 'date'); @@ -288,24 +223,10 @@ class GoogleChartController extends Controller $chart->addColumn('Recorded bill entry', 'number'); // get first transaction or today for start: - $first = $bill->transactionjournals()->orderBy('date', 'ASC')->first(); - if ($first) { - $start = $first->date; - } else { - $start = new Carbon; - } - - $results = $bill->transactionjournals()->after($start)->get(); + $results = $repository->getJournals($bill); /** @var TransactionJournal $result */ foreach ($results as $result) { - $amount = 0; - /** @var Transaction $tr */ - foreach ($result->transactions()->get() as $tr) { - if (floatval($tr->amount) > 0) { - $amount = floatval($tr->amount); - } - } - $chart->addRow(clone $result->date, $bill->amount_max, $bill->amount_min, $amount); + $chart->addRow(clone $result->date, floatval($bill->amount_max), floatval($bill->amount_min), floatval($result->amount)); } $chart->generate(); @@ -319,18 +240,21 @@ class GoogleChartController extends Controller * * @return \Symfony\Component\HttpFoundation\Response */ - public function billsOverview(GChart $chart, BillRepositoryInterface $repository) + public function billsOverview(GChart $chart, BillRepositoryInterface $repository, AccountRepositoryInterface $accounts) { $chart->addColumn('Name', 'string'); $chart->addColumn('Amount', 'number'); - - $paid = ['items' => [], 'amount' => 0]; - $unpaid = ['items' => [], 'amount' => 0]; $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); - - $bills = Auth::user()->bills()->where('active', 1)->get(); + $bills = $repository->getActiveBills(); + $paid = new Collection; // journals. + $unpaid = new Collection; // bills + // loop paid and create single entry: + $paidDescriptions = []; + $paidAmount = 0; + $unpaidDescriptions = []; + $unpaidAmount = 0; /** @var Bill $bill */ foreach ($bills as $bill) { @@ -338,71 +262,56 @@ class GoogleChartController extends Controller foreach ($ranges as $range) { // paid a bill in this range? - $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count(); - if ($count == 0) { - $unpaid['items'][] = $bill->name . ' (' . $range['start']->format('jS M Y') . ')'; - $unpaid['amount'] += ($bill->amount_max + $bill->amount_min / 2); - + $journals = $repository->getJournalsInRange($bill, $range['start'], $range['end']); + if ($journals->count() == 0) { + $unpaid->push([$bill, $range['start']]); } else { - $journal = $bill->transactionjournals()->with('transactions')->before($range['end'])->after($range['start'])->first(); - $paid['items'][] = $journal->description; - $amount = 0; - foreach ($journal->transactions as $t) { - if (floatval($t->amount) > 0) { - $amount = floatval($t->amount); - } - } - $paid['amount'] += $amount; + $paid = $paid->merge($journals); } } } - /** - * Find credit card accounts and possibly unpaid credit card bills. - */ - $creditCards = Auth::user()->accounts() - ->hasMetaValue('accountRole', 'ccAsset') - ->hasMetaValue('ccType', 'monthlyFull') - ->get( - [ - 'accounts.*', - 'ccType.data as ccType', - 'accountRole.data as accountRole' - ] - ); - // if the balance is not zero, the monthly payment is still underway. - /** @var Account $creditCard */ + $creditCards = $accounts->getCreditCards(); foreach ($creditCards as $creditCard) { $balance = Steam::balance($creditCard, null, true); $date = new Carbon($creditCard->getMeta('ccMonthlyPaymentDate')); if ($balance < 0) { - // unpaid! - $unpaid['amount'] += $balance * -1; - $unpaid['items'][] = $creditCard->name . ' (expected ' . Amount::format(($balance * -1), false) . ') on the ' . $date->format('jS') . ')'; + // unpaid! create a fake bill that matches the amount. + $description = $creditCard->name; + $amount = $balance * -1; + $fakeBill = $repository->createFakeBill($description, $date, $amount); + unset($description, $amount); + $unpaid->push([$fakeBill, $date]); } if ($balance == 0) { - // find a transfer TO the credit card which should account for + // find transfer(s) TO the credit card which should account for // anything paid. If not, the CC is not yet used. - $transactions = $creditCard->transactions() - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->before($end)->after($start)->get(); - if ($transactions->count() > 0) { - /** @var Transaction $transaction */ - foreach ($transactions as $transaction) { - $journal = $transaction->transactionJournal; - if ($journal->transactionType->type == 'Transfer') { - $paid['amount'] += floatval($transaction->amount); - $paid['items'][] = $creditCard->name . - ' (paid ' . Amount::format((floatval($transaction->amount)), false) . - ' on the ' . $journal->date->format('jS') . ')'; - } - } - } + $journals = $accounts->getTransfersInRange($creditCard, $start, $end); + $paid = $paid->merge($journals); } } - $chart->addRow('Unpaid: ' . join(', ', $unpaid['items']), $unpaid['amount']); - $chart->addRow('Paid: ' . join(', ', $paid['items']), $paid['amount']); + + + /** @var TransactionJournal $entry */ + foreach ($paid as $entry) { + + $paidDescriptions[] = $entry->description; + $paidAmount += floatval($entry->amount); + } + + // loop unpaid: + /** @var Bill $entry */ + foreach ($unpaid as $entry) { + $description = $entry[0]->name . ' (' . $entry[1]->format('jS M Y') . ')'; + $amount = ($entry[0]->amount_max + $entry[0]->amount_min) / 2; + $unpaidDescriptions[] = $description; + $unpaidAmount += $amount; + unset($amount, $description); + } + + $chart->addRow('Unpaid: ' . join(', ', $unpaidDescriptions), $unpaidAmount); + $chart->addRow('Paid: ' . join(', ', $paidDescriptions), $paidAmount); $chart->generate(); return Response::json($chart->getData()); @@ -415,7 +324,7 @@ class GoogleChartController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function budgetLimitSpending(Budget $budget, LimitRepetition $repetition, GChart $chart) + public function budgetLimitSpending(Budget $budget, LimitRepetition $repetition, GChart $chart, BudgetRepositoryInterface $repository) { $start = clone $repetition->startdate; $end = $repetition->enddate; @@ -430,7 +339,7 @@ class GoogleChartController extends Controller /* * Sum of expenses on this day: */ - $sum = floatval($budget->transactionjournals()->lessThan(0)->transactionTypes(['Withdrawal'])->onDate($start)->sum('amount')); + $sum = $repository->expensesOnDay($budget, $start); $amount += $sum; $chart->addRow(clone $start, $amount); $start->addDay(); @@ -442,37 +351,22 @@ class GoogleChartController extends Controller } /** + * @param Budget $budget + * @param int $year + * @param GChart $chart + * @param BudgetRepositoryInterface $repository * - * @param Budget $budget - * - * @param int $year - * - * @return \Illuminate\Http\JsonResponse + * @return \Symfony\Component\HttpFoundation\Response */ - public function budgetsAndSpending(Budget $budget, $year = 0) + public function budgetsAndSpending(Budget $budget, $year = 0, GChart $chart, BudgetRepositoryInterface $repository) { - - $chart = App::make('Grumpydictator\Gchart\GChart'); - $repository = App::make('FireflyIII\Repositories\Budget\BudgetRepository'); $chart->addColumn('Month', 'date'); $chart->addColumn('Budgeted', 'number'); $chart->addColumn('Spent', 'number'); - if ($year == 0) { - // grab the first budgetlimit ever: - $firstLimit = $budget->budgetlimits()->orderBy('startdate', 'ASC')->first(); - if ($firstLimit) { - $start = new Carbon($firstLimit->startdate); - } else { - $start = Carbon::now()->startOfYear(); - } - // grab the last budget limit ever: - $lastLimit = $budget->budgetlimits()->orderBy('startdate', 'DESC')->first(); - if ($lastLimit) { - $end = new Carbon($lastLimit->startdate); - } else { - $end = Carbon::now()->endOfYear(); - } + if ($year == 0) { + $start = $repository->getFirstBudgetLimitDate($budget); + $end = $repository->getLastBudgetLimitDate($budget); } else { $start = Carbon::createFromDate(intval($year), 1, 1); $end = clone $start; @@ -480,19 +374,8 @@ class GoogleChartController extends Controller } while ($start <= $end) { - $spent = $repository->spentInMonth($budget, $start); - $repetition = LimitRepetition::leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->where('limit_repetitions.startdate', $start->format('Y-m-d 00:00:00')) - ->where('budget_limits.budget_id', $budget->id) - ->first(['limit_repetitions.*']); - - if ($repetition) { - $budgeted = floatval($repetition->amount); - \Log::debug('Found a repetition on ' . $start->format('Y-m-d') . ' for budget ' . $budget->name . '!'); - } else { - \Log::debug('No repetition on ' . $start->format('Y-m-d') . ' for budget ' . $budget->name); - $budgeted = null; - } + $spent = $repository->spentInMonth($budget, $start); + $budgeted = $repository->getLimitAmountOnDate($budget, $start); $chart->addRow(clone $start, $budgeted, $spent); $start->addMonth(); } @@ -510,12 +393,11 @@ class GoogleChartController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function categoryOverviewChart(Category $category, GChart $chart) + public function categoryOverviewChart(Category $category, GChart $chart, CategoryRepositoryInterface $repository) { // oldest transaction in category: - /** @var TransactionJournal $first */ - $first = $category->transactionjournals()->orderBy('date', 'ASC')->first(); - $start = $first->date; + $start = $repository->getFirstActivityDate($category); + /** @var Preference $range */ $range = Preferences::get('viewRange', '1M'); // jump to start of week / month / year / etc (TODO). @@ -528,13 +410,12 @@ class GoogleChartController extends Controller while ($start <= $end) { $currentEnd = Navigation::endOfPeriod($start, $range->data); - $spent = floatval($category->transactionjournals()->before($currentEnd)->after($start)->lessThan(0)->sum('amount')) * -1; + $spent = $repository->spentInPeriodSum($category, $start, $currentEnd); $chart->addRow(clone $start, $spent); $start = Navigation::addPeriod($start, $range->data, 0); } - $chart->generate(); return Response::json($chart->getData()); @@ -548,17 +429,15 @@ class GoogleChartController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function categoryPeriodChart(Category $category, GChart $chart) + public function categoryPeriodChart(Category $category, GChart $chart, CategoryRepositoryInterface $repository) { - // oldest transaction in category: - /** @var TransactionJournal $first */ - $start = clone Session::get('start'); + $start = clone Session::get('start', Carbon::now()->startOfMonth()); $chart->addColumn('Period', 'date'); $chart->addColumn('Spent', 'number'); - $end = Session::get('end'); + $end = Session::get('end', Carbon::now()->endOfMonth()); while ($start <= $end) { - $spent = floatval($category->transactionjournals()->onDate($start)->lessThan(0)->sum('amount')) * -1; + $spent = $repository->spentOnDaySum($category, $start); $chart->addRow(clone $start, $spent); $start->addDay(); } @@ -576,13 +455,13 @@ class GoogleChartController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function piggyBankHistory(PiggyBank $piggyBank, GChart $chart) + public function piggyBankHistory(PiggyBank $piggyBank, GChart $chart, PiggyBankRepositoryInterface $repository) { $chart->addColumn('Date', 'date'); $chart->addColumn('Balance', 'number'); /** @var Collection $set */ - $set = DB::table('piggy_bank_events')->where('piggy_bank_id', $piggyBank->id)->groupBy('date')->get(['date', DB::Raw('SUM(`amount`) AS `sum`')]); + $set = $repository->getEventSummarySet($piggyBank); $sum = 0; foreach ($set as $entry) { @@ -604,11 +483,7 @@ class GoogleChartController extends Controller */ public function yearInExp($year, GChart $chart, ReportQueryInterface $query) { - try { - $start = new Carbon('01-01-' . $year); - } catch (Exception $e) { - return view('error')->with('message', 'Invalid year.'); - } + $start = new Carbon('01-01-' . $year); $chart->addColumn('Month', 'date'); $chart->addColumn('Income', 'number'); $chart->addColumn('Expenses', 'number'); @@ -623,19 +498,9 @@ class GoogleChartController extends Controller while ($start < $end) { $currentEnd = clone $start; $currentEnd->endOfMonth(); - // total income: - $income = $query->incomeByPeriod($start, $currentEnd, $showSharedReports); - $incomeSum = 0; - foreach ($income as $entry) { - $incomeSum += floatval($entry->amount); - } - - // total expenses: - $expense = $query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports); - $expenseSum = 0; - foreach ($expense as $entry) { - $expenseSum += floatval($entry->amount); - } + // total income && total expenses: + $incomeSum = floatval($query->incomeByPeriod($start, $currentEnd, $showSharedReports)->sum('queryAmount')); + $expenseSum = floatval($query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports)->sum('queryAmount')); $chart->addRow(clone $start, $incomeSum, $expenseSum); $start->addMonth(); @@ -656,11 +521,7 @@ class GoogleChartController extends Controller */ public function yearInExpSum($year, GChart $chart, ReportQueryInterface $query) { - try { - $start = new Carbon('01-01-' . $year); - } catch (Exception $e) { - return view('error')->with('message', 'Invalid year.'); - } + $start = new Carbon('01-01-' . $year); $chart->addColumn('Summary', 'string'); $chart->addColumn('Income', 'number'); $chart->addColumn('Expenses', 'number'); @@ -678,18 +539,9 @@ class GoogleChartController extends Controller $currentEnd = clone $start; $currentEnd->endOfMonth(); // total income: - $incomeResult = $query->incomeByPeriod($start, $currentEnd, $showSharedReports); - $incomeSum = 0; - foreach ($incomeResult as $entry) { - $incomeSum += floatval($entry->amount); - } - + $incomeSum = floatval($query->incomeByPeriod($start, $currentEnd, $showSharedReports)->sum('queryAmount')); // total expenses: - $expenseResult = $query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports); - $expenseSum = 0; - foreach ($expenseResult as $entry) { - $expenseSum += floatval($entry->amount); - } + $expenseSum = floatval($query->journalsByExpenseAccount($start, $currentEnd, $showSharedReports)->sum('queryAmount')); $income += $incomeSum; $expense += $expenseSum; diff --git a/app/Http/Controllers/HelpController.php b/app/Http/Controllers/HelpController.php index 5c03c30456..414e015944 100644 --- a/app/Http/Controllers/HelpController.php +++ b/app/Http/Controllers/HelpController.php @@ -2,7 +2,9 @@ use Cache; use ErrorException; +use FireflyIII\Helpers\Help\HelpInterface; use League\CommonMark\CommonMarkConverter; +use Log; use Response; use Route; @@ -19,73 +21,34 @@ class HelpController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function show($route) + public function show($route, HelpInterface $help) { $content = [ 'text' => 'There is no help for this route!
', 'title' => 'Help', ]; - if (!Route::has($route)) { - \Log::error('No such route: ' . $route); + if (!$help->hasRoute($route)) { + Log::error('No such route: ' . $route); return Response::json($content); } - if ($this->inCache($route)) { + if ($help->inCache($route)) { $content = [ - 'text' => Cache::get('help.' . $route . '.text'), - 'title' => Cache::get('help.' . $route . '.title'), + 'text' => $help->getFromCache('help.' . $route . '.text'), + 'title' => $help->getFromCache('help.' . $route . '.title'), ]; return Response::json($content); } - $content = $this->getFromGithub($route); + $content = $help->getFromGithub($route); - - Cache::put('help.' . $route . '.text', $content['text'], 10080); // a week. - Cache::put('help.' . $route . '.title', $content['title'], 10080); + $help->putInCache($route, $content); return Response::json($content); } - /** - * @param $route - * - * @return bool - */ - protected function inCache($route) - { - return Cache::has('help.' . $route . '.title') && Cache::has('help.' . $route . '.text'); - } - - /** - * @param $route - * - * @return array - */ - protected function getFromGithub($route) - { - $uri = 'https://raw.githubusercontent.com/JC5/firefly-iii-help/master/' . e($route) . '.md'; - $content = [ - 'text' => 'There is no help for this route!
', - 'title' => $route, - ]; - try { - $content['text'] = file_get_contents($uri); - } catch (ErrorException $e) { - \Log::error(trim($e->getMessage())); - } - if (strlen(trim($content['text'])) == 0) { - $content['text'] = 'There is no help for this route.
'; - } - $converter = new CommonMarkConverter(); - $content['text'] = $converter->convertToHtml($content['text']); - - return $content; - - - } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 2f029fde65..d7728b61b1 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -1,13 +1,14 @@ countAccounts($types); - $title = 'Firefly'; - $subTitle = 'What\'s playing?'; - $mainTitleIcon = 'fa-fire'; - $transactions = []; - $frontPage = Preferences::get('frontPageAccounts', []); - $start = Session::get('start', Carbon::now()->startOfMonth()); - $end = Session::get('end', Carbon::now()->endOfMonth()); - $accounts = $repository->getFrontpageAccounts($frontPage); - $savings = $repository->getSavingsAccounts(); + $types = Config::get('firefly.accountTypesByIdentifier.asset'); + $count = $repository->countAccounts($types); + $title = 'Firefly'; + $subTitle = 'What\'s playing?'; + $mainTitleIcon = 'fa-fire'; + $transactions = []; + $frontPage = Preferences::get('frontPageAccounts', []); + $start = Session::get('start', Carbon::now()->startOfMonth()); + $end = Session::get('end', Carbon::now()->endOfMonth()); + $accounts = $repository->getFrontpageAccounts($frontPage); + $savings = $repository->getSavingsAccounts(); + $piggyBankAccounts = $repository->getPiggyBankAccounts(); + + + $savingsTotal = 0; + foreach ($savings as $savingAccount) { + $savingsTotal += Steam::balance($savingAccount, $end); + } // check if all books are correct. - $sum = floatval(Auth::user()->transactions()->sum('amount')); + $sum = $repository->sumOfEverything(); if ($sum != 0) { Session::flash( 'error', 'Your transactions are unbalanced. This means a' @@ -71,7 +86,7 @@ class HomeController extends Controller } } - return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions')); + return view('index', compact('count', 'title', 'savings', 'subTitle', 'mainTitleIcon', 'transactions', 'savingsTotal','piggyBankAccounts')); } diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 322e34c97a..abbc81b0b4 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -3,13 +3,16 @@ use Amount; use Auth; use Carbon\Carbon; -use DB; +use FireflyIII\Helpers\Report\ReportQueryInterface; use FireflyIII\Models\Account; use FireflyIII\Models\Bill; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; -use Input; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Support\Collection; use Preferences; use Response; use Session; @@ -23,149 +26,124 @@ use Steam; class JsonController extends Controller { + /** + * @param BillRepositoryInterface $repository * + * @return \Symfony\Component\HttpFoundation\Response */ - public function box(BillRepositoryInterface $repository) + public function boxBillsPaid(BillRepositoryInterface $repository, AccountRepositoryInterface $accountRepository) { + $start = Session::get('start', Carbon::now()->startOfMonth()); + $end = Session::get('end', Carbon::now()->endOfMonth()); $amount = 0; - $start = Session::get('start'); - $end = Session::get('end'); - $box = 'empty'; - switch (Input::get('box')) { - case 'in': - $box = Input::get('box'); - $in = Auth::user()->transactionjournals() - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->before($end) - ->after($start) - ->transactionTypes(['Deposit']) - ->where('transactions.amount', '>', 0) - ->first([DB::Raw('SUM(transactions.amount) as `amount`')]); - if (!is_null($in)) { - $amount = floatval($in->amount); - } - break; - case 'out': - $box = Input::get('box'); - $in = Auth::user()->transactionjournals() - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->before($end) - ->after($start) - ->transactionTypes(['Withdrawal']) - ->where('transactions.amount', '>', 0) - ->first([DB::Raw('SUM(transactions.amount) as `amount`')]); - if (!is_null($in)) { - $amount = floatval($in->amount); - } + // these two functions are the same as the chart TODO + $bills = $repository->getActiveBills(); - break; - case 'bills-unpaid': - $box = 'bills-unpaid'; - $bills = Auth::user()->bills()->where('active', 1)->get(); + /** @var Bill $bill */ + foreach ($bills as $bill) { + $ranges = $repository->getRanges($bill, $start, $end); - /** @var Bill $bill */ - foreach ($bills as $bill) { - $ranges = $repository->getRanges($bill, $start, $end); + foreach ($ranges as $range) { + // paid a bill in this range? + $amount += $repository->getJournalsInRange($bill, $range['start'], $range['end'])->sum('amount'); + } + } + unset($ranges, $bill, $range, $bills); - foreach ($ranges as $range) { - // paid a bill in this range? - $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count(); - if ($count == 0) { - $amount += floatval($bill->amount_max + $bill->amount_min / 2); - } - - } - } - - /** - * Find credit card accounts and possibly unpaid credit card bills. - */ - $creditCards = Auth::user()->accounts() - ->hasMetaValue('accountRole', 'ccAsset') - ->hasMetaValue('ccType', 'monthlyFull') - ->get( - [ - 'accounts.*', - 'ccType.data as ccType', - 'accountRole.data as accountRole' - ] - ); - // if the balance is not zero, the monthly payment is still underway. - /** @var Account $creditCard */ - foreach ($creditCards as $creditCard) { - $balance = Steam::balance($creditCard, null, true); - if ($balance < 0) { - // unpaid! - $amount += $balance * -1; - } - } - - break; - case 'bills-paid': - $box = 'bills-paid'; - // these two functions are the same as the chart TODO - $bills = Auth::user()->bills()->where('active', 1)->get(); - - /** @var Bill $bill */ - foreach ($bills as $bill) { - $ranges = $repository->getRanges($bill, $start, $end); - - foreach ($ranges as $range) { - // paid a bill in this range? - $count = $bill->transactionjournals()->before($range['end'])->after($range['start'])->count(); - if ($count != 0) { - $journal = $bill->transactionjournals()->with('transactions')->before($range['end'])->after($range['start'])->first(); - $currentAmount = 0; - foreach ($journal->transactions as $t) { - if (floatval($t->amount) > 0) { - $currentAmount = floatval($t->amount); - } - } - $amount += $currentAmount; - } - - } - } - - /** - * Find credit card accounts and possibly unpaid credit card bills. - */ - $creditCards = Auth::user()->accounts() - ->hasMetaValue('accountRole', 'ccAsset') - ->hasMetaValue('ccType', 'monthlyFull') - ->get( - [ - 'accounts.*', - 'ccType.data as ccType', - 'accountRole.data as accountRole' - ] - ); - // if the balance is not zero, the monthly payment is still underway. - /** @var Account $creditCard */ - foreach ($creditCards as $creditCard) { - $balance = Steam::balance($creditCard, null, true); - if ($balance == 0) { - // find a transfer TO the credit card which should account for - // anything paid. If not, the CC is not yet used. - $transactions = $creditCard->transactions() - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->before($end)->after($start)->get(); - if ($transactions->count() > 0) { - /** @var Transaction $transaction */ - foreach ($transactions as $transaction) { - $journal = $transaction->transactionJournal; - if ($journal->transactionType->type == 'Transfer') { - $amount += floatval($transaction->amount); - } - } - } - } - } + /** + * Find credit card accounts and possibly unpaid credit card bills. + */ + $creditCards = $accountRepository->getCreditCards(); + // if the balance is not zero, the monthly payment is still underway. + /** @var Account $creditCard */ + foreach ($creditCards as $creditCard) { + $balance = Steam::balance($creditCard, null, true); + if ($balance == 0) { + // find a transfer TO the credit card which should account for + // anything paid. If not, the CC is not yet used. + $amount += $accountRepository->getTransfersInRange($creditCard, $start, $end)->sum('amount'); + } } - return Response::json(['box' => $box, 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]); + return Response::json(['box' => 'bills-paid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]); + } + + /** + * @param BillRepositoryInterface $repository + * @param AccountRepositoryInterface $accountRepository + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function boxBillsUnpaid(BillRepositoryInterface $repository, AccountRepositoryInterface $accountRepository) + { + $amount = 0; + $start = Session::get('start', Carbon::now()->startOfMonth()); + $end = Session::get('end', Carbon::now()->endOfMonth()); + $bills = $repository->getActiveBills(); + $unpaid = new Collection; // bills + + /** @var Bill $bill */ + foreach ($bills as $bill) { + $ranges = $repository->getRanges($bill, $start, $end); + + foreach ($ranges as $range) { + $journals = $repository->getJournalsInRange($bill, $range['start'], $range['end']); + if ($journals->count() == 0) { + $unpaid->push([$bill, $range['start']]); + } + } + } + unset($bill, $bills, $range, $ranges); + + $creditCards = $accountRepository->getCreditCards(); + foreach ($creditCards as $creditCard) { + $balance = Steam::balance($creditCard, null, true); + $date = new Carbon($creditCard->getMeta('ccMonthlyPaymentDate')); + if ($balance < 0) { + // unpaid! create a fake bill that matches the amount. + $description = $creditCard->name; + $fakeAmount = $balance * -1; + $fakeBill = $repository->createFakeBill($description, $date, $fakeAmount); + $unpaid->push([$fakeBill, $date]); + } + } + /** @var Bill $entry */ + foreach ($unpaid as $entry) { + $current = ($entry[0]->amount_max + $entry[0]->amount_min) / 2; + $amount += $current; + } + + return Response::json(['box' => 'bills-unpaid', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]); + } + + /** + * @param ReportQueryInterface $reportQuery + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function boxIn(ReportQueryInterface $reportQuery) + { + $start = Session::get('start', Carbon::now()->startOfMonth()); + $end = Session::get('end', Carbon::now()->endOfMonth()); + $amount = $reportQuery->incomeByPeriod($start, $end, true)->sum('queryAmount'); + + return Response::json(['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]); + } + + /** + * @param ReportQueryInterface $reportQuery + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function boxOut(ReportQueryInterface $reportQuery) + { + $start = Session::get('start', Carbon::now()->startOfMonth()); + $end = Session::get('end', Carbon::now()->endOfMonth()); + $amount = $reportQuery->journalsByExpenseAccount($start, $end, true)->sum('queryAmount'); + + return Response::json(['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]); } /** @@ -173,13 +151,14 @@ class JsonController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function categories() + public function categories(CategoryRepositoryInterface $repository) { - $list = Auth::user()->categories()->orderBy('name', 'ASC')->get(); + $list = $repository->getCategories(); $return = []; foreach ($list as $entry) { $return[] = $entry->name; } + sort($return); return Response::json($return); } @@ -189,9 +168,9 @@ class JsonController extends Controller * * @return \Illuminate\Http\JsonResponse */ - public function expenseAccounts() + public function expenseAccounts(AccountRepositoryInterface $accountRepository) { - $list = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')->accountTypeIn(['Expense account', 'Beneficiary account'])->get(); + $list = $accountRepository->getAccounts(['Expense account', 'Beneficiary account']); $return = []; foreach ($list as $entry) { $return[] = $entry->name; @@ -204,9 +183,9 @@ class JsonController extends Controller /** * @return \Illuminate\Http\JsonResponse */ - public function revenueAccounts() + public function revenueAccounts(AccountRepositoryInterface $accountRepository) { - $list = Auth::user()->accounts()->accountTypeIn(['Revenue account'])->orderBy('accounts.name', 'ASC')->get(['accounts.*']); + $list = $accountRepository->getAccounts(['Revenue account']); $return = []; foreach ($list as $entry) { $return[] = $entry->name; @@ -239,13 +218,17 @@ class JsonController extends Controller return Response::json(['value' => $pref->data]); } - public function transactionJournals($what) + /** + * @param $what + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function transactionJournals($what, JournalRepositoryInterface $repository) { $descriptions = []; - $dbType = TransactionType::whereType($what)->first(); - $journals = Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id) - ->orderBy('id', 'DESC')->take(50) - ->get(); + $dbType = $repository->getTransactionType($what); + + $journals = $repository->getJournalsOfType($dbType); foreach ($journals as $j) { $descriptions[] = $j->description; } diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 51349c6371..d219359656 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -16,8 +16,8 @@ use Input; use Redirect; use Session; use Steam; -use View; use URL; +use View; /** * Class PiggyBankController @@ -170,7 +170,7 @@ class PiggyBankController extends Controller if (!isset($accounts[$account->id])) { $accounts[$account->id] = [ 'name' => $account->name, - 'balance' => Steam::balance($account,null,true), + 'balance' => Steam::balance($account, null, true), 'leftForPiggyBanks' => $repository->leftOnAccount($account), 'sumOfSaved' => $piggyBank->savedSoFar, 'sumOfTargets' => floatval($piggyBank->targetamount), @@ -326,6 +326,7 @@ class PiggyBankController extends Controller if (intval(Input::get('create_another')) === 1) { Session::put('piggy-banks.create.fromStore', true); + return Redirect::route('piggy-banks.create')->withInput(); } @@ -360,6 +361,7 @@ class PiggyBankController extends Controller if (intval(Input::get('return_to_edit')) === 1) { Session::put('piggy-banks.edit.fromUpdate', true); + return Redirect::route('piggy-banks.edit', $piggyBank->id); } diff --git a/app/Http/Controllers/RelatedController.php b/app/Http/Controllers/RelatedController.php index 5bdebaae3a..d8d914a3ec 100644 --- a/app/Http/Controllers/RelatedController.php +++ b/app/Http/Controllers/RelatedController.php @@ -40,19 +40,7 @@ class RelatedController extends Controller $unique = array_unique($ids); $journals = new Collection; if (count($unique) > 0) { - $journals = Auth::user()->transactionjournals()->whereIn('id', $unique)->get(); - $journals->each( - function (TransactionJournal $journal) { - /** @var Transaction $t */ - foreach ($journal->transactions()->get() as $t) { - if ($t->amount > 0) { - $journal->amount = $t->amount; - } - } - - } - ); } $parent = $journal; diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 20f24d4d6b..9c82e2f7cc 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -11,7 +11,6 @@ use Preferences; use Session; use Steam; use View; -use Crypt; /** * Class ReportController @@ -82,7 +81,7 @@ class ReportController extends Controller $id = intval($budget->id); $data = $budget->toArray(); $array[$id] = $data; - if (floatval($data['amount']) != 0) { + if (floatval($data['queryAmount']) != 0) { $hide = false; } } @@ -246,7 +245,7 @@ class ReportController extends Controller /** * Start getExpenseGroupedForMonth DONE */ - $set = $this->query->journalsByExpenseAccount($start, $end, $showSharedReports); + $set = $this->query->journalsByExpenseAccount($start, $end, $showSharedReports); $expenses = Steam::makeArray($set); $expenses = Steam::sortArray($expenses); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 4d850ef7bb..5a3bbfa628 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -149,13 +149,7 @@ class TransactionController extends Controller $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id; } - $preFilled['amount'] = 0; - /** @var Transaction $t */ - foreach ($transactions as $t) { - if (floatval($t->amount) > 0) { - $preFilled['amount'] = floatval($t->amount); - } - } + $preFilled['amount'] = $journal->amount; $preFilled['account_id'] = $repository->getAssetAccount($journal); $preFilled['expense_account'] = $transactions[0]->account->name; $preFilled['revenue_account'] = $transactions[1]->account->name; diff --git a/app/Http/Middleware/PiggyBanks.php b/app/Http/Middleware/PiggyBanks.php index 0854d338a8..8c00cf2376 100644 --- a/app/Http/Middleware/PiggyBanks.php +++ b/app/Http/Middleware/PiggyBanks.php @@ -3,17 +3,13 @@ namespace FireflyIII\Http\Middleware; -use Carbon\Carbon; +use App; use Closure; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankRepetition; use Illuminate\Contracts\Auth\Guard; -use Illuminate\Database\Query\JoinClause; use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Navigation; -use Session; -use App; /** * Class PiggyBanks diff --git a/app/Http/Requests/BudgetFormRequest.php b/app/Http/Requests/BudgetFormRequest.php index 57cd60d20f..452acc42e2 100644 --- a/app/Http/Requests/BudgetFormRequest.php +++ b/app/Http/Requests/BudgetFormRequest.php @@ -30,7 +30,7 @@ class BudgetFormRequest extends Request $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted'; if (Budget::find(Input::get('id'))) { - $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted,'.intval(Input::get('id')); + $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,encrypted,' . intval(Input::get('id')); } return [ diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index 4a074750bd..7c02b57152 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -30,7 +30,7 @@ class CategoryFormRequest extends Request $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted'; if (Category::find(Input::get('id'))) { - $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted,'.intval(Input::get('id')); + $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,encrypted,' . intval(Input::get('id')); } return [ diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index 2e950b8019..86b9d3ec23 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -3,9 +3,7 @@ namespace FireflyIII\Http\Requests; use Auth; -use Carbon\Carbon; use Input; -use Navigation; /** * Class PiggyBankFormRequest @@ -32,7 +30,7 @@ class PiggyBankFormRequest extends Request $nameRule = 'required|between:1,255|uniquePiggyBankForUser'; $targetDateRule = 'date'; if (intval(Input::get('id'))) { - $nameRule = 'required|between:1,255|uniquePiggyBankForUser:'.intval(Input::get('id')); + $nameRule = 'required|between:1,255|uniquePiggyBankForUser:' . intval(Input::get('id')); } diff --git a/app/Http/routes.php b/app/Http/routes.php index 3b6a5bc63f..274cc21d5a 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -170,7 +170,6 @@ Route::group( Route::get('/bills/add/{bill}', ['uses' => 'BillController@add', 'as' => 'bills.add']); Route::get('/bills/delete/{bill}', ['uses' => 'BillController@delete', 'as' => 'bills.delete']); Route::get('/bills/show/{bill}', ['uses' => 'BillController@show', 'as' => 'bills.show']); - Route::post('/bills/store', ['uses' => 'BillController@store', 'as' => 'bills.store']); Route::post('/bills/update/{bill}', ['uses' => 'BillController@update', 'as' => 'bills.update']); Route::post('/bills/destroy/{bill}', ['uses' => 'BillController@destroy', 'as' => 'bills.destroy']); @@ -226,7 +225,7 @@ Route::group( Route::get('/chart/home/bills', ['uses' => 'GoogleChartController@billsOverview']); Route::get('/chart/account/{account}/{view?}', ['uses' => 'GoogleChartController@accountBalanceChart']); Route::get('/chart/budget/{budget}/spending/{year?}', ['uses' => 'GoogleChartController@budgetsAndSpending']); - Route::get('/chart/budgets/spending/{year?}', ['uses' => 'GoogleChartController@allBudgetsAndSpending']); + Route::get('/chart/budgets/spending/{year?}', ['uses' => 'GoogleChartController@allBudgetsAndSpending'])->where(['year' => '[0-9]+']); Route::get('/chart/budget/{budget}/{limitrepetition}', ['uses' => 'GoogleChartController@budgetLimitSpending']); Route::get('/chart/reports/income-expenses/{year}', ['uses' => 'GoogleChartController@yearInExp']); Route::get('/chart/reports/income-expenses-sum/{year}', ['uses' => 'GoogleChartController@yearInExpSum']); @@ -246,7 +245,10 @@ Route::group( Route::get('/json/expense-accounts', ['uses' => 'JsonController@expenseAccounts', 'as' => 'json.expense-accounts']); Route::get('/json/revenue-accounts', ['uses' => 'JsonController@revenueAccounts', 'as' => 'json.revenue-accounts']); Route::get('/json/categories', ['uses' => 'JsonController@categories', 'as' => 'json.categories']); - Route::get('/json/box', ['uses' => 'JsonController@box', 'as' => 'json.box']); + Route::get('/json/box/in', ['uses' => 'JsonController@boxIn', 'as' => 'json.box.in']); + Route::get('/json/box/out', ['uses' => 'JsonController@boxOut', 'as' => 'json.box.out']); + Route::get('/json/box/bills-unpaid', ['uses' => 'JsonController@boxBillsUnpaid', 'as' => 'json.box.paid']); + Route::get('/json/box/bills-paid', ['uses' => 'JsonController@boxBillsPaid', 'as' => 'json.box.unpaid']); Route::get('/json/show-shared-reports', 'JsonController@showSharedReports'); Route::get('/json/transaction-journals/{what}', 'JsonController@transactionJournals'); Route::get('/json/show-shared-reports/set', 'JsonController@setSharedReports'); diff --git a/app/Models/Account.php b/app/Models/Account.php index e95240cdbb..2712aef197 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -51,9 +51,11 @@ class Account extends Model $account = Account::create($fields); if (is_null($account->id)) { // could not create account: - App::abort(500, 'Could not create new account with data: ' . json_encode($fields)); + App::abort(500, 'Could not create new account with data: ' . json_encode($fields).' because ' . json_encode($account->getErrors())); + } + return $account; } diff --git a/app/Models/Category.php b/app/Models/Category.php index 539f889378..60a8198571 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -1,8 +1,9 @@ belongsToMany('FireflyIII\Models\TransactionJournal', 'category_transaction_journal', 'category_id'); } + /** + * @param array $fields + * + * @return Account|null + */ + public static function firstOrCreateEncrypted(array $fields) + { + // everything but the name: + $query = Category::orderBy('id'); + foreach ($fields as $name => $value) { + if ($name != 'name') { + $query->where($name, $value); + } + } + $set = $query->get(['categories.*']); + /** @var Category $category */ + foreach ($set as $category) { + if ($category->name == $fields['name']) { + return $category; + } + } + // create it! + $category = Category::create($fields); + if (is_null($category->id)) { + // could not create account: + App::abort(500, 'Could not create new category with data: ' . json_encode($fields)); + + } + + return $category; + + } + /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ @@ -46,6 +80,7 @@ class Category extends Model $this->attributes['name'] = Crypt::encrypt($value); $this->attributes['encrypted'] = true; } + /** * @param $value * diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 927d33b1f9..129e0a4901 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -1,5 +1,7 @@ leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id') - ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->where('transaction_journals.date', '>=', $this->startdate->format('Y-m-d')) - ->where('transaction_journals.date', '<=', $this->enddate->format('Y-m-d')) - ->where('transactions.amount', '>', 0) - ->where('limit_repetitions.id', '=', $this->id) - ->sum('transactions.amount'); + $sum = DB::table('transactions') + ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id') + ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') + ->where('transaction_journals.date', '>=', $this->startdate->format('Y-m-d')) + ->where('transaction_journals.date', '<=', $this->enddate->format('Y-m-d')) + ->where('transaction_journals.user_id', Auth::user()->id) + ->whereNull('transactions.deleted_at') + ->where('transactions.amount', '>', 0) + ->where('limit_repetitions.id', '=', $this->id) + ->sum('transactions.amount'); return floatval($sum); } diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index c81ef28b71..4b952c1258 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -1,8 +1,9 @@ attributes['name'] = Crypt::encrypt($value); $this->attributes['encrypted'] = true; } + /** * @param $value * diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php index 62c053d765..b8a62a2383 100644 --- a/app/Models/Reminder.php +++ b/app/Models/Reminder.php @@ -1,9 +1,10 @@ encrypted) == 1) { return json_decode(Crypt::decrypt($value)); } + return json_decode($value); } @@ -90,7 +92,7 @@ class Reminder extends Model public function setMetadataAttribute($value) { $this->attributes['encrypted'] = true; - $this->attributes['metadata'] = Crypt::encrypt(json_encode($value)); + $this->attributes['metadata'] = Crypt::encrypt(json_encode($value)); } /** diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index ab1e04c0be..85f8e74e17 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -1,10 +1,11 @@ belongsToMany('FireflyIII\Models\Category'); } + /** + * @return float + */ + public function getAmountAttribute() + { + /** @var Transaction $t */ + foreach ($this->transactions as $t) { + if ($t->amount > 0) { + return floatval($t->amount); + } + } + } + /** * @return array */ diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 2b41702c09..e19c145043 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -1,6 +1,7 @@ reminders()->get(); - /** @var Reminder $reminder */ - foreach($reminders as $reminder) { - $reminder->delete(); + PiggyBank::deleting( + function (PiggyBank $piggyBank) { + $reminders = $piggyBank->reminders()->get(); + /** @var Reminder $reminder */ + foreach ($reminders as $reminder) { + $reminder->delete(); + } } - }); - + ); Account::deleted( function (Account $account) { diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 113a25c433..a00ffc289e 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -66,6 +66,7 @@ class FireflyServiceProvider extends ServiceProvider $this->app->bind('FireflyIII\Support\Search\SearchInterface', 'FireflyIII\Support\Search\Search'); + $this->app->bind('FireflyIII\Helpers\Help\HelpInterface', 'FireflyIII\Helpers\Help\Help'); $this->app->bind('FireflyIII\Helpers\Reminders\ReminderHelperInterface', 'FireflyIII\Helpers\Reminders\ReminderHelper'); $this->app->bind('FireflyIII\Helpers\Report\ReportHelperInterface', 'FireflyIII\Helpers\Report\ReportHelper'); $this->app->bind('FireflyIII\Helpers\Report\ReportQueryInterface', 'FireflyIII\Helpers\Report\ReportQuery'); diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index b09f53bdae..2d3bd4c388 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -6,6 +6,7 @@ use App; use Auth; use Carbon\Carbon; use Config; +use DB; use FireflyIII\Models\Account; use FireflyIII\Models\AccountMeta; use FireflyIII\Models\AccountType; @@ -53,26 +54,36 @@ class AccountRepository implements AccountRepositoryInterface /** * @param array $types - * @param int $page * * @return Collection */ - public function getAccounts(array $types, $page) + public function getAccounts(array $types) { - $query = Auth::user()->accounts()->with( + $result = Auth::user()->accounts()->with( ['accountmeta' => function (HasMany $query) { $query->where('name', 'accountRole'); }] - )->accountTypeIn($types)->orderBy('accounts.name', 'ASC'); + )->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*'])->sortBy('name'); - if ($page == -1) { - return $query->get(['accounts.*']); - } else { - $size = 50; - $offset = ($page - 1) * $size; + return $result; + } - return $query->take($size)->offset($offset)->get(['accounts.*']); - } + + /** + * @return Collection + */ + public function getCreditCards() + { + return Auth::user()->accounts() + ->hasMetaValue('accountRole', 'ccAsset') + ->hasMetaValue('ccType', 'monthlyFull') + ->get( + [ + 'accounts.*', + 'ccType.data as ccType', + 'accountRole.data as accountRole' + ] + ); } /** @@ -135,7 +146,7 @@ class AccountRepository implements AccountRepositoryInterface * @param Account $account * @param int $page * - * @return mixed + * @return LengthAwarePaginator */ public function getJournals(Account $account, $page) { @@ -177,6 +188,51 @@ class AccountRepository implements AccountRepositoryInterface return null; } + /** + * Get the accounts of a user that have piggy banks connected to them. + * + * @return Collection + */ + public function getPiggyBankAccounts() + { + $ids = []; + $start = clone Session::get('start', new Carbon); + $end = clone Session::get('end', new Carbon); + $accountIds = DB::table('piggy_banks')->distinct()->get(['piggy_banks.account_id']); + $accounts = new Collection; + + foreach ($accountIds as $id) { + $ids[] = intval($id->account_id); + } + + $ids = array_unique($ids); + if (count($ids) > 0) { + $accounts = Auth::user()->accounts()->whereIn('id', $ids)->get(); + } + + $accounts->each( + function (Account $account) use ($start, $end) { + $account->startBalance = Steam::balance($account, $start, true); + $account->endBalance = Steam::balance($account, $end, true); + $account->piggyBalance = 0; + /** @var PiggyBank $piggyBank */ + foreach ($account->piggyBanks as $piggyBank) { + $account->piggyBalance += $piggyBank->currentRelevantRep()->currentamount; + } + // sum of piggy bank amounts on this account: + // diff between endBalance and piggyBalance. + // then, percentage. + $difference = $account->endBalance - $account->piggyBalance; + $account->difference = $difference; + $account->percentage = $difference != 0 ? round((($difference / $account->endBalance) * 100)) : 100; + + } + ); + + return $accounts; + + } + /** * Get savings accounts and the balance difference in the period. * @@ -219,6 +275,34 @@ class AccountRepository implements AccountRepositoryInterface return $accounts; } + /** + * Get all transfers TO this account in this range. + * + * @param Account $account + * @param Carbon $start + * @param Carbon $end + * + * @return Collection + */ + public function getTransfersInRange(Account $account, Carbon $start, Carbon $end) + { + return TransactionJournal::whereIn( + 'id', function ($q) use ($account, $start, $end) { + $q->select('transaction_journals.id') + ->from('transactions') + ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') + ->where('transactions.account_id', $account->id) + ->where('transaction_journals.user_id', Auth::user()->id) + ->where('transaction_journals.date', '>=', $start->format('Y-m-d')) + ->where('transaction_journals.date', '<=', $end->format('Y-m-d')) + ->where('transactions.amount', '>', 0) + ->where('transaction_types.type', 'Transfer'); + + } + )->get(); + } + /** * @param Account $account * @@ -279,6 +363,14 @@ class AccountRepository implements AccountRepositoryInterface } + /** + * @return float + */ + public function sumOfEverything() + { + return floatval(Auth::user()->transactions()->sum('amount')); + } + /** * @param Account $account * @param array $data @@ -461,7 +553,6 @@ class AccountRepository implements AccountRepositoryInterface protected function updateMetadata(Account $account, array $data) { $validFields = ['accountRole', 'ccMonthlyPaymentDate', 'ccType']; - $updated = false; foreach ($validFields as $field) { $entry = $account->accountMeta()->where('name', $field)->first(); diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index d064db673a..0a80c40691 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -7,6 +7,7 @@ use FireflyIII\Models\Account; use FireflyIII\Models\Preference; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; +use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; /** @@ -32,11 +33,10 @@ interface AccountRepositoryInterface /** * @param array $types - * @param int $page * * @return mixed */ - public function getAccounts(array $types, $page); + public function getAccounts(array $types); /** * @param TransactionJournal $journal @@ -46,6 +46,30 @@ interface AccountRepositoryInterface */ public function getFirstTransaction(TransactionJournal $journal, Account $account); + /** + * @return Collection + */ + public function getCreditCards(); + + /** + * Get the accounts of a user that have piggy banks connected to them. + * + * @return Collection + */ + public function getPiggyBankAccounts(); + + + /** + * Get all transfers TO this account in this range. + * + * @param Account $account + * @param Carbon $start + * @param Carbon $end + * + * @return Collection + */ + public function getTransfersInRange(Account $account, Carbon $start, Carbon $end); + /** * @param Preference $preference * @@ -66,7 +90,7 @@ interface AccountRepositoryInterface * @param Account $account * @param string $range * - * @return mixed + * @return LengthAwarePaginator */ public function getJournals(Account $account, $page); @@ -77,6 +101,11 @@ interface AccountRepositoryInterface */ public function getLastActivity(Account $account); + /** + * @return float + */ + public function sumOfEverything(); + /** * Get savings accounts and the balance difference in the period. * diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 049634ac40..df997ba2c0 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -4,9 +4,12 @@ namespace FireflyIII\Repositories\Bill; use Auth; use Carbon\Carbon; +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; use FireflyIII\Models\Bill; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; +use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; use Log; use Navigation; @@ -18,6 +21,31 @@ use Navigation; */ class BillRepository implements BillRepositoryInterface { + /** + * Create a fake bill to help the chart controller. + * + * @param string $description + * @param Carbon $date + * @param float $amount + * + * @return Bill + */ + public function createFakeBill($description, Carbon $date, $amount) + { + $bill = new Bill; + $bill->name = $description; + $bill->match = $description; + $bill->amount_min = $amount; + $bill->amount_max = $amount; + $bill->date = $date; + $bill->repeat_freq = 'monthly'; + $bill->skip = 0; + $bill->automatch = false; + $bill->active = false; + + return $bill; + } + /** * @param Bill $bill * @@ -28,12 +56,26 @@ class BillRepository implements BillRepositoryInterface return $bill->delete(); } + /** + * @return Collection + */ + public function getActiveBills() + { + /** @var Collection $set */ + $set = Auth::user()->bills()->orderBy('name', 'ASC')->where('active', 1)->get()->sortBy('name'); + + return $set; + } + /** * @return Collection */ public function getBills() { - return Auth::user()->bills()->orderBy('name', 'ASC')->get(); + /** @var Collection $set */ + $set = Auth::user()->bills()->orderBy('name', 'ASC')->get()->sortBy('name'); + + return $set; } /** @@ -44,10 +86,30 @@ class BillRepository implements BillRepositoryInterface public function getJournals(Bill $bill) { return $bill->transactionjournals()->withRelevantData() + ->leftJoin( + 'transactions', function (JoinClause $join) { + $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id') + ->where('transactions.amount', '>', 0); + } + ) ->orderBy('transaction_journals.date', 'DESC') ->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.id', 'DESC') - ->get(); + ->get(['transaction_journals.*', 'transactions.amount']); + } + + /** + * Get all journals that were recorded on this bill between these dates. + * + * @param Bill $bill + * @param Carbon $start + * @param Carbon $end + * + * @return Collection + */ + public function getJournalsInRange(Bill $bill, Carbon $start, Carbon $end) + { + return $bill->transactionjournals()->before($end)->after($start)->get(); } /** @@ -253,6 +315,12 @@ class BillRepository implements BillRepositoryInterface Log::debug('TOTAL match is true!'); $journal->bill()->associate($bill); $journal->save(); + } else { + if ((!$wordMatch || !$amountMatch) && $bill->id == $journal->bill_id) { + // if no match, but bill used to match, remove it: + $journal->bill_id = null; + $journal->save(); + } } } diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 134d275f00..a6d5c5ea1e 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -15,6 +15,17 @@ use Illuminate\Support\Collection; interface BillRepositoryInterface { + /** + * Create a fake bill to help the chart controller. + * + * @param string $description + * @param Carbon $date + * @param float $amount + * + * @return Bill + */ + public function createFakeBill($description, Carbon $date, $amount); + /** * @param Bill $bill * @@ -22,6 +33,11 @@ interface BillRepositoryInterface */ public function destroy(Bill $bill); + /** + * @return Collection + */ + public function getActiveBills(); + /** * @return Collection */ @@ -32,14 +48,25 @@ interface BillRepositoryInterface * * @return Collection */ - public function getPossiblyRelatedJournals(Bill $bill); + public function getJournals(Bill $bill); + + /** + * Get all journals that were recorded on this bill between these dates. + * + * @param Bill $bill + * @param Carbon $start + * @param Carbon $end + * + * @return Collection + */ + public function getJournalsInRange(Bill $bill, Carbon $start, Carbon $end); /** * @param Bill $bill * * @return Collection */ - public function getJournals(Bill $bill); + public function getPossiblyRelatedJournals(Bill $bill); /** * Every bill repeats itself weekly, monthly or yearly (or whatever). This method takes a date-range (usually the view-range of Firefly itself) @@ -61,6 +88,7 @@ interface BillRepositoryInterface */ public function lastFoundMatch(Bill $bill); + /** * @param Bill $bill * diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 5d614286bd..82ceed96cf 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -7,6 +7,7 @@ use Carbon\Carbon; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\LimitRepetition; +use Illuminate\Database\Query\Builder as QueryBuilder; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -55,12 +56,65 @@ class BudgetRepository implements BudgetRepositoryInterface return true; } + /** + * @param Budget $budget + * @param Carbon $date + * + * @return float + */ + public function expensesOnDay(Budget $budget, Carbon $date) + { + return floatval($budget->transactionjournals()->lessThan(0)->transactionTypes(['Withdrawal'])->onDate($date)->sum('amount')); + } + /** * @return Collection */ public function getActiveBudgets() { - return Auth::user()->budgets()->where('active', 1)->get(); + $budgets = Auth::user()->budgets()->where('active', 1)->get(); + $budgets->sortBy('name'); + + return $budgets; + } + + /** + * @param Budget $budget + * @param Carbon $start + * @param Carbon $end + * + * @return Collection + */ + public function getBudgetLimitRepetitions(Budget $budget, Carbon $start, Carbon $end) + { + /** @var Collection $repetitions */ + return LimitRepetition:: + leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') + ->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00')) + ->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00')) + ->where('budget_limits.budget_id', $budget->id) + ->get(['limit_repetitions.*']); + } + + /** + * @param Budget $budget + * + * @return Collection + */ + public function getBudgetLimits(Budget $budget) + { + return $budget->budgetLimits()->orderBy('startdate', 'DESC')->get(); + } + + /** + * @return Collection + */ + public function getBudgets() + { + $budgets = Auth::user()->budgets()->get(); + $budgets->sortBy('name'); + + return $budgets; } /** @@ -74,12 +128,27 @@ class BudgetRepository implements BudgetRepositoryInterface return $budget->limitrepetitions()->where('limit_repetitions.startdate', $date)->first(['limit_repetitions.*']); } + /** + * @param Budget $budget + * + * @return Carbon + */ + public function getFirstBudgetLimitDate(Budget $budget) + { + $limit = $budget->budgetlimits()->orderBy('startdate', 'ASC')->first(); + if ($limit) { + return $limit->startdate; + } + + return Carbon::now()->startOfYear(); + } + /** * @return Collection */ public function getInactiveBudgets() { - return Auth::user()->budgets()->where('active', 1)->get(); + return Auth::user()->budgets()->where('active', 0)->get(); } /** @@ -115,6 +184,41 @@ class BudgetRepository implements BudgetRepositoryInterface return new LengthAwarePaginator($set, $count, $take, $offset); } + /** + * @param Budget $budget + * + * @return Carbon + */ + public function getLastBudgetLimitDate(Budget $budget) + { + $limit = $budget->budgetlimits()->orderBy('startdate', 'DESC')->first(); + if ($limit) { + return $limit->startdate; + } + + return Carbon::now()->startOfYear(); + } + + /** + * @param Budget $budget + * @param Carbon $date + * + * @return float|null + */ + public function getLimitAmountOnDate(Budget $budget, Carbon $date) + { + $repetition = LimitRepetition::leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') + ->where('limit_repetitions.startdate', $date->format('Y-m-d 00:00:00')) + ->where('budget_limits.budget_id', $budget->id) + ->first(['limit_repetitions.*']); + + if ($repetition) { + return floatval($repetition->amount); + } + + return null; + } + /** * @param Carbon $start * @param Carbon $end @@ -135,6 +239,36 @@ class BudgetRepository implements BudgetRepositoryInterface ->get(['transaction_journals.*']); } + /** + * @param Carbon $start + * @param Carbon $end + * + * @return mixed + */ + public function getWithoutBudgetSum(Carbon $start, Carbon $end) + { + $noBudgetSet = Auth::user() + ->transactionjournals() + ->whereNotIn( + 'transaction_journals.id', function (QueryBuilder $query) use ($start, $end) { + $query + ->select('transaction_journals.id') + ->from('transaction_journals') + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00')) + ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00')) + ->whereNotNull('budget_transaction_journal.budget_id'); + } + ) + ->before($end) + ->after($start) + ->lessThan(0) + ->transactionTypes(['Withdrawal']) + ->get(); + + return floatval($noBudgetSet->sum('amount')) * -1; + } + /** * @param Budget $budget * @param Carbon $date @@ -169,6 +303,18 @@ class BudgetRepository implements BudgetRepositoryInterface return $newBudget; } + /** + * @param Budget $budget + * @param Carbon $start + * @param Carbon $end + * + * @return float + */ + public function sumBudgetExpensesInPeriod(Budget $budget, $start, $end) + { + return floatval($budget->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1; + } + /** * @param Budget $budget * @param array $data @@ -224,14 +370,4 @@ class BudgetRepository implements BudgetRepositoryInterface } - - /** - * @param Budget $budget - * - * @return Collection - */ - public function getBudgetLimits(Budget $budget) - { - return $budget->budgetLimits()->orderBy('startdate', 'DESC')->get(); - } } diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 38cdc43532..d2c0cd0bed 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -14,6 +14,11 @@ use Illuminate\Support\Collection; */ interface BudgetRepositoryInterface { + /** + * @return void + */ + public function cleanupBudgets(); + /** * @param Budget $budget * @@ -21,36 +26,27 @@ interface BudgetRepositoryInterface */ public function destroy(Budget $budget); - /** - * @return Collection - */ - public function getActiveBudgets(); - - /** - * @return Collection - */ - public function getInactiveBudgets(); - - /** - * @return void - */ - public function cleanupBudgets(); - /** * @param Budget $budget * @param Carbon $date * * @return float */ - public function spentInMonth(Budget $budget, Carbon $date); + public function expensesOnDay(Budget $budget, Carbon $date); /** + * @return Collection + */ + public function getActiveBudgets(); + + /** + * @param Budget $budget * @param Carbon $start * @param Carbon $end * * @return Collection */ - public function getWithoutBudget(Carbon $start, Carbon $end); + public function getBudgetLimitRepetitions(Budget $budget, Carbon $start, Carbon $end); /** * @param Budget $budget @@ -59,6 +55,11 @@ interface BudgetRepositoryInterface */ public function getBudgetLimits(Budget $budget); + /** + * @return Collection + */ + public function getBudgets(); + /** * @param Budget $budget * @param Carbon $date @@ -69,27 +70,15 @@ interface BudgetRepositoryInterface /** * @param Budget $budget - * @param Carbon $date - * @param $amount * - * @return mixed + * @return Carbon */ - public function updateLimitAmount(Budget $budget, Carbon $date, $amount); + public function getFirstBudgetLimitDate(Budget $budget); /** - * @param array $data - * - * @return Budget + * @return Collection */ - public function store(array $data); - - /** - * @param Budget $budget - * @param array $data - * - * @return Budget - */ - public function update(Budget $budget, array $data); + public function getInactiveBudgets(); /** * Returns all the transaction journals for a limit, possibly limited by a limit repetition. @@ -102,4 +91,76 @@ interface BudgetRepositoryInterface */ public function getJournals(Budget $budget, LimitRepetition $repetition = null, $take = 50); + /** + * @param Budget $budget + * + * @return Carbon + */ + public function getLastBudgetLimitDate(Budget $budget); + + /** + * @param Budget $budget + * @param Carbon $date + * + * @return float + */ + public function getLimitAmountOnDate(Budget $budget, Carbon $date); + + /** + * @param Carbon $start + * @param Carbon $end + * + * @return Collection + */ + public function getWithoutBudget(Carbon $start, Carbon $end); + + /** + * @param Carbon $start + * @param Carbon $end + * + * @return mixed + */ + public function getWithoutBudgetSum(Carbon $start, Carbon $end); + + /** + * @param Budget $budget + * @param Carbon $date + * + * @return float + */ + public function spentInMonth(Budget $budget, Carbon $date); + + /** + * @param array $data + * + * @return Budget + */ + public function store(array $data); + + /** + * @param Budget $budget + * @param Carbon $start + * @param Carbon $end + * + * @return float + */ + public function sumBudgetExpensesInPeriod(Budget $budget, $start, $end); + + /** + * @param Budget $budget + * @param array $data + * + * @return Budget + */ + public function update(Budget $budget, array $data); + + /** + * @param Budget $budget + * @param Carbon $date + * @param $amount + * + * @return mixed + */ + public function updateLimitAmount(Budget $budget, Carbon $date, $amount); + } diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 3b8710a3f4..9fe14b1bbb 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -4,7 +4,10 @@ namespace FireflyIII\Repositories\Category; use Auth; use Carbon\Carbon; +use DB; use FireflyIII\Models\Category; +use FireflyIII\Models\TransactionJournal; +use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; /** @@ -43,7 +46,62 @@ class CategoryRepository implements CategoryRepositoryInterface */ public function getCategories() { - return Auth::user()->categories()->orderBy('name', 'ASC')->get(); + /** @var Collection $set */ + $set = Auth::user()->categories()->orderBy('name', 'ASC')->get(); + $set->sortBy( + function (Category $category) { + return $category->name; + } + ); + + return $set; + } + + /** + * @param Carbon $start + * @param Carbon $end + * + * @return Collection + */ + public function getCategoriesAndExpenses($start, $end) + { + return TransactionJournal:: + where('transaction_journals.user_id', Auth::user()->id) + ->leftJoin( + 'transactions', + function (JoinClause $join) { + $join->on('transaction_journals.id', '=', 'transactions.transaction_journal_id')->where('amount', '>', 0); + } + ) + ->leftJoin( + 'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id' + ) + ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id') + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') + ->before($end) + ->where('categories.user_id', Auth::user()->id) + ->after($start) + ->where('transaction_types.type', 'Withdrawal') + ->groupBy('categories.id') + ->orderBy('sum', 'DESC') + ->get(['categories.id', 'categories.encrypted', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]); + } + + /** + * @param Category $category + * + * @return Carbon + */ + public function getFirstActivityDate(Category $category) + { + /** @var TransactionJournal $first */ + $first = $category->transactionjournals()->orderBy('date', 'ASC')->first(); + if ($first) { + return $first->date; + } + + return new Carbon; + } /** @@ -105,6 +163,29 @@ class CategoryRepository implements CategoryRepositoryInterface ->get(['transaction_journals.*']); } + /** + * @param Category $category + * @param Carbon $start + * @param Carbon $end + * + * @return float + */ + public function spentInPeriodSum(Category $category, Carbon $start, Carbon $end) + { + return floatval($category->transactionjournals()->before($end)->after($start)->lessThan(0)->sum('amount')) * -1; + } + + /** + * @param Category $category + * @param Carbon $date + * + * @return float + */ + public function spentOnDaySum(Category $category, Carbon $date) + { + return floatval($category->transactionjournals()->onDate($date)->lessThan(0)->sum('amount')) * -1; + } + /** * @param array $data * diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 33ba5cc1d1..5b29845daf 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -32,6 +32,21 @@ interface CategoryRepositoryInterface */ public function getCategories(); + /** + * @param Carbon $start + * @param Carbon $end + * + * @return Collection + */ + public function getCategoriesAndExpenses($start, $end); + + /** + * @param Category $category + * + * @return Carbon + */ + public function getFirstActivityDate(Category $category); + /** * @param Category $category * @param int $page @@ -55,6 +70,23 @@ interface CategoryRepositoryInterface */ public function getWithoutCategory(Carbon $start, Carbon $end); + /** + * @param Category $category + * @param Carbon $start + * @param Carbon $end + * + * @return float + */ + public function spentInPeriodSum(Category $category, Carbon $start, Carbon $end); + + /** + * @param Category $category + * @param Carbon $date + * + * @return float + */ + public function spentOnDaySum(Category $category, Carbon $date); + /** * @param array $data * diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index bffdc88c94..d7991b6098 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -81,4 +81,4 @@ class CurrencyRepository implements CurrencyRepositoryInterface return $currency; } -} \ No newline at end of file +} diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index cfb72467ba..2514d08aba 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -49,4 +49,4 @@ interface CurrencyRepositoryInterface */ public function update(TransactionCurrency $currency, array $data); -} \ No newline at end of file +} diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index fdda6ae3d4..f8732d7867 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -62,6 +62,26 @@ class JournalRepository implements JournalRepositoryInterface return $journal->transactions()->first()->account_id; } + /** + * @param TransactionType $dbType + * + * @return Collection + */ + public function getJournalsOfType(TransactionType $dbType) + { + return Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)->orderBy('id', 'DESC')->take(50)->get(); + } + + /** + * @param $type + * + * @return TransactionType + */ + public function getTransactionType($type) + { + return TransactionType::whereType($type)->first(); + } + /** * @param string $query * @param TransactionJournal $journal @@ -140,7 +160,7 @@ class JournalRepository implements JournalRepositoryInterface // store or get category if (strlen($data['category']) > 0) { - $category = Category::firstOrCreate(['name' => $data['category'], 'user_id' => $data['user']]); + $category = Category::firstOrCreateEncrypted(['name' => $data['category'], 'user_id' => $data['user']]); $journal->categories()->save($category); } @@ -193,7 +213,7 @@ class JournalRepository implements JournalRepositoryInterface // unlink all categories, recreate them: $journal->categories()->detach(); if (strlen($data['category']) > 0) { - $category = Category::firstOrCreate(['name' => $data['category'], 'user_id' => $data['user']]); + $category = Category::firstOrCreateEncrypted(['name' => $data['category'], 'user_id' => $data['user']]); $journal->categories()->save($category); } @@ -289,5 +309,4 @@ class JournalRepository implements JournalRepositoryInterface return [$from, $to]; } - } diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 2bd13b2870..02febb7b96 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -2,8 +2,9 @@ namespace FireflyIII\Repositories\Journal; -use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Models\TransactionType; use Illuminate\Support\Collection; /** @@ -13,6 +14,13 @@ use Illuminate\Support\Collection; */ interface JournalRepositoryInterface { + /** + * Get users first transaction journal + * + * @return TransactionJournal + */ + public function first(); + /** * * Get the account_id, which is the asset account that paid for the transaction. @@ -23,6 +31,13 @@ interface JournalRepositoryInterface */ public function getAssetAccount(TransactionJournal $journal); + /** + * @param TransactionType $dbType + * + * @return Collection + */ + public function getJournalsOfType(TransactionType $dbType); + /** * @param string $query * @param TransactionJournal $journal @@ -31,6 +46,13 @@ interface JournalRepositoryInterface */ public function searchRelated($query, TransactionJournal $journal); + + /** + * @param $type + * + * @return TransactionType + */ + public function getTransactionType($type); /** * @param array $data * @@ -45,10 +67,4 @@ interface JournalRepositoryInterface * @return mixed */ public function update(TransactionJournal $journal, array $data); - - /** - * Get users first transaction journal - * @return TransactionJournal - */ - public function first(); } diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index fb381ba1c1..ecabb40237 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -17,6 +17,7 @@ use Navigation; class PiggyBankRepository implements PiggyBankRepositoryInterface { + /** * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind. * @@ -86,6 +87,18 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface return $part; } + /** + * @param PiggyBank $piggyBank + * + * @return Collection + */ + public function getEventSummarySet(PiggyBank $piggyBank) + { + return DB::table('piggy_bank_events')->where('piggy_bank_id', $piggyBank->id)->groupBy('date')->get(['date', DB::Raw('SUM(`amount`) AS `sum`')]); + } + + + /** * Set all piggy banks to order 0. * diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index 13afce327d..bc445cad87 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -14,7 +14,6 @@ use Illuminate\Support\Collection; interface PiggyBankRepositoryInterface { - /** * @SuppressWarnings("CyclomaticComplexity") // It's exactly 5. So I don't mind. * @@ -35,6 +34,13 @@ interface PiggyBankRepositoryInterface */ public function createPiggyBankPart(array $data); + /** + * @param PiggyBank $piggyBank + * + * @return Collection + */ + public function getEventSummarySet(PiggyBank $piggyBank); + /** * Set all piggy banks to order 0. * diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 5bd043eefe..591bba1db5 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -67,8 +67,8 @@ class Steam public function limitArray(array $array, $limit = 10) { $others = [ - 'name' => 'Others', - 'amount' => 0 + 'name' => 'Others', + 'queryAmount' => 0 ]; $return = []; $count = 0; @@ -76,7 +76,7 @@ class Steam if ($count < ($limit - 1)) { $return[$id] = $entry; } else { - $others['amount'] += $entry['amount']; + $others['queryAmount'] += $entry['queryAmount']; } $count++; @@ -103,14 +103,16 @@ class Steam $id = intval($entry->id); if (isset($array[$id])) { $array[$id]['amount'] += floatval($entry->amount); + $array[$id]['queryAmount'] += floatval($entry->queryAmount); $array[$id]['spent'] += floatval($entry->spent); $array[$id]['encrypted'] = intval($entry->encrypted); } else { $array[$id] = [ - 'amount' => floatval($entry->amount), - 'spent' => floatval($entry->spent), - 'encrypted' => intval($entry->encrypted), - 'name' => $entry->name + 'amount' => floatval($entry->amount), + 'queryAmount' => floatval($entry->queryAmount), + 'spent' => floatval($entry->spent), + 'encrypted' => intval($entry->encrypted), + 'name' => $entry->name ]; } } @@ -131,7 +133,7 @@ class Steam foreach ($two as $id => $value) { // $otherId also exists in $one: if (isset($one[$id])) { - $one[$id]['amount'] += $value['amount']; + $one[$id]['queryAmount'] += $value['queryAmount']; $one[$id]['spent'] += $value['spent']; } else { $one[$id] = $value; @@ -170,11 +172,11 @@ class Steam { uasort( $array, function ($left, $right) { - if ($left['amount'] == $right['amount']) { + if ($left['queryAmount'] == $right['queryAmount']) { return 0; } - return ($left['amount'] < $right['amount']) ? 1 : -1; + return ($left['queryAmount'] < $right['queryAmount']) ? 1 : -1; } ); @@ -193,11 +195,11 @@ class Steam { uasort( $array, function ($left, $right) { - if ($left['amount'] == $right['amount']) { + if ($left['queryAmount'] == $right['queryAmount']) { return 0; } - return ($left['amount'] < $right['amount']) ? -1 : 1; + return ($left['queryAmount'] < $right['queryAmount']) ? -1 : 1; } ); diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index 3ba63000ab..3dec04fa7e 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -223,10 +223,10 @@ class FireflyValidator extends Validator } $set = $query->get(['piggy_banks.*']); - foreach($set as $entry) { + foreach ($set as $entry) { $isEncrypted = intval($entry->encrypted) == 1 ? true : false; - $checkValue = $isEncrypted ? Crypt::decrypt($entry->name) : $entry->name; - if($checkValue == $value) { + $checkValue = $isEncrypted ? Crypt::decrypt($entry->name) : $entry->name; + if ($checkValue == $value) { return false; } } diff --git a/composer.lock b/composer.lock index 889d37ed8f..ed45ccf657 100644 --- a/composer.lock +++ b/composer.lock @@ -677,16 +677,16 @@ }, { "name": "grumpydictator/gchart", - "version": "1.0.8", + "version": "1.0.9", "source": { "type": "git", "url": "https://github.com/JC5/gchart.git", - "reference": "24d06101cfda7ff336ecb10f7f0cb0d6004cb83c" + "reference": "920a0494a0697472bf81c0111b6825c516099e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JC5/gchart/zipball/24d06101cfda7ff336ecb10f7f0cb0d6004cb83c", - "reference": "24d06101cfda7ff336ecb10f7f0cb0d6004cb83c", + "url": "https://api.github.com/repos/JC5/gchart/zipball/920a0494a0697472bf81c0111b6825c516099e59", + "reference": "920a0494a0697472bf81c0111b6825c516099e59", "shasum": "" }, "require": { @@ -709,7 +709,7 @@ } ], "description": "GChart is a small package that allows you to easily generate data for the Google Charts API.", - "time": "2015-02-20 20:07:26" + "time": "2015-04-05 19:17:17" }, { "name": "illuminate/html", @@ -945,16 +945,16 @@ }, { "name": "laravel/framework", - "version": "v5.0.26", + "version": "v5.0.27", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "8e53c33e144f94032cc6ecbfee0be2a96ed63be0" + "reference": "4d6330118a295086ce9ff8eed2200d5b67f17688" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/8e53c33e144f94032cc6ecbfee0be2a96ed63be0", - "reference": "8e53c33e144f94032cc6ecbfee0be2a96ed63be0", + "url": "https://api.github.com/repos/laravel/framework/zipball/4d6330118a295086ce9ff8eed2200d5b67f17688", + "reference": "4d6330118a295086ce9ff8eed2200d5b67f17688", "shasum": "" }, "require": { @@ -1067,7 +1067,7 @@ "framework", "laravel" ], - "time": "2015-04-03 02:58:05" + "time": "2015-04-04 01:34:57" }, { "name": "league/commonmark", @@ -1377,16 +1377,16 @@ }, { "name": "nikic/php-parser", - "version": "v1.2.1", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "dba7524b3724f25b947cd26a580787c55c8a6f9b" + "reference": "08f97eb4efa029e2fafb6d8c98b71731bf0cf621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dba7524b3724f25b947cd26a580787c55c8a6f9b", - "reference": "dba7524b3724f25b947cd26a580787c55c8a6f9b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/08f97eb4efa029e2fafb6d8c98b71731bf0cf621", + "reference": "08f97eb4efa029e2fafb6d8c98b71731bf0cf621", "shasum": "" }, "require": { @@ -1418,7 +1418,7 @@ "parser", "php" ], - "time": "2015-03-24 19:10:28" + "time": "2015-04-03 14:33:59" }, { "name": "psr/log", @@ -3225,31 +3225,33 @@ }, { "name": "phpunit/php-file-iterator", - "version": "1.3.4", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb" + "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb", - "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb", + "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, "autoload": { "classmap": [ - "File/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -3266,7 +3268,7 @@ "filesystem", "iterator" ], - "time": "2013-10-10 15:34:57" + "time": "2015-04-02 05:19:05" }, { "name": "phpunit/php-text-template", @@ -3407,16 +3409,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.5.1", + "version": "4.6.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4" + "reference": "08b2aacdd8433abbba468f995d6d64b76a7a62ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d6429b0995b24a2d9dfe5587ee3a7071c1161af4", - "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/08b2aacdd8433abbba468f995d6d64b76a7a62ec", + "reference": "08b2aacdd8433abbba468f995d6d64b76a7a62ec", "shasum": "" }, "require": { @@ -3428,17 +3430,17 @@ "php": ">=5.3.3", "phpspec/prophecy": "~1.3,>=1.3.1", "phpunit/php-code-coverage": "~2.0,>=2.0.11", - "phpunit/php-file-iterator": "~1.3.2", + "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "~1.0.2", + "phpunit/php-timer": "~1.0", "phpunit/phpunit-mock-objects": "~2.3", "sebastian/comparator": "~1.1", - "sebastian/diff": "~1.1", + "sebastian/diff": "~1.2", "sebastian/environment": "~1.2", "sebastian/exporter": "~1.2", "sebastian/global-state": "~1.0", "sebastian/version": "~1.0", - "symfony/yaml": "~2.0" + "symfony/yaml": "~2.1|~3.0" }, "suggest": { "phpunit/php-invoker": "~1.1" @@ -3449,12 +3451,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.5.x-dev" + "dev-master": "4.6.x-dev" } }, "autoload": { "classmap": [ "src/" + ], + "files": [ + "src/Framework/Assert/Functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3475,7 +3480,7 @@ "testing", "xunit" ], - "time": "2015-03-29 09:24:05" + "time": "2015-04-03 13:46:59" }, { "name": "phpunit/phpunit-mock-objects", @@ -3666,16 +3671,16 @@ }, { "name": "sebastian/diff", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "5843509fed39dee4b356a306401e9dd1a931fec7" + "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7", - "reference": "5843509fed39dee4b356a306401e9dd1a931fec7", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3", + "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3", "shasum": "" }, "require": { @@ -3687,7 +3692,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -3714,32 +3719,32 @@ "keywords": [ "diff" ], - "time": "2014-08-15 10:29:00" + "time": "2015-02-22 15:13:53" }, { "name": "sebastian/environment", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7" + "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7", - "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e", + "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.3" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -3764,7 +3769,7 @@ "environment", "hhvm" ], - "time": "2014-10-25 08:00:45" + "time": "2015-01-01 10:01:08" }, { "name": "sebastian/exporter", @@ -3938,16 +3943,16 @@ }, { "name": "sebastian/version", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b" + "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b", - "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/ab931d46cd0d3204a91e1b9a40c4bc13032b58e4", + "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4", "shasum": "" }, "type": "library", @@ -3969,7 +3974,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2014-12-15 14:25:24" + "time": "2015-02-24 06:35:25" }, { "name": "symfony/class-loader", diff --git a/config/app.php b/config/app.php index 23d8fa9af1..fe7ad89606 100644 --- a/config/app.php +++ b/config/app.php @@ -136,8 +136,6 @@ return [ 'Illuminate\Validation\ValidationServiceProvider', 'Illuminate\View\ViewServiceProvider', 'Illuminate\Html\HtmlServiceProvider', - 'Barryvdh\Debugbar\ServiceProvider', - 'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider', 'DaveJamesMiller\Breadcrumbs\ServiceProvider', /* diff --git a/database/migrations/2014_12_13_190730_changes_for_v321.php b/database/migrations/2014_12_13_190730_changes_for_v321.php index b381e774ab..5a0524d322 100644 --- a/database/migrations/2014_12_13_190730_changes_for_v321.php +++ b/database/migrations/2014_12_13_190730_changes_for_v321.php @@ -426,7 +426,6 @@ class ChangesForV321 extends Migration public function moveComponentIdToBudgetId() { - //Log::debug('Now in moveComponentIdToBudgetId()'); BudgetLimit::get()->each( function (BudgetLimit $bl) { Log::debug('Now at budgetLimit #' . $bl->id . ' with component_id: ' . $bl->component_id); @@ -447,7 +446,6 @@ class ChangesForV321 extends Migration } } ); - //Log::debug('Done with moveComponentIdToBudgetId()'); } diff --git a/public/css/bootstrap-sortable.css b/public/css/bootstrap-sortable.css new file mode 100644 index 0000000000..7991cd2a78 --- /dev/null +++ b/public/css/bootstrap-sortable.css @@ -0,0 +1,100 @@ +table.sortable span.sign { + display: block; + position: absolute; + top: 50%; + right: 5px; + font-size: 12px; + margin-top: -10px; + color: #bfbfc1; +} + +table.sortable th:after { + display: block; + position: absolute; + top: 50%; + right: 5px; + font-size: 12px; + margin-top: -10px; + color: #bfbfc1; +} + +table.sortable th.arrow:after { + content: ''; +} + +table.sortable span.arrow, span.reversed, th.arrow.down:after, th.reversedarrow.down:after, th.arrow.up:after, th.reversedarrow.up:after { + border-style: solid; + border-width: 5px; + font-size: 0; + border-color: #ccc transparent transparent transparent; + line-height: 0; + height: 0; + width: 0; + margin-top: -2px; +} + + table.sortable span.arrow.up, th.arrow.up:after { + border-color: transparent transparent #ccc transparent; + margin-top: -7px; + } + +table.sortable span.reversed, th.reversedarrow.down:after { + border-color: transparent transparent #ccc transparent; + margin-top: -7px; +} + + table.sortable span.reversed.up, th.reversedarrow.up:after { + border-color: #ccc transparent transparent transparent; + margin-top: -2px; + } + +table.sortable span.az:before, th.az.down:after { + content: "a .. z"; +} + +table.sortable span.az.up:before, th.az.up:after { + content: "z .. a"; +} + +table.sortable th.az.nosort:after, th.AZ.nosort:after, th._19.nosort:after, th.month.nosort:after { + content: ".."; +} + +table.sortable span.AZ:before, th.AZ.down:after { + content: "A .. Z"; +} + +table.sortable span.AZ.up:before, th.AZ.up:after { + content: "Z .. A"; +} + +table.sortable span._19:before, th._19.down:after { + content: "1 .. 9"; +} + +table.sortable span._19.up:before, th._19.up:after { + content: "9 .. 1"; +} + +table.sortable span.month:before, th.month.down:after { + content: "jan .. dec"; +} + +table.sortable span.month.up:before, th.month.up:after { + content: "dec .. jan"; +} + +table.sortable thead th:not([data-defaultsort=disabled]) { + cursor: pointer; + position: relative; + top: 0; + left: 0; +} + +table.sortable thead th:hover:not([data-defaultsort=disabled]) { + background: #efefef; +} + +table.sortable thead th div.mozilla { + position: relative; +} diff --git a/public/css/firefly.css b/public/css/firefly.css index 195d5a4043..422c9bed10 100644 --- a/public/css/firefly.css +++ b/public/css/firefly.css @@ -1,3 +1,8 @@ #daterange {cursor:pointer;} .google-chart-error {height:30px;background:url('/images/error.png') no-repeat center center;} -.handle {cursor:move;} \ No newline at end of file +.handle {cursor:move;} + +.ui-sortable-placeholder { + display: inline-block; + height: 1px; +} \ No newline at end of file diff --git a/public/js/bootstrap-sortable.js b/public/js/bootstrap-sortable.js new file mode 100644 index 0000000000..48bfb151be --- /dev/null +++ b/public/js/bootstrap-sortable.js @@ -0,0 +1,209 @@ +/** + * TinySort is a small script that sorts HTML elements. It sorts by text- or attribute value, or by that of one of it's children. + * @summary A nodeElement sorting script. + * @version 2.2.0 + * @license MIT/GPL + * @author Ron Valstar{{$options['helpText']}}
-@endif \ No newline at end of file +@endif diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 7773963ef2..013e4a4a15 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -52,62 +52,104 @@ -Mark your asset accounts as "Savings account" to fill this panel.
- @else - @foreach($savings as $account) - -Mark your asset accounts as "Savings account" to fill this panel.
+ @else + @foreach($savings as $account) + +Create piggy banks to fill this panel.
+ @else + @foreach($piggyBankAccounts as $account) + +| + | Name | @if(isset($what) && $what == 'asset')Role | @@ -13,6 +11,8 @@Last activity | Balance difference between {{Session::get('start')->format('jS F Y')}} and {{Session::get('end')->format('jS F Y')}} | |||||
|---|---|---|---|---|---|---|---|---|---|
| @@ -31,29 +31,30 @@ @endforeach | @endif -{!! Amount::format(Steam::balance($account)) !!} | -+ + | {!! Amount::format($balance) !!} | +@if($account->active) @else @endif | -@if($account->lastActivityDate) - {{{$account->lastActivityDate->format('j F Y')}}} + | + {{{$account->lastActivityDate->format('j F Y')}}} + | @else - Never ++ Never + | @endif - -+ | {!! Amount::format($account->endBalance - $account->startBalance) !!} |
| - | Name | -Last activity | -
|---|
| + | Name | +Last activity | +|||
|---|---|---|---|---|---|
| Without a category | @@ -20,13 +23,16 @@{{{$category->name}}} | -- @if($category->lastActivity) + @if($category->lastActivity) + | {{$category->lastActivity->format('jS F Y')}} - @else + | + @else +Never - @endif - | + + @endif
| {{{$expense['name']}}} | -{!! Amount::format(floatval($expense['amount'])*-1) !!} | +{{{$expense['name']}}} | +{!! Amount::format(floatval($expense['queryAmount'])*-1) !!} |
| Sum | diff --git a/resources/views/transactions/edit.blade.php b/resources/views/transactions/edit.blade.php index 884582ff36..e955d470f2 100644 --- a/resources/views/transactions/edit.blade.php +++ b/resources/views/transactions/edit.blade.php @@ -91,6 +91,9 @@ @stop @section('scripts') + @stop diff --git a/tests/TestCase.php b/tests/TestCase.php index 9ceb86ea36..336e5f2a9a 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -22,16 +22,6 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase return $app; } - /** - * This method is called before the first test of this test class is run. - * - * @since Method available since Release 3.4.0 - */ - public static function setUpBeforeClass() - { - parent::setUpBeforeClass(); - } - /** * Sets up the fixture, for example, opens a network connection. * This method is called before a test is executed. @@ -44,7 +34,15 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase } - + /** + * This method is called before the first test of this test class is run. + * + * @since Method available since Release 3.4.0 + */ + public static function setUpBeforeClass() + { + parent::setUpBeforeClass(); + } /** * @param string $class @@ -61,5 +59,4 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase } - } diff --git a/tests/controllers/AccountControllerTest.php b/tests/controllers/AccountControllerTest.php index be21d77d87..58b908c640 100644 --- a/tests/controllers/AccountControllerTest.php +++ b/tests/controllers/AccountControllerTest.php @@ -4,6 +4,7 @@ use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Preference; use FireflyIII\Models\TransactionCurrency; +use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use League\FactoryMuffin\Facade as FactoryMuffin; @@ -95,12 +96,15 @@ class AccountControllerTest extends TestCase $account = FactoryMuffin::create('FireflyIII\Models\Account'); $this->be($account->user); - $this->assertCount(1, DB::table('accounts')->where('id', $account->id)->whereNull('deleted_at')->get()); + + // mock: + $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); + $repository->shouldReceive('destroy')->andReturn(true); // post it! $this->call('POST', '/accounts/destroy/' . $account->id, ['_token' => 'replaceme']); $this->assertSessionHas('success'); - $this->assertCount(0, DB::table('accounts')->where('id', $account->id)->whereNull('deleted_at')->get()); + $this->assertResponseStatus(302); } public function testEdit() @@ -167,7 +171,10 @@ class AccountControllerTest extends TestCase // an account: $this->be($this->account->user); + // mock! Amount::shouldReceive('getCurrencyCode')->once()->andReturn('A'); + $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); + $repository->shouldReceive('getJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); // get edit page: $this->call('GET', '/accounts/show/' . $this->account->id); diff --git a/tests/controllers/BillControllerTest.php b/tests/controllers/BillControllerTest.php index aa24ff040d..eab8b1c0f6 100644 --- a/tests/controllers/BillControllerTest.php +++ b/tests/controllers/BillControllerTest.php @@ -93,6 +93,9 @@ class BillControllerTest extends TestCase $bill = FactoryMuffin::create('FireflyIII\Models\Bill'); $this->be($bill->user); + $repository = $this->mock('FireflyIII\Repositories\Bill\BillRepositoryInterface'); + $repository->shouldReceive('destroy')->andReturn(true); + $this->call('POST', '/bills/destroy/' . $bill->id, ['_token' => 'replaceMe']); $this->assertSessionHas('success', 'The bill was deleted.'); diff --git a/tests/controllers/BudgetControllerTest.php b/tests/controllers/BudgetControllerTest.php index 0a89b99076..50ea295ca7 100644 --- a/tests/controllers/BudgetControllerTest.php +++ b/tests/controllers/BudgetControllerTest.php @@ -78,12 +78,13 @@ class BudgetControllerTest extends TestCase $budget = FactoryMuffin::create('FireflyIII\Models\Budget'); $this->be($budget->user); - $this->assertCount(1, DB::table('budgets')->where('id', $budget->id)->get()); + $repository = $this->mock('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); + $repository->shouldReceive('destroy')->andReturn(true); $this->call('POST', '/budgets/destroy/' . $budget->id, ['_token' => 'replaceme']); $this->assertSessionHas('success', 'The budget "' . e($budget->name) . '" was deleted.'); - $this->assertCount(0, DB::table('budgets')->wherenull('deleted_at')->where('id', $budget->id)->get()); + } public function testEdit() diff --git a/tests/controllers/CategoryControllerTest.php b/tests/controllers/CategoryControllerTest.php index 33119cc388..0a13d671d6 100644 --- a/tests/controllers/CategoryControllerTest.php +++ b/tests/controllers/CategoryControllerTest.php @@ -146,12 +146,18 @@ class CategoryControllerTest extends TestCase public function testStore() { - $category = FactoryMuffin::create('FireflyIII\Models\Category'); - $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); - - $repository->shouldReceive('store')->andReturn($category); + // create + $category = FactoryMuffin::create('FireflyIII\Models\Category'); $this->be($category->user); + // mock + $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); + $request = $this->mock('FireflyIII\Http\Requests\CategoryFormRequest'); + + // expect + $repository->shouldReceive('store')->andReturn($category); + $request->shouldReceive('input')->andReturn(''); + $this->call('POST', '/categories/store', ['_token' => 'replaceMe', 'name' => 'Bla bla #' . rand(1, 1000)]); $this->assertResponseStatus(302); $this->assertSessionHas('success', 'New category "' . $category->name . '" stored!'); @@ -160,12 +166,19 @@ class CategoryControllerTest extends TestCase // public function testStoreAndRedirect() { - $category = FactoryMuffin::create('FireflyIII\Models\Category'); - $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); - - $repository->shouldReceive('store')->andReturn($category); + // create + $category = FactoryMuffin::create('FireflyIII\Models\Category'); $this->be($category->user); + // mock: + $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); + $request = $this->mock('FireflyIII\Http\Requests\CategoryFormRequest'); + + // fake: + $repository->shouldReceive('store')->andReturn($category); + $request->shouldReceive('input')->andReturn(''); + + $this->call('POST', '/categories/store', ['_token' => 'replaceMe', 'create_another' => 1, 'name' => 'Bla bla #' . rand(1, 1000)]); $this->assertResponseStatus(302); $this->assertSessionHas('success', 'New category "' . $category->name . '" stored!'); @@ -173,12 +186,18 @@ class CategoryControllerTest extends TestCase public function testUpdate() { - $category = FactoryMuffin::create('FireflyIII\Models\Category'); - $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); - - $repository->shouldReceive('update')->andReturn($category); + // create + $category = FactoryMuffin::create('FireflyIII\Models\Category'); $this->be($category->user); + // mock + $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); + $request = $this->mock('FireflyIII\Http\Requests\CategoryFormRequest'); + + // expect + $repository->shouldReceive('update')->andReturn($category); + $request->shouldReceive('input')->andReturn(''); + $this->call('POST', '/categories/update/' . $category->id, ['_token' => 'replaceMe', 'name' => 'Bla bla #' . rand(1, 1000)]); $this->assertResponseStatus(302); $this->assertSessionHas('success', 'Category "' . $category->name . '" updated.'); @@ -186,12 +205,19 @@ class CategoryControllerTest extends TestCase public function testUpdateAndRedirect() { - $category = FactoryMuffin::create('FireflyIII\Models\Category'); - $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); - - $repository->shouldReceive('update')->andReturn($category); + // create + $category = FactoryMuffin::create('FireflyIII\Models\Category'); $this->be($category->user); + // mock + $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); + $request = $this->mock('FireflyIII\Http\Requests\CategoryFormRequest'); + + // expect + $request->shouldReceive('input')->andReturn(''); + $repository->shouldReceive('update')->andReturn($category); + + $this->call('POST', '/categories/update/' . $category->id, ['_token' => 'replaceMe', 'return_to_edit' => 1, 'name' => 'Bla bla #' . rand(1, 1000)]); $this->assertResponseStatus(302); $this->assertSessionHas('success', 'Category "' . $category->name . '" updated.'); diff --git a/tests/controllers/GoogleChartControllerTest.php b/tests/controllers/GoogleChartControllerTest.php new file mode 100644 index 0000000000..d6cf2bf489 --- /dev/null +++ b/tests/controllers/GoogleChartControllerTest.php @@ -0,0 +1,339 @@ +be($account->user); + + // mock stuff: + Steam::shouldReceive('balance')->andReturn(0); + + $this->call('GET', '/chart/account/' . $account->id); + $this->assertResponseOk(); + } + + public function testAllAccountsBalanceChart() + { + $account = FactoryMuffin::create('FireflyIII\Models\Account'); + $this->be($account->user); + $collection = new Collection; + $collection->push($account); + + //mock stuff: + Preferences::shouldReceive('get')->andReturn(new Preference); + $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); + $repository->shouldReceive('getFrontpageAccounts')->andReturn($collection); + + $this->call('GET', '/chart/home/account'); + $this->assertResponseOk(); + + + } + + public function testAllBudgetsAndSpending() + { + $budget = FactoryMuffin::create('FireflyIII\Models\Budget'); + $this->be($budget->user); + $collection = new Collection; + $collection->push($budget); + + // mock stuff: + $repository = $this->mock('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); + $repository->shouldReceive('getBudgets')->andReturn($collection); + $repository->shouldReceive('spentInMonth')->andReturn(rand(1, 100)); + + $this->call('GET', '/chart/budgets/spending/2015'); + $this->assertResponseOk(); + } + + public function testAllBudgetsHomeChart() + { + $budget = FactoryMuffin::create('FireflyIII\Models\Budget'); + $budget1 = FactoryMuffin::create('FireflyIII\Models\Budget'); + $this->be($budget->user); + + $start = Carbon::now()->startOfMonth(); + $end = Carbon::now()->endOfMonth(); + + $repetition = FactoryMuffin::create('FireflyIII\Models\LimitRepetition'); + $repetitions = new Collection; + $repetitions->push($repetition); + $emptyRepetitions = new Collection; + + $collection = new Collection; + $collection->push($budget); + $collection->push($budget1); + + // mock stuff: + $repository = $this->mock('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); + $repository->shouldReceive('getBudgets')->andReturn($collection); + $repository->shouldReceive('getBudgetLimitRepetitions')->once()->andReturn($repetitions, $emptyRepetitions); + $repository->shouldReceive('sumBudgetExpensesInPeriod')->andReturn(12); + $repository->shouldReceive('getWithoutBudgetSum')->andReturn(0); + + $this->call('GET', '/chart/home/budgets'); + $this->assertResponseOk(); + } + + public function testAllCategoriesHomeChart() + { + $category = FactoryMuffin::create('FireflyIII\Models\Category'); + + $this->be($category->user); + $category->save(); + $category->sum = 100; + $collection = new Collection; + $collection->push($category); + + // mock stuff: + $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); + $repository->shouldReceive('getCategoriesAndExpenses')->andReturn($collection); + Crypt::shouldReceive('decrypt')->andReturn('Hello!'); + Crypt::shouldReceive('encrypt')->andReturn('Hello!'); + + + $this->call('GET', '/chart/home/categories'); + $this->assertResponseOk(); + } + + public function testBillOverview() + { + $bill = FactoryMuffin::create('FireflyIII\Models\Bill'); + $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $collection = new Collection; + $collection->push($journal); + $this->be($bill->user); + + // mock! + $repository = $this->mock('FireflyIII\Repositories\Bill\BillRepositoryInterface'); + $repository->shouldReceive('getJournals')->andReturn($collection); + + + // call! + $this->call('GET', '/chart/bills/' . $bill->id); + $this->assertResponseOk(); + } + + public function testBillsOverview() + { + $bill1 = FactoryMuffin::create('FireflyIII\Models\Bill'); + $bill2 = FactoryMuffin::create('FireflyIII\Models\Bill'); + $journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $card1 = FactoryMuffin::create('FireflyIII\Models\Account'); + $card2 = FactoryMuffin::create('FireflyIII\Models\Account'); + $fake = FactoryMuffin::create('FireflyIII\Models\Bill'); + + + $bills = new Collection([$bill1, $bill2]); + $journals = new Collection([$journal1, $journal2]); + $cards = new Collection([$card1, $card2]); + $emptyCollection = new Collection; + $ranges = [['start' => new Carbon, 'end' => new Carbon]]; + $this->be($bill1->user); + + // mock! + $repository = $this->mock('FireflyIII\Repositories\Bill\BillRepositoryInterface'); + $accounts = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); + + // calls: + $repository->shouldReceive('getActiveBills')->andReturn($bills); + $repository->shouldReceive('getRanges')->andReturn($ranges); + $repository->shouldReceive('getJournalsInRange')->andReturn($journals, $emptyCollection); + $accounts->shouldReceive('getCreditCards')->andReturn($cards); + $accounts->shouldReceive('getTransfersInRange')->andReturn($journals, $emptyCollection); + $repository->shouldReceive('createFakeBill')->andReturn($fake); + Steam::shouldReceive('balance')->andReturn(-1, 0); + + $this->call('GET', '/chart/home/bills'); + $this->assertResponseOk(); + } + + public function testBudgetLimitSpending() + { + $repetition = FactoryMuffin::create('FireflyIII\Models\LimitRepetition'); + $repetition->startdate = Carbon::now()->startOfMonth(); + $repetition->enddate = Carbon::now()->endOfMonth(); + $repetition->save(); + $budget = $repetition->budgetlimit->budget; + $this->be($budget->user); + ///chart/budget/{budget}/{limitrepetition} + + // mock! + $repository = $this->mock('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); + $repository->shouldReceive('expensesOnDay')->andReturn(rand(1, 1000)); + + $this->call('GET', '/chart/budget/' . $budget->id . '/' . $repetition->id); + $this->assertResponseOk(); + + } + + public function testBudgetsAndSpending() + { + $budget = FactoryMuffin::create('FireflyIII\Models\Budget'); + $this->be($budget->user); + + $repository = $this->mock('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); + $repository->shouldReceive('spentInMonth')->andReturn(100); + $repository->shouldReceive('getLimitAmountOnDate')->andReturn(100); + $repository->shouldReceive('getFirstBudgetLimitDate')->andReturn(Carbon::now()->startOfMonth()); + $repository->shouldReceive('getLastBudgetLimitDate')->andReturn(Carbon::now()->endOfYear()); + + // /chart/budget/{budget}/spending/{year?} + $this->call('GET', '/chart/budget/' . $budget->id . '/spending/0'); + $this->assertResponseOk(); + } + + public function testBudgetsAndSpendingWithYear() + { + $budget = FactoryMuffin::create('FireflyIII\Models\Budget'); + $this->be($budget->user); + + $repository = $this->mock('FireflyIII\Repositories\Budget\BudgetRepositoryInterface'); + $repository->shouldReceive('spentInMonth')->andReturn(100); + $repository->shouldReceive('getLimitAmountOnDate')->andReturn(100); + + // /chart/budget/{budget}/spending/{year?} + $this->call('GET', '/chart/budget/' . $budget->id . '/spending/2015'); + $this->assertResponseOk(); + } + + public function testCategoryOverviewChart() + { + $category = FactoryMuffin::create('FireflyIII\Models\Category'); + $pref = FactoryMuffin::create('FireflyIII\Models\Preference'); + $this->be($category->user); + $start = new Carbon(); + $start->subDay(); + $end = new Carbon; + $end->addWeek(); + + // mock! + $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); + $repository->shouldReceive('getFirstActivityDate')->andReturn($start); + $repository->shouldReceive('spentInPeriodSum')->andReturn(rand(1, 100)); + Preferences::shouldReceive('get')->andReturn($pref); + + Navigation::shouldReceive('startOfPeriod')->andReturn($start); + Navigation::shouldReceive('endOfPeriod')->andReturn($start); + Navigation::shouldReceive('addPeriod')->andReturn($end); + + $this->call('GET', '/chart/category/' . $category->id . '/overview'); + $this->assertResponseOk(); + } + + public function testCategoryPeriodChart() + { + $category = FactoryMuffin::create('FireflyIII\Models\Category'); + $this->be($category->user); + + // mock! + $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); + $repository->shouldReceive('spentOnDaySum')->andReturn(rand(1, 100)); + + $this->call('GET', '/chart/category/' . $category->id . '/period'); + $this->assertResponseOk(); + } + + public function testPiggyBankHistory() + { + $piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank'); + $this->be($piggyBank->account->user); + + $obj = new stdClass; + $obj->sum = 12; + $obj->date = new Carbon; + $collection = new Collection([$obj]); + + $repository = $this->mock('FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface'); + $repository->shouldReceive('getEventSummarySet')->andReturn($collection); + + $this->call('GET', '/chart/piggy-history/' . $piggyBank->id); + $this->assertResponseOk(); + } + + public function testYearInExp() + { + $user = FactoryMuffin::create('FireflyIII\User'); + $preference = FactoryMuffin::create('FireflyIII\Models\Preference'); + $journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journals = new Collection([$journal1, $journal2]); + $this->be($user); + + + // mock! + $repository = $this->mock('FireflyIII\Helpers\Report\ReportQueryInterface'); + + // expect! + $repository->shouldReceive('incomeByPeriod')->andReturn($journals); + $repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals); + Preferences::shouldReceive('get')->withArgs(['showSharedReports', false])->once()->andReturn($preference); + + + $this->call('GET', '/chart/reports/income-expenses/2015'); + $this->assertResponseOk(); + } + + public function testYearInExpSum() + { + $user = FactoryMuffin::create('FireflyIII\User'); + $preference = FactoryMuffin::create('FireflyIII\Models\Preference'); + $journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journals = new Collection([$journal1, $journal2]); + $this->be($user); + + + // mock! + $repository = $this->mock('FireflyIII\Helpers\Report\ReportQueryInterface'); + + // expect! + $repository->shouldReceive('incomeByPeriod')->andReturn($journals); + $repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals); + Preferences::shouldReceive('get')->withArgs(['showSharedReports', false])->once()->andReturn($preference); + + + $this->call('GET', '/chart/reports/income-expenses-sum/2015'); + } + +} \ No newline at end of file diff --git a/tests/controllers/HelpControllerTest.php b/tests/controllers/HelpControllerTest.php new file mode 100644 index 0000000000..849fb45180 --- /dev/null +++ b/tests/controllers/HelpControllerTest.php @@ -0,0 +1,98 @@ +be($user); + // mock some stuff. + $interface = $this->mock('FireflyIII\Helpers\Help\HelpInterface'); + $interface->shouldReceive('hasRoute')->once()->with('accounts.index')->andReturn(true); + $interface->shouldReceive('getFromCache')->once()->with('help.accounts.index.title')->andReturn('Title.'); + $interface->shouldReceive('getFromCache')->once()->with('help.accounts.index.text')->andReturn('Text'); + $interface->shouldReceive('inCache')->andReturn(true); + + + $this->call('GET', '/help/accounts.index'); + $this->assertResponseOk(); + } + + /** + * Everything present and accounted for, but not cached + */ + public function testGetHelpTextNoCache() + { + // login + $user = FactoryMuffin::create('FireflyIII\User'); + $content = ['title' => 'Bla', 'text' => 'Bla']; + + $this->be($user); + // mock some stuff. + $interface = $this->mock('FireflyIII\Helpers\Help\HelpInterface'); + $interface->shouldReceive('hasRoute')->once()->with('accounts.index')->andReturn(true); + $interface->shouldReceive('getFromGithub')->once()->with('accounts.index')->andReturn($content); + $interface->shouldReceive('putInCache')->once()->withArgs(['accounts.index', $content]); + $interface->shouldReceive('inCache')->once()->andReturn(false); + + + $this->call('GET', '/help/accounts.index'); + $this->assertResponseOk(); + } + + /** + * No such route. + */ + public function testGetHelpTextNoRoute() + { + // login + $user = FactoryMuffin::create('FireflyIII\User'); + + $this->be($user); + // mock some stuff. + $interface = $this->mock('FireflyIII\Helpers\Help\HelpInterface'); + $interface->shouldReceive('hasRoute')->once()->with('accounts.index')->andReturn(false); + + + $this->call('GET', '/help/accounts.index'); + $this->assertResponseOk(); + } +} \ No newline at end of file diff --git a/tests/controllers/HomeControllerTest.php b/tests/controllers/HomeControllerTest.php index e49ea0fcfc..d9491bac8c 100644 --- a/tests/controllers/HomeControllerTest.php +++ b/tests/controllers/HomeControllerTest.php @@ -1,7 +1,10 @@ be($user); + + + $this->call('POST', '/daterange', ['end' => $end, 'start' => $start, '_token' => 'replaceme']); + $this->assertResponseOk(); + + $this->assertSessionHas('start'); + $this->assertSessionHas('end'); + + } + + /** * @covers FireflyIII\Http\Controllers\HomeController::dateRange */ @@ -32,55 +54,62 @@ class HomeControllerTest extends TestCase { $start = '2014-03-01'; $end = '2015-03-31'; - $this->be(new FireflyIII\User); - $this->call('POST', '/daterange', ['end' => $end, 'start' => $start,'_token' => 'replaceme']); + $user = FactoryMuffin::create('FireflyIII\User'); + $this->be($user); + + $this->call('POST', '/daterange', ['end' => $end, 'start' => $start, '_token' => 'replaceme']); $this->assertResponseOk(); $this->assertSessionHas('start'); $this->assertSessionHas('end'); $this->assertSessionHas('warning'); - } /** - * @covers FireflyIII\Http\Controllers\HomeController::dateRange + * */ - public function testDateRange() + public function testFlush() { - $start = '2015-03-01'; - $end = '2015-03-31'; - $this->be(new FireflyIII\User); + $user = FactoryMuffin::create('FireflyIII\User'); + $this->be($user); - - $this->call('POST', '/daterange', ['end' => $end, 'start' => $start,'_token' => 'replaceme']); - $this->assertResponseOk(); - - $this->assertSessionHas('start'); - $this->assertSessionHas('end'); + $this->call('GET', '/flush'); + $this->assertResponseStatus(302); } /** * @covers FireflyIII\Http\Controllers\HomeController::index */ - public function testIndexLoggedIn() + public function testIndex() { - $this->be(new FireflyIII\User); + $user = FactoryMuffin::create('FireflyIII\User'); + $preference = FactoryMuffin::create('FireflyIII\Models\Preference'); + $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $journals = new Collection([$journal]); + $account = FactoryMuffin::create('FireflyIII\Models\Account'); + $accounts = new Collection([$account]); + $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); + + $this->be($user); + + // mock ALL THE THINGS! + $repository->shouldReceive('countAccounts')->once()->andReturn(3); + Preferences::shouldReceive('get')->once()->withArgs(['frontPageAccounts', []])->andReturn($preference); + $repository->shouldReceive('getFrontpageAccounts')->once()->with($preference)->andReturn($accounts); + $repository->shouldReceive('getSavingsAccounts')->once()->andReturn($accounts); + $repository->shouldReceive('getPiggyBankAccounts')->once()->andReturn($accounts); + $repository->shouldReceive('sumOfEverything')->once()->andReturn(1); + $repository->shouldReceive('getFrontpageTransactions')->once()->andReturn($journals); + + Amount::shouldReceive('getCurrencyCode')->andReturn('EUR'); + Amount::shouldReceive('format')->andReturn('xxx'); + Amount::shouldReceive('formatJournal')->with($journal)->andReturn('xxx'); - $response = $this->call('GET', '/'); + $this->call('GET', '/'); $this->assertResponseOk(); } - /** - * @covers FireflyIII\Http\Controllers\HomeController::index - */ - public function testIndexNoLogin() - { - $response = $this->call('GET', '/'); - $this->assertRedirectedTo('auth/login'); - - } - } diff --git a/tests/controllers/JsonControllerTest.php b/tests/controllers/JsonControllerTest.php new file mode 100644 index 0000000000..4a902079f6 --- /dev/null +++ b/tests/controllers/JsonControllerTest.php @@ -0,0 +1,206 @@ + new Carbon, 'end' => new Carbon]]; + $this->be($bill->user); + + $bills = $this->mock('FireflyIII\Repositories\Bill\BillRepositoryInterface'); + $accounts = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); + + // mock! + $bills->shouldReceive('getActiveBills')->andReturn($collection); + $bills->shouldReceive('getRanges')->andReturn($ranges); + $bills->shouldReceive('getJournalsInRange')->andReturn(new Collection); + $accounts->shouldReceive('getCreditCards')->andReturn($ccs); + $accounts->shouldReceive('getTransfersInRange')->andReturn(new Collection); + Amount::shouldReceive('format')->andReturn('xx'); + Steam::shouldReceive('balance')->andReturn(0); + + + $this->call('GET', '/json/box/bills-paid'); + $this->assertResponseOk(); + + } + + public function testBoxBillsUnpaid() + { + $bill = FactoryMuffin::create('FireflyIII\Models\Bill'); + $cc = FactoryMuffin::create('FireflyIII\Models\Account'); + $ccs = new Collection([$cc]); + $collection = new Collection([$bill]); + $ranges = [['start' => new Carbon, 'end' => new Carbon]]; + $this->be($bill->user); + + $bills = $this->mock('FireflyIII\Repositories\Bill\BillRepositoryInterface'); + $accounts = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); + + // mock! + $bills->shouldReceive('getActiveBills')->andReturn($collection); + $bills->shouldReceive('getRanges')->andReturn($ranges); + $bills->shouldReceive('getJournalsInRange')->andReturn(new Collection); + $bills->shouldReceive('createFakeBill')->andReturn($bill); + $accounts->shouldReceive('getCreditCards')->andReturn($ccs); + Amount::shouldReceive('format')->andReturn('xx'); + Steam::shouldReceive('balance')->andReturn(-1); + + $this->call('GET', '/json/box/bills-unpaid'); + $this->assertResponseOk(); + } + + public function testBoxIn() + { + $user = FactoryMuffin::create('FireflyIII\User'); + $this->be($user); + + $repository = $this->mock('FireflyIII\Helpers\Report\ReportQueryInterface'); + $repository->shouldReceive('incomeByPeriod')->andReturn(new Collection); + Amount::shouldReceive('format')->andReturn('xx'); + + $this->call('GET', '/json/box/in'); + $this->assertResponseOk(); + } + + public function testBoxOut() + { + $user = FactoryMuffin::create('FireflyIII\User'); + $this->be($user); + + $repository = $this->mock('FireflyIII\Helpers\Report\ReportQueryInterface'); + $repository->shouldReceive('journalsByExpenseAccount')->andReturn(new Collection); + Amount::shouldReceive('format')->andReturn('xx'); + + $this->call('GET', '/json/box/out'); + $this->assertResponseOk(); + } + + public function testCategories() + { + $category = FactoryMuffin::create('FireflyIII\Models\Category'); + $this->be($category->user); + $categories = new Collection([$category]); + + $repository = $this->mock('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); + $repository->shouldReceive('getCategories')->andReturn($categories); + + $this->call('GET', '/json/categories'); + $this->assertResponseOk(); + } + + public function testExpenseAccounts() + { + $account = FactoryMuffin::create('FireflyIII\Models\Account'); + $this->be($account->user); + $accounts = new Collection([$account]); + + $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); + $repository->shouldReceive('getAccounts')->with(['Expense account', 'Beneficiary account'])->andReturn($accounts); + + $this->call('GET', '/json/expense-accounts'); + $this->assertResponseOk(); + } + + public function testRevenueAccounts() + { + $account = FactoryMuffin::create('FireflyIII\Models\Account'); + $this->be($account->user); + $accounts = new Collection([$account]); + + $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); + $repository->shouldReceive('getAccounts')->with(['Revenue account'])->andReturn($accounts); + + $this->call('GET', '/json/revenue-accounts'); + $this->assertResponseOk(); + } + + public function testSetSharedReports() + { + $pref = FactoryMuffin::create('FireflyIII\Models\Preference'); + $pref->data = false; + $pref->save(); + $user = FactoryMuffin::create('FireflyIII\User'); + $this->be($user); + + Preferences::shouldReceive('get')->withArgs(['showSharedReports', false])->andReturn($pref); + Preferences::shouldReceive('set')->withArgs(['showSharedReports', true]); + + $this->call('GET', '/json/show-shared-reports/set'); + $this->assertResponseOk(); + } + + + public function testShowSharedReports() + { + $pref = FactoryMuffin::create('FireflyIII\Models\Preference'); + $pref->data = false; + $pref->save(); + $user = FactoryMuffin::create('FireflyIII\User'); + $this->be($user); + + Preferences::shouldReceive('get')->withArgs(['showSharedReports', false])->andReturn($pref); + + + $this->call('GET', '/json/show-shared-reports'); + $this->assertResponseOk(); + } + + public function testTransactionJournals() + { + $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $type = FactoryMuffin::create('FireflyIII\Models\TransactionType'); + $collection = new Collection([$journal]); + $user = FactoryMuffin::create('FireflyIII\User'); + $this->be($user); + + $repository = $this->mock('FireflyIII\Repositories\Journal\JournalRepositoryInterface'); + $repository->shouldReceive('getTransactionType')->with('withdrawal')->andReturn($type); + $repository->shouldReceive('getJournalsOfType')->with($type)->andReturn($collection); + + + $this->call('GET', '/json/transaction-journals/withdrawal'); + $this->assertResponseOk(); + } + +} \ No newline at end of file diff --git a/tests/factories/all.php b/tests/factories/all.php index d551718cdb..0a6d507a1a 100644 --- a/tests/factories/all.php +++ b/tests/factories/all.php @@ -160,10 +160,32 @@ FactoryMuffin::define( ] ); +FactoryMuffin::define( + 'FireflyIII\Models\PiggyBank', + [ + 'account_id' => 'factory|FireflyIII\Models\Account', + 'name' => 'sentence', + 'targetamount' => 'integer', + 'startdate' => 'date', + 'targetdate' => 'date', + 'reminder_skip' => 0, + 'remind_me' => 0, + 'order' => 0, + ] +); + FactoryMuffin::define( 'FireflyIII\Models\TransactionType', [ - 'type' => 'word', + 'type' => function () { + $types = ['Withdrawal', 'Deposit', 'Transfer']; + $count = DB::table('transaction_types')->count(); + if ($count < 3) { + return $types[$count]; + } else { + return RandomString::generateRandomString(10); + } + } ] );