kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Code for #207

Browse Source
This commit is contained in:
James Cole
2016-03-29 15:55:14 +02:00
parent ef97c3b42d
commit f200086d01
4 changed files with 82 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/BillController.php
View File

@@ -110,11 +110,29 @@ class BillController extends Controller
*/
public function index(BillRepositoryInterface $repository)
{
$start = session('start');
$end = session('end');
$bills = $repository->getBills();
$bills->each(
function (Bill $bill) use ($repository) {
function (Bill $bill) use ($repository, $start, $end) {
$bill->nextExpectedMatch = $repository->nextExpectedMatch($bill);
$bill->lastFoundMatch = $repository->lastFoundMatch($bill);
$journals = $repository->getJournalsInRange($bill, $start, $end);
// loop journals, find average:
$average = '0';
$count = $journals->count();
if ($count > 0) {
$sum = '0';
foreach ($journals as $journal) {
$sum = bcadd($sum, TransactionJournal::amountPositive($journal));
}
$average = bcdiv($sum, strval($count));
}
$bill->lastPaidAmount = $average;
$bill->paidInPeriod = ($start <= $bill->lastFoundMatch) && ($end >= $bill->lastFoundMatch);
}
);