mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2024-11-21 16:38:36 -06:00
Merge branch 'main' into develop
# Conflicts: # composer.lock
This commit is contained in:
commit
37671499c8
2
.github/label-actions.yml
vendored
2
.github/label-actions.yml
vendored
@ -4,6 +4,7 @@
|
|||||||
feature:
|
feature:
|
||||||
issues:
|
issues:
|
||||||
# Post a comment, `{issue-author}` is an optional placeholder
|
# Post a comment, `{issue-author}` is an optional placeholder
|
||||||
|
unlabel: feature
|
||||||
comment: |
|
comment: |
|
||||||
Hi there!
|
Hi there!
|
||||||
|
|
||||||
@ -32,6 +33,7 @@ epic:
|
|||||||
Thank you for your contributions.
|
Thank you for your contributions.
|
||||||
|
|
||||||
enhancement:
|
enhancement:
|
||||||
|
unlabel: enhancement
|
||||||
issues:
|
issues:
|
||||||
# Post a comment, `{issue-author}` is an optional placeholder
|
# Post a comment, `{issue-author}` is an optional placeholder
|
||||||
comment: |
|
comment: |
|
||||||
|
@ -37,30 +37,43 @@ class AccountType extends Model
|
|||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string ASSET = 'Asset account';
|
public const string ASSET = 'Asset account';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string BENEFICIARY = 'Beneficiary account';
|
public const string BENEFICIARY = 'Beneficiary account';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string CASH = 'Cash account';
|
public const string CASH = 'Cash account';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string CREDITCARD = 'Credit card';
|
public const string CREDITCARD = 'Credit card';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string DEBT = 'Debt';
|
public const string DEBT = 'Debt';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string DEFAULT = 'Default account';
|
public const string DEFAULT = 'Default account';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string EXPENSE = 'Expense account';
|
public const string EXPENSE = 'Expense account';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string IMPORT = 'Import account';
|
public const string IMPORT = 'Import account';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string INITIAL_BALANCE = 'Initial balance account';
|
public const string INITIAL_BALANCE = 'Initial balance account';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string LIABILITY_CREDIT = 'Liability credit account';
|
public const string LIABILITY_CREDIT = 'Liability credit account';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string LOAN = 'Loan';
|
public const string LOAN = 'Loan';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string MORTGAGE = 'Mortgage';
|
public const string MORTGAGE = 'Mortgage';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string RECONCILIATION = 'Reconciliation account';
|
public const string RECONCILIATION = 'Reconciliation account';
|
||||||
|
|
||||||
/** @deprecated */
|
/** @deprecated */
|
||||||
public const string REVENUE = 'Revenue account';
|
public const string REVENUE = 'Revenue account';
|
||||||
|
|
||||||
@ -80,7 +93,7 @@ class AccountType extends Model
|
|||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
//'type' => AccountTypeEnum::class,
|
// 'type' => AccountTypeEnum::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -57,7 +57,7 @@ class AutoBudget extends Model
|
|||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
//'auto_budget_type' => AutoBudgetType::class,
|
// 'auto_budget_type' => AutoBudgetType::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ class RecurrenceRepetition extends Model
|
|||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
//'weekend' => RecurrenceRepetitionWeekend::class,
|
// 'weekend' => RecurrenceRepetitionWeekend::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ class TransactionType extends Model
|
|||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
//'type' => TransactionTypeEnum::class,
|
// 'type' => TransactionTypeEnum::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,9 +56,9 @@ class Webhook extends Model
|
|||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
// 'delivery' => WebhookDelivery::class,
|
// 'delivery' => WebhookDelivery::class,
|
||||||
// 'response' => WebhookResponse::class,
|
// 'response' => WebhookResponse::class,
|
||||||
// 'trigger' => WebhookTrigger::class,
|
// 'trigger' => WebhookTrigger::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user