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

This should fix the tests.

Browse Source
This commit is contained in:
James Cole 2015-06-23 22:13:13 +02:00
parent cd27f0ad69
commit 124c9303b9
5 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,7 @@ class PiggyBankController extends Controller
*/ */
public function show(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) public function show(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
{ {
$events = $repository->getEvents($piggyBank); $events = $repository->getEvents($piggyBank);
$subTitle = e($piggyBank->name); $subTitle = e($piggyBank->name);
return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle')); return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle'));
@ -314,11 +314,13 @@ class PiggyBankController extends Controller
{ {
$piggyBankData = [ $piggyBankData = [
'name' => $request->get('name'), 'name' => $request->get('name'),
'startdate' => new Carbon, 'startdate' => new Carbon,
'account_id' => intval($request->get('account_id')), 'account_id' => intval($request->get('account_id')),
'targetamount' => floatval($request->get('targetamount')), 'targetamount' => floatval($request->get('targetamount')),
'targetdate' => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null, 'remind_me' => false,
'reminder_skip' => 0,
'targetdate' => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
]; ];
$piggyBank = $repository->store($piggyBankData); $piggyBank = $repository->store($piggyBankData);
@ -347,11 +349,13 @@ class PiggyBankController extends Controller
public function update(PiggyBankRepositoryInterface $repository, PiggyBankFormRequest $request, PiggyBank $piggyBank) public function update(PiggyBankRepositoryInterface $repository, PiggyBankFormRequest $request, PiggyBank $piggyBank)
{ {
$piggyBankData = [ $piggyBankData = [
'name' => $request->get('name'), 'name' => $request->get('name'),
'startdate' => is_null($piggyBank->startdate) ? $piggyBank->created_at : $piggyBank->startdate, 'startdate' => is_null($piggyBank->startdate) ? $piggyBank->created_at : $piggyBank->startdate,
'account_id' => intval($request->get('account_id')), 'account_id' => intval($request->get('account_id')),
'targetamount' => floatval($request->get('targetamount')), 'targetamount' => floatval($request->get('targetamount')),
'targetdate' => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null, 'remind_me' => false,
'reminder_skip' => 0,
'targetdate' => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
]; ];
$piggyBank = $repository->update($piggyBank, $piggyBankData); $piggyBank = $repository->update($piggyBank, $piggyBankData);

4
app/Models/PiggyBank.php
View File

@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/** /**
* Class PiggyBank * Class PiggyBank
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* @package FireflyIII\Models * @package FireflyIII\Models
* @property integer $id * @property integer $id
* @property \Carbon\Carbon $created_at * @property \Carbon\Carbon $created_at
@ -43,7 +43,7 @@ class PiggyBank extends Model
use SoftDeletes; use SoftDeletes;
protected $fillable protected $fillable
= ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate']; = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'remind_me', 'reminder_skip'];
protected $hidden = ['targetamount_encrypted', 'encrypted']; protected $hidden = ['targetamount_encrypted', 'encrypted'];
/** /**

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

@ -116,7 +116,10 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
*/ */
public function store(array $data) public function store(array $data)
{ {
$piggyBank = PiggyBank::create($data); $data['remind_me'] = false;
$data['reminder_skip'] = 0;
$piggyBank = PiggyBank::create($data);
return $piggyBank; return $piggyBank;
} }

2
tests/factories/all.php
View File

@ -237,6 +237,8 @@ FactoryMuffin::define(
}, },
'startdate' => 'date', 'startdate' => 'date',
'targetdate' => 'date', 'targetdate' => 'date',
'remind_me' => false,
'reminder_skip' => 0,
'order' => 0, 'order' => 0,
] ]
); );

4
tests/repositories/PiggyBankRepositoryTest.php
View File

@ -138,6 +138,8 @@ class PiggyBankRepositoryTest extends TestCase
'name' => 'Some piggy', 'name' => 'Some piggy',
'targetamount' => 100, 'targetamount' => 100,
'order' => 1, 'order' => 1,
'remind_me' => false,
'reminder_skip' => 0,
]; ];
@ -161,6 +163,8 @@ class PiggyBankRepositoryTest extends TestCase
'targetamount' => 100, 'targetamount' => 100,
'create_another' => 1, 'create_another' => 1,
'order' => 1, 'order' => 1,
'remind_me' => false,
'reminder_skip' => 0,
]; ];