diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index e9cee699e6..59bf1f01ac 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -42,8 +42,16 @@ class ReportController extends Controller */ public function index(AccountRepositoryInterface $repository) { - $start = Session::get('first'); - $months = $this->helper->listOfMonths($start); + $start = Session::get('first'); + $months = $this->helper->listOfMonths($start); + $startOfMonth = clone Session::get('start'); + $endOfMonth = clone Session::get('start'); + $startOfYear = clone Session::get('start'); + $endOfYear = clone Session::get('start'); + $startOfMonth->startOfMonth(); + $endOfMonth->endOfMonth(); + $startOfYear->startOfYear(); + $endOfYear->endOfYear(); // does the user have shared accounts? $accounts = $repository->getAccounts(['Default account', 'Asset account']); @@ -56,7 +64,9 @@ class ReportController extends Controller $accountList = join(',', $accountIds); - return view('reports.index', compact('months', 'accounts', 'start', 'accountList')); + return view('reports.index', compact('months', 'accounts', 'start', 'accountList', + 'startOfMonth', 'endOfMonth', 'startOfYear', 'endOfYear' + )); } /** @@ -194,7 +204,7 @@ class ReportController extends Controller 'firefly.report_default', [ 'start' => $start->formatLocalized($this->monthFormat), - 'end' => $end->formatLocalized($this->monthFormat) + 'end' => $end->formatLocalized($this->monthFormat), ] ) ); diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 516be1fa6e..4376e02ff9 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -172,6 +172,7 @@ class AccountRepository implements AccountRepositoryInterface ->before($end) ->after($start) ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.id', 'DESC') ->take(10) ->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']); diff --git a/resources/twig/reports/index.twig b/resources/twig/reports/index.twig index 773de4e3d8..93ca24c200 100644 --- a/resources/twig/reports/index.twig +++ b/resources/twig/reports/index.twig @@ -95,16 +95,16 @@
  • {{ 'report_this_month_quick'|_ }}
  • {{ 'report_this_year_quick'|_ }}
  • @@ -112,7 +112,7 @@ {{ 'report_all_time_quick'|_ }}