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

https://github.com/firefly-iii/firefly-iii/pull/8026

Browse Source
This commit is contained in:
James Cole 2023-10-12 19:15:56 +02:00
parent 1966e12703
commit 64ed9376fe
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Transformers/BillTransformer.php
View File

@ -173,14 +173,14 @@ class BillTransformer extends AbstractTransformer
* Get from database when bill was paid. * Get from database when bill was paid.
*/ */
$set = $this->repository->getPaidDatesInRange($bill, $searchStart, $this->parameters->get('end')); $set = $this->repository->getPaidDatesInRange($bill, $searchStart, $this->parameters->get('end'));
//app('log')->debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count())); app('log')->debug(sprintf('Count %d entries in getPaidDatesInRange()', $set->count()));
/* /*
* Grab from array the most recent payment. If none exist, fall back to the start date and pretend *that* was the last paid date. * Grab from array the most recent payment. If none exist, fall back to the start date and pretend *that* was the last paid date.
*/ */
//app('log')->debug(sprintf('Grab last paid date from function, return %s if it comes up with nothing.', $start->format('Y-m-d'))); app('log')->debug(sprintf('Grab last paid date from function, return %s if it comes up with nothing.', $start->format('Y-m-d')));
$lastPaidDate = $this->lastPaidDate($set, $start); $lastPaidDate = $this->lastPaidDate($set, $start);
//app('log')->debug(sprintf('Result of lastPaidDate is %s', $lastPaidDate->format('Y-m-d'))); app('log')->debug(sprintf('Result of lastPaidDate is %s', $lastPaidDate->format('Y-m-d')));
/* /*
* The next expected match (nextMatch) is, initially, the bill's date. * The next expected match (nextMatch) is, initially, the bill's date.
@ -192,11 +192,19 @@ class BillTransformer extends AbstractTransformer
$steps = app('navigation')->diffInPeriods($bill->repeat_freq, $start, $nextMatch); $steps = app('navigation')->diffInPeriods($bill->repeat_freq, $start, $nextMatch);
$nextMatch = app('navigation')->addPeriod($nextMatch, $bill->repeat_freq, $steps); $nextMatch = app('navigation')->addPeriod($nextMatch, $bill->repeat_freq, $steps);
if ($nextMatch->lt($lastPaidDate)) {
/*
* Add another period because it's before the last paid date
*/
app('log')->debug('Because the last paid date was before our next expected match, add another period.');
$nextMatch = app('navigation')->addPeriod($nextMatch, $bill->repeat_freq, $bill->skip);
}
if ($nextMatch->isSameDay($lastPaidDate)) { if ($nextMatch->isSameDay($lastPaidDate)) {
/* /*
* Add another period because it's the same day as the last paid date. * Add another period because it's the same day as the last paid date.
*/ */
//app('log')->debug('Because the last paid date was on the same day as our next expected match, add another day.'); app('log')->debug('Because the last paid date was on the same day as our next expected match, add another day.');
$nextMatch = app('navigation')->addPeriod($nextMatch, $bill->repeat_freq, $bill->skip); $nextMatch = app('navigation')->addPeriod($nextMatch, $bill->repeat_freq, $bill->skip);
} }
/* /*