diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 2aeac51618..3a332167ea 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -113,7 +113,8 @@ class CategoryController extends Controller ->after($start) ->orderBy('transaction_journals.date') ->get(['transaction_journals.*']); - $subTitle = 'Transactions without a category in ' . $start->format('F Y'); + + $subTitle = 'Transactions without a category between ' . $start->format('jS F Y').' and '.$end->format('jS F Y'); return view('categories.noCategory', compact('list', 'subTitle')); } diff --git a/resources/views/list/journals-full.blade.php b/resources/views/list/journals-full.blade.php index 804690c354..bc2608dbe7 100644 --- a/resources/views/list/journals-full.blade.php +++ b/resources/views/list/journals-full.blade.php @@ -71,14 +71,14 @@ {{$journal->date->format('j F Y')}} - @if($journal->transactions[0]->account->accounttype->description == 'Cash account') + @if($journal->transactions[0]->account->accounttype->type == 'Cash account') (cash) @else {{{$journal->transactions[0]->account->name}}} @endif - @if($journal->transactions[1]->account->accounttype->description == 'Cash account') + @if($journal->transactions[1]->account->accounttype->type == 'Cash account') (cash) @else {{{$journal->transactions[1]->account->name}}}