kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop

Browse Source 
* 'develop' of https://github.com/JC5/firefly-iii:
  Should fix frontpage.

# Conflicts:
#	app/Models/TransactionJournal.php
#	app/Repositories/Account/AccountRepository.php
This commit is contained in:
James Cole
2016-05-11 06:08:05 +02:00
parent cda6cfb4cd 7c7740d3ba
commit d233a2df3c
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Helpers/Report/BudgetReportHelperInterface.php
View File

@@ -40,12 +40,4 @@ interface BudgetReportHelperInterface
*/ */
public function getBudgetsWithExpenses(Carbon $start, Carbon $end, Collection $accounts): Collection; public function getBudgetsWithExpenses(Carbon $start, Carbon $end, Collection $accounts): Collection;
/**
* @param $start
* @param $end
* @param $accounts
*
* @return Collection
*/
public function getCategoriesWithTransactions($start, $end, $accounts): Collection;
} }

19
app/Helpers/Report/ReportHelperInterface.php
View File

@@ -32,6 +32,15 @@ interface ReportHelperInterface
*/ */
public function getBillReport(Carbon $start, Carbon $end, Collection $accounts): BillCollection; public function getBillReport(Carbon $start, Carbon $end, Collection $accounts): BillCollection;
/**
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
* @return Collection
*/
public function getCategoriesWithTransactions(Carbon $start, Carbon $end, Collection $accounts): Collection;
/** /**
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end
@@ -81,14 +90,4 @@ interface ReportHelperInterface
*/ */
public function tagReport(Carbon $start, Carbon $end, Collection $accounts): array; public function tagReport(Carbon $start, Carbon $end, Collection $accounts): array;
/**
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
* @return Collection
*/
public function getCategoriesWithExpenses(Carbon $start, Carbon $end, Collection $accounts): Collection;
} }

4
app/Models/TransactionJournal.php
View File

@@ -338,10 +338,6 @@ class TransactionJournal extends TransactionJournalSupport
$join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '>', 0); $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '>', 0);
} }
); );
// order
$query->orderBy('transaction_journals.date', 'DESC')->orderBy('transaction_journals.order', 'ASC')->orderBy('transaction_journals.id', 'DESC');
$query->groupBy('transaction_journals.id'); $query->groupBy('transaction_journals.id');
$query->with(['categories', 'budgets', 'attachments', 'bill','transactions']); $query->with(['categories', 'budgets', 'attachments', 'bill','transactions']);
} }