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

Piggy bank supports notes (#350)

Browse Source
This commit is contained in:
James Cole
2016-10-22 10:13:49 +02:00
parent 091f6e918b
commit e4d249e73c
8 changed files with 158 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,6 +168,7 @@ class PiggyBankController extends Controller
'account_id' => $piggyBank->account_id,
'targetamount' => $piggyBank->targetamount,
'targetdate' => $targetDate,
'note' => $piggyBank->notes()->first()->text,
];
Session::flash('preFilled', $preFilled);
Session::flash('gaEventCategory', 'piggy-banks');
@@ -346,10 +347,11 @@ class PiggyBankController extends Controller
*/
public function show(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank)
{
$note = $piggyBank->notes()->first();
$events = $repository->getEvents($piggyBank);
$subTitle = e($piggyBank->name);
return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle'));
return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'note'));
}
@@ -369,6 +371,7 @@ class PiggyBankController extends Controller
'targetamount' => round($request->get('targetamount'), 2),
'order' => $repository->getMaxOrder() + 1,
'targetdate' => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
'note' => $request->get('note'),
];
$piggyBank = $repository->store($piggyBankData);
@@ -402,6 +405,7 @@ class PiggyBankController extends Controller
'account_id' => intval($request->get('account_id')),
'targetamount' => round($request->get('targetamount'), 2),
'targetdate' => strlen($request->get('targetdate')) > 0 ? new Carbon($request->get('targetdate')) : null,
'note' => $request->get('note'),
];
$piggyBank = $repository->update($piggyBank, $piggyBankData);

54
app/Models/Note.php Normal file
View File

@@ -0,0 +1,54 @@
<?php
/**
* Note.php
* Copyright (C) 2016 thegrumpydictator@gmail.com
*
* This software may be modified and distributed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International License.
*
* See the LICENSE file for details.
*/
declare(strict_types = 1);
namespace FireflyIII\Models;
use Illuminate\Database\Eloquent\Model;
/**
* FireflyIII\Models\Note
*
* @property integer $id
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property string $deleted_at
* @property integer $noteable_id
* @property string $noteable_type
* @property string $title
* @property string $text
* @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $noteable
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereNoteableId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereNoteableType($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereTitle($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Note whereText($value)
* @mixin \Eloquent
*/
class Note extends Model
{
protected $dates = ['created_at', 'updated_at', 'deleted_at'];
protected $fillable = ['title', 'text'];
/**
* Get all of the owning noteable models. Currently only piggy bank
*/
public function noteable()
{
return $this->morphTo();
}
}

9
app/Models/PiggyBank.php
View File

@@ -56,6 +56,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @mixin \Eloquent
* @property boolean $active
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereActive($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Note[] $notes
*/
class PiggyBank extends Model
{
@@ -146,6 +147,14 @@ class PiggyBank extends Model
}
/**
* Get all of the piggy bank's notes.
*/
public function notes()
{
return $this->morphMany('FireflyIII\Models\Note', 'noteable');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/

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

@@ -15,6 +15,7 @@ namespace FireflyIII\Repositories\PiggyBank;
use Amount;
use Carbon\Carbon;
use FireflyIII\Models\Note;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\User;
@@ -176,6 +177,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
{
$piggyBank = PiggyBank::create($data);
$this->updateNote($piggyBank, $data['note']);
return $piggyBank;
}
@@ -196,6 +199,8 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
$piggyBank->save();
$this->updateNote($piggyBank, $data['note']);
// if the piggy bank is now smaller than the current relevant rep,
// remove money from the rep.
$repetition = $piggyBank->currentRelevantRep();
@@ -210,4 +215,31 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
return $piggyBank;
}
/**
* @param PiggyBank $piggyBank
* @param string $note
*
* @return bool
*/
private function updateNote(PiggyBank $piggyBank, string $note): bool
{
if (strlen($note) === 0) {
$dbNote = $piggyBank->notes()->first();
if (!is_null($dbNote)) {
$dbNote->delete();
}
return true;
}
$dbNote= $piggyBank->notes()->first();
if (is_null($dbNote)) {
$dbNote= new Note();
$dbNote->noteable()->associate($piggyBank);
}
$dbNote->text = trim($note);
$dbNote->save();
return true;
}
}