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

Various code cleanup and fixed alignments.

Browse Source
This commit is contained in:
James Cole 2024-01-01 14:45:51 +01:00
parent f963ac63f1
commit f3773ebfc2
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
66 changed files with 460 additions and 460 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/php-cs-fixer/.php-cs-fixer.php
View File

@ -23,7 +23,7 @@ $current = __DIR__;
$paths = [
$current . '/../../app',
// $current . '/../../config',
$current . '/../../config',
// $current . '/../../database',
// $current . '/../../routes',
// $current . '/../../tests',

2
app/Console/Commands/Correction/DeleteEmptyGroups.php
View File

@ -47,7 +47,7 @@ class DeleteEmptyGroups extends Command
{
$groupIds
= TransactionGroup::leftJoin('transaction_journals', 'transaction_groups.id', '=', 'transaction_journals.transaction_group_id')
->whereNull('transaction_journals.id')->get(['transaction_groups.id'])->pluck('id')->toArray()
->whereNull('transaction_journals.id')->get(['transaction_groups.id'])->pluck('id')->toArray()
;
$total = count($groupIds);

26
app/Console/Commands/System/ForceDecimalSize.php
View File

@ -74,19 +74,19 @@ class ForceDecimalSize extends Command
private string $regularExpression;
private array $tables
= [
'accounts' => ['virtual_balance'],
'auto_budgets' => ['amount'],
'available_budgets' => ['amount'],
'bills' => ['amount_min', 'amount_max'],
'budget_limits' => ['amount'],
'currency_exchange_rates' => ['rate', 'user_rate'],
'limit_repetitions' => ['amount'],
'piggy_bank_events' => ['amount'],
'piggy_bank_repetitions' => ['currentamount'],
'piggy_banks' => ['targetamount'],
'recurrences_transactions' => ['amount', 'foreign_amount'],
'transactions' => ['amount', 'foreign_amount'],
];
'accounts' => ['virtual_balance'],
'auto_budgets' => ['amount'],
'available_budgets' => ['amount'],
'bills' => ['amount_min', 'amount_max'],
'budget_limits' => ['amount'],
'currency_exchange_rates' => ['rate', 'user_rate'],
'limit_repetitions' => ['amount'],
'piggy_bank_events' => ['amount'],
'piggy_bank_repetitions' => ['currentamount'],
'piggy_banks' => ['targetamount'],
'recurrences_transactions' => ['amount', 'foreign_amount'],
'transactions' => ['amount', 'foreign_amount'],
];
/**
* Execute the console command.

10
app/Http/Controllers/Budget/IndexController.php
View File

@ -296,11 +296,11 @@ class IndexController extends Controller
// also calculate how much left from budgeted:
$sums['left'][$currencyId]
??= [
'amount' => '0',
'currency_id' => $budgeted['currency_id'],
'currency_symbol' => $budgeted['currency_symbol'],
'currency_decimal_places' => $budgeted['currency_decimal_places'],
];
'amount' => '0',
'currency_id' => $budgeted['currency_id'],
'currency_symbol' => $budgeted['currency_symbol'],
'currency_decimal_places' => $budgeted['currency_decimal_places'],
];
}
}

10
app/Http/Controllers/Chart/CategoryController.php
View File

@ -247,11 +247,11 @@ class CategoryController extends Controller
$chartData[$inKey]
= [
'label' => sprintf('%s (%s)', (string)trans('firefly.earned'), $currencyInfo['currency_name']),
'entries' => [],
'type' => 'bar',
'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
];
'label' => sprintf('%s (%s)', (string)trans('firefly.earned'), $currencyInfo['currency_name']),
'entries' => [],
'type' => 'bar',
'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
];
// loop empty periods:
foreach (array_keys($periods) as $period) {
$label = $periods[$period];

14
app/Models/Account.php
View File

@ -122,13 +122,13 @@ class Account extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'user_id' => 'integer',
'deleted_at' => 'datetime',
'active' => 'boolean',
'encrypted' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'user_id' => 'integer',
'deleted_at' => 'datetime',
'active' => 'boolean',
'encrypted' => 'boolean',
];
protected $fillable = ['user_id', 'user_group_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban'];

6
app/Models/AccountMeta.php
View File

@ -59,9 +59,9 @@ class AccountMeta extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
protected $fillable = ['account_id', 'name', 'data'];

6
app/Models/AccountType.php
View File

@ -72,9 +72,9 @@ class AccountType extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
protected $fillable = ['type'];

10
app/Models/Attachment.php
View File

@ -97,11 +97,11 @@ class Attachment extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'uploaded' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'uploaded' => 'boolean',
];
protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'description', 'size', 'uploaded'];

14
app/Models/AvailableBudget.php
View File

@ -80,13 +80,13 @@ class AvailableBudget extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'start_date' => 'date',
'end_date' => 'date',
'transaction_currency_id' => 'int',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'start_date' => 'date',
'end_date' => 'date',
'transaction_currency_id' => 'int',
];
protected $fillable = ['user_id', 'user_group_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date'];

54
app/Models/Bill.php
View File

@ -114,36 +114,36 @@ class Bill extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'date' => 'date',
'end_date' => 'date',
'extension_date' => 'date',
'skip' => 'int',
'automatch' => 'boolean',
'active' => 'boolean',
'name_encrypted' => 'boolean',
'match_encrypted' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'date' => 'date',
'end_date' => 'date',
'extension_date' => 'date',
'skip' => 'int',
'automatch' => 'boolean',
'active' => 'boolean',
'name_encrypted' => 'boolean',
'match_encrypted' => 'boolean',
];
protected $fillable
= [
'name',
'match',
'amount_min',
'user_id',
'user_group_id',
'amount_max',
'date',
'repeat_freq',
'skip',
'automatch',
'active',
'transaction_currency_id',
'end_date',
'extension_date',
];
'name',
'match',
'amount_min',
'user_id',
'user_group_id',
'amount_max',
'date',
'repeat_freq',
'skip',
'automatch',
'active',
'transaction_currency_id',
'end_date',
'extension_date',
];
protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted'];

12
app/Models/Budget.php
View File

@ -97,12 +97,12 @@ class Budget extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'active' => 'boolean',
'encrypted' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'active' => 'boolean',
'encrypted' => 'boolean',
];
protected $fillable = ['user_id', 'name', 'active', 'order', 'user_group_id'];

20
app/Models/BudgetLimit.php
View File

@ -74,18 +74,18 @@ class BudgetLimit extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'start_date' => 'date',
'end_date' => 'date',
'auto_budget' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'start_date' => 'date',
'end_date' => 'date',
'auto_budget' => 'boolean',
];
protected $dispatchesEvents
= [
'created' => Created::class,
'updated' => Updated::class,
'deleted' => Deleted::class,
];
'created' => Created::class,
'updated' => Updated::class,
'deleted' => Deleted::class,
];
protected $fillable = ['budget_id', 'start_date', 'end_date', 'amount', 'transaction_currency_id'];

10
app/Models/Category.php
View File

@ -86,11 +86,11 @@ class Category extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'encrypted' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'encrypted' => 'boolean',
];
protected $fillable = ['user_id', 'user_group_id', 'name'];

8
app/Models/Configuration.php
View File

@ -62,10 +62,10 @@ class Configuration extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
/** @var string The table to store the data in */
protected $table = 'configuration';

10
app/Models/LinkType.php
View File

@ -72,11 +72,11 @@ class LinkType extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'editable' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'editable' => 'boolean',
];
protected $fillable = ['name', 'inward', 'outward', 'editable'];

