TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-30 21:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only show non-draft invoices on dashboard

Browse Source 
An invoice cannot be considered due if it has not been sent (and thus
still a 'DRAFT').

This change adds a `WHERE status != 'DRAFT'` to each invoice query in
the dashboard controller.

Additionally, this change replaces `->get()->count()` calls to just
`->count()`, which should be equivalent and more efficient.
This commit is contained in:
Patrick Lucas
2021-05-26 10:49:08 +02:00
parent 90bb90cd99
commit 3cf70135f3
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/V1/Dashboard/DashboardController.php
View File

@ -58,6 +58,7 @@ class DashboardController extends Controller
'invoice_date',
[$start->format('Y-m-d'), $end->format('Y-m-d')]
)
->where('status', '!=', Invoice::STATUS_DRAFT)
->whereCompany($request->header('company'))
->sum('total')
);
@ -94,6 +95,7 @@ class DashboardController extends Controller
$start->subMonth()->endOfMonth();
$salesTotal = Invoice::whereCompany($request->header('company'))
->where('status', '!=', Invoice::STATUS_DRAFT)
->whereBetween(
'invoice_date',
[$startDate->format('Y-m-d'), $start->format('Y-m-d')]
@ -121,11 +123,21 @@ class DashboardController extends Controller
'netProfits' => $netProfits,
];
$customersCount = User::customer()->whereCompany($request->header('company'))->get()->count();
$invoicesCount = Invoice::whereCompany($request->header('company'))->get()->count();
$estimatesCount = Estimate::whereCompany($request->header('company'))->get()->count();
$totalDueAmount = Invoice::whereCompany($request->header('company'))->sum('due_amount');
$dueInvoices = Invoice::with('user')->whereCompany($request->header('company'))->where('due_amount', '>', 0)->take(5)->latest()->get();
$customersCount = User::customer()->whereCompany($request->header('company'))->count();
$invoicesCount = Invoice::whereCompany($request->header('company'))
->where('status', '!=', Invoice::STATUS_DRAFT)
->count();
$estimatesCount = Estimate::whereCompany($request->header('company'))->count();
$totalDueAmount = Invoice::whereCompany($request->header('company'))
->where('status', '!=', Invoice::STATUS_DRAFT)
->sum('due_amount');
$dueInvoices = Invoice::with('user')
->whereCompany($request->header('company'))
->where('status', '!=', Invoice::STATUS_DRAFT)
->where('due_amount', '>', 0)
->take(5)
->latest()
->get();
$estimates = Estimate::with('user')->whereCompany($request->header('company'))->take(5)->latest()->get();
return response()->json([