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

Followed up on some inspections.

Browse Source
This commit is contained in:
James Cole 2016-01-01 21:49:27 +01:00
parent 5eb0e18cae
commit e892c9a824
32 changed files with 374 additions and 571 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Chart/AccountController.php
View File

@ -53,6 +53,7 @@ class AccountController extends Controller
$cache->addProperty('all'); $cache->addProperty('all');
$cache->addProperty('accounts'); $cache->addProperty('accounts');
$cache->addProperty('default'); $cache->addProperty('default');
$cache->addProperty($reportType);
$cache->addProperty($accounts); $cache->addProperty($accounts);
if ($cache->has()) { if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore return Response::json($cache->get()); // @codeCoverageIgnore

2
app/Http/Controllers/Chart/ReportController.php
View File

@ -49,6 +49,7 @@ class ReportController extends Controller
$cache = new CacheProperties; $cache = new CacheProperties;
$cache->addProperty('yearInOut'); $cache->addProperty('yearInOut');
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($reportType);
$cache->addProperty($accounts); $cache->addProperty($accounts);
$cache->addProperty($end); $cache->addProperty($end);
if ($cache->has()) { if ($cache->has()) {
@ -115,6 +116,7 @@ class ReportController extends Controller
$cache->addProperty('yearInOutSummarized'); $cache->addProperty('yearInOutSummarized');
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);
$cache->addProperty($reportType);
$cache->addProperty($accounts); $cache->addProperty($accounts);
if ($cache->has()) { if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore return Response::json($cache->get()); // @codeCoverageIgnore

2
app/Http/Controllers/CsvController.php
View File

@ -146,7 +146,7 @@ class CsvController extends Controller
* *
* STEP ONE * STEP ONE
* *
* @param AccountRepositoryInterface $repository * @param ARI $repository
* *
* @return \Illuminate\View\View * @return \Illuminate\View\View
*/ */

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

@ -157,7 +157,7 @@ class PiggyBankController extends Controller
} }
/** /**
* @param AccountRepositoryInterface $repository * @param ARI $repository
* @param PiggyBankRepositoryInterface $piggyRepository * @param PiggyBankRepositoryInterface $piggyRepository
* *
* @return View * @return View

5
app/Http/Middleware/Authenticate.php
View File

@ -54,8 +54,9 @@ class Authenticate
return redirect()->guest('auth/login'); return redirect()->guest('auth/login');
} }
} }
/** @var User $user */
if ($this->auth->user() instanceof User && intval($this->auth->user()->blocked) == 1) { $user = $this->auth->user();
if ($user instanceof User && intval($user->blocked) == 1) {
Auth::logout(); Auth::logout();
return redirect()->route('index'); return redirect()->route('index');

4
app/Http/breadcrumbs.php
View File

@ -355,9 +355,9 @@ Breadcrumbs::register(
$breadcrumbs->parent('reports.index'); $breadcrumbs->parent('reports.index');
$monthFormat = trans('config.month_and_day'); $monthFormat = trans('config.month_and_day');
$title = trans('firefly.report_default', ['start' => $start->formatLocalized($monthFormat), 'end' => $end->formatLocalized($monthFormat)]); $title = trans('firefly.report_' . $reportType, ['start' => $start->formatLocalized($monthFormat), 'end' => $end->formatLocalized($monthFormat)]);
$breadcrumbs->push($title, route('reports.report', ['url' => 'abcde'])); $breadcrumbs->push($title, route('reports.report', [$reportType, $start->format('Ymd'), $end->format('Ymd'), join(',', $accountIds)]));
} }
); );

63
app/Models/Account.php
View File