14
app/Models/Location.php
View File

@ -71,13 +71,13 @@ class Location extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'zoomLevel' => 'int',
'latitude' => 'float',
'longitude' => 'float',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'zoomLevel' => 'int',
'latitude' => 'float',
'longitude' => 'float',
];
protected $fillable = ['locatable_id', 'locatable_type', 'latitude', 'longitude', 'zoom_level'];

8
app/Models/Note.php
View File

@ -69,10 +69,10 @@ class Note extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
protected $fillable = ['title', 'text', 'noteable_id', 'noteable_type'];

18
app/Models/PiggyBank.php
View File

@ -92,15 +92,15 @@ class PiggyBank extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'startdate' => 'date',
'targetdate' => 'date',
'order' => 'int',
'active' => 'boolean',
'encrypted' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'startdate' => 'date',
'targetdate' => 'date',
'order' => 'int',
'active' => 'boolean',
'encrypted' => 'boolean',
];
protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate', 'active'];

8
app/Models/PiggyBankEvent.php
View File

@ -63,10 +63,10 @@ class PiggyBankEvent extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'date' => 'date',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'date' => 'date',
];
protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount'];

10
app/Models/PiggyBankRepetition.php
View File

@ -64,11 +64,11 @@ class PiggyBankRepetition extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'startdate' => 'date',
'targetdate' => 'date',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'startdate' => 'date',
'targetdate' => 'date',
];
protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount'];

8
app/Models/Preference.php
View File

@ -63,10 +63,10 @@ class Preference extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'data' => 'array',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'data' => 'array',
];
protected $fillable = ['user_id', 'data', 'name'];

26
app/Models/Recurrence.php
View File

@ -104,19 +104,19 @@ class Recurrence extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'title' => 'string',
'id' => 'int',
'description' => 'string',
'first_date' => 'date',
'repeat_until' => 'date',
'latest_date' => 'date',
'repetitions' => 'int',
'active' => 'bool',
'apply_rules' => 'bool',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'title' => 'string',
'id' => 'int',
'description' => 'string',
'first_date' => 'date',
'repeat_until' => 'date',
'latest_date' => 'date',
'repetitions' => 'int',
'active' => 'bool',
'apply_rules' => 'bool',
];
protected $fillable
= ['user_id', 'transaction_type_id', 'title', 'description', 'first_date', 'repeat_until', 'latest_date', 'repetitions', 'apply_rules', 'active'];

12
app/Models/RecurrenceMeta.php
View File

@ -67,12 +67,12 @@ class RecurrenceMeta extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'name' => 'string',
'value' => 'string',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'name' => 'string',
'value' => 'string',
];
protected $fillable = ['recurrence_id', 'name', 'value'];

16
app/Models/RecurrenceRepetition.php
View File

@ -76,14 +76,14 @@ class RecurrenceRepetition extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'repetition_type' => 'string',
'repetition_moment' => 'string',
'repetition_skip' => 'int',
'weekend' => 'int',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'repetition_type' => 'string',
'repetition_moment' => 'string',
'repetition_skip' => 'int',
'weekend' => 'int',
];
protected $fillable = ['recurrence_id', 'weekend', 'repetition_type', 'repetition_moment', 'repetition_skip'];

32
app/Models/RecurrenceTransaction.php
View File

@ -91,25 +91,25 @@ class RecurrenceTransaction extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'amount' => 'string',
'foreign_amount' => 'string',
'description' => 'string',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'amount' => 'string',
'foreign_amount' => 'string',
'description' => 'string',
];
protected $fillable
= [
'recurrence_id',
'transaction_currency_id',
'foreign_currency_id',
'source_id',
'destination_id',
'amount',
'foreign_amount',
'description',
];
'recurrence_id',
'transaction_currency_id',
'foreign_currency_id',
'source_id',
'destination_id',
'amount',
'foreign_amount',
'description',
];
/** @var string The table to store the data in */
protected $table = 'recurrences_transactions';

