IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some cleaning up for tests.

Browse Source
This commit is contained in:
James Cole 2014-12-23 21:13:42 +01:00
parent 01c5e15bcd
commit cdb5875d6b
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/controllers/PiggybankController.php
View File

@ -41,15 +41,22 @@ class PiggybankController extends BaseController
*/ */
public function add(Piggybank $piggybank) public function add(Piggybank $piggybank)
{ {
/** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */ \Log::debug('Now in add() for piggy bank #' . $piggybank->id . ' (' . $piggybank->name . ')');
$repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank'); \Log::debug('Z');
\Log::debug('currentRelevantRep is null: ' . boolstr($piggybank->currentRelevantRep()));
$leftOnAccount = $this->_repository->leftOnAccount($piggybank->account);
\Log::debug('A');
$leftOnAccount = $repos->leftOnAccount($piggybank->account); $savedSoFar = $piggybank->currentRelevantRep()->currentamount;
$savedSoFar = $piggybank->currentRelevantRep()->currentamount; \Log::debug('B');
$leftToSave = $piggybank->targetamount - $savedSoFar; $leftToSave = $piggybank->targetamount - $savedSoFar;
$maxAmount = min($leftOnAccount, $leftToSave); \Log::debug('C');
$maxAmount = min($leftOnAccount, $leftToSave);
\Log::debug('D');
\Log::debug('Now going to view for piggy bank #' . $piggybank->id . ' (' . $piggybank->name . ')');
return View::make('piggybanks.add', compact('piggybank', 'maxAmount')); return View::make('piggybanks.add', compact('piggybank', 'maxAmount'));
} }
@ -115,7 +122,7 @@ class PiggybankController extends BaseController
/* /*
* Flash some data to fill the form. * Flash some data to fill the form.
*/ */
if (is_null($piggybank->targetdate)) { if (is_null($piggybank->targetdate) || $piggybank->targetdate == '') {
$targetDate = null; $targetDate = null;
} else { } else {
$targetDate = new Carbon($piggybank->targetdate); $targetDate = new Carbon($piggybank->targetdate);
@ -138,11 +145,8 @@ class PiggybankController extends BaseController
*/ */
public function index() public function index()
{ {
/** @var \FireflyIII\Database\PiggyBank\PiggyBank $repos */
$repos = App::make('FireflyIII\Database\PiggyBank\PiggyBank');
/** @var Collection $piggybanks */ /** @var Collection $piggybanks */
$piggybanks = $repos->get(); $piggybanks = $this->_repository->get();
$accounts = []; $accounts = [];
/** @var Piggybank $piggybank */ /** @var Piggybank $piggybank */
@ -156,9 +160,14 @@ class PiggybankController extends BaseController
*/ */
$account = $piggybank->account; $account = $piggybank->account;
if (!isset($accounts[$account->id])) { if (!isset($accounts[$account->id])) {
$accounts[$account->id] = ['name' => $account->name, 'balance' => Steam::balance($account), $accounts[$account->id] = [
'leftForPiggybanks' => $repos->leftOnAccount($account), 'sumOfSaved' => $piggybank->savedSoFar, 'name' => $account->name,
'sumOfTargets' => floatval($piggybank->targetamount), 'leftToSave' => $piggybank->leftToSave]; 'balance' => Steam::balance($account),
'leftForPiggybanks' => $this->_repository->leftOnAccount($account),
'sumOfSaved' => $piggybank->savedSoFar,
'sumOfTargets' => floatval($piggybank->targetamount),
'leftToSave' => $piggybank->leftToSave
];
} else { } else {
$accounts[$account->id]['sumOfSaved'] += $piggybank->savedSoFar; $accounts[$account->id]['sumOfSaved'] += $piggybank->savedSoFar;
$accounts[$account->id]['sumOfTargets'] += floatval($piggybank->targetamount); $accounts[$account->id]['sumOfTargets'] += floatval($piggybank->targetamount);