Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix dashboard totals when 'First month' is set

Browse Source
This commit is contained in:
Hillel Coren 2017-02-02 14:33:43 +02:00
parent 6e18841cea
commit 4853d32bf4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Ninja/Repositories/DashboardRepository.php
View File

@ -205,8 +205,12 @@ class DashboardRepository
if ($startDate) { if ($startDate) {
$paidToDate->where('payments.payment_date', '>=', $startDate); $paidToDate->where('payments.payment_date', '>=', $startDate);
} elseif ($account->financial_year_start) { } elseif ($account->financial_year_start) {
$yearStart = str_replace('2000', date('Y'), $account->financial_year_start); $yearStart = Carbon::parse($account->financial_year_start);
$paidToDate->where('payments.payment_date', '>=', $yearStart); $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') return $paidToDate->groupBy('payments.account_id')