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

Don’t filter dashboard totals by fiscal year start

Browse Source
This commit is contained in:
Hillel Coren 2017-02-26 20:33:35 +02:00
parent 0a2f2593f8
commit 00ae600d1c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,7 +219,7 @@ class DashboardRepository
if ($startDate) { if ($startDate) {
$paidToDate->where('payments.payment_date', '>=', $startDate); $paidToDate->where('payments.payment_date', '>=', $startDate);
} elseif ($startDate = $account->financialYearStart()) { } elseif ($startDate = $account->financialYearStart()) {
$paidToDate->where('payments.payment_date', '>=', $startDate); //$paidToDate->where('payments.payment_date', '>=', $startDate);
} }
return $paidToDate->groupBy('payments.account_id') return $paidToDate->groupBy('payments.account_id')
@ -250,7 +250,7 @@ class DashboardRepository
} }
if ($startDate = $account->financialYearStart()) { if ($startDate = $account->financialYearStart()) {
$averageInvoice->where('invoices.invoice_date', '>=', $startDate); //$averageInvoice->where('invoices.invoice_date', '>=', $startDate);
} }
return $averageInvoice->groupBy('accounts.id') return $averageInvoice->groupBy('accounts.id')
@ -393,7 +393,7 @@ class DashboardRepository
} }
if ($startDate = $account->financialYearStart()) { if ($startDate = $account->financialYearStart()) {
$expenses->where('expenses.expense_date', '>=', $startDate); //$expenses->where('expenses.expense_date', '>=', $startDate);
} }
return $expenses->groupBy('accounts.id') return $expenses->groupBy('accounts.id')