kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 16:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/6148

Browse Source
This commit is contained in:
James Cole
2022-06-09 05:56:50 +02:00
parent 313676e3be
commit de3376c966
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Jobs/CreateAutoBudgetLimits.php
View File

@@ -281,13 +281,18 @@ class CreateAutoBudgetLimits implements ShouldQueue
$spentAmount = $spent[$currencyId]['sum'] ?? '0';
Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));
// previous budget limit + this period + spent
$totalAmount = bcadd(bcadd($budgetLimit->amount, $autoBudget->amount), $spentAmount);
Log::debug(sprintf('Total amount for current budget period will be %s', $totalAmount));
// if you spent more in previous budget period, than whatever you had previous budget period, the amount resets
// previous budget limit + spent
$budgetLeft = bcadd($budgetLimit->amount, $spentAmount);
$totalAmount = $autoBudget->amount;
Log::debug(sprintf('Total amount left for previous budget period is %s', $budgetLeft));
if (1 !== bccomp($totalAmount, '0')) {
Log::info(sprintf('The total amount is negative, so it will be reset to %s.', $totalAmount));
$totalAmount = $autoBudget->amount;
if (-1 !== bccomp('0', $budgetLeft)) {
Log::info(sprintf('The amount left is negative, so it will be reset to %s.', $totalAmount));
}
if (1 !== bccomp('0', $budgetLeft)) {
$totalAmount = bcadd($budgetLeft, $budgetLimit->amount);
Log::info(sprintf('The amount left is positive, so the new amount will be %s.', $totalAmount));
}
// create budget limit: