kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix #251

Browse Source
This commit is contained in:
James Cole
2016-04-21 11:03:04 +02:00
parent 0ef5eeeb55
commit 3972882a33
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/PiggyBankController.php
View File

@@ -175,6 +175,7 @@ class PiggyBankController extends Controller
$piggyBank->savedSoFar = round($piggyBank->currentRelevantRep()->currentamount, 2); $piggyBank->savedSoFar = round($piggyBank->currentRelevantRep()->currentamount, 2);
$piggyBank->percentage = $piggyBank->savedSoFar != 0 ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0; $piggyBank->percentage = $piggyBank->savedSoFar != 0 ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0;
$piggyBank->leftToSave = bcsub($piggyBank->targetamount, $piggyBank->savedSoFar); $piggyBank->leftToSave = bcsub($piggyBank->targetamount, $piggyBank->savedSoFar);
$piggyBank->percentage = $piggyBank->percentage > 100 ? 100 : $piggyBank->percentage;
/* /*
* Fill account information: * Fill account information:

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

@@ -169,6 +169,14 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
$piggyBank->save(); $piggyBank->save();
// if the piggy bank is now smaller than the current relevant rep,
// remove money from the rep.
$repetition = $piggyBank->currentRelevantRep();
if ($repetition->currentamount > $piggyBank->targetamount) {
$repetition->currentamount = $piggyBank->targetamount;
$repetition->save();
}
return $piggyBank; return $piggyBank;
} }
} }