diff --git a/app/Models/Account.php b/app/Models/Account.php index ee46be8716..f8ece4909f 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -7,8 +7,22 @@ use Illuminate\Database\Eloquent\Model; * * @package FireflyIII\Models */ -class Account extends Model { +class Account extends Model +{ - // + public function accountMeta() + { + return $this->hasMany('AccountMeta'); + } + + public function accountType() + { + return $this->belongsTo('AccountType'); + } + + public function user() + { + return $this->belongsTo('User'); + } } diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 85943ced0e..a90460af49 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -2,8 +2,23 @@ use Illuminate\Database\Eloquent\Model; -class AccountMeta extends Model { +class AccountMeta extends Model +{ - // + public function account() + { + return $this->belongsTo('Account'); + } + + + public function getDataAttribute($value) + { + return json_decode($value); + } + + public function setDataAttribute($value) + { + $this->attributes['data'] = json_encode($value); + } } diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 097744c746..b3369c656c 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -2,8 +2,12 @@ use Illuminate\Database\Eloquent\Model; -class AccountType extends Model { - - // +class AccountType extends Model +{ + // + public function accounts() + { + return $this->hasMany('Account'); + } } diff --git a/app/Models/Bill.php b/app/Models/Bill.php index a47a812d16..9c8a5044e6 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class Bill extends Model { +class Bill extends Model +{ - // + // } diff --git a/app/Models/Budget.php b/app/Models/Budget.php index ad118e33b8..393a2bfca5 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class Budget extends Model { +class Budget extends Model +{ - // + // } diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 60f4df6b9f..31b1e1b050 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class BudgetLimit extends Model { +class BudgetLimit extends Model +{ - // + // } diff --git a/app/Models/Category.php b/app/Models/Category.php index 5fc640abac..e014779288 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class Category extends Model { +class Category extends Model +{ - // + // } diff --git a/app/Models/Component.php b/app/Models/Component.php index db9bbfd65f..d8b590a4f7 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class Component extends Model { +class Component extends Model +{ - // + // } diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 17804aad91..26913777ba 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class LimitRepetition extends Model { +class LimitRepetition extends Model +{ - // + // } diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 80a570fd46..0eafb632b3 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class PiggyBank extends Model { +class PiggyBank extends Model +{ - // + // } diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index b15c5ac181..f4a317f7ff 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class PiggyBankEvent extends Model { +class PiggyBankEvent extends Model +{ - // + // } diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 6a39ce1392..416d71173a 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class PiggyBankRepetition extends Model { +class PiggyBankRepetition extends Model +{ - // + // } diff --git a/app/Models/Preference.php b/app/Models/Preference.php index e8e6bd94dc..1014fae8f9 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class Preference extends Model { +class Preference extends Model +{ - // + // } diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php index 094d22fbbf..429d6ad335 100644 --- a/app/Models/Reminder.php +++ b/app/Models/Reminder.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class Reminder extends Model { +class Reminder extends Model +{ - // + // } diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index eee92e4bbb..4fdd6c2eaa 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class Transaction extends Model { +class Transaction extends Model +{ - // + // } diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index caa9901933..5481e372df 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class TransactionCurrency extends Model { +class TransactionCurrency extends Model +{ - // + // } diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index a6ad7f7580..6996c03dd9 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class TransactionGroup extends Model { +class TransactionGroup extends Model +{ - // + // } diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 3f986d0fa0..2806db956e 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class TransactionJournal extends Model { +class TransactionJournal extends Model +{ - // + // } diff --git a/app/Models/TransactionRelation.php b/app/Models/TransactionRelation.php index 04d835dcc6..b4370b2966 100644 --- a/app/Models/TransactionRelation.php +++ b/app/Models/TransactionRelation.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class TransactionRelation extends Model { +class TransactionRelation extends Model +{ - // + // } diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 9168cb3491..13a518284c 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -2,8 +2,9 @@ use Illuminate\Database\Eloquent\Model; -class TransactionType extends Model { +class TransactionType extends Model +{ - // + // } diff --git a/app/Models/User.php b/app/Models/User.php index 4506b5824d..65e809c75a 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -1,37 +1,41 @@ hasMany('Account'); + } }