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

Clean up models, fixed a bug.

Browse Source
This commit is contained in:
James Cole
2014-12-01 06:09:27 +01:00
parent d7b0106e7d
commit 4720519aef
9 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/Account.php
View File

@@ -17,14 +17,14 @@ use LaravelBook\Ardent\Builder;
* @property-read \Illuminate\Database\Eloquent\Collection|\Transaction[] $transactions
* @property-read \Illuminate\Database\Eloquent\Collection|\Piggybank[] $piggybanks
* @property-read \User $user
* @method static \Illuminate\Database\Query\Builder|\Account whereId($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereAccountTypeId($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereName($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereActive($value)
* @method static \Account accountTypeIn($types)
* @method static \Illuminate\Database\Query\Builder|\Account whereId($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereAccountTypeId($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereName($value)
* @method static \Illuminate\Database\Query\Builder|\Account whereActive($value)
* @method static \Account accountTypeIn($types)
*/
class Account extends Ardent
{

2
app/models/PiggybankRepetition.php
View File

@@ -21,6 +21,8 @@ use LaravelBook\Ardent\Builder;
* @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereStartdate($value)
* @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereTargetdate($value)
* @method static \Illuminate\Database\Query\Builder|\PiggybankRepetition whereCurrentamount($value)
* @method static \PiggybankRepetition starts($date)
* @method static \PiggybankRepetition targets($date)
*/
class PiggybankRepetition extends Ardent
{

32
app/models/Reminder.php
View File

@@ -3,6 +3,7 @@
use Carbon\Carbon;
use LaravelBook\Ardent\Ardent;
/**
* Reminder
*
@@ -14,25 +15,22 @@ use LaravelBook\Ardent\Ardent;
* @property \Carbon\Carbon $enddate
* @property boolean $active
* @property boolean $notnow
* @property integer $remembersable_id
* @property string $remembersable_type
* @property-read \Piggybank $remindersable
* @property-read \User $user
* @property mixed $data
* @method static \Illuminate\Database\Query\Builder|\Reminder whereId($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereStartdate($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereEnddate($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereActive($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereRemembersableId($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereRemembersableType($value)
* @method static \Reminder dateIs($start, $end)
* @property integer $remindersable_id
* @property string $remindersable_type
* @method static \Illuminate\Database\Query\Builder|\Reminder whereRemindersableId($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereRemindersableType($value)
* @property-read \ $remindersable
* @property-read \User $user
* @property mixed $data
* @method static \Illuminate\Database\Query\Builder|\Reminder whereId($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereStartdate($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereEnddate($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereActive($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereNotnow($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereRemindersableId($value)
* @method static \Illuminate\Database\Query\Builder|\Reminder whereRemindersableType($value)
* @method static \Reminder dateIs($start, $end)
*/
class Reminder extends Ardent
{

16
app/models/TransactionGroup.php
View File

@@ -1,6 +1,22 @@
<?php
use LaravelBook\Ardent\Ardent;
/**
* TransactionGroup
*
* @property integer $id
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property integer $user_id
* @property string $relation
* @property-read \Illuminate\Database\Eloquent\Collection|\TransactionJournal[] $transactionjournals
* @property-read \User $user
* @method static \Illuminate\Database\Query\Builder|\TransactionGroup whereId($value)
* @method static \Illuminate\Database\Query\Builder|\TransactionGroup whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\TransactionGroup whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\TransactionGroup whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\TransactionGroup whereRelation($value)
*/
class TransactionGroup extends Ardent
{

5
app/models/TransactionJournal.php
View File

@@ -60,6 +60,11 @@ use LaravelBook\Ardent\Builder;
* 'Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\
* 'Category[] $categories
* @property-read \Illuminate\Database\Eloquent\Collection|\
* 'Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\
* 'Category[] $categories
* @property-read \Illuminate\Database\Eloquent\Collection|\TransactionGroup[] $transactiongroups
*/
class TransactionJournal extends Ardent
{

4
app/models/TransactionRelation.php
View File

@@ -2,6 +2,10 @@
use Carbon\Carbon;
use LaravelBook\Ardent\Ardent;
/**
* TransactionRelation
*
*/
class TransactionRelation extends Ardent {
}

12
app/models/User.php
View File

@@ -32,7 +32,7 @@ use LaravelBook\Ardent\Ardent;
* @method static \Illuminate\Database\Query\Builder|\User whereReset($value)
* @method static \Illuminate\Database\Query\Builder|\User whereRememberToken($value)
* @method static \Illuminate\Database\Query\Builder|\User whereMigrated($value)
* @property-read \Illuminate\Database\Eloquent\Collection|\Reminder[] $reminders
* @property-read \Illuminate\Database\Eloquent\Collection|\Reminder[] $reminders
*/
class User extends Ardent implements UserInterface, RemindableInterface
{
@@ -97,10 +97,6 @@ class User extends Ardent implements UserInterface, RemindableInterface
{
return $this->hasManyThrough('Piggybank', 'Account');
}
public function transactions()
{
return $this->hasManyThrough('TransactionJournal', 'Transaction');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
@@ -126,7 +122,6 @@ class User extends Ardent implements UserInterface, RemindableInterface
return $this->hasMany('Reminder');
}
/**
* @param $value
*/
@@ -143,4 +138,9 @@ class User extends Ardent implements UserInterface, RemindableInterface
return $this->hasMany('TransactionJournal');
}
public function transactions()
{
return $this->hasManyThrough('TransactionJournal', 'Transaction');
}
}