12
app/Models/RecurrenceTransactionMeta.php
View File

@ -67,12 +67,12 @@ class RecurrenceTransactionMeta extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'name' => 'string',
'value' => 'string',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'name' => 'string',
'value' => 'string',
];
protected $fillable = ['rt_id', 'name', 'value'];

6
app/Models/Role.php
View File

@ -62,9 +62,9 @@ class Role extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
protected $fillable = ['name', 'display_name', 'description'];

18
app/Models/Rule.php
View File

@ -95,15 +95,15 @@ class Rule extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'active' => 'boolean',
'order' => 'int',
'stop_processing' => 'boolean',
'id' => 'int',
'strict' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'active' => 'boolean',
'order' => 'int',
'stop_processing' => 'boolean',
'id' => 'int',
'strict' => 'boolean',
];
protected $fillable = ['rule_group_id', 'order', 'active', 'title', 'description', 'user_id', 'strict'];

12
app/Models/RuleAction.php
View File

@ -66,12 +66,12 @@ class RuleAction extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'active' => 'boolean',
'order' => 'int',
'stop_processing' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'active' => 'boolean',
'order' => 'int',
'stop_processing' => 'boolean',
];
protected $fillable = ['rule_id', 'action_type', 'action_value', 'order', 'active', 'stop_processing'];

14
app/Models/RuleGroup.php
View File

@ -85,13 +85,13 @@ class RuleGroup extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'active' => 'boolean',
'stop_processing' => 'boolean',
'order' => 'int',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'active' => 'boolean',
'stop_processing' => 'boolean',
'order' => 'int',
];
protected $fillable = ['user_id', 'user_group_id', 'stop_processing', 'order', 'title', 'description', 'active'];

12
app/Models/RuleTrigger.php
View File

@ -66,12 +66,12 @@ class RuleTrigger extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'active' => 'boolean',
'order' => 'int',
'stop_processing' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'active' => 'boolean',
'order' => 'int',
'stop_processing' => 'boolean',
];
protected $fillable = ['rule_id', 'trigger_type', 'trigger_value', 'order', 'active', 'stop_processing'];

16
app/Models/Tag.php
View File

@ -93,14 +93,14 @@ class Tag extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'date' => 'date',
'zoomLevel' => 'int',
'latitude' => 'float',
'longitude' => 'float',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'date' => 'date',
'zoomLevel' => 'int',
'latitude' => 'float',
'longitude' => 'float',
];
protected $fillable = ['user_id', 'user_group_id', 'tag', 'date', 'description', 'tagMode'];

36
app/Models/Transaction.php
View File

@ -99,27 +99,27 @@ class Transaction extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'identifier' => 'int',
'encrypted' => 'boolean', // model does not have these fields though
'bill_name_encrypted' => 'boolean',
'reconciled' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'identifier' => 'int',
'encrypted' => 'boolean', // model does not have these fields though
'bill_name_encrypted' => 'boolean',
'reconciled' => 'boolean',
];
protected $fillable
= [
'account_id',
'transaction_journal_id',
'description',
'amount',
'identifier',
'transaction_currency_id',
'foreign_currency_id',
'foreign_amount',
'reconciled',
];
'account_id',
'transaction_journal_id',
'description',
'amount',
'identifier',
'transaction_currency_id',
'foreign_currency_id',
'foreign_amount',
'reconciled',
];
protected $hidden = ['encrypted'];

12
app/Models/TransactionCurrency.php
View File

@ -89,12 +89,12 @@ class TransactionCurrency extends Model
public ?bool $userGroupEnabled;
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'decimal_places' => 'int',
'enabled' => 'bool',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'decimal_places' => 'int',
'enabled' => 'bool',
];
protected $fillable = ['name', 'code', 'symbol', 'decimal_places', 'enabled'];

14
app/Models/TransactionGroup.php
View File

@ -78,13 +78,13 @@ class TransactionGroup extends Model
protected $casts
= [
'id' => 'integer',
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'title' => 'string',
'date' => 'datetime',
];
'id' => 'integer',
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'title' => 'string',
'date' => 'datetime',
];
protected $fillable = ['user_id', 'user_group_id', 'title'];

46
app/Models/TransactionJournal.php
View File

@ -138,32 +138,32 @@ class TransactionJournal extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'date' => 'datetime',
'interest_date' => 'date',
'book_date' => 'date',
'process_date' => 'date',
'order' => 'int',
'tag_count' => 'int',
'encrypted' => 'boolean',
'completed' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
'date' => 'datetime',
'interest_date' => 'date',
'book_date' => 'date',
'process_date' => 'date',
'order' => 'int',
'tag_count' => 'int',
'encrypted' => 'boolean',
'completed' => 'boolean',
];
protected $fillable
= [
'user_id',
'user_group_id',
'transaction_type_id',
'bill_id',
'tag_count',
'transaction_currency_id',
'description',
'completed',
'order',
'date',
];
'user_id',
'user_group_id',
'transaction_type_id',
'bill_id',
'tag_count',
'transaction_currency_id',
'description',
'completed',
'order',
'date',
];
protected $hidden = ['encrypted'];

6
app/Models/TransactionJournalLink.php
View File

@ -71,9 +71,9 @@ class TransactionJournalLink extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
];
/** @var string The table to store the data in */
protected $table = 'journal_links';

8
app/Models/TransactionJournalMeta.php
View File

@ -69,10 +69,10 @@ class TransactionJournalMeta extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash'];

