kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 14:12:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6255 from rickdoesdev/develop

Browse Source 
Use Piggy Bank's start date in suggested monthly calc
This commit is contained in:
James Cole
2022-07-22 11:31:30 +00:00
committed by GitHub
parent 397c0abebe 203ae2812f
commit 7f694ede98
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@@ -341,7 +341,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
}
if (null !== $piggyBank->targetdate && $repetition->currentamount < $piggyBank->targetamount) {
$now = Carbon::now();
$diffInMonths = $now->diffInMonths($piggyBank->targetdate, false);
$startDate = null !== $piggyBank->startdate && $piggyBank->startdate->gte($now) ? $piggyBank->startdate : $now;
$diffInMonths = $startDate->diffInMonths($piggyBank->targetdate, false);
$remainingAmount = bcsub($piggyBank->targetamount, $repetition->currentamount);
// more than 1 month to go and still need money to save: