gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-10 12:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

This fixes the tests.

Browse Source
This commit is contained in:
James Cole
2016-12-28 09:56:07 +01:00
parent 6151d4a0ec
commit 9c6a3e4ad5
4 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/breadcrumbs.php
View File

@@ -320,6 +320,14 @@ Breadcrumbs::register(
}
);
Breadcrumbs::register(
'categories.show.all', function (BreadCrumbGenerator $breadcrumbs, Category $category) {
$breadcrumbs->parent('categories.index');
$breadcrumbs->push(e($category->name) . '(' . strtolower(trans('firefly.all_periods')) . ')', route('categories.show.all', [$category->id]));
}
);
Breadcrumbs::register(
'categories.show.date', function (BreadCrumbGenerator $breadcrumbs, Category $category, Carbon $date) {

4
app/Repositories/Category/CategoryRepository.php
View File

@@ -145,8 +145,10 @@ class CategoryRepository implements CategoryRepositoryInterface
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->orderBy('transaction_journals.date', 'ASC')->first(['transaction_journals.date']);
// both exist, the one that is earliest "wins".
if (!is_null($firstTransaction) && !is_null($first) && $firstTransaction->date->lt($first)) {
if (!is_null($firstTransaction) && !is_null($first) && Carbon::parse($firstTransaction->date)->lt($first)) {
$first = $firstTransaction->date;
}