mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-30 02:26:58 +00:00
Some updates.
This commit is contained in:
@@ -12,17 +12,17 @@ class Account extends Model
|
|||||||
|
|
||||||
public function accountMeta()
|
public function accountMeta()
|
||||||
{
|
{
|
||||||
return $this->hasMany('AccountMeta');
|
return $this->hasMany('FireflyIII\Models\AccountMeta');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function accountType()
|
public function accountType()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('AccountType');
|
return $this->belongsTo('FireflyIII\Models\AccountType');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('User');
|
return $this->belongsTo('FireflyIII\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -7,7 +7,7 @@ class AccountMeta extends Model
|
|||||||
|
|
||||||
public function account()
|
public function account()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('Account');
|
return $this->belongsTo('FireflyIII\Models\Account');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -8,6 +8,6 @@ class AccountType extends Model
|
|||||||
//
|
//
|
||||||
public function accounts()
|
public function accounts()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Account');
|
return $this->hasMany('FireflyIII\Models\Account');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -7,12 +7,12 @@ class Bill extends Model
|
|||||||
|
|
||||||
public function transactionjournals()
|
public function transactionjournals()
|
||||||
{
|
{
|
||||||
return $this->hasMany('TransactionJournal');
|
return $this->hasMany('FireflyIII\Models\TransactionJournal');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('User');
|
return $this->belongsTo('FireflyIII\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -8,22 +8,22 @@ class Budget extends Model
|
|||||||
|
|
||||||
public function budgetlimits()
|
public function budgetlimits()
|
||||||
{
|
{
|
||||||
return $this->hasMany('BudgetLimit');
|
return $this->hasMany('FireflyIII\Models\BudgetLimit');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function limitrepetitions()
|
public function limitrepetitions()
|
||||||
{
|
{
|
||||||
return $this->hasManyThrough('LimitRepetition', 'BudgetLimit', 'budget_id');
|
return $this->hasManyThrough('FireflyIII\Models\LimitRepetition', 'BudgetLimit', 'budget_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactionjournals()
|
public function transactionjournals()
|
||||||
{
|
{
|
||||||
return $this->belongsToMany('TransactionJournal', 'budget_transaction_journal', 'budget_id');
|
return $this->belongsToMany('FireflyIII\Models\TransactionJournal', 'budget_transaction_journal', 'budget_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('User');
|
return $this->belongsTo('FireflyIII\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -7,12 +7,12 @@ class BudgetLimit extends Model
|
|||||||
|
|
||||||
public function budget()
|
public function budget()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('Budget');
|
return $this->belongsTo('FireflyIII\Models\Budget');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function limitrepetitions()
|
public function limitrepetitions()
|
||||||
{
|
{
|
||||||
return $this->hasMany('LimitRepetition');
|
return $this->hasMany('FireflyIII\Models\LimitRepetition');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -7,12 +7,12 @@ class Category extends Model
|
|||||||
|
|
||||||
public function transactionjournals()
|
public function transactionjournals()
|
||||||
{
|
{
|
||||||
return $this->belongsToMany('TransactionJournal', 'category_transaction_journal', 'category_id');
|
return $this->belongsToMany('FireflyIII\Models\TransactionJournal', 'category_transaction_journal', 'category_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('User');
|
return $this->belongsTo('FireflyIII\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -7,7 +7,7 @@ class LimitRepetition extends Model
|
|||||||
|
|
||||||
public function budgetLimit()
|
public function budgetLimit()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('BudgetLimit');
|
return $this->belongsTo('FireflyIII\Models\BudgetLimit');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -7,21 +7,21 @@ class PiggyBank extends Model
|
|||||||
|
|
||||||
public function account()
|
public function account()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('Account');
|
return $this->belongsTo('FireflyIII\Models\Account');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function piggyBankEvents()
|
public function piggyBankEvents()
|
||||||
{
|
{
|
||||||
return $this->hasMany('PiggyBankEvent');
|
return $this->hasMany('FireflyIII\Models\PiggyBankEvent');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function piggyBankRepetitions()
|
public function piggyBankRepetitions()
|
||||||
{
|
{
|
||||||
return $this->hasMany('PiggyBankRepetition');
|
return $this->hasMany('FireflyIII\Models\PiggyBankRepetition');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reminders()
|
public function reminders()
|
||||||
{
|
{
|
||||||
return $this->morphMany('Reminder', 'remindersable');
|
return $this->morphMany('FireflyIII\Models\Reminder', 'remindersable');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -7,12 +7,12 @@ class PiggyBankEvent extends Model
|
|||||||
|
|
||||||
public function piggyBank()
|
public function piggyBank()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('PiggyBank');
|
return $this->belongsTo('FireflyIII\Models\PiggyBank');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactionJournal()
|
public function transactionJournal()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('TransactionJournal');
|
return $this->belongsTo('FireflyIII\Models\TransactionJournal');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -7,7 +7,7 @@ class PiggyBankRepetition extends Model
|
|||||||
|
|
||||||
public function piggyBank()
|
public function piggyBank()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('PiggyBank');
|
return $this->belongsTo('FireflyIII\Models\PiggyBank');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -17,7 +17,7 @@ class Preference extends Model
|
|||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('User');
|
return $this->belongsTo('FireflyIII\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -12,7 +12,7 @@ class Reminder extends Model
|
|||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('User');
|
return $this->belongsTo('FireflyIII\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -7,12 +7,12 @@ class Transaction extends Model
|
|||||||
|
|
||||||
public function account()
|
public function account()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('Account');
|
return $this->belongsTo('FireflyIII\Models\Account');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactionJournal()
|
public function transactionJournal()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('TransactionJournal');
|
return $this->belongsTo('FireflyIII\Models\TransactionJournal');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -7,7 +7,7 @@ class TransactionCurrency extends Model
|
|||||||
|
|
||||||
public function transactionJournals()
|
public function transactionJournals()
|
||||||
{
|
{
|
||||||
return $this->hasMany('TransactionJournal');
|
return $this->hasMany('FireflyIII\Models\TransactionJournal');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -7,12 +7,12 @@ class TransactionGroup extends Model
|
|||||||
|
|
||||||
public function transactionjournals()
|
public function transactionjournals()
|
||||||
{
|
{
|
||||||
return $this->belongsToMany('TransactionJournal');
|
return $this->belongsToMany('FireflyIII\Models\TransactionJournal');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('User');
|
return $this->belongsTo('FireflyIII\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -7,17 +7,17 @@ class TransactionJournal extends Model
|
|||||||
|
|
||||||
public function bill()
|
public function bill()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('Bill');
|
return $this->belongsTo('FireflyIII\Models\Bill');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function budgets()
|
public function budgets()
|
||||||
{
|
{
|
||||||
return $this->belongsToMany('Budget');
|
return $this->belongsToMany('FireflyIII\Models\Budget');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function categories()
|
public function categories()
|
||||||
{
|
{
|
||||||
return $this->belongsToMany('Category');
|
return $this->belongsToMany('FireflyIII\Models\Category');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getDescriptionAttribute($value)
|
public function getDescriptionAttribute($value)
|
||||||
@@ -33,38 +33,38 @@ class TransactionJournal extends Model
|
|||||||
|
|
||||||
public function piggyBankEvents()
|
public function piggyBankEvents()
|
||||||
{
|
{
|
||||||
return $this->hasMany('PiggyBankEvent');
|
return $this->hasMany('FireflyIII\Models\PiggyBankEvent');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setDescriptionAttribute($value)
|
public function setDescriptionAttribute($value)
|
||||||
{
|
{
|
||||||
$this->attributes['description'] = Crypt::encrypt($value);
|
$this->attributes['description'] = \Crypt::encrypt($value);
|
||||||
$this->attributes['encrypted'] = true;
|
$this->attributes['encrypted'] = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactionCurrency()
|
public function transactionCurrency()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('TransactionCurrency');
|
return $this->belongsTo('FireflyIII\Models\TransactionCurrency');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactionType()
|
public function transactionType()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('TransactionType');
|
return $this->belongsTo('FireflyIII\Models\TransactionType');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactiongroups()
|
public function transactiongroups()
|
||||||
{
|
{
|
||||||
return $this->belongsToMany('TransactionGroup');
|
return $this->belongsToMany('FireflyIII\Models\TransactionGroup');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactions()
|
public function transactions()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Transaction');
|
return $this->hasMany('FireflyIII\Models\Transaction');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function user()
|
public function user()
|
||||||
{
|
{
|
||||||
return $this->belongsTo('User');
|
return $this->belongsTo('FireflyIII\User');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -7,7 +7,7 @@ class TransactionType extends Model
|
|||||||
|
|
||||||
public function transactionJournals()
|
public function transactionJournals()
|
||||||
{
|
{
|
||||||
return $this->hasMany('TransactionJournal');
|
return $this->hasMany('FireflyIII\Models\TransactionJournal');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
<?php namespace FireflyIII\Models;
|
<?php namespace FireflyIII;
|
||||||
|
|
||||||
use Illuminate\Auth\Authenticatable;
|
use Illuminate\Auth\Authenticatable;
|
||||||
use Illuminate\Auth\Passwords\CanResetPassword;
|
use Illuminate\Auth\Passwords\CanResetPassword;
|
||||||
@@ -32,47 +32,47 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
|
|||||||
|
|
||||||
public function accounts()
|
public function accounts()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Account');
|
return $this->hasMany('FireflyIII\Models\Account');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function bills()
|
public function bills()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Bill');
|
return $this->hasMany('FireflyIII\Models\Bill');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function budgets()
|
public function budgets()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Budget');
|
return $this->hasMany('FireflyIII\Models\Budget');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function categories()
|
public function categories()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Category');
|
return $this->hasMany('FireflyIII\Models\Category');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function piggyBanks()
|
public function piggyBanks()
|
||||||
{
|
{
|
||||||
return $this->hasManyThrough('PiggyBank', 'Account');
|
return $this->hasManyThrough('FireflyIII\Models\PiggyBank', 'Account');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function preferences()
|
public function preferences()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Preference');
|
return $this->hasMany('FireflyIII\Models\Preference');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function reminders()
|
public function reminders()
|
||||||
{
|
{
|
||||||
return $this->hasMany('Reminder');
|
return $this->hasMany('FireflyIII\Models\Reminder');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactionjournals()
|
public function transactionjournals()
|
||||||
{
|
{
|
||||||
return $this->hasMany('TransactionJournal');
|
return $this->hasMany('FireflyIII\Models\TransactionJournal');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setPasswordAttribute($value)
|
public function setPasswordAttribute($value)
|
||||||
{
|
{
|
||||||
$this->attributes['password'] = Hash::make($value);
|
$this->attributes['password'] = \Hash::make($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
2
composer.lock
generated
2
composer.lock
generated
@@ -4,7 +4,7 @@
|
|||||||
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"hash": "748428ef7844b760438fcafa6965cafa",
|
"hash": "5bb84809ab2fa2c5a8486b6b38f1e47f",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "classpreloader/classpreloader",
|
"name": "classpreloader/classpreloader",
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Database\Seeder;
|
use Illuminate\Database\Seeder;
|
||||||
use FireflyIII\Models\User;
|
use FireflyIII\User;
|
||||||
use FireflyIII\Models\Account;
|
use FireflyIII\Models\Account;
|
||||||
use FireflyIII\Models\AccountType;
|
use FireflyIII\Models\AccountType;
|
||||||
use FireflyIII\Models\Budget;
|
use FireflyIII\Models\Budget;
|
||||||
@@ -17,6 +17,7 @@ use FireflyIII\Models\Transaction;
|
|||||||
use FireflyIII\Models\TransactionCurrency;
|
use FireflyIII\Models\TransactionCurrency;
|
||||||
use FireflyIII\Models\TransactionJournal;
|
use FireflyIII\Models\TransactionJournal;
|
||||||
use FireflyIII\Models\TransactionType;
|
use FireflyIII\Models\TransactionType;
|
||||||
|
use FireflyIII\Models\TransactionGroup;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @SuppressWarnings("CamelCase") // I'm fine with this.
|
* @SuppressWarnings("CamelCase") // I'm fine with this.
|
||||||
|
Reference in New Issue
Block a user