kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Bug fixes in strict types.

Browse Source
This commit is contained in:
James Cole
2016-05-20 11:53:34 +02:00
parent 7dd858be39
commit 74a9edaaf7
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,7 +175,7 @@ class PiggyBankController extends Controller
foreach ($piggyBanks as $piggyBank) {
$piggyBank->savedSoFar = round($piggyBank->currentRelevantRep()->currentamount, 2);
$piggyBank->percentage = $piggyBank->savedSoFar != 0 ? intval($piggyBank->savedSoFar / $piggyBank->targetamount * 100) : 0;
$piggyBank->leftToSave = bcsub($piggyBank->targetamount, $piggyBank->savedSoFar);
$piggyBank->leftToSave = bcsub($piggyBank->targetamount, strval($piggyBank->savedSoFar));
$piggyBank->percentage = $piggyBank->percentage > 100 ? 100 : $piggyBank->percentage;
/*
@@ -192,7 +192,7 @@ class PiggyBankController extends Controller
'leftToSave' => $piggyBank->leftToSave,
];
} else {
$accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], $piggyBank->savedSoFar);
$accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], strval($piggyBank->savedSoFar));
$accounts[$account->id]['sumOfTargets'] = bcadd($accounts[$account->id]['sumOfTargets'], $piggyBank->targetamount);
$accounts[$account->id]['leftToSave'] = bcadd($accounts[$account->id]['leftToSave'], $piggyBank->leftToSave);
}

5
app/Http/Controllers/Transaction/MassController.php
View File

@@ -1,4 +1,6 @@
<?php
declare(strict_types = 1);
/**
* MassController.php
* Copyright (C) 2016 thegrumpydictator@gmail.com
@@ -7,11 +9,8 @@
* of the MIT license. See the LICENSE file for details.
*/
declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Transaction;
use Auth;
use Carbon\Carbon;
use ExpandedForm;