8
app/Models/TransactionType.php
View File

@ -73,10 +73,10 @@ class TransactionType extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'deleted_at' => 'datetime',
];
protected $fillable = ['type'];
/**

12
app/Repositories/Category/NoCategoryRepository.php
View File

@ -75,9 +75,9 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface
$journalId = (int)$journal['transaction_journal_id'];
$array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
= [
'amount' => app('steam')->negative($journal['amount']),
'date' => $journal['date'],
];
'amount' => app('steam')->negative($journal['amount']),
'date' => $journal['date'],
];
}
return $array;
@ -128,9 +128,9 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface
$journalId = (int)$journal['transaction_journal_id'];
$array[$currencyId]['categories'][0]['transaction_journals'][$journalId]
= [
'amount' => app('steam')->positive($journal['amount']),
'date' => $journal['date'],
];
'amount' => app('steam')->positive($journal['amount']),
'date' => $journal['date'],
];
}
return $array;

8
app/Rules/UniqueIban.php
View File

@ -146,10 +146,10 @@ class UniqueIban implements ValidationRule
}
$query
= auth()->user()
->accounts()
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('accounts.iban', $iban)
->whereIn('account_types.type', $typesArray)
->accounts()
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('accounts.iban', $iban)
->whereIn('account_types.type', $typesArray)
;
if (null !== $this->account) {

14
app/Support/Http/Controllers/PeriodOverview.php
View File

@ -452,13 +452,13 @@ trait PeriodOverview
}
$entries[]
= [
'title' => $title,
'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
'total_transactions' => count($spent) + count($earned) + count($transferred),
'spent' => $this->groupByCurrency($spent),
'earned' => $this->groupByCurrency($earned),
'transferred' => $this->groupByCurrency($transferred),
];
'title' => $title,
'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),
'total_transactions' => count($spent) + count($earned) + count($transferred),
'spent' => $this->groupByCurrency($spent),
'earned' => $this->groupByCurrency($earned),
'transferred' => $this->groupByCurrency($transferred),
];
}
return $entries;

20
app/Support/Report/Budget/BudgetReportGenerator.php
View File

@ -250,16 +250,16 @@ class BudgetReportGenerator
// make sum information:
$this->report['sums'][$currencyId]
??= [
'budgeted' => '0',
'spent' => '0',
'left' => '0',
'overspent' => '0',
'currency_id' => $currencyId,
'currency_code' => $limitCurrency->code,
'currency_name' => $limitCurrency->name,
'currency_symbol' => $limitCurrency->symbol,
'currency_decimal_places' => $limitCurrency->decimal_places,
];
'budgeted' => '0',
'spent' => '0',
'left' => '0',
'overspent' => '0',
'currency_id' => $currencyId,
'currency_code' => $limitCurrency->code,
'currency_name' => $limitCurrency->name,
'currency_symbol' => $limitCurrency->symbol,
'currency_decimal_places' => $limitCurrency->decimal_places,
];
$this->report['sums'][$currencyId]['budgeted'] = bcadd($this->report['sums'][$currencyId]['budgeted'], $limit->amount);
$this->report['sums'][$currencyId]['spent'] = bcadd($this->report['sums'][$currencyId]['spent'], $spent);
$this->report['sums'][$currencyId]['left'] = bcadd($this->report['sums'][$currencyId]['left'], bcadd($limit->amount, $spent));

10
config/app.php
View File

@ -145,12 +145,12 @@ return [
'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
'Twig' => TwigBridge\Facade\Twig::class,
'Arr' => Illuminate\Support\Arr::class,
'Http' => Illuminate\Support\Facades\Http::class,
'Str' => Illuminate\Support\Str::class,
'Arr' => Illuminate\Support\Arr::class,
'Http' => Illuminate\Support\Facades\Http::class,
'Str' => Illuminate\Support\Str::class,
],
'asset_url' => env('ASSET_URL', null),
'asset_url' => env('ASSET_URL', null),
/*
|--------------------------------------------------------------------------
@ -163,5 +163,5 @@ return [
|
*/
'faker_locale' => 'en_US',
'faker_locale' => 'en_US',
];

12
config/auth.php
View File

