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

Added archived data to the dashboard calculations

Browse Source
This commit is contained in:
Hillel Coren 2014-09-14 09:05:16 +03:00
parent 213579ff34
commit 2995814927
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/DashboardController.php
View File

@ -15,7 +15,7 @@ class DashboardController extends \BaseController {
->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
->leftJoin('invoices', 'clients.id', '=', 'invoices.client_id')
->where('accounts.id', '=', Auth::user()->account_id)
->where('clients.deleted_at', '=', null)
->where('clients.is_deleted', '=', false)
->groupBy('accounts.id')
->first();
@ -25,7 +25,7 @@ class DashboardController extends \BaseController {
->select($select)
->leftJoin('clients', 'accounts.id', '=', 'clients.account_id')
->where('accounts.id', '=', Auth::user()->account_id)
->where('clients.deleted_at', '=', null)
->where('clients.is_deleted', '=', false)
->groupBy('accounts.id')
->first();
@ -37,6 +37,7 @@ class DashboardController extends \BaseController {
->where('balance', '>', 0)
->where('is_recurring', '=', false)
->where('is_quote', '=', false)
->where('is_deleted', '=', false)
->orderBy('due_date', 'asc')->take(6)->get();
$upcoming = Invoice::scope()
@ -44,6 +45,7 @@ class DashboardController extends \BaseController {
->where('balance', '>', 0)
->where('is_recurring', '=', false)
->where('is_quote', '=', false)
->where('is_deleted', '=', false)
->orderBy('due_date', 'asc')->take(6)->get();
$data = [