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

Auto commit for release 'develop' on 2024-03-18

Browse Source
This commit is contained in:
github-actions 2024-03-18 20:25:30 +01:00
parent db0dbcfcf1
commit 9aa90650b4
108 changed files with 528 additions and 529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.ci/php-cs-fixer/composer.lock generated
View File

@ -226,16 +226,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.51.0",
"version": "v3.52.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "127fa74f010da99053e3f5b62672615b72dd6efd"
"reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd",
"reference": "127fa74f010da99053e3f5b62672615b72dd6efd",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a3564bd66f4bce9bc871ef18b690e2dc67a7f969",
"reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969",
"shasum": ""
},
"require": {
@ -306,7 +306,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.51.0"
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.0"
},
"funding": [
{
@ -314,7 +314,7 @@
"type": "github"
}
],
"time": "2024-02-28T19:50:06+00:00"
"time": "2024-03-18T18:40:11+00:00"
},
{
"name": "psr/container",

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

@ -53,40 +53,40 @@ class ForceDecimalSize extends Command
{
use ShowsFriendlyMessages;
protected $description = 'This command resizes DECIMAL columns in MySQL or PostgreSQL and correct amounts (only MySQL).';
protected $signature = 'firefly-iii:force-decimal-size';
protected $description = 'This command resizes DECIMAL columns in MySQL or PostgreSQL and correct amounts (only MySQL).';
protected $signature = 'firefly-iii:force-decimal-size';
private string $cast;
private array $classes
= [
'accounts' => Account::class,
'auto_budgets' => AutoBudget::class,
'available_budgets' => AvailableBudget::class,
'bills' => Bill::class,
'budget_limits' => BudgetLimit::class,
'piggy_bank_events' => PiggyBankEvent::class,
'piggy_bank_repetitions' => PiggyBankRepetition::class,
'piggy_banks' => PiggyBank::class,
'recurrences_transactions' => RecurrenceTransaction::class,
'transactions' => Transaction::class,
];
= [
'accounts' => Account::class,
'auto_budgets' => AutoBudget::class,
'available_budgets' => AvailableBudget::class,
'bills' => Bill::class,
'budget_limits' => BudgetLimit::class,
'piggy_bank_events' => PiggyBankEvent::class,
'piggy_bank_repetitions' => PiggyBankRepetition::class,
'piggy_banks' => PiggyBank::class,
'recurrences_transactions' => RecurrenceTransaction::class,
'transactions' => Transaction::class,
];
private string $operator;
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.

2
app/Http/Controllers/Account/ReconcileController.php
View File

@ -75,7 +75,7 @@ class ReconcileController extends Controller
*
* @throws FireflyException
* */
public function reconcile(Account $account, Carbon $start = null, Carbon $end = null)
public function reconcile(Account $account, ?Carbon $start = null, ?Carbon $end = null)
{
if (!$this->isEditableAccount($account)) {
return $this->redirectAccountToAccount($account);

2
app/Http/Controllers/Account/ShowController.php
View File

@ -75,7 +75,7 @@ class ShowController extends Controller
*
* @throws FireflyException
* */
public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null)
public function show(Request $request, Account $account, ?Carbon $start = null, ?Carbon $end = null)
{
$objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));

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

@ -85,7 +85,7 @@ class IndexController extends Controller
*
* @throws FireflyException
* */
public function index(Carbon $start = null, Carbon $end = null)
public function index(?Carbon $start = null, ?Carbon $end = null)
{
$this->abRepository->cleanup();
app('log')->debug(sprintf('Start of IndexController::index("%s", "%s")', $start?->format('Y-m-d'), $end?->format('Y-m-d')));

2
app/Http/Controllers/Budget/ShowController.php
View File

@ -75,7 +75,7 @@ class ShowController extends Controller
*
* @throws FireflyException
*/
public function noBudget(Request $request, Carbon $start = null, Carbon $end = null)
public function noBudget(Request $request, ?Carbon $start = null, ?Carbon $end = null)
{
// @var Carbon $start
$start ??= session('start');

2
app/Http/Controllers/Category/NoCategoryController.php
View File

@ -70,7 +70,7 @@ class NoCategoryController extends Controller
*
* @throws FireflyException
*/
public function show(Request $request, Carbon $start = null, Carbon $end = null)
public function show(Request $request, ?Carbon $start = null, ?Carbon $end = null)
{
app('log')->debug('Start of noCategory()');
// @var Carbon $start

2
app/Http/Controllers/Category/ShowController.php
View File

@ -71,7 +71,7 @@ class ShowController extends Controller
*
* @throws FireflyException
*/
public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
public function show(Request $request, Category $category, ?Carbon $start = null, ?Carbon $end = null)
{
// @var Carbon $start
$start ??= session('start', today(config('app.timezone'))->startOfMonth());

6
app/Http/Controllers/Json/IntroController.php
View File

@ -38,7 +38,7 @@ class IntroController extends Controller
/**
* Returns the introduction wizard for a page.
*/
public function getIntroSteps(string $route, string $specificPage = null): JsonResponse
public function getIntroSteps(string $route, ?string $specificPage = null): JsonResponse
{
app('log')->debug(sprintf('getIntroSteps for route "%s" and page "%s"', $route, $specificPage));
$specificPage ??= '';
@ -91,7 +91,7 @@ class IntroController extends Controller
*
* @throws FireflyException
*/
public function postEnable(string $route, string $specialPage = null): JsonResponse
public function postEnable(string $route, ?string $specialPage = null): JsonResponse
{
$specialPage ??= '';
$route = str_replace('.', '_', $route);
@ -111,7 +111,7 @@ class IntroController extends Controller
*
* @throws FireflyException
*/
public function postFinished(string $route, string $specialPage = null): JsonResponse
public function postFinished(string $route, ?string $specialPage = null): JsonResponse
{
$specialPage ??= '';
$key = 'shown_demo_'.$route;

4
app/Http/Controllers/Json/ReconcileController.php
View File

@ -67,7 +67,7 @@ class ReconcileController extends Controller
*
* @throws FireflyException
*/
public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse
public function overview(Request $request, ?Account $account = null, ?Carbon $start = null, ?Carbon $end = null): JsonResponse
{
$startBalance = $request->get('startBalance');
$endBalance = $request->get('endBalance');
@ -177,7 +177,7 @@ class ReconcileController extends Controller
*
* @throws FireflyException
*/
public function transactions(Account $account, Carbon $start = null, Carbon $end = null)
public function transactions(Account $account, ?Carbon $start = null, ?Carbon $end = null)
{
if (null === $start || null === $end) {
throw new FireflyException('Invalid dates submitted.');

2
app/Http/Controllers/Rule/CreateController.php
View File

@ -76,7 +76,7 @@ class CreateController extends Controller
*
* @throws FireflyException
*/
public function create(Request $request, RuleGroup $ruleGroup = null)
public function create(Request $request, ?RuleGroup $ruleGroup = null)
{
$this->createDefaultRuleGroup();
$preFilled = [

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

@ -215,7 +215,7 @@ class TagController extends Controller
*
* @throws FireflyException
*/
public function show(Request $request, Tag $tag, Carbon $start = null, Carbon $end = null)
public function show(Request $request, Tag $tag, ?Carbon $start = null, ?Carbon $end = null)
{
// default values:
$subTitleIcon = 'fa-tag';

2
app/Http/Controllers/Transaction/IndexController.php
View File

@ -69,7 +69,7 @@ class IndexController extends Controller
*
* @throws FireflyException
*/
public function index(Request $request, string $objectType, Carbon $start = null, Carbon $end = null)
public function index(Request $request, string $objectType, ?Carbon $start = null, ?Carbon $end = null)
{
if ('transfers' === $objectType) {
$objectType = 'transfer';

8
app/Http/Middleware/TrustProxies.php
View File

@ -34,10 +34,10 @@ class TrustProxies extends Middleware
// After...
protected $headers
= Request::HEADER_X_FORWARDED_FOR |
Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO |
Request::HEADER_X_FORWARDED_AWS_ELB;
Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO |
Request::HEADER_X_FORWARDED_AWS_ELB;
/**
* TrustProxies constructor.

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';

14
app/Models/CurrencyExchangeRate.php
View File

@ -82,13 +82,13 @@ class CurrencyExchangeRate extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'user_id' => 'int',
'from_currency_id' => 'int',
'to_currency_id' => 'int',
'date' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'user_id' => 'int',
'from_currency_id' => 'int',
'to_currency_id' => 'int',
'date' => 'datetime',
];
protected $fillable = ['user_id', 'from_currency_id', 'to_currency_id', 'date', 'rate'];
public function fromCurrency(): BelongsTo

6
app/Models/InvitedUser.php
View File

@ -70,9 +70,9 @@ class InvitedUser extends Model
protected $casts
= [
'expires' => 'datetime',
'redeemed' => 'boolean',
];
'expires' => 'datetime',
'redeemed' => 'boolean',
];
protected $fillable = ['user_id', 'email', 'invite_code', 'expires', 'redeemed'];
/**

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

@ -74,13 +74,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'];

10
app/Models/ObjectGroup.php
View File

@ -79,11 +79,11 @@ class ObjectGroup extends Model
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'user_id' => 'integer',
'deleted_at' => 'datetime',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'user_id' => 'integer',
'deleted_at' => 'datetime',
];
protected $fillable = ['title', 'order', 'user_id', 'user_group_id'];
/**

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

@ -69,12 +69,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'];

38
app/Models/Transaction.php
View File

@ -99,28 +99,28 @@ 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',
'date' => 'datetime',
];
'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',
'date' => 'datetime',
];
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'];
/**

10
app/Models/Webhook.php
View File

@ -93,11 +93,11 @@ class Webhook extends Model
protected $casts
= [
'active' => 'boolean',
'trigger' => 'integer',
'response' => 'integer',
'delivery' => 'integer',
];
'active' => 'boolean',
'trigger' => 'integer',
'response' => 'integer',
'delivery' => 'integer',
];
protected $fillable = ['active', 'trigger', 'response', 'delivery', 'user_id', 'user_group_id', 'url', 'title', 'secret'];
public static function getDeliveries(): array

1
app/Providers/AdminServiceProvider.php
View File

@ -25,7 +25,6 @@ namespace FireflyIII\Providers;
use FireflyIII\Repositories\LinkType\LinkTypeRepository;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
use Illuminate\Contracts\Support\DeferrableProvider;
use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;

6
app/Repositories/Budget/BudgetLimitRepository.php
View File

@ -122,7 +122,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
$budgetLimit->delete();
}
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, Carbon $start = null, Carbon $end = null): Collection
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, ?Carbon $start = null, ?Carbon $end = null): Collection
{
return $this->getAllBudgetLimits($start, $end)->filter(
static function (BudgetLimit $budgetLimit) use ($currency) {
@ -131,7 +131,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
);
}
public function getAllBudgetLimits(Carbon $start = null, Carbon $end = null): Collection
public function getAllBudgetLimits(?Carbon $start = null, ?Carbon $end = null): Collection
{
// both are NULL:
if (null === $start && null === $end) {
@ -198,7 +198,7 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface
;
}
public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection
public function getBudgetLimits(Budget $budget, ?Carbon $start = null, ?Carbon $end = null): Collection
{
if (null === $end && null === $start) {
return $budget->budgetlimits()->with(['transactionCurrency'])->orderBy('budget_limits.start_date', 'DESC')->get(['budget_limits.*']);

6
app/Repositories/Budget/BudgetLimitRepositoryInterface.php
View File

@ -57,11 +57,11 @@ interface BudgetLimitRepositoryInterface
/**
* TODO this method is not multi currency aware.
*/
public function getAllBudgetLimits(Carbon $start = null, Carbon $end = null): Collection;
public function getAllBudgetLimits(?Carbon $start = null, ?Carbon $end = null): Collection;
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, Carbon $start = null, Carbon $end = null): Collection;
public function getAllBudgetLimitsByCurrency(TransactionCurrency $currency, ?Carbon $start = null, ?Carbon $end = null): Collection;
public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection;
public function getBudgetLimits(Budget $budget, ?Carbon $start = null, ?Carbon $end = null): Collection;
public function setUser(null|Authenticatable|User $user): void;

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

@ -438,7 +438,7 @@ class BudgetRepository implements BudgetRepositoryInterface
*
* @param null|int $budgetId |null
*/
public function find(int $budgetId = null): ?Budget
public function find(?int $budgetId = null): ?Budget
{
return $this->user->budgets()->find($budgetId);
}

2
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@ -61,7 +61,7 @@ interface BudgetRepositoryInterface
public function destroyAutoBudget(Budget $budget): void;
public function find(int $budgetId = null): ?Budget;
public function find(?int $budgetId = null): ?Budget;
public function findBudget(?int $budgetId, ?string $budgetName): ?Budget;

6
app/Repositories/LinkType/LinkTypeRepository.php
View File

@ -44,7 +44,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
return $linkType->transactionJournalLinks()->count();
}
public function destroy(LinkType $linkType, LinkType $moveTo = null): bool
public function destroy(LinkType $linkType, ?LinkType $moveTo = null): bool
{
if (null !== $moveTo) {
TransactionJournalLink::where('link_type_id', $linkType->id)->update(['link_type_id' => $moveTo->id]);
@ -113,7 +113,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
/**
* Returns all the journal links (of a specific type).
*/
public function getJournalLinks(LinkType $linkType = null): Collection
public function getJournalLinks(?LinkType $linkType = null): Collection
{
$query = TransactionJournalLink::with(['source', 'destination'])
->leftJoin('transaction_journals as source_journals', 'journal_links.source_id', '=', 'source_journals.id')
@ -225,7 +225,7 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface
return LinkType::find($linkTypeId);
}
public function findByName(string $name = null): ?LinkType
public function findByName(?string $name = null): ?LinkType
{
if (null === $name) {
return null;

6
app/Repositories/LinkType/LinkTypeRepositoryInterface.php
View File

@ -37,7 +37,7 @@ interface LinkTypeRepositoryInterface
{
public function countJournals(LinkType $linkType): int;
public function destroy(LinkType $linkType, LinkType $moveTo = null): bool;
public function destroy(LinkType $linkType, ?LinkType $moveTo = null): bool;
public function destroyLink(TransactionJournalLink $link): bool;
@ -46,7 +46,7 @@ interface LinkTypeRepositoryInterface
/**
* Find link type by name.
*/
public function findByName(string $name = null): ?LinkType;
public function findByName(?string $name = null): ?LinkType;
/**
* Check if link exists between journals.
@ -65,7 +65,7 @@ interface LinkTypeRepositoryInterface
*/
public function getJournalIds(LinkType $linkType): array;
public function getJournalLinks(LinkType $linkType = null): Collection;
public function getJournalLinks(?LinkType $linkType = null): Collection;
/**
* Return list of existing connections.

2
app/Repositories/Recurring/RecurringRepository.php
View File

@ -202,7 +202,7 @@ class RecurringRepository implements RecurringRepositoryInterface
/**
* Returns the journals created for this recurrence, possibly limited by time.
*/
public function getJournalCount(Recurrence $recurrence, Carbon $start = null, Carbon $end = null): int
public function getJournalCount(Recurrence $recurrence, ?Carbon $start = null, ?Carbon $end = null): int
{
$query = TransactionJournal::leftJoin('journal_meta', 'journal_meta.transaction_journal_id', '=', 'transaction_journals.id')
->where('transaction_journals.user_id', $recurrence->user_id)

2
app/Repositories/Recurring/RecurringRepositoryInterface.php
View File

@ -83,7 +83,7 @@ interface RecurringRepositoryInterface
/**
* Returns the count of journals created for this recurrence, possibly limited by time.
*/
public function getJournalCount(Recurrence $recurrence, Carbon $start = null, Carbon $end = null): int;
public function getJournalCount(Recurrence $recurrence, ?Carbon $start = null, ?Carbon $end = null): int;
/**
* Get journal ID's for journals created by this recurring transaction.

4
app/Support/Amount.php
View File

@ -40,7 +40,7 @@ class Amount
*
* @throws FireflyException
*/
public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = null): string
public function formatAnything(TransactionCurrency $format, string $amount, ?bool $coloured = null): string
{
return $this->formatFlat($format->symbol, $format->decimal_places, $amount, $coloured);
}
@ -53,7 +53,7 @@ class Amount
*
* @SuppressWarnings(PHPMD.MissingImport)
*/
public function formatFlat(string $symbol, int $decimalPlaces, string $amount, bool $coloured = null): string
public function formatFlat(string $symbol, int $decimalPlaces, string $amount, ?bool $coloured = null): string
{
$locale = app('steam')->getLocale();
$rounded = app('steam')->bcround($amount, $decimalPlaces);

24
app/Support/ExpandedForm.php
View File

@ -40,7 +40,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function amountNoCurrency(string $name, $value = null, array $options = null): string
public function amountNoCurrency(string $name, $value = null, ?array $options = null): string
{
$options ??= [];
$label = $this->label($name, $options);
@ -71,7 +71,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function checkbox(string $name, int $value = null, $checked = null, array $options = null): string
public function checkbox(string $name, ?int $value = null, $checked = null, ?array $options = null): string
{
$options ??= [];
$value ??= 1;
@ -106,7 +106,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function date(string $name, $value = null, array $options = null): string
public function date(string $name, $value = null, ?array $options = null): string
{
$label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options);
@ -129,7 +129,7 @@ class ExpandedForm
/**
* @throws FireflyException
*/
public function file(string $name, array $options = null): string
public function file(string $name, ?array $options = null): string
{
$options ??= [];
$label = $this->label($name, $options);
@ -153,7 +153,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function integer(string $name, $value = null, array $options = null): string
public function integer(string $name, $value = null, ?array $options = null): string
{
$options ??= [];
$label = $this->label($name, $options);
@ -179,7 +179,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function location(string $name, $value = null, array $options = null): string
public function location(string $name, $value = null, ?array $options = null): string
{
$options ??= [];
$label = $this->label($name, $options);
@ -227,7 +227,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function objectGroup($value = null, array $options = null): string
public function objectGroup($value = null, ?array $options = null): string
{
$name = 'object_group';
$label = $this->label($name, $options);
@ -272,7 +272,7 @@ class ExpandedForm
/**
* @throws FireflyException
*/
public function password(string $name, array $options = null): string
public function password(string $name, ?array $options = null): string
{
$label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options);
@ -297,7 +297,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function percentage(string $name, $value = null, array $options = null): string
public function percentage(string $name, $value = null, ?array $options = null): string
{
$label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options);
@ -323,7 +323,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function staticText(string $name, $value, array $options = null): string
public function staticText(string $name, $value, ?array $options = null): string
{
$label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options);
@ -346,7 +346,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function text(string $name, $value = null, array $options = null): string
public function text(string $name, $value = null, ?array $options = null): string
{
$label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options);
@ -370,7 +370,7 @@ class ExpandedForm
*
* @throws FireflyException
*/
public function textarea(string $name, $value = null, array $options = null): string
public function textarea(string $name, $value = null, ?array $options = null): string
{
$label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options);

12
app/Support/Form/AccountForm.php
View File

@ -43,7 +43,7 @@ class AccountForm
/**
* Grouped dropdown list of all accounts that are valid as the destination of a withdrawal.
*/
public function activeDepositDestinations(string $name, mixed $value = null, array $options = null): string
public function activeDepositDestinations(string $name, mixed $value = null, ?array $options = null): string
{
$types = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN, AccountType::REVENUE];
$repository = $this->getAccountRepository();
@ -55,7 +55,7 @@ class AccountForm
return $this->select($name, $grouped, $value, $options);
}
private function getAccountsGrouped(array $types, AccountRepositoryInterface $repository = null): array
private function getAccountsGrouped(array $types, ?AccountRepositoryInterface $repository = null): array
{
if (null === $repository) {
$repository = $this->getAccountRepository();
@ -89,7 +89,7 @@ class AccountForm
/**
* Grouped dropdown list of all accounts that are valid as the destination of a withdrawal.
*/
public function activeWithdrawalDestinations(string $name, mixed $value = null, array $options = null): string
public function activeWithdrawalDestinations(string $name, mixed $value = null, ?array $options = null): string
{
$types = [AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN, AccountType::EXPENSE];
$repository = $this->getAccountRepository();
@ -107,7 +107,7 @@ class AccountForm
*
* @throws FireflyException
*/
public function assetAccountCheckList(string $name, array $options = null): string
public function assetAccountCheckList(string $name, ?array $options = null): string
{
$options ??= [];
$label = $this->label($name, $options);
@ -138,7 +138,7 @@ class AccountForm
*
* @param mixed $value
*/
public function assetAccountList(string $name, $value = null, array $options = null): string
public function assetAccountList(string $name, $value = null, ?array $options = null): string
{
$types = [AccountType::ASSET, AccountType::DEFAULT];
$grouped = $this->getAccountsGrouped($types);
@ -151,7 +151,7 @@ class AccountForm
*
* @param mixed $value
*/
public function longAccountList(string $name, $value = null, array $options = null): string
public function longAccountList(string $name, $value = null, ?array $options = null): string
{
$types = [AccountType::ASSET, AccountType::DEFAULT, AccountType::MORTGAGE, AccountType::DEBT, AccountType::CREDITCARD, AccountType::LOAN];
$grouped = $this->getAccountsGrouped($types);

12
app/Support/Form/CurrencyForm.php
View File

@ -42,7 +42,7 @@ class CurrencyForm
*
* @throws FireflyException
*/
public function amount(string $name, $value = null, array $options = null): string
public function amount(string $name, $value = null, ?array $options = null): string
{
return $this->currencyField($name, 'amount', $value, $options);
}
@ -50,7 +50,7 @@ class CurrencyForm
/**
* @throws FireflyException
*/
protected function currencyField(string $name, string $view, mixed $value = null, array $options = null): string
protected function currencyField(string $name, string $view, mixed $value = null, ?array $options = null): string
{
$label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options);
@ -106,7 +106,7 @@ class CurrencyForm
*
* @throws FireflyException
*/
public function balanceAll(string $name, $value = null, array $options = null): string
public function balanceAll(string $name, $value = null, ?array $options = null): string
{
return $this->allCurrencyField($name, 'balance', $value, $options);
}
@ -118,7 +118,7 @@ class CurrencyForm
*
* @throws FireflyException
*/
protected function allCurrencyField(string $name, string $view, $value = null, array $options = null): string
protected function allCurrencyField(string $name, string $view, $value = null, ?array $options = null): string
{
$label = $this->label($name, $options);
$options = $this->expandOptionArray($name, $label, $options);
@ -173,7 +173,7 @@ class CurrencyForm
*
* @param mixed $value
*/
public function currencyList(string $name, $value = null, array $options = null): string
public function currencyList(string $name, $value = null, ?array $options = null): string
{
/** @var CurrencyRepositoryInterface $currencyRepos */
$currencyRepos = app(CurrencyRepositoryInterface::class);
@ -195,7 +195,7 @@ class CurrencyForm
*
* @param mixed $value
*/
public function currencyListEmpty(string $name, $value = null, array $options = null): string
public function currencyListEmpty(string $name, $value = null, ?array $options = null): string
{
/** @var CurrencyRepositoryInterface $currencyRepos */
$currencyRepos = app(CurrencyRepositoryInterface::class);

6
app/Support/Form/FormSupport.php
View File

@ -36,7 +36,7 @@ trait FormSupport
/**
* @param mixed $selected
*/
public function select(string $name, array $list = null, $selected = null, array $options = null): string
public function select(string $name, ?array $list = null, $selected = null, ?array $options = null): string
{
$list ??= [];
$label = $this->label($name, $options);
@ -55,7 +55,7 @@ trait FormSupport
return $html;
}
protected function label(string $name, array $options = null): string
protected function label(string $name, ?array $options = null): string
{
$options ??= [];
if (array_key_exists('label', $options)) {
@ -69,7 +69,7 @@ trait FormSupport
/**
* @param mixed $label
*/
protected function expandOptionArray(string $name, $label, array $options = null): array
protected function expandOptionArray(string $name, $label, ?array $options = null): array
{
$options ??= [];
$name = str_replace('[]', '', $name);

2
app/Support/Form/PiggyBankForm.php
View File

@ -40,7 +40,7 @@ class PiggyBankForm
*
* @param mixed $value
*/
public function piggyBankList(string $name, $value = null, array $options = null): string
public function piggyBankList(string $name, $value = null, ?array $options = null): string
{
// make repositories
/** @var PiggyBankRepositoryInterface $repository */

4
app/Support/Form/RuleForm.php
View File

@ -34,7 +34,7 @@ class RuleForm
{
use FormSupport;
public function ruleGroupList(string $name, mixed $value = null, array $options = null): string
public function ruleGroupList(string $name, mixed $value = null, ?array $options = null): string
{
/** @var RuleGroupRepositoryInterface $groupRepos */
$groupRepos = app(RuleGroupRepositoryInterface::class);
@ -54,7 +54,7 @@ class RuleForm
/**
* @param null $value
*/
public function ruleGroupListWithEmpty(string $name, $value = null, array $options = null): string
public function ruleGroupListWithEmpty(string $name, $value = null, ?array $options = null): string
{
$options ??= [];
$options['class'] = 'form-control';

4
app/Support/Navigation.php
View File

@ -38,7 +38,7 @@ class Navigation
{
private Calculator $calculator;
public function __construct(Calculator $calculator = null)
public function __construct(?Calculator $calculator = null)
{
$this->calculator = $calculator instanceof Calculator ? $calculator : new Calculator();
}
@ -631,7 +631,7 @@ class Navigation
/**
* @throws FireflyException
*/
public function subtractPeriod(Carbon $theDate, string $repeatFreq, int $subtract = null): Carbon
public function subtractPeriod(Carbon $theDate, string $repeatFreq, ?int $subtract = null): Carbon
{
$subtract ??= 1;
$date = clone $theDate;

2
app/Support/Steam.php
View File

@ -851,7 +851,7 @@ class Steam
return number_format((float)$value, 0, '.', '');
}
public function opposite(string $amount = null): ?string
public function opposite(?string $amount = null): ?string
{
if (null === $amount) {
return null;

6
app/Support/Twig/AmountFormat.php
View File

@ -87,7 +87,7 @@ class AmountFormat extends AbstractExtension
{
return new TwigFunction(
'formatAmountByAccount',
static function (AccountModel $account, string $amount, bool $coloured = null): string {
static function (AccountModel $account, string $amount, ?bool $coloured = null): string {
$coloured ??= true;
/** @var AccountRepositoryInterface $accountRepos */
@ -107,7 +107,7 @@ class AmountFormat extends AbstractExtension
{
return new TwigFunction(
'formatAmountBySymbol',
static function (string $amount, string $symbol, int $decimalPlaces = null, bool $coloured = null): string {
static function (string $amount, string $symbol, ?int $decimalPlaces = null, ?bool $coloured = null): string {
$decimalPlaces ??= 2;
$coloured ??= true;
$currency = new TransactionCurrency();
@ -127,7 +127,7 @@ class AmountFormat extends AbstractExtension
{
return new TwigFunction(
'formatAmountByCurrency',
static function (TransactionCurrency $currency, string $amount, bool $coloured = null): string {
static function (TransactionCurrency $currency, string $amount, ?bool $coloured = null): string {
$coloured ??= true;
return app('amount')->formatAnything($currency, $amount, $coloured);

8
app/User.php
View File

@ -187,10 +187,10 @@ class User extends Authenticatable
protected $casts
= [
'created_at' => 'datetime',
'updated_at' => 'datetime',
'blocked' => 'boolean',
];
'created_at' => 'datetime',
'updated_at' => 'datetime',
'blocked' => 'boolean',
];
protected $fillable = ['email', 'password', 'blocked', 'blocked_code'];
protected $hidden = ['password', 'remember_token'];
protected $table = 'users';

4
app/Validation/FireflyValidator.php
View File

@ -253,7 +253,7 @@ class FireflyValidator extends Validator
return 1 === $count;
}
public function validateRuleActionValue(string $attribute, string $value = null): bool
public function validateRuleActionValue(string $attribute, ?string $value = null): bool
{
// first, get the index from this string:
$value ??= '';
@ -324,7 +324,7 @@ class FireflyValidator extends Validator
/**
* $attribute has the format triggers.%d.value.
*/
public function validateRuleTriggerValue(string $attribute, string $value = null): bool
public function validateRuleTriggerValue(string $attribute, ?string $value = null): bool
{
// first, get the index from this string:
$parts = explode('.', $attribute);

2
app/Validation/TransactionValidation.php
View File

@ -45,7 +45,7 @@ trait TransactionValidation
*
* Inclusion of user and/or group is optional.
*/
public function validateAccountInformation(Validator $validator, User $user = null, UserGroup $userGroup = null): void
public function validateAccountInformation(Validator $validator, ?User $user = null, ?UserGroup $userGroup = null): void
{
if ($validator->errors()->count() > 0) {
return;

10
composer.lock generated
View File

@ -10277,16 +10277,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.62",
"version": "1.10.63",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9"
"reference": "ad12836d9ca227301f5fb9960979574ed8628339"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9",
"reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad12836d9ca227301f5fb9960979574ed8628339",
"reference": "ad12836d9ca227301f5fb9960979574ed8628339",
"shasum": ""
},
"require": {
@ -10335,7 +10335,7 @@
"type": "tidelift"
}
],
"time": "2024-03-13T12:27:20+00:00"
"time": "2024-03-18T16:53:53+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",

2
public/build/assets/create-b70c5f7e.js → public/build/assets/create-dec509ea.js
View File

File diff suppressed because one or more lines are too long

2
public/build/assets/create-empty-split-70d17748.js → public/build/assets/create-empty-split-9549645c.js
View File

@ -1 +1 @@
import{f as n}from"./vendor-291d7a70.js";function e(){return{id:"",name:"",alpine_name:""}}function o(){return{description:[],amount:[],currency_code:[],foreign_amount:[],foreign_currency_code:[],source_account:[],destination_account:[],budget_id:[],category_name:[],piggy_bank_id:[],bill_id:[],tags:[],notes:[],internal_reference:[],external_url:[],latitude:[],longitude:[],zoom_level:[],date:[],interest_date:[],book_date:[],process_date:[],due_date:[],payment_date:[],invoice_date:[]}}function d(){let t=n(new Date,"yyyy-MM-dd HH:mm");return{description:"",amount:"",currency_code:"EUR",foreign_amount:"",foreign_currency_code:"",source_account:e(),destination_account:e(),budget_id:null,category_name:"",piggy_bank_id:null,bill_id:null,tags:[],notes:"",internal_reference:"",external_url:"",hasLocation:!1,latitude:null,longitude:null,zoomLevel:null,date:t,interest_date:"",book_date:"",process_date:"",due_date:"",payment_date:"",invoice_date:"",errors:o()}}export{d as c,o as d};
import{f as n}from"./vendor-029c0fc2.js";function e(){return{id:"",name:"",alpine_name:""}}function o(){return{description:[],amount:[],currency_code:[],foreign_amount:[],foreign_currency_code:[],source_account:[],destination_account:[],budget_id:[],category_name:[],piggy_bank_id:[],bill_id:[],tags:[],notes:[],internal_reference:[],external_url:[],latitude:[],longitude:[],zoom_level:[],date:[],interest_date:[],book_date:[],process_date:[],due_date:[],payment_date:[],invoice_date:[]}}function d(){let t=n(new Date,"yyyy-MM-dd HH:mm");return{description:"",amount:"",currency_code:"EUR",foreign_amount:"",foreign_currency_code:"",source_account:e(),destination_account:e(),budget_id:null,category_name:"",piggy_bank_id:null,bill_id:null,tags:[],notes:"",internal_reference:"",external_url:"",hasLocation:!1,latitude:null,longitude:null,zoomLevel:null,date:t,interest_date:"",book_date:"",process_date:"",due_date:"",payment_date:"",invoice_date:"",errors:o()}}export{d as c,o as d};

2
public/build/assets/dashboard-39513f31.js → public/build/assets/dashboard-f6f6ae3f.js
View File

File diff suppressed because one or more lines are too long

2
public/build/assets/edit-0146de3c.js → public/build/assets/edit-990ac3ab.js
View File

File diff suppressed because one or more lines are too long

2
public/build/assets/format-money-5a1aa122.js → public/build/assets/format-money-89cf90df.js
View File

File diff suppressed because one or more lines are too long

2
public/build/assets/get-2d864c96.js → public/build/assets/get-23aadb69.js
View File

@ -1 +1 @@
import{a as s}from"./format-money-5a1aa122.js";import{f as n}from"./vendor-291d7a70.js";class c{show(a,t){return s.get("/api/v2/accounts/"+a,{params:t})}index(a){return s.get("/api/v2/accounts",{params:a})}transactions(a,t){const r={page:t.page??1};return t.hasOwnProperty("start")&&(r.start=n(t.start,"y-MM-dd")),t.hasOwnProperty("end")&&(r.end=n(t.end,"y-MM-dd")),s.get("/api/v2/accounts/"+a+"/transactions",{params:r})}}export{c as G};
import{a as s}from"./format-money-89cf90df.js";import{f as n}from"./vendor-029c0fc2.js";class c{show(a,t){return s.get("/api/v2/accounts/"+a,{params:t})}index(a){return s.get("/api/v2/accounts",{params:a})}transactions(a,t){const r={page:t.page??1};return t.hasOwnProperty("start")&&(r.start=n(t.start,"y-MM-dd")),t.hasOwnProperty("end")&&(r.end=n(t.end,"y-MM-dd")),s.get("/api/v2/accounts/"+a+"/transactions",{params:r})}}export{c as G};

2
public/build/assets/get-316f0281.js → public/build/assets/get-58830780.js
View File

@ -1 +1 @@
import{a as s}from"./format-money-5a1aa122.js";let t=class{list(a){return s.get("/api/v2/subscriptions",{params:a})}paid(a){return s.get("/api/v2/subscriptions/sum/paid",{params:a})}unpaid(a){return s.get("/api/v2/subscriptions/sum/unpaid",{params:a})}};class e{list(a){return s.get("/api/v2/piggy-banks",{params:a})}}export{t as G,e as a};
import{a as s}from"./format-money-89cf90df.js";let t=class{list(a){return s.get("/api/v2/subscriptions",{params:a})}paid(a){return s.get("/api/v2/subscriptions/sum/paid",{params:a})}unpaid(a){return s.get("/api/v2/subscriptions/sum/unpaid",{params:a})}};class e{list(a){return s.get("/api/v2/piggy-banks",{params:a})}}export{t as G,e as a};

2
public/build/assets/get-a398221d.js → public/build/assets/get-b646f004.js
View File

@ -1 +1 @@
import{a as t}from"./format-money-5a1aa122.js";class n{list(a){return t.get("/api/v2/transactions",{params:a})}infiniteList(a){return t.get("/api/v2/infinite/transactions",{params:a})}show(a,i){return t.get("/api/v2/transactions/"+a,{params:i})}}export{n as G};
import{a as t}from"./format-money-89cf90df.js";class n{list(a){return t.get("/api/v2/transactions",{params:a})}infiniteList(a){return t.get("/api/v2/infinite/transactions",{params:a})}show(a,i){return t.get("/api/v2/transactions/"+a,{params:i})}}export{n as G};

2
public/build/assets/index-548de579.js → public/build/assets/index-56152516.js
View File

@ -1 +1 @@
import{a as d,d as h,f as p}from"./format-money-5a1aa122.js";import{f as r,i as a}from"./vendor-291d7a70.js";/* empty css */import{G as m}from"./get-2d864c96.js";class f{setElement(t){console.log("GenericEditor.setElement()",t),this.element=t,this.parent=t.parentElement,this.options={}}init(){this.options.type=this.element.dataset.type,this.options.id=this.element.dataset.id,this.options.value=this.element.dataset.value,this.options.index=this.element.dataset.index,this.options.model=this.element.dataset.model,this.options.field=this.element.dataset.field,console.log("GenericEditor["+this.options.index+"].init()")}replace(){console.log("GenericEditor["+this.options.index+"].replace()"),this.options.original=this.element.parentElement.innerHTML,this.options.type==="text"&&this.replaceText()}replaceText(){console.log("GenericEditor["+this.options.index+"].replaceText()");let t=this.formStart()+this.rowStart();t+=this.columnStart("7")+this.label()+this.textField()+this.closeDiv(),t+=this.columnStart("5")+this.buttonGroup()+this.closeDiv(),t+=this.closeDiv()+this.closeForm(),this.element.parentElement.innerHTML=t}textField(){return'<input data-index="'+this.options.index+'input" autocomplete="off" type="text" class="form-control form-control-sm" id="input" name="name" value="'+this.options.value+'" placeholder="'+this.options.value+'" autofocus>'}closeDiv(){return"</div>"}closeForm(){return"</form>"}formStart(){return'<form class="form-inline">'}rowStart(){return'<div class="row">'}columnStart(t){return t===""?'<div class="col">':'<div class="col-'+t+'">'}label(){return'<label class="sr-only" for="input">Field value</label>'}buttonGroup(){return'<div class="btn-group btn-group-sm" role="group" aria-label="Options"><button data-index="'+this.options.index+'" type="button" @click="cancelInlineEdit" class="btn btn-danger"><em class="fa-solid fa-xmark text-white"></em></button><button data-index="'+this.options.index+'" type="submit" @click="submitInlineEdit" class="btn btn-success"><em class="fa-solid fa-check"></em></button></div>'}cancel(){console.log("GenericEditor["+this.options.index+"].cancel()"),console.log(this.element),console.log(this.parent),this.parent.innerHTML=this.options.original}submitInlineEdit(t){console.log("Submit?")}}class b{put(t,n){return d.put("/api/v2/accounts/"+t,n)}}const l=window.location.href.split("/"),g=l[l.length-1];let w=function(){return{notifications:{error:{show:!1,text:"",url:""},success:{show:!1,text:"",url:""},wait:{show:!1,text:""}},totalPages:1,page:1,tableColumns:{name:{enabled:!0}},editors:{},sortingColumn:"",sortDirection:"",accounts:[],sort(e){return this.sortingColumn=e,this.sortDirection=this.sortDirection==="asc"?"desc":"asc",this.loadAccounts(),!1},formatMoney(e,t){return p(e,t)},format(e){return r(e,a.t("config.date_time_fns"))},init(){this.notifications.wait.show=!0,this.notifications.wait.text=a.t("firefly.wait_loading_data"),this.loadAccounts()},submitInlineEdit(e){e.preventDefault();const n=e.currentTarget.dataset.index,i=document.querySelectorAll('[data-index="'+n+'input"]')[0].value??"";if(i==="")return;const o=this.editors[n].options.field,s={};s[o]=i,console.log(s),console.log("New value is "+i+" for account #"+this.editors[n].options.id),new b().put(this.editors[n].options.id,s)},cancelInlineEdit(e){const n=e.currentTarget.dataset.index;this.editors[n].cancel()},triggerEdit(e){const t=e.currentTarget,n=t.dataset.index;this.editors[n]=new f,this.editors[n].setElement(t),this.editors[n].init(),this.editors[n].replace()},loadAccounts(){this.notifications.wait.show=!0,this.notifications.wait.text=a.t("firefly.wait_loading_data"),this.accounts=[];const e=[{column:this.sortingColumn,direction:this.sortDirection}];new m().index({sorting:e,type:g,page:this.page}).then(t=>{for(let n=0;n<t.data.data.length;n++)if(t.data.data.hasOwnProperty(n)){let i=t.data.data[n],o={id:parseInt(i.id),active:i.attributes.active,name:i.attributes.name,type:i.attributes.type,role:i.attributes.account_role,iban:i.attributes.iban===null?"":i.attributes.iban.match(/.{1,4}/g).join(" "),account_number:i.attributes.account_number===null?"":i.attributes.account_number,current_balance:i.attributes.current_balance,currency_code:i.attributes.currency_code,native_current_balance:i.attributes.native_current_balance,native_currency_code:i.attributes.native_currency_code,last_activity:i.attributes.last_activity===null?"":r(new Date(i.attributes.last_activity),"P")};this.accounts.push(o)}this.notifications.wait.show=!1})}}},c={index:w,dates:h};function u(){Object.keys(c).forEach(e=>{console.log(`Loading page component "${e}"`);let t=c[e]();Alpine.data(e,()=>t)}),Alpine.start()}document.addEventListener("firefly-iii-bootstrapped",()=>{console.log("Loaded through event listener."),u()});window.bootstrapped&&(console.log("Loaded through window variable."),u());
import{a as d,d as h,f as p}from"./format-money-89cf90df.js";import{f as r,i as a}from"./vendor-029c0fc2.js";/* empty css */import{G as m}from"./get-23aadb69.js";class f{setElement(t){console.log("GenericEditor.setElement()",t),this.element=t,this.parent=t.parentElement,this.options={}}init(){this.options.type=this.element.dataset.type,this.options.id=this.element.dataset.id,this.options.value=this.element.dataset.value,this.options.index=this.element.dataset.index,this.options.model=this.element.dataset.model,this.options.field=this.element.dataset.field,console.log("GenericEditor["+this.options.index+"].init()")}replace(){console.log("GenericEditor["+this.options.index+"].replace()"),this.options.original=this.element.parentElement.innerHTML,this.options.type==="text"&&this.replaceText()}replaceText(){console.log("GenericEditor["+this.options.index+"].replaceText()");let t=this.formStart()+this.rowStart();t+=this.columnStart("7")+this.label()+this.textField()+this.closeDiv(),t+=this.columnStart("5")+this.buttonGroup()+this.closeDiv(),t+=this.closeDiv()+this.closeForm(),this.element.parentElement.innerHTML=t}textField(){return'<input data-index="'+this.options.index+'input" autocomplete="off" type="text" class="form-control form-control-sm" id="input" name="name" value="'+this.options.value+'" placeholder="'+this.options.value+'" autofocus>'}closeDiv(){return"</div>"}closeForm(){return"</form>"}formStart(){return'<form class="form-inline">'}rowStart(){return'<div class="row">'}columnStart(t){return t===""?'<div class="col">':'<div class="col-'+t+'">'}label(){return'<label class="sr-only" for="input">Field value</label>'}buttonGroup(){return'<div class="btn-group btn-group-sm" role="group" aria-label="Options"><button data-index="'+this.options.index+'" type="button" @click="cancelInlineEdit" class="btn btn-danger"><em class="fa-solid fa-xmark text-white"></em></button><button data-index="'+this.options.index+'" type="submit" @click="submitInlineEdit" class="btn btn-success"><em class="fa-solid fa-check"></em></button></div>'}cancel(){console.log("GenericEditor["+this.options.index+"].cancel()"),console.log(this.element),console.log(this.parent),this.parent.innerHTML=this.options.original}submitInlineEdit(t){console.log("Submit?")}}class b{put(t,n){return d.put("/api/v2/accounts/"+t,n)}}const l=window.location.href.split("/"),g=l[l.length-1];let w=function(){return{notifications:{error:{show:!1,text:"",url:""},success:{show:!1,text:"",url:""},wait:{show:!1,text:""}},totalPages:1,page:1,tableColumns:{name:{enabled:!0}},editors:{},sortingColumn:"",sortDirection:"",accounts:[],sort(e){return this.sortingColumn=e,this.sortDirection=this.sortDirection==="asc"?"desc":"asc",this.loadAccounts(),!1},formatMoney(e,t){return p(e,t)},format(e){return r(e,a.t("config.date_time_fns"))},init(){this.notifications.wait.show=!0,this.notifications.wait.text=a.t("firefly.wait_loading_data"),this.loadAccounts()},submitInlineEdit(e){e.preventDefault();const n=e.currentTarget.dataset.index,i=document.querySelectorAll('[data-index="'+n+'input"]')[0].value??"";if(i==="")return;const o=this.editors[n].options.field,s={};s[o]=i,console.log(s),console.log("New value is "+i+" for account #"+this.editors[n].options.id),new b().put(this.editors[n].options.id,s)},cancelInlineEdit(e){const n=e.currentTarget.dataset.index;this.editors[n].cancel()},triggerEdit(e){const t=e.currentTarget,n=t.dataset.index;this.editors[n]=new f,this.editors[n].setElement(t),this.editors[n].init(),this.editors[n].replace()},loadAccounts(){this.notifications.wait.show=!0,this.notifications.wait.text=a.t("firefly.wait_loading_data"),this.accounts=[];const e=[{column:this.sortingColumn,direction:this.sortDirection}];new m().index({sorting:e,type:g,page:this.page}).then(t=>{for(let n=0;n<t.data.data.length;n++)if(t.data.data.hasOwnProperty(n)){let i=t.data.data[n],o={id:parseInt(i.id),active:i.attributes.active,name:i.attributes.name,type:i.attributes.type,role:i.attributes.account_role,iban:i.attributes.iban===null?"":i.attributes.iban.match(/.{1,4}/g).join(" "),account_number:i.attributes.account_number===null?"":i.attributes.account_number,current_balance:i.attributes.current_balance,currency_code:i.attributes.currency_code,native_current_balance:i.attributes.native_current_balance,native_currency_code:i.attributes.native_currency_code,last_activity:i.attributes.last_activity===null?"":r(new Date(i.attributes.last_activity),"P")};this.accounts.push(o)}this.notifications.wait.show=!1})}}},c={index:w,dates:h};function u(){Object.keys(c).forEach(e=>{console.log(`Loading page component "${e}"`);let t=c[e]();Alpine.data(e,()=>t)}),Alpine.start()}document.addEventListener("firefly-iii-bootstrapped",()=>{console.log("Loaded through event listener."),u()});window.bootstrapped&&(console.log("Loaded through window variable."),u());

2
public/build/assets/index-80c224c9.js → public/build/assets/index-979da1db.js
View File

File diff suppressed because one or more lines are too long

2
public/build/assets/parse-downloaded-splits-ce04c01c.js → public/build/assets/parse-downloaded-splits-2d74acfc.js
View File

@ -1 +1 @@
import{c as o}from"./create-empty-split-70d17748.js";import{f as _}from"./vendor-291d7a70.js";function l(a,r){let n=[];for(let i in a)if(a.hasOwnProperty(i)){let e=a[i],t=o();t.transaction_journal_id=e.transaction_journal_id,t.transaction_group_id=r,t.bill_id=e.bill_id,t.bill_name=e.bill_name,t.budget_id=e.budget_id,t.budget_name=e.budget_name,t.category_name=e.category_name,t.category_id=e.category_id,t.piggy_bank_id=e.piggy_bank_id,t.piggy_bank_name=e.piggy_bank_name,t.book_date=e.book_date,t.due_date=e.due_date,t.interest_date=e.interest_date,t.invoice_date=e.invoice_date,t.payment_date=e.payment_date,t.process_date=e.process_date,t.external_url=e.external_url,t.internal_reference=e.internal_reference,t.notes=e.notes,t.tags=e.tags,t.amount=parseFloat(e.amount).toFixed(e.currency_decimal_places),t.currency_code=e.currency_code,e.foreign_amount!==null&&(t.forein_currency_code=e.foreign_currency_code,t.foreign_amount=parseFloat(e.foreign_amount).toFixed(e.foreign_currency_decimal_places)),t.date=_(new Date(e.date),"yyyy-MM-dd HH:mm"),t.description=e.description,t.destination_account={id:e.destination_id,name:e.destination_name,type:e.destination_type,alpine_name:e.destination_name},t.source_account={id:e.source_id,name:e.source_name,type:e.source_type,alpine_name:e.source_name},e.latitude!==null&&(t.hasLocation=!0,t.latitude=e.latitude,t.longitude=e.longitude,t.zoomLevel=e.zoom_level),n.push(t)}return n}export{l as p};
import{c as o}from"./create-empty-split-9549645c.js";import{f as _}from"./vendor-029c0fc2.js";function l(a,r){let n=[];for(let i in a)if(a.hasOwnProperty(i)){let e=a[i],t=o();t.transaction_journal_id=e.transaction_journal_id,t.transaction_group_id=r,t.bill_id=e.bill_id,t.bill_name=e.bill_name,t.budget_id=e.budget_id,t.budget_name=e.budget_name,t.category_name=e.category_name,t.category_id=e.category_id,t.piggy_bank_id=e.piggy_bank_id,t.piggy_bank_name=e.piggy_bank_name,t.book_date=e.book_date,t.due_date=e.due_date,t.interest_date=e.interest_date,t.invoice_date=e.invoice_date,t.payment_date=e.payment_date,t.process_date=e.process_date,t.external_url=e.external_url,t.internal_reference=e.internal_reference,t.notes=e.notes,t.tags=e.tags,t.amount=parseFloat(e.amount).toFixed(e.currency_decimal_places),t.currency_code=e.currency_code,e.foreign_amount!==null&&(t.forein_currency_code=e.foreign_currency_code,t.foreign_amount=parseFloat(e.foreign_amount).toFixed(e.foreign_currency_decimal_places)),t.date=_(new Date(e.date),"yyyy-MM-dd HH:mm"),t.description=e.description,t.destination_account={id:e.destination_id,name:e.destination_name,type:e.destination_type,alpine_name:e.destination_name},t.source_account={id:e.source_id,name:e.source_name,type:e.source_type,alpine_name:e.source_name},e.latitude!==null&&(t.hasLocation=!0,t.latitude=e.latitude,t.longitude=e.longitude,t.zoomLevel=e.zoom_level),n.push(t)}return n}export{l as p};

2
public/build/assets/put-02a25c9f.js → public/build/assets/put-c581fff2.js
View File

@ -1 +1 @@
import{a as p}from"./format-money-5a1aa122.js";class u{put(t,a){let r="/api/v2/transactions/"+parseInt(a.id);return p.put(r,t)}}export{u as P};
import{a as p}from"./format-money-89cf90df.js";class u{put(t,a){let r="/api/v2/transactions/"+parseInt(a.id);return p.put(r,t)}}export{u as P};

2
public/build/assets/show-7b497861.js → public/build/assets/show-31120d76.js
View File

File diff suppressed because one or more lines are too long

2
public/build/assets/splice-errors-into-transactions-5b51d5fd.js → public/build/assets/splice-errors-into-transactions-81484c73.js
View File

File diff suppressed because one or more lines are too long

4
public/build/assets/vendor-291d7a70.js → public/build/assets/vendor-029c0fc2.js
View File

File diff suppressed because one or more lines are too long

132
public/build/manifest.json
View File

@ -1,57 +1,57 @@
{
"_create-empty-split-70d17748.js": {
"file": "assets/create-empty-split-70d17748.js",
"_create-empty-split-9549645c.js": {
"file": "assets/create-empty-split-9549645c.js",
"imports": [
"_vendor-291d7a70.js"
"_vendor-029c0fc2.js"
]
},
"_format-money-5a1aa122.js": {
"file": "assets/format-money-5a1aa122.js",
"_format-money-89cf90df.js": {
"file": "assets/format-money-89cf90df.js",
"imports": [
"_vendor-291d7a70.js"
"_vendor-029c0fc2.js"
]
},
"_get-2d864c96.js": {
"file": "assets/get-2d864c96.js",
"_get-23aadb69.js": {
"file": "assets/get-23aadb69.js",
"imports": [
"_format-money-5a1aa122.js",
"_vendor-291d7a70.js"
"_format-money-89cf90df.js",
"_vendor-029c0fc2.js"
]
},
"_get-316f0281.js": {
"file": "assets/get-316f0281.js",
"_get-58830780.js": {
"file": "assets/get-58830780.js",
"imports": [
"_format-money-5a1aa122.js"
"_format-money-89cf90df.js"
]
},
"_get-a398221d.js": {
"file": "assets/get-a398221d.js",
"_get-b646f004.js": {
"file": "assets/get-b646f004.js",
"imports": [
"_format-money-5a1aa122.js"
"_format-money-89cf90df.js"
]
},
"_parse-downloaded-splits-ce04c01c.js": {
"file": "assets/parse-downloaded-splits-ce04c01c.js",
"_parse-downloaded-splits-2d74acfc.js": {
"file": "assets/parse-downloaded-splits-2d74acfc.js",
"imports": [
"_create-empty-split-70d17748.js",
"_vendor-291d7a70.js"
"_create-empty-split-9549645c.js",
"_vendor-029c0fc2.js"
]
},
"_put-02a25c9f.js": {
"file": "assets/put-02a25c9f.js",
"_put-c581fff2.js": {
"file": "assets/put-c581fff2.js",
"imports": [
"_format-money-5a1aa122.js"
"_format-money-89cf90df.js"
]
},
"_splice-errors-into-transactions-5b51d5fd.js": {
"file": "assets/splice-errors-into-transactions-5b51d5fd.js",
"_splice-errors-into-transactions-81484c73.js": {
"file": "assets/splice-errors-into-transactions-81484c73.js",
"imports": [
"_format-money-5a1aa122.js",
"_get-316f0281.js",
"_vendor-291d7a70.js"
"_format-money-89cf90df.js",
"_get-58830780.js",
"_vendor-029c0fc2.js"
]
},
"_vendor-291d7a70.js": {
"_vendor-029c0fc2.js": {
"assets": [
"assets/layers-1dbbe9d0.png",
"assets/layers-2x-066daca8.png",
@ -60,7 +60,7 @@
"css": [
"assets/vendor-52daf6b6.css"
],
"file": "assets/vendor-291d7a70.js"
"file": "assets/vendor-029c0fc2.js"
},
"grid-ff3-theme.css": {
"file": "assets/grid-ff3-theme-badb0a41.css",
@ -106,50 +106,50 @@
"css": [
"assets/grid-ff3-theme-badb0a41.css"
],
"file": "assets/index-548de579.js",
"file": "assets/index-56152516.js",
"imports": [
"_format-money-5a1aa122.js",
"_vendor-291d7a70.js",
"_get-2d864c96.js"
"_format-money-89cf90df.js",
"_vendor-029c0fc2.js",
"_get-23aadb69.js"
],
"isEntry": true,
"src": "resources/assets/v2/pages/accounts/index.js"
},
"resources/assets/v2/pages/dashboard/dashboard.js": {
"file": "assets/dashboard-39513f31.js",
"file": "assets/dashboard-f6f6ae3f.js",
"imports": [
"_format-money-5a1aa122.js",
"_vendor-291d7a70.js",
"_get-2d864c96.js",
"_get-a398221d.js",
"_get-316f0281.js"
"_format-money-89cf90df.js",
"_vendor-029c0fc2.js",
"_get-23aadb69.js",
"_get-b646f004.js",
"_get-58830780.js"
],
"isEntry": true,
"src": "resources/assets/v2/pages/dashboard/dashboard.js"
},
"resources/assets/v2/pages/transactions/create.js": {
"file": "assets/create-b70c5f7e.js",
"file": "assets/create-dec509ea.js",
"imports": [
"_format-money-5a1aa122.js",
"_create-empty-split-70d17748.js",
"_splice-errors-into-transactions-5b51d5fd.js",
"_vendor-291d7a70.js",
"_get-316f0281.js"
"_format-money-89cf90df.js",
"_create-empty-split-9549645c.js",
"_splice-errors-into-transactions-81484c73.js",
"_vendor-029c0fc2.js",
"_get-58830780.js"
],
"isEntry": true,
"src": "resources/assets/v2/pages/transactions/create.js"
},
"resources/assets/v2/pages/transactions/edit.js": {
"file": "assets/edit-0146de3c.js",
"file": "assets/edit-990ac3ab.js",
"imports": [
"_format-money-5a1aa122.js",
"_get-a398221d.js",
"_parse-downloaded-splits-ce04c01c.js",
"_splice-errors-into-transactions-5b51d5fd.js",
"_vendor-291d7a70.js",
"_create-empty-split-70d17748.js",
"_put-02a25c9f.js",
"_get-316f0281.js"
"_format-money-89cf90df.js",
"_get-b646f004.js",
"_parse-downloaded-splits-2d74acfc.js",
"_splice-errors-into-transactions-81484c73.js",
"_vendor-029c0fc2.js",
"_create-empty-split-9549645c.js",
"_put-c581fff2.js",
"_get-58830780.js"
],
"isEntry": true,
"src": "resources/assets/v2/pages/transactions/edit.js"
@ -158,12 +158,12 @@
"css": [
"assets/grid-ff3-theme-badb0a41.css"
],
"file": "assets/index-80c224c9.js",
"file": "assets/index-979da1db.js",
"imports": [
"_format-money-5a1aa122.js",
"_vendor-291d7a70.js",
"_put-02a25c9f.js",
"_get-a398221d.js"
"_format-money-89cf90df.js",
"_vendor-029c0fc2.js",
"_put-c581fff2.js",
"_get-b646f004.js"
],
"isEntry": true,
"src": "resources/assets/v2/pages/transactions/index.js"
@ -176,13 +176,13 @@
"css": [
"assets/show-8b1429e5.css"
],
"file": "assets/show-7b497861.js",
"file": "assets/show-31120d76.js",
"imports": [
"_format-money-5a1aa122.js",
"_vendor-291d7a70.js",
"_get-a398221d.js",
"_parse-downloaded-splits-ce04c01c.js",
"_create-empty-split-70d17748.js"
"_format-money-89cf90df.js",
"_vendor-029c0fc2.js",
"_get-b646f004.js",
"_parse-downloaded-splits-2d74acfc.js",
"_create-empty-split-9549645c.js"
],
"isEntry": true,
"src": "resources/assets/v2/pages/transactions/show.js"

2
public/v1/js/create_transaction.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/edit_transaction.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/profile.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/create.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/edit.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/index.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/show.js
View File

File diff suppressed because one or more lines are too long

2
public/v2/i18n/de.json
View File

@ -2,7 +2,7 @@
"config": {
"html_language": "de",
"date_time_fns": "dd. MMM. yyyy um HH:mm:ss",
"date_time_fns_short": "MMMM do, yyyy @ HH:mm"
"date_time_fns_short": "dd. MMM. yyyy um HH:mm"
},
"firefly": {
"spent": "Ausgegeben",

Some files were not shown because too many files have changed in this diff Show More