Some cleaning up courtesy of PHPStorm.

This commit is contained in:
James Cole
2016-01-15 23:12:52 +01:00
parent 3857e8d49f
commit 7bf75128a8
56 changed files with 193 additions and 179 deletions

View File

@@ -24,13 +24,15 @@ class Kernel extends ConsoleKernel
* *
* @var array * @var array
*/ */
protected $commands = [ protected $commands
= [
]; ];
/** /**
* Define the application's command schedule. * Define the application's command schedule.
* *
* @param \Illuminate\Console\Scheduling\Schedule $schedule * @param \Illuminate\Console\Scheduling\Schedule $schedule
*
* @return void * @return void
* *
* @SuppressWarnings(PHPMD.UnusedFormalParameters) * @SuppressWarnings(PHPMD.UnusedFormalParameters)

View File

@@ -35,7 +35,7 @@ class ChartJsBillChartGenerator implements BillChartGenerator
'color' => 'rgba(0, 141, 76, 0.7)', 'color' => 'rgba(0, 141, 76, 0.7)',
'highlight' => 'rgba(0, 141, 76, 0.9)', 'highlight' => 'rgba(0, 141, 76, 0.9)',
'label' => trans('firefly.paid'), 'label' => trans('firefly.paid'),
] ],
]; ];
return $data; return $data;

View File

@@ -28,12 +28,12 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
'datasets' => [ 'datasets' => [
[ [
'label' => trans('firefly.spent'), 'label' => trans('firefly.spent'),
'data' => [] 'data' => [],
], ],
[ [
'label' => trans('firefly.earned'), 'label' => trans('firefly.earned'),
'data' => [] 'data' => [],
] ],
], ],
]; ];
@@ -95,8 +95,8 @@ class ChartJsCategoryChartGenerator implements CategoryChartGenerator
'datasets' => [ 'datasets' => [
[ [
'label' => trans('firefly.spent'), 'label' => trans('firefly.spent'),
'data' => [] 'data' => [],
] ],
], ],
]; ];
foreach ($entries as $entry) { foreach ($entries as $entry) {

View File

@@ -31,8 +31,8 @@ class ChartJsPiggyBankChartGenerator implements PiggyBankChartGenerator
'datasets' => [ 'datasets' => [
[ [
'label' => 'Diff', 'label' => 'Diff',
'data' => [] 'data' => [],
] ],
], ],
]; ];
$sum = '0'; $sum = '0';

View File

@@ -27,12 +27,12 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
'datasets' => [ 'datasets' => [
[ [
'label' => trans('firefly.income'), 'label' => trans('firefly.income'),
'data' => [] 'data' => [],
], ],
[ [
'label' => trans('firefly.expenses'), 'label' => trans('firefly.expenses'),
'data' => [] 'data' => [],
] ],
], ],
]; ];
@@ -60,12 +60,12 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
'datasets' => [ 'datasets' => [
[ [
'label' => trans('firefly.income'), 'label' => trans('firefly.income'),
'data' => [] 'data' => [],
], ],
[ [
'label' => trans('firefly.expenses'), 'label' => trans('firefly.expenses'),
'data' => [] 'data' => [],
] ],
], ],
]; ];
$data['datasets'][0]['data'][] = round($income, 2); $data['datasets'][0]['data'][] = round($income, 2);
@@ -92,12 +92,12 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
'datasets' => [ 'datasets' => [
[ [
'label' => trans('firefly.income'), 'label' => trans('firefly.income'),
'data' => [] 'data' => [],
], ],
[ [
'label' => trans('firefly.expenses'), 'label' => trans('firefly.expenses'),
'data' => [] 'data' => [],
] ],
], ],
]; ];
@@ -126,12 +126,12 @@ class ChartJsReportChartGenerator implements ReportChartGenerator
'datasets' => [ 'datasets' => [
[ [
'label' => trans('firefly.income'), 'label' => trans('firefly.income'),
'data' => [] 'data' => [],
], ],
[ [
'label' => trans('firefly.expenses'), 'label' => trans('firefly.expenses'),
'data' => [] 'data' => [],
] ],
], ],
]; ];
$data['datasets'][0]['data'][] = round($income, 2); $data['datasets'][0]['data'][] = round($income, 2);

View File

@@ -8,6 +8,7 @@
*/ */
namespace FireflyIII\Handlers\Events; namespace FireflyIII\Handlers\Events;
use FireflyIII\Events\TransactionJournalUpdated; use FireflyIII\Events\TransactionJournalUpdated;
use Log; use Log;

