Merge branch 'main' into develop

# Conflicts:
#	composer.lock
This commit is contained in:
James Cole 2024-11-06 19:39:11 +01:00
commit 37671499c8
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
6 changed files with 22 additions and 7 deletions

View File

@ -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: |

View File

@ -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,
]; ];
} }
} }

View File

@ -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,
]; ];
} }

View File

@ -62,7 +62,7 @@ class RecurrenceRepetition extends Model
protected function casts(): array protected function casts(): array
{ {
return [ return [
//'weekend' => RecurrenceRepetitionWeekend::class, // 'weekend' => RecurrenceRepetitionWeekend::class,
]; ];
} }

View File

@ -57,7 +57,7 @@ class TransactionType extends Model
protected function casts(): array protected function casts(): array
{ {
return [ return [
//'type' => TransactionTypeEnum::class, // 'type' => TransactionTypeEnum::class,
]; ];
} }

View File

@ -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,
]; ];
} }