@ -37,12 +37,12 @@ return [
|
*/
'defaults' => [
'defaults' => [
'guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
'passwords' => 'users',
],
'guard_header' => envNonEmpty('AUTHENTICATION_GUARD_HEADER', 'REMOTE_USER'),
'guard_email' => envNonEmpty('AUTHENTICATION_GUARD_EMAIL', null),
'guard_header' => envNonEmpty('AUTHENTICATION_GUARD_HEADER', 'REMOTE_USER'),
'guard_email' => envNonEmpty('AUTHENTICATION_GUARD_EMAIL', null),
/*
|--------------------------------------------------------------------------
@ -61,7 +61,7 @@ return [
|
*/
'guards' => [
'guards' => [
'web' => [
'driver' => 'session',
'provider' => 'users',
@ -93,7 +93,7 @@ return [
|
*/
'providers' => [
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => FireflyIII\User::class,
@ -119,7 +119,7 @@ return [
|
*/
'passwords' => [
'passwords' => [
'users' => [
'provider' => 'users',
'table' => 'password_resets',

2
config/breadcrumbs.php
View File

@ -46,7 +46,7 @@ return [
|
*/
'view' => 'partials/layout/breadcrumbs',
'view' => 'partials/layout/breadcrumbs',
/*
|--------------------------------------------------------------------------

10
config/broadcasting.php
View File

@ -35,7 +35,7 @@ return [
|
*/
'default' => env('BROADCAST_DRIVER', 'null'),
'default' => env('BROADCAST_DRIVER', 'null'),
/*
|--------------------------------------------------------------------------
@ -67,21 +67,21 @@ return [
],
],
'ably' => [
'ably' => [
'driver' => 'ably',
'key' => env('ABLY_KEY'),
],
'redis' => [
'redis' => [
'driver' => 'redis',
'connection' => 'default',
],
'log' => [
'log' => [
'driver' => 'log',
],
'null' => [
'null' => [
'driver' => 'null',
],
],

16
config/cache.php
View File

@ -48,23 +48,23 @@ return [
|
*/
'stores' => [
'apc' => [
'stores' => [
'apc' => [
'driver' => 'apc',
],
'array' => [
'array' => [
'driver' => 'array',
'serialize' => false,
],
'database' => [
'database' => [
'driver' => 'database',
'table' => 'cache',
'connection' => null,
],
'file' => [
'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache/data'),
],
@ -88,11 +88,11 @@ return [
],
],
'redis' => [
'redis' => [
'driver' => 'redis',
'connection' => 'default',
],
'dynamodb' => [
'dynamodb' => [
'driver' => 'dynamodb',
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
@ -113,5 +113,5 @@ return [
|
*/
'prefix' => env('CACHE_PREFIX', 'firefly'),
'prefix' => env('CACHE_PREFIX', 'firefly'),
];

14
config/cors.php
View File

@ -36,19 +36,19 @@ return [
|
*/
'paths' => ['api/*', 'sanctum/csrf-cookie'],
'paths' => ['api/*', 'sanctum/csrf-cookie'],
'allowed_methods' => ['*'],
'allowed_methods' => ['*'],
'allowed_origins' => ['*'],
'allowed_origins' => ['*'],
'allowed_origins_patterns' => ['*'],
'allowed_headers' => ['*'],
'allowed_headers' => ['*'],
'exposed_headers' => [],
'exposed_headers' => [],
'max_age' => 0,
'max_age' => 0,
'supports_credentials' => false,
'supports_credentials' => false,
];

16
config/database.php
View File

@ -23,12 +23,12 @@ declare(strict_types=1);
use Illuminate\Support\Str;
$databaseUrl = getenv('DATABASE_URL');
$host = '';
$username = '';
$password = '';
$database = '';
$port = '';
$databaseUrl = getenv('DATABASE_URL');
$host = '';
$username = '';
$password = '';
$database = '';
$port = '';
if (false !== $databaseUrl) {
$options = parse_url($databaseUrl);
@ -47,8 +47,8 @@ $mysql_ssl_key = envNonEmpty('MYSQL_SSL_KEY', null);
$mysql_ssl_ciphers = envNonEmpty('MYSQL_SSL_CIPHER', null);
$mysql_ssl_verify = envNonEmpty('MYSQL_SSL_VERIFY_SERVER_CERT', null);
$mySqlSSLOptions = [];
$useSSL = envNonEmpty('MYSQL_USE_SSL', false);
$mySqlSSLOptions = [];
$useSSL = envNonEmpty('MYSQL_USE_SSL', false);
if (false !== $useSSL && null !== $useSSL && '' !== $useSSL) {
if (null !== $mysql_ssl_ca_dir) {
$mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CAPATH] = $mysql_ssl_ca_dir;

16
config/debugbar.php
View File

@ -34,8 +34,8 @@ return [
|
*/
'enabled' => env('DEBUGBAR_ENABLED', null),
'except' => [
'enabled' => env('DEBUGBAR_ENABLED', null),
'except' => [
'telescope*',
],
@ -51,7 +51,7 @@ return [
| can also be used. For PDO, run the package migrations first.
|
*/
'storage' => [
'storage' => [
'enabled' => true,
'driver' => 'file', // redis, file, pdo, custom
'path' => storage_path('debugbar'), // For file driver
@ -120,7 +120,7 @@ return [
|
*/
'collectors' => [
'collectors' => [
'phpinfo' => true, // Php version
'messages' => true, // Messages
'time' => true, // Time Datalogger
@ -154,7 +154,7 @@ return [
|
*/
'options' => [
'options' => [
'auth' => [
'show_name' => true, // Also show the users name/email in the debugbar
],
@ -197,7 +197,7 @@ return [
|
*/
'inject' => true,
'inject' => true,
/*
|--------------------------------------------------------------------------
@ -209,7 +209,7 @@ return [
| from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97
|
*/
'route_prefix' => '_debugbar',
'route_prefix' => '_debugbar',
/*
|--------------------------------------------------------------------------
@ -219,5 +219,5 @@ return [
| By default DebugBar route served from the same domain that request served.
| To override default domain, specify it as a non-empty value.
*/
'route_domain' => null,
'route_domain' => null,
];

4
config/filesystems.php
View File

@ -51,7 +51,7 @@ return [
|
*/
'disks' => [
'disks' => [
'local' => [
'driver' => 'local',
'root' => storage_path('app'),
@ -85,7 +85,7 @@ return [
'root' => base_path('resources'),
],
'public' => [
'public' => [
'driver' => 'local',
'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage',

40
config/firefly.php
View File

@ -431,7 +431,7 @@ return [
'transfers' => 'fa-exchange',
],
'bindables' => [
'bindables' => [
// models
'account' => Account::class,
'attachment' => Attachment::class,
@ -488,7 +488,7 @@ return [
'userGroupBill' => UserGroupBill::class,
'userGroup' => UserGroup::class,
],
'rule-actions' => [
'rule-actions' => [
'set_category' => SetCategory::class,
'clear_category' => ClearCategory::class,
'set_budget' => SetBudget::class,
@ -519,7 +519,7 @@ return [
'set_source_to_cash' => SetSourceToCashAccount::class,
'set_destination_to_cash' => SetDestinationToCashAccount::class,
],
'context-rule-actions' => [
'context-rule-actions' => [
'set_category',
'set_budget',
'add_tag',
@ -538,13 +538,13 @@ return [
'convert_transfer',
],
'test-triggers' => [
'test-triggers' => [
'limit' => 10,
'range' => 200,
],
// expected source types for each transaction type, in order of preference.
'expected_source_types' => [
'expected_source_types' => [
'source' => [
TransactionTypeModel::WITHDRAWAL => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE],
TransactionTypeEnum::DEPOSIT->value => [AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE, AccountType::REVENUE, AccountType::CASH],
@ -589,7 +589,7 @@ return [
TransactionTypeModel::LIABILITY_CREDIT => [AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE],
],
],
'allowed_opposing_types' => [
'allowed_opposing_types' => [
'source' => [
AccountType::ASSET => [
AccountType::ASSET,
@ -679,7 +679,7 @@ return [
],
],
// depending on the account type, return the allowed transaction types:
'allowed_transaction_types' => [
'allowed_transaction_types' => [
'source' => [
AccountType::ASSET => [
TransactionTypeModel::WITHDRAWAL,
@ -748,7 +748,7 @@ return [
],
// having the source + dest will tell you the transaction type.
'account_to_transaction' => [
'account_to_transaction' => [
AccountType::ASSET => [
AccountType::ASSET => TransactionTypeModel::TRANSFER,
AccountType::CASH => TransactionTypeModel::WITHDRAWAL,
@ -813,7 +813,7 @@ return [
],
// allowed source -> destination accounts.
'source_dests' => [
'source_dests' => [
TransactionTypeModel::WITHDRAWAL => [
AccountType::ASSET => [AccountType::EXPENSE, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE, AccountType::CASH],
AccountType::LOAN => [AccountType::EXPENSE, AccountType::CASH],
@ -852,7 +852,7 @@ return [
],
],
// if you add fields to this array, don't forget to update the export routine (ExportDataGenerator).
'journal_meta_fields' => [
'journal_meta_fields' => [
// sepa
'sepa_cc',
'sepa_ct_op',
@ -886,28 +886,28 @@ return [
'recurrence_count',
'recurrence_date',
],
'webhooks' => [
'webhooks' => [
'max_attempts' => env('WEBHOOK_MAX_ATTEMPTS', 3),
],
'can_have_virtual_amounts' => [AccountType::ASSET],
'can_have_opening_balance' => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE],
'dynamic_creation_allowed' => [
'can_have_virtual_amounts' => [AccountType::ASSET],
'can_have_opening_balance' => [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE],
'dynamic_creation_allowed' => [
AccountType::EXPENSE,
AccountType::REVENUE,
AccountType::INITIAL_BALANCE,
AccountType::RECONCILIATION,
AccountType::LIABILITY_CREDIT,
],
'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],
'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],
'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],
// dynamic date ranges are as follows:
'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],
'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],
// only used in v1
'allowed_sort_parameters' => ['order', 'name', 'iban'],
'allowed_sort_parameters' => ['order', 'name', 'iban'],
// preselected account lists possibilities:
'preselected_accounts' => ['all', 'assets', 'liabilities'],
'preselected_accounts' => ['all', 'assets', 'liabilities'],
];

10
config/google2fa.php
View File

@ -26,22 +26,22 @@ use PragmaRX\Google2FALaravel\Support\Constants;
return [
// Auth container binding
'enabled' => true,
'enabled' => true,
/*
* Lifetime in minutes.
* In case you need your users to be asked for a new one time passwords from time to time.
*/
'lifetime' => 0, // 0 = eternal
'lifetime' => 0, // 0 = eternal
// Renew lifetime at every new request.
'keep_alive' => true,
'keep_alive' => true,
// Auth container binding
'auth' => 'auth',
'auth' => 'auth',
// 2FA verified session var
@ -70,7 +70,7 @@ return [
// Throw exceptions or just fire events?
'throw_exceptions' => true,
'store_in_cookie' => true,
'store_in_cookie' => true,
'qrcode_image_backend' => Constants::QRCODE_IMAGE_BACKEND_SVG,
];

2
config/hashing.php
View File

@ -64,7 +64,7 @@ return [
|
*/
'argon' => [
'argon' => [
'memory' => 65536,
'threads' => 1,
'time' => 4,

20
config/ide-helper.php
View File

@ -31,10 +31,10 @@ return [
|
*/
'filename' => '_ide_helper',
'format' => 'php',
'filename' => '_ide_helper',
'format' => 'php',
'meta_filename' => '.phpstorm.meta.php',
'meta_filename' => '.phpstorm.meta.php',
/*
|--------------------------------------------------------------------------
@ -45,7 +45,7 @@ return [
|
*/
'include_fluent' => true,
'include_fluent' => true,
/*
|--------------------------------------------------------------------------
@ -56,7 +56,7 @@ return [
|
*/
'write_model_magic_where' => true,
'write_model_magic_where' => true,
/*
|--------------------------------------------------------------------------
@ -83,9 +83,9 @@ return [
|
*/
'include_helpers' => false,
'include_helpers' => false,
'helper_files' => [
'helper_files' => [
base_path().'/vendor/laravel/framework/src/Illuminate/Support/helpers.php',
],
@ -99,7 +99,7 @@ return [
|
*/
'model_locations' => [
'model_locations' => [
'app',
],
@ -112,12 +112,12 @@ return [
|
*/
'extra' => [
'extra' => [
'Eloquent' => ['Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'],
'Session' => ['Illuminate\Session\Store'],
],
'magic' => [
'magic' => [
'Log' => [
'debug' => 'Monolog\Logger::addDebug',
'info' => 'Monolog\Logger::addInfo',

48
config/intro.php
View File

@ -25,7 +25,7 @@ declare(strict_types=1);
return [
// index
'index' => [
'index' => [
'intro' => [],
'accounts-chart' => ['element' => '#accounts-chart'],
'box_out_holder' => ['element' => '#box_out_holder'],
@ -35,11 +35,11 @@ return [
'outro' => [],
],
// accounts: create
'accounts_create' => [
'accounts_create' => [
'iban' => ['element' => '#ffInput_iban'],
],
// transactions: create
'transactions_create' => [
'transactions_create' => [
'basic_info' => ['element' => '#transaction-info', 'position' => 'right'],
'amount_info' => ['element' => '#amount-info', 'position' => 'bottom'],
'optional_info' => ['element' => '#optional-info', 'position' => 'left'],
@ -49,21 +49,21 @@ return [
'transactions_create_withdrawal' => [
],
'transactions_create_deposit' => [
'transactions_create_deposit' => [
],
'transactions_create_transfer' => [
'transactions_create_transfer' => [
],
// extra text for asset account creation.
'accounts_create_asset' => [
'accounts_create_asset' => [
'opening_balance' => ['element' => '#ffInput_opening_balance'],
'currency' => ['element' => '#ffInput_currency_id'],
'virtual' => ['element' => '#ffInput_virtual_balance'],
],
// budgets: index
'budgets_index' => [
'budgets_index' => [
'intro' => [],
'set_budget' => ['element' => '#availableBar'],
'see_expenses_bar' => ['element' => '#spentBar'],
@ -73,59 +73,59 @@ return [
'outro' => [],
],
// reports: index, default report, audit, budget, cat, tag
'reports_index' => [
'reports_index' => [
'intro' => [],
'inputReportType' => ['element' => '#inputReportType'],
'inputAccountsSelect' => ['element' => '#inputAccountsSelect'],
'inputDateRange' => ['element' => '#inputDateRange'],
'extra-options-box' => ['element' => '#extra-options-box', 'position' => 'top'],
],
'reports_report_default' => [
'reports_report_default' => [
'intro' => [],
],
'reports_report_audit' => [
'reports_report_audit' => [
'intro' => [],
'optionsBox' => ['element' => '#optionsBox'],
],
'reports_report_category' => [
'reports_report_category' => [
'intro' => [],
'pieCharts' => ['element' => '#pieCharts'],
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
],
'reports_report_tag' => [
'reports_report_tag' => [
'intro' => [],
'pieCharts' => ['element' => '#pieCharts'],
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
],
'reports_report_budget' => [
'reports_report_budget' => [
'intro' => [],
'pieCharts' => ['element' => '#pieCharts'],
'incomeAndExpensesChart' => ['element' => '#incomeAndExpensesChart', 'position' => 'top'],
],
// piggies: index, create, show
'piggy-banks_index' => [
'piggy-banks_index' => [
'saved' => ['element' => '.piggySaved'],
'button' => ['element' => '.piggyBar'],
'accountStatus' => ['element' => '#accountStatus', 'position' => 'top'],
],
'piggy-banks_create' => [
'piggy-banks_create' => [
'name' => ['element' => '#ffInput_name'],
'date' => ['element' => '#ffInput_targetdate'],
],
'piggy-banks_show' => [
'piggy-banks_show' => [
'piggyChart' => ['element' => '#piggyChart'],
'piggyDetails' => ['element' => '#piggyDetails'],
'piggyEvents' => ['element' => '#piggyEvents'],
],
// bills: index, create, show
'bills_index' => [
'bills_index' => [
'rules' => ['element' => '.rules'],
'paid_in_period' => ['element' => '.paid_in_period'],
'expected_in_period' => ['element' => '.expected_in_period'],
],
'bills_create' => [
'bills_create' => [
'intro' => [],
'name' => ['element' => '#name_holder'],
// 'match' => ['element' => '#match_holder'],
@ -133,13 +133,13 @@ return [
'repeat_freq_holder' => ['element' => '#repeat_freq_holder'],
'skip_holder' => ['element' => '#skip_holder'],
],
'bills_show' => [
'bills_show' => [
'billInfo' => ['element' => '#billInfo'],
'billButtons' => ['element' => '#billButtons'],
'billChart' => ['element' => '#billChart', 'position' => 'top'],
],
// rules: index, create-rule, edit-rule
'rules_index' => [
'rules_index' => [
'intro' => [],
'new_rule_group' => ['element' => '#new_rule_group'],
'new_rule' => ['element' => '.new_rule'],
@ -148,23 +148,23 @@ return [
'rule-triggers' => ['element' => '.rule-triggers'],
'outro' => [],
],
'rules_create' => [
'rules_create' => [
'mandatory' => ['element' => '#mandatory'],
'ruletriggerholder' => ['element' => '.rule-trigger-box'],
'test_rule_triggers' => ['element' => '.test_rule_triggers'],
'actions' => ['element' => '.rule-action-box', 'position' => 'top'],
],
// preferences: index
'preferences_index' => [
'preferences_index' => [
'tabs' => ['element' => '.nav-tabs'],
],
// currencies: index, create
'currencies_index' => [
'currencies_index' => [
'intro' => [],
'default' => ['element' => '#default-currency'],
'buttons' => ['element' => '.buttons'],
],
'currencies_create' => [
'currencies_create' => [
'code' => ['element' => '#ffInput_code'],
],
];

12
config/logging.php
View File

@ -25,16 +25,16 @@ use FireflyIII\Support\Logging\AuditLogger;
use Monolog\Handler\SyslogUdpHandler;
// standard config for both log things:
$defaultChannels = ['daily', 'stdout'];
$auditChannels = ['audit_daily', 'audit_stdout'];
$defaultChannels = ['daily', 'stdout'];
$auditChannels = ['audit_daily', 'audit_stdout'];
// validChannels is missing 'stack' because we already check for that one.
$validChannels = ['single', 'papertrail', 'stdout', 'daily', 'syslog', 'errorlog'];
$validAuditChannels = ['audit_papertrail', 'audit_stdout', 'audit_stdout', 'audit_daily', 'audit_syslog', 'audit_errorlog'];
// which settings did the user set, if any?
$defaultLogChannel = (string)envNonEmpty('LOG_CHANNEL', 'stack');
$auditLogChannel = (string)envNonEmpty('AUDIT_LOG_CHANNEL', '');
$defaultLogChannel = (string)envNonEmpty('LOG_CHANNEL', 'stack');
$auditLogChannel = (string)envNonEmpty('AUDIT_LOG_CHANNEL', '');
if ('stack' === $defaultLogChannel) {
$defaultChannels = ['daily', 'stdout'];
@ -59,8 +59,8 @@ return [
|
*/
'default' => envNonEmpty('LOG_CHANNEL', 'stack'),
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
'default' => envNonEmpty('LOG_CHANNEL', 'stack'),
'level' => envNonEmpty('APP_LOG_LEVEL', 'info'),
/*
|--------------------------------------------------------------------------
| Log Channels

12
config/mail.php
View File

@ -32,10 +32,10 @@ return [
| and used as needed; however, this mailer will be used by default.
|
*/
'default' => envNonEmpty('MAIL_MAILER', 'log'),
'default' => envNonEmpty('MAIL_MAILER', 'log'),
'mailers' => [
'smtp' => [
'mailers' => [
'smtp' => [
'transport' => 'smtp',
'host' => envNonEmpty('MAIL_HOST', 'smtp.mailtrap.io'),
'port' => (int)env('MAIL_PORT', 2525),
@ -46,11 +46,11 @@ return [
'verify_peer' => null !== env('MAIL_ENCRYPTION'),
],
'ses' => [
'ses' => [
'transport' => 'ses',
],
'mailgun' => [
'mailgun' => [
'transport' => 'mailgun',
],
@ -77,7 +77,7 @@ return [
'level' => 'notice',
],
'array' => [
'array' => [
'transport' => 'array',
],
],

8
config/passport.php
View File

@ -34,7 +34,7 @@ return [
|
*/
'guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
'guard' => envNonEmpty('AUTHENTICATION_GUARD', 'web'),
/*
|--------------------------------------------------------------------------
@ -47,9 +47,9 @@ return [
|
*/
'private_key' => env('PASSPORT_PRIVATE_KEY'),
'private_key' => env('PASSPORT_PRIVATE_KEY'),
'public_key' => env('PASSPORT_PUBLIC_KEY'),
'public_key' => env('PASSPORT_PUBLIC_KEY'),
/*
|--------------------------------------------------------------------------
@ -62,7 +62,7 @@ return [
|
*/
'client_uuids' => false,
'client_uuids' => false,
/*
|--------------------------------------------------------------------------

12
config/queue.php
View File

@ -34,7 +34,7 @@ return [
|
*/
'default' => env('QUEUE_CONNECTION', 'sync'),
'default' => env('QUEUE_CONNECTION', 'sync'),
/*
|--------------------------------------------------------------------------
@ -50,11 +50,11 @@ return [
*/
'connections' => [
'sync' => [
'sync' => [
'driver' => 'sync',
],
'database' => [
'database' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => 'default',
@ -69,7 +69,7 @@ return [
'block_for' => 0,
],
'sqs' => [
'sqs' => [
'driver' => 'sqs',
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
@ -79,7 +79,7 @@ return [
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
],
'redis' => [
'redis' => [
'driver' => 'redis',
'connection' => 'default',
'queue' => env('REDIS_QUEUE', 'default'),
@ -99,7 +99,7 @@ return [
|
*/
'failed' => [
'failed' => [
'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',

4
config/sanctum.php
View File

@ -37,7 +37,7 @@ return [
|
*/
'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', '')),
'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', '')),
/*
|--------------------------------------------------------------------------
@ -51,7 +51,7 @@ return [
|
*/
'guard' => [env('AUTHENTICATION_GUARD', 'web')],
'guard' => [env('AUTHENTICATION_GUARD', 'web')],
/*
|--------------------------------------------------------------------------

8
config/services.php
View File

@ -34,13 +34,13 @@ return [
|
*/
'mailgun' => [
'mailgun' => [
'domain' => env('MAILGUN_DOMAIN'),
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
'secret' => env('MAILGUN_SECRET'),
],
'ses' => [
'ses' => [
'key' => env('SES_KEY'),
'secret' => env('SES_SECRET'),
'region' => 'us-east-1',
@ -50,12 +50,12 @@ return [
'secret' => env('SPARKPOST_SECRET'),
],
'stripe' => [
'stripe' => [
'model' => FireflyIII\User::class,
'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'),
],
'mandrill' => [
'mandrill' => [
'secret' => env('MANDRILL_SECRET'),
],
];

2
config/twigbridge.php
View File

@ -54,7 +54,7 @@ use TwigBridge\Extension\Loader\Globals;
// Configuration options for Twig.
return [
'twig' => [
'twig' => [
'extension' => 'twig',
'environment' => [
'debug' => env('APP_DEBUG', false),

2
config/view.php
View File

@ -40,7 +40,7 @@ return [
|
*/
'paths' => $paths,
'paths' => $paths,
/*
|--------------------------------------------------------------------------