View File

@@ -24,7 +24,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
$category = Category::firstOrCreateEncrypted( $category = Category::firstOrCreateEncrypted(
[ [
'name' => $this->value, 'name' => $this->value,
'user_id' => Auth::user()->id 'user_id' => Auth::user()->id,
] ]
); );
} }

View File

@@ -18,8 +18,8 @@ use FireflyIII\Helpers\Collection\Expense;
use FireflyIII\Helpers\Collection\Income; use FireflyIII\Helpers\Collection\Income;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Budget as BudgetModel; use FireflyIII\Models\Budget as BudgetModel;
use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition; use FireflyIII\Models\LimitRepetition;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;

View File

@@ -50,7 +50,7 @@ class ReportQuery implements ReportQueryInterface
->get( ->get(
[ [
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'), DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`t_from`.`amount`) AS `sum`') DB::Raw('SUM(`t_from`.`amount`) AS `sum`'),
] ]
); );
$array = []; $array = [];
@@ -95,7 +95,7 @@ class ReportQuery implements ReportQueryInterface
->get( ->get(
[ [
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'), DB::Raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`t_to`.`amount`) AS `sum`') DB::Raw('SUM(`t_to`.`amount`) AS `sum`'),
] ]
); );
$array = []; $array = [];

View File

@@ -133,7 +133,7 @@ class AccountController extends Controller
'ccMonthlyPaymentDate' => $account->getMeta('ccMonthlyPaymentDate'), 'ccMonthlyPaymentDate' => $account->getMeta('ccMonthlyPaymentDate'),
'openingBalanceDate' => $openingBalance ? $openingBalance->date->format('Y-m-d') : null, 'openingBalanceDate' => $openingBalance ? $openingBalance->date->format('Y-m-d') : null,
'openingBalance' => $openingBalanceAmount, 'openingBalance' => $openingBalanceAmount,
'virtualBalance' => round($account->virtual_balance, 2) 'virtualBalance' => round($account->virtual_balance, 2),
]; ];
Session::flash('preFilled', $preFilled); Session::flash('preFilled', $preFilled);
Session::flash('gaEventCategory', 'accounts'); Session::flash('gaEventCategory', 'accounts');

View File

@@ -57,7 +57,7 @@ class Controller extends BaseController
$localeconv = [ $localeconv = [
'mon_decimal_point' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL)), 'mon_decimal_point' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL)),
'mon_thousands_sep' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL)), 'mon_thousands_sep' => $numberFormatter->getSymbol($numberFormatter->getAttribute(NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL)),
'frac_digits' => $numberFormatter->getAttribute(NumberFormatter::MAX_FRACTION_DIGITS) 'frac_digits' => $numberFormatter->getAttribute(NumberFormatter::MAX_FRACTION_DIGITS),
]; ];
View::share('monthFormat', $this->monthFormat); View::share('monthFormat', $this->monthFormat);
View::share('monthAndDayFormat', $this->monthAndDayFormat); View::share('monthAndDayFormat', $this->monthAndDayFormat);

View File

@@ -186,7 +186,7 @@ class PiggyBankController extends Controller
'leftForPiggyBanks' => $repository->leftOnAccount($account, $end), 'leftForPiggyBanks' => $repository->leftOnAccount($account, $end),
'sumOfSaved' => $piggyBank->savedSoFar, 'sumOfSaved' => $piggyBank->savedSoFar,
'sumOfTargets' => round($piggyBank->targetamount, 2), 'sumOfTargets' => round($piggyBank->targetamount, 2),
'leftToSave' => $piggyBank->leftToSave 'leftToSave' => $piggyBank->leftToSave,
]; ];
} else { } else {
$accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], $piggyBank->savedSoFar); $accounts[$account->id]['sumOfSaved'] = bcadd($accounts[$account->id]['sumOfSaved'], $piggyBank->savedSoFar);

View File

@@ -126,7 +126,7 @@ class ProfileController extends Controller
'email' => $email, 'email' => $email,
'password' => 'deleted', 'password' => 'deleted',
'blocked' => 1, 'blocked' => 1,
'blocked_code' => 'deleted' 'blocked_code' => 'deleted',
] ]
); );

