IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Back to old method [skip ci]

Browse Source
This commit is contained in:
James Cole 2016-10-21 06:33:56 +02:00
parent a38e057fa7
commit a9c3992331
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Repositories/Bill/BillRepository.php
View File

@ -241,7 +241,7 @@ class BillRepository implements BillRepositoryInterface
foreach ($bills as $bill) { foreach ($bills as $bill) {
$currentStart = clone $start; $currentStart = clone $start;
while ($currentStart <= $end) { while ($currentStart <= $end) {
$nextExpectedMatch = $this->nextDateMatch($bill, $currentStart); $nextExpectedMatch = $this->nextExpectedMatch($bill, $currentStart);
if ($nextExpectedMatch > $end) { if ($nextExpectedMatch > $end) {
break; break;
} }
@ -253,7 +253,7 @@ class BillRepository implements BillRepositoryInterface
$sum = bcadd($sum, $amount); $sum = bcadd($sum, $amount);
Log::info( Log::info(
sprintf( sprintf(
'Bill "%s" is PAID in period %s to %s (%d transaction(s)), add %f to sum (sum is now %f).', $bill->name, 'getBillsPaidInRange: Bill "%s" is PAID in period %s to %s (%d transaction(s)), add %f to sum (sum is now %f).', $bill->name,
$currentStart->format('Y-m-d'), $currentStart->format('Y-m-d'),
$nextExpectedMatch->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d'),
$set->count(), $set->count(),
@ -292,7 +292,7 @@ class BillRepository implements BillRepositoryInterface
while ($currentStart <= $end) { while ($currentStart <= $end) {
Log::debug(sprintf('Currentstart is now %s.', $currentStart->format('Y-m-d'))); Log::debug(sprintf('Currentstart is now %s.', $currentStart->format('Y-m-d')));
$nextExpectedMatch = $this->nextDateMatch($bill, $currentStart); $nextExpectedMatch = $this->nextExpectedMatch($bill, $currentStart);
Log::debug(sprintf('next Expected match after %s is %s', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d'))); Log::debug(sprintf('next Expected match after %s is %s', $currentStart->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d')));
/* /*
* If $nextExpectedMatch is after $end, we continue: * If $nextExpectedMatch is after $end, we continue:
@ -312,7 +312,7 @@ class BillRepository implements BillRepositoryInterface
$sum = bcadd($sum, $average); $sum = bcadd($sum, $average);
Log::info( Log::info(
sprintf( sprintf(
'Bill "%s" is unpaid in period %s to %s, add %f to sum (sum is now %f).', $bill->name, 'getBillsUnpaidInRange: Bill "%s" is unpaid in period %s to %s, add %f to sum (sum is now %f).', $bill->name,
$currentStart->format('Y-m-d'), $currentStart->format('Y-m-d'),
$nextExpectedMatch->format('Y-m-d'), $nextExpectedMatch->format('Y-m-d'),
$average, $sum $average, $sum