IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-09-03 20:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Some code cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-02-07 07:56:58 +01:00
parent b22774a599
commit 9429d84cf8
21 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Helpers/Report/AccountReportHelper.php
+2 -2
View File
@@ -54,7 +54,7 @@ class AccountReportHelper implements AccountReportHelperInterface
->whereNull('transactions.deleted_at')
->where('transaction_journals.date', '<=', $yesterday->format('Y-m-d'))
->groupBy('accounts.id')
->get(['accounts.id', DB::Raw('SUM(`transactions`.`amount`) as `balance`')]);
->get(['accounts.id', DB::raw('SUM(`transactions`.`amount`) as `balance`')]);
// and end:
$endSet = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
@@ -64,7 +64,7 @@ class AccountReportHelper implements AccountReportHelperInterface
->whereNull('transactions.deleted_at')
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->groupBy('accounts.id')
->get(['accounts.id', DB::Raw('SUM(`transactions`.`amount`) as `balance`')]);
->get(['accounts.id', DB::raw('SUM(`transactions`.`amount`) as `balance`')]);
$accounts->each(
app/Helpers/Report/ReportQuery.php
+4 -4
View File
@@ -50,8 +50,8 @@ class ReportQuery implements ReportQueryInterface
->groupBy('dateFormatted')
->get(
[
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`t_to`.`amount`) AS `sum`'),
DB::raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::raw('SUM(`t_to`.`amount`) AS `sum`'),
]
);
$array = [];
@@ -164,8 +164,8 @@ class ReportQuery implements ReportQueryInterface
->groupBy('dateFormatted')
->get(
[
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`t_from`.`amount`) AS `sum`'),
DB::raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::raw('SUM(`t_from`.`amount`) AS `sum`'),
]
);
$array = [];