View File

@@ -60,7 +60,7 @@ class TagController extends Controller
$subTitleIcon = 'fa-tag'; $subTitleIcon = 'fa-tag';
$preFilled = [ $preFilled = [
'tagMode' => 'nothing' 'tagMode' => 'nothing',
]; ];
if (!Input::old('tagMode')) { if (!Input::old('tagMode')) {
Session::flash('preFilled', $preFilled); Session::flash('preFilled', $preFilled);

View File

@@ -54,6 +54,7 @@ class Binder
private function performBinding($key, $value, $route) private function performBinding($key, $value, $route)
{ {
$class = $this->binders[$key]; $class = $this->binders[$key];
return $class::routeBinder($value, $route); return $class::routeBinder($value, $route);
} }
} }

View File

@@ -16,7 +16,8 @@ class EncryptCookies extends BaseEncrypter
* *
* @var array * @var array
*/ */
protected $except = [ protected $except
= [
// //
]; ];
} }

View File

@@ -53,7 +53,7 @@ class AccountFormRequest extends Request
'ccMonthlyPaymentDate' => 'date', 'ccMonthlyPaymentDate' => 'date',
'amount_currency_id_openingBalance' => 'exists:transaction_currencies,id', 'amount_currency_id_openingBalance' => 'exists:transaction_currencies,id',
'amount_currency_id_virtualBalance' => 'exists:transaction_currencies,id', 'amount_currency_id_virtualBalance' => 'exists:transaction_currencies,id',
'what' => 'in:' . $types 'what' => 'in:' . $types,
]; ];
} }
} }

View File

@@ -36,7 +36,7 @@ class BudgetFormRequest extends Request
return [ return [
'name' => $nameRule, 'name' => $nameRule,
'active' => 'numeric|between:0,1' 'active' => 'numeric|between:0,1',
]; ];
} }
} }

View File

@@ -62,6 +62,7 @@ class RuleFormRequest extends Request
for ($i = 0; $i < 10; $i++) { for ($i = 0; $i < 10; $i++) {
$rules['rule-action-value.' . $i] = 'required_if:rule-action.' . $i . ',' . $contextActions . '|ruleActionValue'; $rules['rule-action-value.' . $i] = 'required_if:rule-action.' . $i . ',' . $contextActions . '|ruleActionValue';
} }
return $rules; return $rules;
} }
} }

View File

@@ -42,7 +42,7 @@ class TagFormRequest extends Request
'latitude' => 'numeric|min:-90|max:90', 'latitude' => 'numeric|min:-90|max:90',
'longitude' => 'numeric|min:-90|max:90', 'longitude' => 'numeric|min:-90|max:90',
'zoomLevel' => 'numeric|min:0|max:80', 'zoomLevel' => 'numeric|min:0|max:80',
'tagMode' => 'required|in:nothing,balancingAct,advancePayment' 'tagMode' => 'required|in:nothing,balancingAct,advancePayment',
]; ];
} }
} }

View File

