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

Updated tests.

Browse Source
This commit is contained in:
James Cole
2014-12-20 15:00:53 +01:00
parent e86547645c
commit 82e438d29b
44 changed files with 2000 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
View File

@@ -7,10 +7,10 @@ use FireflyIII\Database\CUD;
use FireflyIII\Database\SwitchUser;
use FireflyIII\Exception\FireflyException;
use FireflyIII\Exception\NotImplementedException;
use Illuminate\Database\Eloquent\Model as Eloquent;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
/**
* Class Piggybank
*
@@ -29,11 +29,11 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
}
/**
* @param \Eloquent $model
* @param Eloquent $model
*
* @return bool
*/
public function destroy(\Eloquent $model)
public function destroy(Eloquent $model)
{
$model->delete();
}
@@ -56,12 +56,12 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
}
/**
* @param \Eloquent $model
* @param array $data
* @param Eloquent $model
* @param array $data
*
* @return bool
*/
public function update(\Eloquent $model, array $data)
public function update(Eloquent $model, array $data)
{
/** @var \Piggybank $model */
$model->name = $data['name'];
@@ -178,7 +178,9 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
public function find($objectId)
{
return \Piggybank::
leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where('piggybanks.id', '=', $objectId)->where('accounts.user_id', $this->getUser()->id)
leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where('piggybanks.id', '=', $objectId)->where(
'accounts.user_id', $this->getUser()->id
)
->first(['piggybanks.*']);
}
@@ -242,6 +244,7 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface
if ($date >= $rep->startdate && $date <= $rep->targetdate) {
return $rep;
}
return null;
}
);