shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #193

Browse Source
This commit is contained in:
denisdulici 2018-01-17 13:23:03 +03:00
parent 75531ee718
commit 9f3b56341c
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Dashboard/Dashboard.php
View File

@ -217,16 +217,26 @@ class Dashboard extends Controller
private function getLatestIncomes() private function getLatestIncomes()
{ {
$latest = collect(Invoice::accrued()->latest()->take(10)->get()); $invoices = collect(Invoice::orderBy('invoiced_at', 'desc')->accrued()->take(10)->get())->each(function ($item) {
$latest = $latest->merge(Revenue::latest()->take(10)->get())->take(5)->sortByDesc('invoiced_at'); $item->paid_at = $item->invoiced_at;
});
$revenues = collect(Revenue::orderBy('paid_at', 'desc')->take(10)->get());
$latest = $revenues->merge($invoices)->take(5)->sortByDesc('paid_at');
return $latest; return $latest;
} }
private function getLatestExpenses() private function getLatestExpenses()
{ {
$latest = collect(Bill::accrued()->latest()->take(10)->get()); $bills = collect(Bill::orderBy('billed_at', 'desc')->accrued()->take(10)->get())->each(function ($item) {
$latest = $latest->merge(Payment::latest()->take(10)->get())->take(5)->sortByDesc('billed_at'); $item->paid_at = $item->billed_at;
});
$payments = collect(Payment::orderBy('paid_at', 'desc')->take(10)->get());
$latest = $payments->merge($bills)->take(5)->sortByDesc('paid_at');
return $latest; return $latest;
} }