@@ -17,9 +17,9 @@ use Illuminate\Database\Eloquent\Model;
class AccountMeta extends Model class AccountMeta extends Model
{ {
protected $dates = ['created_at', 'updated_at'];
protected $fillable = ['account_id', 'name', 'data']; protected $fillable = ['account_id', 'name', 'data'];
protected $table = 'account_meta'; protected $table = 'account_meta';
protected $dates = ['created_at', 'updated_at'];
/** /**
* *

View File

@@ -1,8 +1,6 @@
<?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;
/** /**
* Class Component * Class Component

View File

@@ -19,9 +19,9 @@ use Illuminate\Database\Eloquent\Model;
class PiggyBankEvent extends Model class PiggyBankEvent extends Model
{ {
protected $dates = ['created_at', 'updated_at', 'date'];
protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount']; protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];
protected $hidden = ['amount_encrypted']; protected $hidden = ['amount_encrypted'];
protected $dates = ['created_at', 'updated_at', 'date'];
/** /**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

View File

@@ -24,6 +24,7 @@ class Preference extends Model
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']; protected $dates = ['created_at', 'updated_at'];
/** /**
* @param $value * @param $value
* *

View File

@@ -37,6 +37,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class Rule extends Model class Rule extends Model
{ {
use SoftDeletes; use SoftDeletes;
/** /**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/ */

View File

@@ -17,7 +17,8 @@ class AuthServiceProvider extends ServiceProvider
* *
* @var array * @var array
*/ */
protected $policies = [ protected $policies
= [
'FireflyIII\Model' => 'FireflyIII\Policies\ModelPolicy', 'FireflyIII\Model' => 'FireflyIII\Policies\ModelPolicy',
]; ];
@@ -25,6 +26,7 @@ class AuthServiceProvider extends ServiceProvider
* Register any application authentication / authorization services. * Register any application authentication / authorization services.
* *
* @param \Illuminate\Contracts\Auth\Access\Gate $gate * @param \Illuminate\Contracts\Auth\Access\Gate $gate
*
* @return void * @return void
*/ */
public function boot(GateContract $gate) public function boot(GateContract $gate)

View File

@@ -41,7 +41,7 @@ class EventServiceProvider extends ServiceProvider
'FireflyIII\Handlers\Events\ConnectJournalToPiggyBank', 'FireflyIII\Handlers\Events\ConnectJournalToPiggyBank',
'FireflyIII\Handlers\Events\FireRulesForStore', 'FireflyIII\Handlers\Events\FireRulesForStore',
] ],
]; ];

View File

@@ -11,8 +11,8 @@ use FireflyIII\Support\Twig\Budget;
use FireflyIII\Support\Twig\General; use FireflyIII\Support\Twig\General;
use FireflyIII\Support\Twig\Journal; use FireflyIII\Support\Twig\Journal;
use FireflyIII\Support\Twig\PiggyBank; use FireflyIII\Support\Twig\PiggyBank;
use FireflyIII\Support\Twig\Translation;
use FireflyIII\Support\Twig\Rule; use FireflyIII\Support\Twig\Rule;
use FireflyIII\Support\Twig\Translation;
use FireflyIII\Validation\FireflyValidator; use FireflyIII\Validation\FireflyValidator;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Twig; use Twig;

View File

@@ -2,8 +2,8 @@
namespace FireflyIII\Providers; namespace FireflyIII\Providers;
use Illuminate\Routing\Router;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Routing\Router;
/** /**
* Class RouteServiceProvider * Class RouteServiceProvider
@@ -25,6 +25,7 @@ class RouteServiceProvider extends ServiceProvider
* Define your route model bindings, pattern filters, etc. * Define your route model bindings, pattern filters, etc.
* *
* @param \Illuminate\Routing\Router $router * @param \Illuminate\Routing\Router $router
*
* @return void * @return void
*/ */
public function boot(Router $router) public function boot(Router $router)
@@ -38,12 +39,15 @@ class RouteServiceProvider extends ServiceProvider
* Define the routes for the application. * Define the routes for the application.
* *
* @param \Illuminate\Routing\Router $router * @param \Illuminate\Routing\Router $router
*
* @return void * @return void
*/ */
public function map(Router $router) public function map(Router $router)
{ {
$router->group(['namespace' => $this->namespace], function ($router) { $router->group(
['namespace' => $this->namespace], function ($router) {
require app_path('Http/routes.php'); require app_path('Http/routes.php');
}); }
);
} }
} }

View File

@@ -61,7 +61,7 @@ class BillRepository implements BillRepositoryInterface
->get( ->get(
[ [
'transaction_journals.bill_id', 'transaction_journals.bill_id',
DB::Raw('SUM(`transactions`.`amount`) as `journalAmount`') DB::Raw('SUM(`transactions`.`amount`) as `journalAmount`'),
] ]
); );
@@ -476,7 +476,7 @@ class BillRepository implements BillRepositoryInterface
->get( ->get(
[ [
'bills.*', 'bills.*',
DB::Raw('(`bills`.`amount_min` + `bills`.`amount_max` / 2) as `expectedAmount`') DB::Raw('(`bills`.`amount_min` + `bills`.`amount_max` / 2) as `expectedAmount`'),
] ]
)->sortBy('name'); )->sortBy('name');

View File