@ -1,53 +1,38 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Crypt; use Crypt;
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\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Query\Builder;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
/** /**
* Class Account * FireflyIII\Models\Account
* *
* @package FireflyIII\Models * @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 $account_type_id
* @property integer $account_type_id * @property string $name
* @property string $name * @property boolean $active
* @property boolean $active * @property boolean $encrypted
* @property boolean $encrypted * @property float $virtual_balance
* @property float $virtual_balance * @property string $iban
* @property string $iban * @property-read Collection|AccountMeta[] $accountMeta
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta * @property-read AccountType $accountType
* @property-read \FireflyIII\Models\AccountType $accountType * @property-read mixed $name_for_editform
* @property-read mixed $name_for_editform * @property-read Collection|PiggyBank[] $piggyBanks
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks * @property-read Collection|Transaction[] $transactions
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions * @property-read User $user
* @property-read \FireflyIII\User $user * @method static Builder|Account accountTypeIn($types)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereId($value) * @method static Builder|Account hasMetaValue($name, $value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereAccountTypeId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereActive($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereEncrypted($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalance($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereIban($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account accountTypeIn($types)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account hasMetaValue($name, $value)
* @property-read bool $joinedAccountTypes
* @property float $startBalance
* @property float $endBalance
* @property float $piggyBalance
* @property float $percentage
* @property float $difference
* @property \Carbon\Carbon $lastActivityDate
*/ */
class Account extends Model class Account extends Model
{ {

24
app/Models/AccountMeta.php
View File

@ -1,25 +1,19 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
/** /**
* Class AccountMeta * FireflyIII\Models\AccountMeta
* *
* @package FireflyIII\Models * @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 \FireflyIII\Models\Account $account
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereAccountId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereData($value)
*/ */
class AccountMeta extends Model class AccountMeta extends Model
{ {

22
app/Models/AccountType.php
View File

@ -1,22 +1,18 @@
<?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;
/** /**
* Class AccountType * FireflyIII\Models\AccountType
* *
* @package FireflyIII\Models * @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|\FireflyIII\Models\Account[] $accounts
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereType($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereEditable($value)
*/ */
class AccountType extends Model class AccountType extends Model
{ {

54
app/Models/Attachment.php
View File

@ -2,46 +2,32 @@
namespace FireflyIII\Models; namespace FireflyIII\Models;
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;
/** /**
* Class Attachment * FireflyIII\Models\Attachment
* *
* @package FireflyIII\Models * @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 $mime * @property string $description
* @property integer $size * @property string $notes
* @property boolean $uploaded * @property string $mime
* @property-read \ $attachable * @property integer $size
* @property-read \FireflyIII\User $user * @property boolean $uploaded
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereId($value) * @property-read Attachment $attachable
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereCreatedAt($value) * @property-read User $user
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereAttachableId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereAttachableType($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereMd5($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereFilename($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereMime($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereSize($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereUploaded($value)
* @property string $title
* @property string $description
* @property string $notes
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereTitle($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereDescription($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereNotes($value)
*/ */
class Attachment extends Model class Attachment extends Model
{ {

58
app/Models/Bill.php
View File

@ -1,47 +1,31 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
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;
/** /**
* Class Bill * FireflyIII\Models\Bill
* *
* @package FireflyIII\Models * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals * @property-read User $user
* @property-read \FireflyIII\User $user
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatch($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMin($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMax($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereDate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereActive($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAutomatch($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereRepeatFreq($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereSkip($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value)
* @property \Carbon\Carbon $nextExpectedMatch
* @property \Carbon\Carbon $lastFoundMatch
* @property-read string $expectedAmount
*/ */
class Bill extends Model class Bill extends Model
{ {

36
app/Models/Budget.php
View File

@ -1,32 +1,26 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
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;
/** /**
* Class Budget * FireflyIII\Models\Budget
* *
* @package FireflyIII\Models * @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|\FireflyIII\Models\BudgetLimit[] $budgetlimits * @property-read Collection|TransactionJournal[] $transactionjournals
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals * @property-read User $user
* @property-read \FireflyIII\User $user
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereActive($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereEncrypted($value)
*/ */
class Budget extends Model class Budget extends Model
{ {

33
app/Models/BudgetLimit.php
View File

@ -1,29 +1,22 @@
<?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;
/** /**
* Class BudgetLimit * FireflyIII\Models\BudgetLimit
* *
* @package FireflyIII\Models * @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 \FireflyIII\Models\Budget $budget * @property-read Collection|LimitRepetition[] $limitrepetitions
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\LimitRepetition[] $limitrepetitions
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereBudgetId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereStartdate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereAmount($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeats($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeatFreq($value)
*/ */
class BudgetLimit extends Model class BudgetLimit extends Model
{ {

33
app/Models/Category.php
View File

@ -1,31 +1,24 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
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;
/** /**
* Class Category * FireflyIII\Models\Category
* *
* @package FireflyIII\Models * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals * @property-read User $user
* @property-read \FireflyIII\User $user
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value)
* @property-read float $spent
* @property \Carbon\Carbon $lastActivity
*/ */
class Category extends Model class Category extends Model
{ {

25
app/Models/Component.php
View File

@ -1,26 +1,19 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
/** /**
* Class Component * FireflyIII\Models\Component
* *
* @package FireflyIII\Models * @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 string $class
* @property string $class
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereClass($value)
*/ */
class Component extends Model class Component extends Model
{ {

27
app/Models/LimitRepetition.php
View File

@ -1,26 +1,19 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
/** /**
* Class LimitRepetition * FireflyIII\Models\LimitRepetition
* *
* @package FireflyIII\Models * @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 \FireflyIII\Models\BudgetLimit $budgetLimit
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereBudgetLimitId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereStartdate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereEnddate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereAmount($value)
*/ */
class LimitRepetition extends Model class LimitRepetition extends Model
{ {

25
app/Models/Permission.php
View File

@ -2,25 +2,20 @@
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Zizaco\Entrust\EntrustPermission; use Zizaco\Entrust\EntrustPermission;
/** /**
* Class Permission * FireflyIII\Models\Permission
* *
* @package FireflyIII\Models * @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|\Config::get('entrust.role[] $roles
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereDisplayName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereDescription($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereUpdatedAt($value)
*/ */
class Permission extends EntrustPermission class Permission extends EntrustPermission
{ {

53
app/Models/PiggyBank.php
View File

@ -1,45 +1,30 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
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;
/** /**
* Class PiggyBank * FireflyIII\Models\PiggyBank
* *
* @package FireflyIII\Models * @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 \FireflyIII\Models\Account $account * @property-read Collection|PiggyBankRepetition[] $piggyBankRepetitions
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions * @property-read Collection|PiggyBankEvent[] $piggyBankEvents
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereAccountId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetamount($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereStartdate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetdate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereOrder($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminderSkip($value)
* @property-read \FireflyIII\Models\PiggyBankRepetition $currentRep
* @property string $reminder
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminder($value)
*/ */
class PiggyBank extends Model class PiggyBank extends Model
{ {

29
app/Models/PiggyBankEvent.php
View File

@ -1,27 +1,20 @@
<?php namespace FireflyIII\Models; <?php namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
/** /**
* Class PiggyBankEvent * FireflyIII\Models\PiggyBankEvent
* *
* @package FireflyIII\Models * @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-read PiggyBank $piggyBank
* @property \FireflyIII\Models\PiggyBank $piggyBank * @property-read TransactionJournal $transactionJournal
* @property-read \FireflyIII\Models\TransactionJournal $transactionJournal
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent wherePiggyBankId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereTransactionJournalId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereDate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereAmount($value)
*/ */
class PiggyBankEvent extends Model class PiggyBankEvent extends Model
{ {

31
app/Models/PiggyBankRepetition.php
View File

@ -3,28 +3,21 @@
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;
/** /**
* Class PiggyBankRepetition * FireflyIII\Models\PiggyBankRepetition
* *
* @package FireflyIII\Models * @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 \FireflyIII\Models\PiggyBank $piggyBank * @method static Builder|PiggyBankRepetition onDates($start, $target)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereId($value) * @method static Builder|PiggyBankRepetition relevantOnDate($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition wherePiggyBankId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereStartdate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereTargetdate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCurrentamount($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition onDates($start, $target)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition relevantOnDate($date)
*/ */
class PiggyBankRepetition extends Model class PiggyBankRepetition extends Model
{ {

31
app/Models/Preference.php
View File

@ -1,29 +1,22 @@
<?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;
/** /**
* Class Preference * FireflyIII\Models\Preference
* *
* @package FireflyIII\Models * @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
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereNameEncrypted($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereData($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereDataEncrypted($value)
*/ */
class Preference extends Model class Preference extends Model
{ {

27
app/Models/Role.php
View File

@ -2,26 +2,21 @@
namespace FireflyIII\Models; namespace FireflyIII\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Collection;
use Zizaco\Entrust\EntrustRole; use Zizaco\Entrust\EntrustRole;
/** /**
* Class Role * FireflyIII\Models\Role
* *
* @package FireflyIII\Models * @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|\Config::get('auth.model[] $users * @property-read Collection|Permission[] $perms
* @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.permission[] $perms
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDisplayName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDescription($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereUpdatedAt($value)
*/ */
class Role extends EntrustRole class Role extends EntrustRole
{ {

46
app/Models/Tag.php
View File

@ -2,40 +2,30 @@
namespace FireflyIII\Models; namespace FireflyIII\Models;
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 Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
/** /**
* Class Tag * FireflyIII\Models\Tag
* *
* @package FireflyIII\Models * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals * @property-read User $user
* @property-read \FireflyIII\User $user
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTag($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTagMode($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDescription($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLatitude($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLongitude($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereZoomLevel($value)
*/ */
class Tag extends Model class Tag extends Model
{ {

38
app/Models/Transaction.php
View File

@ -4,34 +4,24 @@ 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;
/** /**
* Class Transaction * FireflyIII\Models\Transaction
* *
* @package FireflyIII\Models * @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 \FireflyIII\Models\Account $account * @property-read TransactionJournal $transactionJournal
* @property-read \FireflyIII\Models\TransactionJournal $transactionJournal * @method static Builder|Transaction after($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereId($value) * @method static Builder|Transaction before($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAccountId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereTransactionJournalId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDescription($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmount($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction after($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction before($date)
* @property float $before
* @property float $after
*/ */
class Transaction extends Model class Transaction extends Model
{ {

28
app/Models/TransactionCurrency.php
View File

@ -1,27 +1,21 @@
<?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;
/** /**
* Class TransactionCurrency * FireflyIII\Models\TransactionCurrency
* *
* @package FireflyIII\Models * @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|\FireflyIII\Models\TransactionJournal[] $transactionJournals
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCode($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereName($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereSymbol($value)
*/ */
class TransactionCurrency extends Model class TransactionCurrency extends Model
{ {

28
app/Models/TransactionGroup.php
View File

@ -1,26 +1,22 @@
<?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;
/** /**
* Class TransactionGroup * FireflyIII\Models\TransactionGroup
* *
* @package FireflyIII\Models * @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|\FireflyIII\Models\TransactionJournal[] $transactionjournals * @property-read User $user
* @property-read \FireflyIII\User $user
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereRelation($value)
*/ */
class TransactionGroup extends Model class TransactionGroup extends Model
{ {

99
app/Models/TransactionJournal.php
View File

@ -3,74 +3,53 @@
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 Watson\Validating\ValidatingTrait; use Watson\Validating\ValidatingTrait;
/** /**
* Class TransactionJournal * FireflyIII\Models\TransactionJournal
* *
* @package FireflyIII\Models * @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 \FireflyIII\Models\Bill $bill * @property-read Collection|Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets * @property-read Collection|Category[] $categories
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories * @property-read mixed $amount_positive
* @property-read mixed $actual_amount * @property-read mixed $amount
* @property-read mixed $amount * @property-read Collection|Tag[] $tags
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags * @property-read Collection|Transaction[] $transactions
* @property-read mixed $correct_amount * @property-read mixed $destination_account
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions * @property-read mixed $source_account
* @property-read mixed $destination_account * @property-read Collection|PiggyBankEvent[] $piggyBankEvents
* @property-read mixed $source_account * @property-read Collection|Attachment[] $attachments
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents * @property-read TransactionCurrency $transactionCurrency
* @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency * @property-read TransactionType $transactionType
* @property-read \FireflyIII\Models\TransactionType $transactionType * @property-read Collection|TransactionGroup[] $transactiongroups
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups * @property-read User $user
* @property-read \FireflyIII\User $user * @method static Builder|TransactionJournal accountIs($account)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereId($value) * @method static Builder|TransactionJournal after($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value) * @method static Builder|TransactionJournal before($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value) * @method static Builder|TransactionJournal onDate($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDeletedAt($value) * @method static Builder|TransactionJournal transactionTypes($types)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUserId($value) * @method static Builder|TransactionJournal withRelevantData()
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionTypeId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereBillId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionCurrencyId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDescription($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCompleted($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereEncrypted($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereOrder($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTagCount($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal accountIs($account)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal after($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal before($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal onDate($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal transactionTypes($types)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal withRelevantData()
* @property-read bool $account_encrypted
* @property-read bool $joinedTransactions
* @property-read bool $joinedTransactionTypes
* @property-read int $account_id
* @property string $name
* @property-read string $symbol
* @property-read string $type
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments
* @property-read mixed $amount_positive
*/ */
class TransactionJournal extends Model class TransactionJournal extends Model
{ {

21
app/Models/TransactionRelation.php
View File

@ -1,21 +0,0 @@
<?php namespace FireflyIII\Models;
use Illuminate\Database\Eloquent\Model;
/**
* Class TransactionRelation
*
* @package FireflyIII\Models
*/
class TransactionRelation extends Model
{
/**
* @return array
*/
public function getDates()
{
return ['created_at', 'updated_at'];
}
}

22
app/Models/TransactionType.php
View File

@ -1,23 +1,19 @@
<?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;
/** /**
* Class TransactionType * FireflyIII\Models\TransactionType
* *
* @package FireflyIII\Models * @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|\FireflyIII\Models\TransactionJournal[] $transactionJournals
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereType($value)
*/ */
class TransactionType extends Model class TransactionType extends Model
{ {

4
app/Repositories/Budget/BudgetRepository.php
View File

@ -710,7 +710,6 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
*/ */
public function spentPerBudgetPerAccount(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end) public function spentPerBudgetPerAccount(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end)
{ {
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();
$budgetIds = $budgets->pluck('id')->toArray(); $budgetIds = $budgets->pluck('id')->toArray();
$set = Auth::user()->transactionjournals() $set = Auth::user()->transactionjournals()
@ -740,8 +739,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE]) ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE])
->get( ->get(
[ [
't_from.account_id', 't_from.account_id', 'budget_transaction_journal.budget_id',
'budget_transaction_journal.budget_id',
DB::Raw('SUM(`t_from`.`amount`) AS `spent`') DB::Raw('SUM(`t_from`.`amount`) AS `spent`')
] ]
); );

6
app/Support/Steam.php
View File

@ -77,9 +77,9 @@ class Steam
* *
* [yyyy-mm-dd] => 123,2 * [yyyy-mm-dd] => 123,2
* *
* @param Account $account * @param \FireflyIII\Models\Account $account
* @param Carbon $start * @param \Carbon\Carbon $start
* @param Carbon $end * @param \Carbon\Carbon $end
* *
* @return array * @return array
*/ */

66
app/User.php
View File

@ -1,43 +1,55 @@
<?php namespace FireflyIII; <?php namespace FireflyIII;
use Carbon\Carbon;
use FireflyIII\Models\Account;
use FireflyIII\Models\Attachment;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Category;
use FireflyIII\Models\Preference;
use FireflyIII\Models\Role;
use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Auth\Authenticatable; use Illuminate\Auth\Authenticatable;
use Illuminate\Auth\Passwords\CanResetPassword; use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Query\Builder;
use Illuminate\Support\Collection;
use Zizaco\Entrust\Traits\EntrustUserTrait; use Zizaco\Entrust\Traits\EntrustUserTrait;
/** /**
* Class User * Class User
* *
* @package FireflyIII * @package FireflyIII
* @property integer $id * @property integer $id
* @property \Carbon\Carbon $created_at * @property Carbon $created_at
* @property \Carbon\Carbon $updated_at * @property Carbon $updated_at
* @property string $email * @property string $email
* @property string $password * @property string $password
* @property string $reset * @property string $reset
* @property string $remember_token * @property string $remember_token
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts * @property-read Collection|Account[] $accounts
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags * @property-read Collection|Tag[] $tags
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills * @property-read Collection|Bill[] $bills
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets * @property-read Collection|Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories * @property-read Collection|Category[] $categories
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[] $preferences * @property-read Collection|Preference[] $preferences
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals * @property-read Collection|TransactionJournal[] $transactionjournals
* @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.role[] $roles * @property-read Collection|Role $roles
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereId($value) * @method static Builder|User whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereCreatedAt($value) * @method static Builder|User whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereUpdatedAt($value) * @method static Builder|User whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereEmail($value) * @method static Builder|User whereEmail($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\User wherePassword($value) * @method static Builder|User wherePassword($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereReset($value) * @method static Builder|User whereReset($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereRememberToken($value) * @method static Builder|User whereRememberToken($value)
* @property boolean $blocked * @property boolean $blocked
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[] $attachments * @property-read Collection|Attachment[] $attachments
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereBlocked($value) * @method static Builder|User whereBlocked($value)
* @property string $blocked_code * @property string $blocked_code
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereBlockedCode($value) * @method static Builder|User whereBlockedCode($value)
*/ */
class User extends Model implements AuthenticatableContract, CanResetPasswordContract class User extends Model implements AuthenticatableContract, CanResetPasswordContract
{ {