From 5d183e56815b6b6fb0801b208035d43a335338f9 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 2 Feb 2017 14:33:02 +0200 Subject: [PATCH] Fix dashboard totals when 'First month' is set --- app/Ninja/Repositories/DashboardRepository.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Ninja/Repositories/DashboardRepository.php b/app/Ninja/Repositories/DashboardRepository.php index d5cf162df453..2dc53b9391bf 100644 --- a/app/Ninja/Repositories/DashboardRepository.php +++ b/app/Ninja/Repositories/DashboardRepository.php @@ -210,8 +210,12 @@ class DashboardRepository if ($startDate) { $paidToDate->where('payments.payment_date', '>=', $startDate); } elseif ($account->financial_year_start) { - $yearStart = str_replace('2000', date('Y'), $account->financial_year_start); - $paidToDate->where('payments.payment_date', '>=', $yearStart); + $yearStart = Carbon::parse($account->financial_year_start); + $yearStart->year = date('Y'); + if ($yearStart->isFuture()) { + $yearStart->subYear(); + } + $paidToDate->where('payments.payment_date', '>=', $yearStart->format('Y-m-d')); } return $paidToDate->groupBy('payments.account_id')