@@ -89,7 +89,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
->get( ->get(
[ [
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y-%m") AS `dateFormatted`'), DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`transactions`.`amount`) as `monthlyAmount`') DB::Raw('SUM(`transactions`.`amount`) as `monthlyAmount`'),
] ]
); );
@@ -316,7 +316,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
[ [
'budgets.*', 'budgets.*',
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y-%m") AS `dateFormatted`'), DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y-%m") AS `dateFormatted`'),
DB::Raw('SUM(`transactions`.`amount`) AS `sumAmount`') DB::Raw('SUM(`transactions`.`amount`) AS `sumAmount`'),
] ]
); );
@@ -559,7 +559,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
[ [
'budgets.*', 'budgets.*',
DB::Raw('DATE_FORMAT(`limit_repetitions`.`startdate`,"%Y") as `dateFormatted`'), DB::Raw('DATE_FORMAT(`limit_repetitions`.`startdate`,"%Y") as `dateFormatted`'),
DB::Raw('SUM(`limit_repetitions`.`amount`) as `budgeted`') DB::Raw('SUM(`limit_repetitions`.`amount`) as `budgeted`'),
] ]
); );
@@ -603,7 +603,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
[ [
'budgets.*', 'budgets.*',
DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y") AS `dateFormatted`'), DB::Raw('DATE_FORMAT(`transaction_journals`.`date`, "%Y") AS `dateFormatted`'),
DB::Raw('SUM(`transactions`.`amount`) AS `sumAmount`') DB::Raw('SUM(`transactions`.`amount`) AS `sumAmount`'),
] ]
); );
@@ -720,7 +720,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
->get( ->get(
[ [
't_from.account_id', 'budget_transaction_journal.budget_id', 't_from.account_id', 'budget_transaction_journal.budget_id',
DB::Raw('SUM(`t_from`.`amount`) AS `spent`') DB::Raw('SUM(`t_from`.`amount`) AS `spent`'),
] ]
); );

View File

@@ -196,14 +196,14 @@ class JournalRepository implements JournalRepositoryInterface
[ [
'account_id' => $fromAccount->id, 'account_id' => $fromAccount->id,
'transaction_journal_id' => $journal->id, 'transaction_journal_id' => $journal->id,
'amount' => $data['amount'] * -1 'amount' => $data['amount'] * -1,
] ]
); );
Transaction::create( // second transaction. Transaction::create( // second transaction.
[ [
'account_id' => $toAccount->id, 'account_id' => $toAccount->id,
'transaction_journal_id' => $journal->id, 'transaction_journal_id' => $journal->id,
'amount' => $data['amount'] 'amount' => $data['amount'],
] ]
); );
$journal->completed = 1; $journal->completed = 1;

View File

@@ -131,7 +131,7 @@ class TagRepository implements TagRepositoryInterface
->get( ->get(
[ [
't_to.account_id', 't_to.account_id',
DB::Raw('SUM(`t_to`.`amount`) as `sum`') DB::Raw('SUM(`t_to`.`amount`) as `sum`'),
] ]
); );

View File

@@ -8,6 +8,7 @@
*/ */
namespace FireflyIII\Rules\Actions; namespace FireflyIII\Rules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;

View File

@@ -15,6 +15,7 @@ use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use Log; use Log;
/** /**
* Class SetBudget * Class SetBudget
* *

View File

@@ -30,16 +30,16 @@ class Domain
/** /**
* @return array * @return array
*/ */
public static function getRuleTriggers() public static function getRuleActions()
{ {
return Config::get('firefly.rule-triggers'); return Config::get('firefly.rule-actions');
} }
/** /**
* @return array * @return array
*/ */
public static function getRuleActions() public static function getRuleTriggers()
{ {
return Config::get('firefly.rule-actions'); return Config::get('firefly.rule-triggers');
} }
} }

View File

