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

Move code to repository.

Browse Source
This commit is contained in:
James Cole
2018-02-17 10:47:32 +01:00
parent c6da990748
commit 7bbfb692de
5 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,12 +67,12 @@ class PiggyBankController extends Controller
*
* @return View
*/
public function add(PiggyBank $piggyBank)
public function add(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository)
{
/** @var Carbon $date */
$date = session('end', Carbon::now()->endOfMonth());
$leftOnAccount = $piggyBank->leftOnAccount($date);
$savedSoFar = $piggyBank->currentRelevantRep()->currentamount ?? '0';
$savedSoFar = $repository->getCurrentAmount($piggyBank);
$leftToSave = bcsub($piggyBank->targetamount, $savedSoFar);
$maxAmount = min($leftOnAccount, $leftToSave);
@@ -86,12 +86,12 @@ class PiggyBankController extends Controller
*
* @return View
*/
public function addMobile(PiggyBank $piggyBank)
public function addMobile(PiggyBank $piggyBank, PiggyBankRepositoryInterface $repository)
{
/** @var Carbon $date */
$date = session('end', Carbon::now()->endOfMonth());
$leftOnAccount = $piggyBank->leftOnAccount($date);
$savedSoFar = $piggyBank->currentRelevantRep()->currentamount ?? '0';
$savedSoFar = $repository->getCurrentAmount($piggyBank);
$leftToSave = bcsub($piggyBank->targetamount, $savedSoFar);
$maxAmount = min($leftOnAccount, $leftToSave);
@@ -212,7 +212,8 @@ class PiggyBankController extends Controller
Log::debug('Looping piggues');
/** @var PiggyBank $piggyBank */
foreach ($collection as $piggyBank) {
$piggyBank->savedSoFar = $piggyBank->currentRelevantRep()->currentamount ?? '0';
$piggyBank->savedSoFar = $piggyRepository->getCurrentAmount($piggyBank);
$piggyBank->percentage = 0 !== bccomp('0', $piggyBank->savedSoFar) ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0;
$piggyBank->leftToSave = bcsub($piggyBank->targetamount, strval($piggyBank->savedSoFar));
$piggyBank->percentage = $piggyBank->percentage > 100 ? 100 : $piggyBank->percentage;