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

fixed #243

Browse Source
This commit is contained in:
denisdulici 2018-03-08 11:48:34 +03:00
parent 1588970990
commit e4f35368b1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,7 @@ class Dashboard extends Controller
$item->paid_at = $item->invoiced_at; $item->paid_at = $item->invoiced_at;
}); });
$revenues = collect(Revenue::orderBy('paid_at', 'desc')->take(10)->get()); $revenues = collect(Revenue::orderBy('paid_at', 'desc')->isNotTransfer()->take(10)->get());
$latest = $revenues->merge($invoices)->take(5)->sortByDesc('paid_at'); $latest = $revenues->merge($invoices)->take(5)->sortByDesc('paid_at');
@ -234,7 +234,7 @@ class Dashboard extends Controller
$item->paid_at = $item->billed_at; $item->paid_at = $item->billed_at;
}); });
$payments = collect(Payment::orderBy('paid_at', 'desc')->take(10)->get()); $payments = collect(Payment::orderBy('paid_at', 'desc')->isNotTransfer()->take(10)->get());
$latest = $payments->merge($bills)->take(5)->sortByDesc('paid_at'); $latest = $payments->merge($bills)->take(5)->sortByDesc('paid_at');