@@ -37,7 +37,7 @@ class Journal extends Twig_Extension
{ {
$functions = [ $functions = [
$this->invalidJournal(), $this->invalidJournal(),
$this->relevantTags() $this->relevantTags(),
]; ];
return $functions; return $functions;

View File

@@ -71,30 +71,6 @@ class User extends Authenticatable
return $this->hasMany('FireflyIII\Models\Attachment'); return $this->hasMany('FireflyIII\Models\Attachment');
} }
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function tags()
{
return $this->hasMany('FireflyIII\Models\Tag');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function rules()
{
return $this->hasMany('FireflyIII\Models\Rule');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function ruleGroups()
{
return $this->hasMany('FireflyIII\Models\RuleGroup');
}
/** /**
* @return \Illuminate\Database\Eloquent\Relations\HasMany * @return \Illuminate\Database\Eloquent\Relations\HasMany
*/ */
@@ -127,14 +103,6 @@ class User extends Authenticatable
return $this->hasManyThrough('FireflyIII\Models\PiggyBank', 'FireflyIII\Models\Account'); return $this->hasManyThrough('FireflyIII\Models\PiggyBank', 'FireflyIII\Models\Account');
} }
/**
* @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
*/
public function transactions()
{
return $this->hasManyThrough('FireflyIII\Models\Transaction', 'FireflyIII\Models\TransactionJournal');
}
/** /**
* @return \Illuminate\Database\Eloquent\Relations\HasMany * @return \Illuminate\Database\Eloquent\Relations\HasMany
*/ */
@@ -143,6 +111,30 @@ class User extends Authenticatable
return $this->hasMany('FireflyIII\Models\Preference'); return $this->hasMany('FireflyIII\Models\Preference');
} }
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function ruleGroups()
{
return $this->hasMany('FireflyIII\Models\RuleGroup');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function rules()
{
return $this->hasMany('FireflyIII\Models\Rule');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function tags()
{
return $this->hasMany('FireflyIII\Models\Tag');
}
/** /**
* @return \Illuminate\Database\Eloquent\Relations\HasMany * @return \Illuminate\Database\Eloquent\Relations\HasMany
*/ */
@@ -151,4 +143,12 @@ class User extends Authenticatable
return $this->hasMany('FireflyIII\Models\TransactionJournal'); return $this->hasMany('FireflyIII\Models\TransactionJournal');
} }
/**
* @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
*/
public function transactions()
{
return $this->hasManyThrough('FireflyIII\Models\Transaction', 'FireflyIII\Models\TransactionJournal');
}
} }

View File

@@ -17,6 +17,6 @@ return [
"token" => "This password reset token is invalid.", "token" => "This password reset token is invalid.",
"sent" => "We have e-mailed your password reset link!", "sent" => "We have e-mailed your password reset link!",
"reset" => "Your password has been reset!", "reset" => "Your password has been reset!",
'blocked' => 'Nice try though.' 'blocked' => 'Nice try though.',
]; ];

View File

@@ -17,6 +17,6 @@ return [
"token" => "Le jeton de réinitialisation de mot de passe est invalide.", "token" => "Le jeton de réinitialisation de mot de passe est invalide.",
"sent" => "Nous avons envoyé votre lien de réinitialisation de mot de passe!", "sent" => "Nous avons envoyé votre lien de réinitialisation de mot de passe!",
"reset" => "Le mot de passe a été réinitialisé!", "reset" => "Le mot de passe a été réinitialisé!",
'blocked' => 'Nice try though.' 'blocked' => 'Nice try though.',
]; ];

View File

@@ -17,6 +17,6 @@ return [
"token" => "Ongeldig token! Sorry", "token" => "Ongeldig token! Sorry",
"sent" => "Je krijgt een mailtje met een linkje om je wachtwoord te herstellen!", "sent" => "Je krijgt een mailtje met een linkje om je wachtwoord te herstellen!",
"reset" => "Je wachtwoord is hersteld!", "reset" => "Je wachtwoord is hersteld!",
'blocked' => 'Leuk geprobeerd wel.' 'blocked' => 'Leuk geprobeerd wel.',
]; ];

View File

@@ -17,6 +17,6 @@ return [
"token" => "Este token de redefinição de senha é inválido.", "token" => "Este token de redefinição de senha é inválido.",
"sent" => "Nós te enviamos um email com um link para trocar a senha!", "sent" => "Nós te enviamos um email com um link para trocar a senha!",
"reset" => "Sua senha foi redefinida!", "reset" => "Sua senha foi redefinida!",
'blocked' => 'Nice try though.' 'blocked' => 'Nice try though.',
]; ];

View File

@@ -62,6 +62,7 @@
</script> </script>
</body> </body>

View File

@@ -1,4 +1,3 @@
{% extends "./layout/default.twig" %} {% extends "./layout/default.twig" %}
{% block breadcrumbs %} {% block breadcrumbs %}