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

Renamed some stuff, courtesy of sensiolabs.

Browse Source
This commit is contained in:
James Cole 2016-01-28 22:06:16 +01:00
parent 43dbba5378
commit d9bafe34eb
21 changed files with 239 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Models/Account.php
View File

@ -1,12 +1,10 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Auth; use Auth;
use Carbon\Carbon;
use Crypt; use Crypt;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
@ -31,27 +29,27 @@ use Watson\Validating\ValidatingTrait;
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
* @property-read \FireflyIII\User $user * @property-read \FireflyIII\User $user
* @method static Builder|\FireflyIII\Models\Account accountTypeIn($types) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account accountTypeIn($types)
* @method static Builder|\FireflyIII\Models\Account hasMetaValue($name, $value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account hasMetaValue($name, $value)
* @property string $startBalance * @property string $startBalance
* @property string $endBalance * @property string $endBalance
* @property float $difference * @property float $difference
* @property Carbon $lastActivityDate * @property \Carbon\Carbon $lastActivityDate
* @property float $piggyBalance * @property float $piggyBalance
* @property float $percentage * @property float $percentage
*/ */
class Account extends Model class Account extends Model
{ {
use SoftDeletes, ValidatingTrait; use SoftDeletes, ValidatingTrait;
/** @var array */ /** @var array */
protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $dates = ['created_at', 'updated_at', 'deleted_at'];
/** @var array */ /** @var array */
protected $fillable = ['user_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; protected $fillable = ['user_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban'];
/** @var array */ /** @var array */
protected $hidden = ['virtual_balance_encrypted', 'encrypted']; protected $hidden = ['virtual_balance_encrypted', 'encrypted'];
protected $rules protected $rules
= [ = [
'user_id' => 'required|exists:users,id', 'user_id' => 'required|exists:users,id',
'account_type_id' => 'required|exists:account_types,id', 'account_type_id' => 'required|exists:account_types,id',
'name' => 'required', 'name' => 'required',

15
app/Models/AccountMeta.php
View File

@ -1,18 +1,17 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
/** /**
* FireflyIII\Models\AccountMeta * FireflyIII\Models\AccountMeta
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property integer $account_id * @property integer $account_id
* @property string $name * @property string $name
* @property string $data * @property string $data
* @property-read Account $account * @property-read Account $account
*/ */
class AccountMeta extends Model class AccountMeta extends Model
{ {

14
app/Models/AccountType.php
View File

@ -1,18 +1,16 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
/** /**
* FireflyIII\Models\AccountType * FireflyIII\Models\AccountType
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property string $type * @property string $type
* @property boolean $editable * @property boolean $editable
* @property-read Collection|Account[] $accounts * @property-read \Illuminate\Database\Eloquent\Collection|Account[] $accounts
*/ */
class AccountType extends Model class AccountType extends Model
{ {

36
app/Models/Attachment.php
View File

@ -3,9 +3,7 @@
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Auth; use Auth;
use Carbon\Carbon;
use Crypt; use Crypt;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -13,23 +11,23 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* FireflyIII\Models\Attachment * FireflyIII\Models\Attachment
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property string $deleted_at * @property string $deleted_at
* @property integer $attachable_id * @property integer $attachable_id
* @property string $attachable_type * @property string $attachable_type
* @property integer $user_id * @property integer $user_id
* @property string $md5 * @property string $md5
* @property string $filename * @property string $filename
* @property string $title * @property string $title
* @property string $description * @property string $description
* @property string $notes * @property string $notes
* @property string $mime * @property string $mime
* @property integer $size * @property integer $size
* @property boolean $uploaded * @property boolean $uploaded
* @property-read Attachment $attachable * @property-read Attachment $attachable
* @property-read User $user * @property-read \FireflyIII\User $user
*/ */
class Attachment extends Model class Attachment extends Model
{ {

41
app/Models/Bill.php
View File

@ -1,35 +1,32 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Auth; use Auth;
use Carbon\Carbon;
use Crypt; use Crypt;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* FireflyIII\Models\Bill * FireflyIII\Models\Bill
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property integer $user_id * @property integer $user_id
* @property string $name * @property string $name
* @property string $match * @property string $match
* @property float $amount_min * @property float $amount_min
* @property float $amount_max * @property float $amount_max
* @property Carbon $date * @property \Carbon\Carbon $date
* @property boolean $active * @property boolean $active
* @property boolean $automatch * @property boolean $automatch
* @property string $repeat_freq * @property string $repeat_freq
* @property integer $skip * @property integer $skip
* @property boolean $name_encrypted * @property boolean $name_encrypted
* @property boolean $match_encrypted * @property boolean $match_encrypted
* @property-read Collection|TransactionJournal[] $transactionjournals * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
* @property-read User $user * @property-read \FireflyIII\User $user
* @property Carbon $nextExpectedMatch * @property \Carbon\Carbon $nextExpectedMatch
* @property Carbon $lastFoundMatch * @property \Carbon\Carbon $lastFoundMatch
*/ */
class Bill extends Model class Bill extends Model
{ {

33
app/Models/Budget.php
View File

@ -1,10 +1,7 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Auth; use Auth;
use Carbon\Carbon;
use Crypt; use Crypt;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -12,21 +9,21 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* FireflyIII\Models\Budget * FireflyIII\Models\Budget
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property Carbon $deleted_at * @property \Carbon\Carbon $deleted_at
* @property string $name * @property string $name
* @property integer $user_id * @property integer $user_id
* @property boolean $active * @property boolean $active
* @property boolean $encrypted * @property boolean $encrypted
* @property-read Collection|BudgetLimit[] $budgetlimits * @property-read \Illuminate\Database\Eloquent\Collection|BudgetLimit[] $budgetlimits
* @property-read Collection|TransactionJournal[] $transactionjournals * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
* @property-read User $user * @property-read \FireflyIII\User $user
* @property string $dateFormatted * @property string $dateFormatted
* @property string $budgeted * @property string $budgeted
* @property float $amount * @property float $amount
* @property Carbon $date * @property \Carbon\Carbon $date
*/ */
class Budget extends Model class Budget extends Model
{ {

24
app/Models/BudgetLimit.php
View File

@ -1,28 +1,26 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
/** /**
* FireflyIII\Models\BudgetLimit * FireflyIII\Models\BudgetLimit
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property integer $budget_id * @property integer $budget_id
* @property Carbon $startdate * @property \Carbon\Carbon $startdate
* @property float $amount * @property float $amount
* @property boolean $repeats * @property boolean $repeats
* @property string $repeat_freq * @property string $repeat_freq
* @property-read Budget $budget * @property-read Budget $budget
* @property-read Collection|LimitRepetition[] $limitrepetitions * @property-read \Illuminate\Database\Eloquent\Collection|LimitRepetition[] $limitrepetitions
*/ */
class BudgetLimit extends Model class BudgetLimit extends Model
{ {
protected $hidden = ['amount_encrypted'];
protected $dates = ['created_at', 'updated_at', 'startdate']; protected $dates = ['created_at', 'updated_at', 'startdate'];
protected $hidden = ['amount_encrypted'];
/** /**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

29
app/Models/Category.php
View File

@ -1,10 +1,7 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Auth; use Auth;
use Carbon\Carbon;
use Crypt; use Crypt;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -12,19 +9,19 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* FireflyIII\Models\Category * FireflyIII\Models\Category
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property Carbon $deleted_at * @property \Carbon\Carbon $deleted_at
* @property string $name * @property string $name
* @property integer $user_id * @property integer $user_id
* @property boolean $encrypted * @property boolean $encrypted
* @property-read Collection|TransactionJournal[] $transactionjournals * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
* @property-read User $user * @property-read \FireflyIII\User $user
* @property string $dateFormatted * @property string $dateFormatted
* @property float $spent * @property float $spent
* @property Carbon $lastActivity * @property \Carbon\Carbon $lastActivity
* @property string $type * @property string $type
*/ */
class Category extends Model class Category extends Model
{ {

9
app/Models/LimitRepetition.php
View File

@ -1,7 +1,6 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Auth; use Auth;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -9,11 +8,11 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* FireflyIII\Models\LimitRepetition * FireflyIII\Models\LimitRepetition
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property integer $budget_limit_id * @property integer $budget_limit_id
* @property Carbon $startdate * @property \Carbon\Carbon $startdate
* @property Carbon $enddate * @property \Carbon\Carbon $enddate
* @property float $amount * @property float $amount
* @property-read BudgetLimit $budgetLimit * @property-read BudgetLimit $budgetLimit
* @property int $budget_id * @property int $budget_id

16
app/Models/Permission.php
View File

@ -2,20 +2,18 @@
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Zizaco\Entrust\EntrustPermission; use Zizaco\Entrust\EntrustPermission;
/** /**
* FireflyIII\Models\Permission * FireflyIII\Models\Permission
* *
* @property integer $id * @property integer $id
* @property string $name * @property string $name
* @property string $display_name * @property string $display_name
* @property string $description * @property string $description
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property-read Collection|Role[] $roles * @property-read \Illuminate\Database\Eloquent\Collection|Role[] $roles
*/ */
class Permission extends EntrustPermission class Permission extends EntrustPermission
{ {

38
app/Models/PiggyBank.php
View File

@ -1,9 +1,7 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Auth; use Auth;
use Carbon\Carbon;
use Crypt; use Crypt;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -11,24 +9,24 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* FireflyIII\Models\PiggyBank * FireflyIII\Models\PiggyBank
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property Carbon $deleted_at * @property \Carbon\Carbon $deleted_at
* @property integer $account_id * @property integer $account_id
* @property string $name * @property string $name
* @property float $targetamount * @property float $targetamount
* @property Carbon $startdate * @property \Carbon\Carbon $startdate
* @property Carbon $targetdate * @property \Carbon\Carbon $targetdate
* @property integer $order * @property integer $order
* @property boolean $encrypted * @property boolean $encrypted
* @property boolean $remind_me * @property boolean $remind_me
* @property integer $reminder_skip * @property integer $reminder_skip
* @property-read Account $account * @property-read Account $account
* @property-read Collection|PiggyBankRepetition[] $piggyBankRepetitions * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankRepetition[] $piggyBankRepetitions
* @property-read Collection|PiggyBankEvent[] $piggyBankEvents * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankEvent[] $piggyBankEvents
* @property string $reminder * @property string $reminder
* @property PiggyBankRepetition $currentRep * @property PiggyBankRepetition $currentRep
*/ */
class PiggyBank extends Model class PiggyBank extends Model
{ {

7
app/Models/PiggyBankEvent.php
View File

@ -1,17 +1,16 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
/** /**
* FireflyIII\Models\PiggyBankEvent * FireflyIII\Models\PiggyBankEvent
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property integer $piggy_bank_id * @property integer $piggy_bank_id
* @property integer $transaction_journal_id * @property integer $transaction_journal_id
* @property Carbon $date * @property \Carbon\Carbon $date
* @property float $amount * @property float $amount
* @property PiggyBank $piggyBank * @property PiggyBank $piggyBank
* @property-read TransactionJournal $transactionJournal * @property-read TransactionJournal $transactionJournal

13
app/Models/PiggyBankRepetition.php
View File

@ -3,21 +3,20 @@
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Query\Builder;
/** /**
* FireflyIII\Models\PiggyBankRepetition * FireflyIII\Models\PiggyBankRepetition
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property integer $piggy_bank_id * @property integer $piggy_bank_id
* @property Carbon $startdate * @property \Carbon\Carbon $startdate
* @property Carbon $targetdate * @property \Carbon\Carbon $targetdate
* @property float $currentamount * @property float $currentamount
* @property-read PiggyBank $piggyBank * @property-read PiggyBank $piggyBank
* @method static Builder|PiggyBankRepetition onDates($start, $target) * @method static \Illuminate\Database\Query\Builder|PiggyBankRepetition onDates($start, $target)
* @method static Builder|PiggyBankRepetition relevantOnDate($date) * @method static \Illuminate\Database\Query\Builder|PiggyBankRepetition relevantOnDate($date)
*/ */
class PiggyBankRepetition extends Model class PiggyBankRepetition extends Model
{ {

22
app/Models/Preference.php
View File

@ -1,29 +1,27 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Crypt; use Crypt;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
/** /**
* FireflyIII\Models\Preference * FireflyIII\Models\Preference
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property integer $user_id * @property integer $user_id
* @property string $name * @property string $name
* @property string $name_encrypted * @property string $name_encrypted
* @property string $data * @property string $data
* @property string $data_encrypted * @property string $data_encrypted
* @property-read User $user * @property-read \FireflyIII\User $user
*/ */
class Preference extends Model class Preference extends Model
{ {
protected $dates = ['created_at', 'updated_at'];
protected $fillable = ['user_id', 'data', 'name']; protected $fillable = ['user_id', 'data', 'name'];
protected $hidden = ['data_encrypted', 'name_encrypted']; protected $hidden = ['data_encrypted', 'name_encrypted'];
protected $dates = ['created_at', 'updated_at'];
/** /**
* @param $value * @param $value

18
app/Models/Role.php
View File

@ -2,21 +2,19 @@
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Zizaco\Entrust\EntrustRole; use Zizaco\Entrust\EntrustRole;
/** /**
* FireflyIII\Models\Role * FireflyIII\Models\Role
* *
* @property integer $id * @property integer $id
* @property string $name * @property string $name
* @property string $display_name * @property string $display_name
* @property string $description * @property string $description
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property-read Collection|\FireflyIII\User[] $users * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\User[] $users
* @property-read Collection|Permission[] $perms * @property-read \Illuminate\Database\Eloquent\Collection|Permission[] $perms
*/ */
class Role extends EntrustRole class Role extends EntrustRole
{ {

33
app/Models/Tag.php
View File

@ -3,31 +3,28 @@
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Auth; use Auth;
use Carbon\Carbon;
use Crypt; use Crypt;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* FireflyIII\Models\Tag * FireflyIII\Models\Tag
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property string $deleted_at * @property string $deleted_at
* @property integer $user_id * @property integer $user_id
* @property string $tag * @property string $tag
* @property string $tagMode * @property string $tagMode
* @property Carbon $date * @property \Carbon\Carbon $date
* @property string $description * @property string $description
* @property float $latitude * @property float $latitude
* @property float $longitude * @property float $longitude
* @property integer $zoomLevel * @property integer $zoomLevel
* @property-read Collection|TransactionJournal[] $transactionjournals * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
* @property-read User $user * @property-read \FireflyIII\User $user
* @property int $account_id * @property int $account_id
*/ */
class Tag extends Model class Tag extends Model
{ {

15
app/Models/Transaction.php
View File

@ -4,26 +4,25 @@ use Carbon\Carbon;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
/** /**
* FireflyIII\Models\Transaction * FireflyIII\Models\Transaction
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property Carbon $deleted_at * @property \Carbon\Carbon $deleted_at
* @property integer $account_id * @property integer $account_id
* @property integer $transaction_journal_id * @property integer $transaction_journal_id
* @property string $description * @property string $description
* @property float $amount * @property float $amount
* @property-read Account $account * @property-read Account $account
* @property-read TransactionJournal $transactionJournal * @property-read TransactionJournal $transactionJournal
* @method static Builder|Transaction after($date) * @method static \Illuminate\Database\Query\Builder|Transaction after($date)
* @method static Builder|Transaction before($date) * @method static \Illuminate\Database\Query\Builder|Transaction before($date)
* @property float $before * @property float $before
* @property float $after * @property float $after
*/ */
class Transaction extends Model class Transaction extends Model
{ {

18
app/Models/TransactionCurrency.php
View File

@ -1,8 +1,6 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Auth; use Auth;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -10,14 +8,14 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/** /**
* FireflyIII\Models\TransactionCurrency * FireflyIII\Models\TransactionCurrency
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property Carbon $deleted_at * @property \Carbon\Carbon $deleted_at
* @property string $code * @property string $code
* @property string $name * @property string $name
* @property string $symbol * @property string $symbol
* @property-read Collection|TransactionJournal[] $transactionJournals * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
*/ */
class TransactionCurrency extends Model class TransactionCurrency extends Model
{ {

19
app/Models/TransactionGroup.php
View File

@ -1,22 +1,19 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
/** /**
* FireflyIII\Models\TransactionGroup * FireflyIII\Models\TransactionGroup
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property Carbon $deleted_at * @property \Carbon\Carbon $deleted_at
* @property integer $user_id * @property integer $user_id
* @property string $relation * @property string $relation
* @property-read Collection|TransactionJournal[] $transactionjournals * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionjournals
* @property-read User $user * @property-read \FireflyIII\User $user
*/ */
class TransactionGroup extends Model class TransactionGroup extends Model
{ {

83
app/Models/TransactionJournal.php
View File

@ -4,59 +4,56 @@ use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Crypt; use Crypt;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
/** /**
* FireflyIII\Models\TransactionJournal * FireflyIII\Models\TransactionJournal
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property Carbon $deleted_at * @property \Carbon\Carbon $deleted_at
* @property integer $user_id * @property integer $user_id
* @property integer $transaction_type_id * @property integer $transaction_type_id
* @property integer $bill_id * @property integer $bill_id
* @property integer $transaction_currency_id * @property integer $transaction_currency_id
* @property string $description * @property string $description
* @property boolean $completed * @property boolean $completed
* @property Carbon $date * @property \Carbon\Carbon $date
* @property boolean $encrypted * @property boolean $encrypted
* @property integer $order * @property integer $order
* @property integer $tag_count * @property integer $tag_count
* @property-read Bill $bill * @property-read Bill $bill
* @property-read Collection|Budget[] $budgets * @property-read \Illuminate\Database\Eloquent\Collection|Budget[] $budgets
* @property-read Collection|Category[] $categories * @property-read \Illuminate\Database\Eloquent\Collection|Category[] $categories
* @property-read mixed $amount_positive * @property-read mixed $amount_positive
* @property-read mixed $amount * @property-read mixed $amount
* @property-read Collection|Tag[] $tags * @property-read \Illuminate\Database\Eloquent\Collection|Tag[] $tags
* @property-read Collection|Transaction[] $transactions * @property-read \Illuminate\Database\Eloquent\Collection|Transaction[] $transactions
* @property-read mixed $destination_account * @property-read mixed $destination_account
* @property-read mixed $source_account * @property-read mixed $source_account
* @property-read Collection|PiggyBankEvent[] $piggyBankEvents * @property-read \Illuminate\Database\Eloquent\Collection|PiggyBankEvent[] $piggyBankEvents
* @property-read Collection|Attachment[] $attachments * @property-read \Illuminate\Database\Eloquent\Collection|Attachment[] $attachments
* @property-read TransactionCurrency $transactionCurrency * @property-read TransactionCurrency $transactionCurrency
* @property-read TransactionType $transactionType * @property-read TransactionType $transactionType
* @property-read Collection|TransactionGroup[] $transactiongroups * @property-read \Illuminate\Database\Eloquent\Collection|TransactionGroup[] $transactiongroups
* @property-read User $user * @property-read \FireflyIII\User $user
* @property float $journalAmount * @property float $journalAmount
* @property int $account_id * @property int $account_id
* @property int $budget_id * @property int $budget_id
* @property string $account_name * @property string $account_name
* @method static Builder|TransactionJournal accountIs($account) * @method static \Illuminate\Database\Query\Builder|TransactionJournal accountIs($account)
* @method static Builder|TransactionJournal after($date) * @method static \Illuminate\Database\Query\Builder|TransactionJournal after($date)
* @method static Builder|TransactionJournal before($date) * @method static \Illuminate\Database\Query\Builder|TransactionJournal before($date)
* @method static Builder|TransactionJournal onDate($date) * @method static \Illuminate\Database\Query\Builder|TransactionJournal onDate($date)
* @method static Builder|TransactionJournal transactionTypes($types) * @method static \Illuminate\Database\Query\Builder|TransactionJournal transactionTypes($types)
* @method static Builder|TransactionJournal withRelevantData() * @method static \Illuminate\Database\Query\Builder|TransactionJournal withRelevantData()
* @property string $type * @property string $type
*/ */
class TransactionJournal extends Model class TransactionJournal extends Model
{ {

14
app/Models/TransactionType.php
View File

@ -1,19 +1,17 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
/** /**
* FireflyIII\Models\TransactionType * FireflyIII\Models\TransactionType
* *
* @property integer $id * @property integer $id
* @property Carbon $created_at * @property \Carbon\Carbon $created_at
* @property Carbon $updated_at * @property \Carbon\Carbon $updated_at
* @property Carbon $deleted_at * @property \Carbon\Carbon $deleted_at
* @property string $type * @property string $type
* @property-read Collection|TransactionJournal[] $transactionJournals * @property-read \Illuminate\Database\Eloquent\Collection|TransactionJournal[] $transactionJournals
*/ */
class TransactionType extends Model class TransactionType extends Model
{ {