kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-20 02:20:54 -07:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/orgs/firefly-iii/discussions/12210

Browse Source
This commit is contained in:
James Cole
2026-05-01 13:46:57 +02:00
parent e46153330a
commit fd8722e401
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Repositories/PiggyBank/ModifiesPiggyBanks.php
+2 -2
View File
@@ -385,9 +385,9 @@ trait ModifiesPiggyBanks
$piggyBank->target_date = $data['target_date'];
$piggyBank->target_date_tz = $data['target_date']?->format('e');
}
if (array_key_exists('start_date', $data)) {
if (array_key_exists('start_date', $data) && '' !== $data['start_date']) {
$piggyBank->start_date = $data['start_date'];
$piggyBank->start_date_tz = $data['target_date']?->format('e');
$piggyBank->start_date_tz = $data['start_date']?->format('e');
}
$piggyBank->save();
app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php
+3 -2
View File
@@ -163,6 +163,7 @@ class PiggyBankEnrichment implements EnrichmentInterface
}
// get suggested per month.
$meta['save_per_month'] = Steam::bcround(
$this->getSuggestedMonthlyAmount($this->date, $item->target_date, $meta['target_amount'], $meta['current_amount']),
$currency->decimal_places
@@ -295,6 +296,7 @@ class PiggyBankEnrichment implements EnrichmentInterface
/**
* Returns the suggested amount the user should save per month, or "".
* TODO same as in repository.
*/
private function getSuggestedMonthlyAmount(?Carbon $startDate, ?Carbon $targetDate, ?string $targetAmount, string $currentAmount): string
{
@@ -303,8 +305,7 @@ class PiggyBankEnrichment implements EnrichmentInterface
}
$savePerMonth = '0';
if (1 === bccomp($targetAmount, $currentAmount)) {
$now = today(config('app.timezone'));
$diffInMonths = (int) $startDate->diffInMonths($targetDate);
$diffInMonths = ceil($startDate->diffInMonths($targetDate));
$remainingAmount = bcsub($targetAmount, $currentAmount);
// more than 1 month to go and still need money to save: