Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-11-26
JC5d8bdbf28423f
diff --git a/app/Console/Commands/Correction/CorrectsInvertedBudgetLimits.php b/app/Console/Commands/Correction/CorrectsInvertedBudgetLimits.phpindex bf214ba4ab..17a57b7c0b 100644--- a/app/Console/Commands/Correction/CorrectsInvertedBudgetLimits.php+++ b/app/Console/Commands/Correction/CorrectsInvertedBudgetLimits.php@@ -1,4 +1,6 @@<?php++declare(strict_types=1);/** CorrectsInversedBudgetLimits.php* Copyright (c) 2025 [email protected]@@ -36,7 +38,7 @@ class CorrectsInvertedBudgetLimits extends Command** @var string*/- protected $signature = 'correction:corrects-inverted-budget-limits';+ protected $signature = 'correction:corrects-inverted-budget-limits';/*** The console command description.@@ -54,8 +56,10 @@ class CorrectsInvertedBudgetLimits extends Command$set = BudgetLimit::where('start_date', '>', DB::raw('end_date'))->get();if (0 === $set->count()) {Log::debug('No inverted budget limits found.');+return Command::SUCCESS;}+/** @var BudgetLimit $budgetLimit */foreach ($set as $budgetLimit) {$start = $budgetLimit->start_date->copy();@@ -66,9 +70,11 @@ class CorrectsInvertedBudgetLimits extends Command}if (1 === $set->count()) {$this->friendlyInfo('Corrected one budget limit to have the right start/end dates.');+return Command::SUCCESS;}$this->friendlyInfo(sprintf('Corrected %d budget limits to have the right start/end dates.', count($set)));+return Command::SUCCESS;}}diff --git a/app/Console/Commands/System/ForcesDecimalSize.php b/app/Console/Commands/System/ForcesDecimalSize.phpindex 0a39fedf78..ec6ca7fc79 100644--- a/app/Console/Commands/System/ForcesDecimalSize.php+++ b/app/Console/Commands/System/ForcesDecimalSize.php@@ -42,6 +42,7 @@ use Illuminate\Database\Eloquent\Builder;use Illuminate\Database\Eloquent\Model;use Illuminate\Support\Facades\DB;use Illuminate\Support\Facades\Log;+use function Safe\json_encode;use function Safe\mb_regex_encoding;@@ -54,11 +55,11 @@ class ForcesDecimalSize 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 {--force}';+ protected $description = 'This command resizes DECIMAL columns in MySQL or PostgreSQL and correct amounts (only MySQL).';+ protected $signature = 'firefly-iii:force-decimal-size {--force}';private string $cast;private array $classes- = [+ = ['accounts' => Account::class,'auto_budgets' => AutoBudget::class,'available_budgets' => AvailableBudget::class,@@ -74,7 +75,7 @@ class ForcesDecimalSize extends Commandprivate string $operator;private string $regularExpression;private array $tables- = [+ = ['accounts' => ['virtual_balance'],'auto_budgets' => ['amount'],'available_budgets' => ['amount'],@@ -238,9 +239,10 @@ class ForcesDecimalSize extends Command$regularExpression = $this->regularExpression;/** @var Builder $query */- $query = Account::leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')- ->where('account_meta.name', 'currency_id')- ->where('account_meta.data', json_encode((string)$currency->id));+ $query = Account::leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')+ ->where('account_meta.name', 'currency_id')+ ->where('account_meta.data', json_encode((string)$currency->id))+ ;$query->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {foreach ($fields as $field) {$q->orWhere(@@ -250,7 +252,7 @@ class ForcesDecimalSize extends Command);}});- $result = $query->get(['accounts.*']);+ $result = $query->get(['accounts.*']);if (0 === $result->count()) {$this->friendlyPositive(sprintf('All accounts in %s are OK', $currency->code));@@ -261,13 +263,13 @@ class ForcesDecimalSize extends Commandforeach ($result as $account) {/** @var string $field */foreach ($fields as $field) {- $value = $account->{$field};+ $value = $account->{$field};if (null === $value) {continue;}// fix $field by rounding it down correctly.- $pow = 10 ** $currency->decimal_places;- $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);+ $pow = 10 ** $currency->decimal_places;+ $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);$this->friendlyInfo(sprintf('Account #%d has %s with value "%s", this has been corrected to "%s".', $account->id, $field, $value, $correct));/** @var null|Account $updateAccount */@@ -289,7 +291,7 @@ class ForcesDecimalSize extends Command$regularExpression = $this->regularExpression;/** @var Builder $query */- $query = $class::where('transaction_currency_id', $currency->id)->where(+ $query = $class::where('transaction_currency_id', $currency->id)->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {/** @var string $field */foreach ($fields as $field) {@@ -302,7 +304,7 @@ class ForcesDecimalSize extends Command});- $result = $query->get();+ $result = $query->get();if (0 === $result->count()) {$this->friendlyPositive(sprintf('All %s in %s are OK', $table, $currency->code));@@ -313,7 +315,7 @@ class ForcesDecimalSize extends Commandforeach ($result as $item) {/** @var string $field */foreach ($fields as $field) {- $value = $item->{$field};+ $value = $item->{$field};if (null === $value || '' === $value) {continue;}@@ -323,7 +325,7 @@ class ForcesDecimalSize extends Command$this->friendlyWarning(sprintf('%s #%d has %s with value "%s", this has been corrected to "%s".', $table, $item->id, $field, $value, $correct));/** @var null|Model $model */- $model = $class::find($item->id);+ $model = $class::find($item->id);$model?->update([$field => $correct]);}}@@ -339,22 +341,23 @@ class ForcesDecimalSize extends Command$regularExpression = $this->regularExpression;/** @var Builder $query */- $query = PiggyBankEvent::leftJoin('piggy_banks', 'piggy_bank_events.piggy_bank_id', '=', 'piggy_banks.id')- ->leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')- ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')- ->where('account_meta.name', 'currency_id')- ->where('account_meta.data', json_encode((string)$currency->id))- ->where(static function (Builder $q) use ($fields, $currency, $cast, $operator, $regularExpression): void {- foreach ($fields as $field) {- $q->orWhere(- DB::raw(sprintf('CAST(piggy_bank_events.%s AS %s)', $field, $cast)),- $operator,- DB::raw(sprintf($regularExpression, $currency->decimal_places))- );- }- });-- $result = $query->get(['piggy_bank_events.*']);+ $query = PiggyBankEvent::leftJoin('piggy_banks', 'piggy_bank_events.piggy_bank_id', '=', 'piggy_banks.id')+ ->leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')+ ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')+ ->where('account_meta.name', 'currency_id')+ ->where('account_meta.data', json_encode((string)$currency->id))+ ->where(static function (Builder $q) use ($fields, $currency, $cast, $operator, $regularExpression): void {+ foreach ($fields as $field) {+ $q->orWhere(+ DB::raw(sprintf('CAST(piggy_bank_events.%s AS %s)', $field, $cast)),+ $operator,+ DB::raw(sprintf($regularExpression, $currency->decimal_places))+ );+ }+ })+ ;++ $result = $query->get(['piggy_bank_events.*']);if (0 === $result->count()) {$this->friendlyPositive(sprintf('All piggy bank events in %s are OK', $currency->code));@@ -365,7 +368,7 @@ class ForcesDecimalSize extends Commandforeach ($result as $item) {/** @var string $field */foreach ($fields as $field) {- $value = $item->{$field};+ $value = $item->{$field};if (null === $value) {continue;}@@ -377,7 +380,7 @@ class ForcesDecimalSize extends Command);/** @var null|PiggyBankEvent $event */- $event = PiggyBankEvent::find($item->id);+ $event = PiggyBankEvent::find($item->id);$event?->update([$field => $correct]);}}@@ -394,22 +397,23 @@ class ForcesDecimalSize extends Command// select all piggy bank repetitions with this currency and issue./** @var Builder $query */- $query = PiggyBankRepetition::leftJoin('piggy_banks', 'piggy_bank_repetitions.piggy_bank_id', '=', 'piggy_banks.id')- ->leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')- ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')- ->where('account_meta.name', 'currency_id')- ->where('account_meta.data', json_encode((string)$currency->id))- ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {- foreach ($fields as $field) {- $q->orWhere(- DB::raw(sprintf('CAST(piggy_bank_repetitions.%s AS %s)', $field, $cast)),- $operator,- DB::raw(sprintf($regularExpression, $currency->decimal_places))- );- }- });-- $result = $query->get(['piggy_bank_repetitions.*']);+ $query = PiggyBankRepetition::leftJoin('piggy_banks', 'piggy_bank_repetitions.piggy_bank_id', '=', 'piggy_banks.id')+ ->leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')+ ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')+ ->where('account_meta.name', 'currency_id')+ ->where('account_meta.data', json_encode((string)$currency->id))+ ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {+ foreach ($fields as $field) {+ $q->orWhere(+ DB::raw(sprintf('CAST(piggy_bank_repetitions.%s AS %s)', $field, $cast)),+ $operator,+ DB::raw(sprintf($regularExpression, $currency->decimal_places))+ );+ }+ })+ ;++ $result = $query->get(['piggy_bank_repetitions.*']);if (0 === $result->count()) {$this->friendlyPositive(sprintf('All piggy bank repetitions in %s', $currency->code));@@ -420,13 +424,13 @@ class ForcesDecimalSize extends Commandforeach ($result as $item) {/** @var string $field */foreach ($fields as $field) {- $value = $item->{$field};+ $value = $item->{$field};if (null === $value) {continue;}// fix $field by rounding it down correctly.- $pow = 10 ** $currency->decimal_places;- $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);+ $pow = 10 ** $currency->decimal_places;+ $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);$this->friendlyWarning(sprintf('Piggy bank repetition #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct));@@ -448,21 +452,22 @@ class ForcesDecimalSize extends Command$regularExpression = $this->regularExpression;/** @var Builder $query */- $query = PiggyBank::leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')- ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')- ->where('account_meta.name', 'currency_id')- ->where('account_meta.data', json_encode((string)$currency->id))- ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {- foreach ($fields as $field) {- $q->orWhere(- DB::raw(sprintf('CAST(piggy_banks.%s AS %s)', $field, $cast)),- $operator,- DB::raw(sprintf($regularExpression, $currency->decimal_places))- );- }- });-- $result = $query->get(['piggy_banks.*']);+ $query = PiggyBank::leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')+ ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')+ ->where('account_meta.name', 'currency_id')+ ->where('account_meta.data', json_encode((string)$currency->id))+ ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {+ foreach ($fields as $field) {+ $q->orWhere(+ DB::raw(sprintf('CAST(piggy_banks.%s AS %s)', $field, $cast)),+ $operator,+ DB::raw(sprintf($regularExpression, $currency->decimal_places))+ );+ }+ })+ ;++ $result = $query->get(['piggy_banks.*']);if (0 === $result->count()) {$this->friendlyPositive(sprintf('All piggy banks in %s are OK', $currency->code));@@ -473,13 +478,13 @@ class ForcesDecimalSize extends Commandforeach ($result as $item) {/** @var string $field */foreach ($fields as $field) {- $value = $item->{$field};+ $value = $item->{$field};if (null === $value) {continue;}// fix $field by rounding it down correctly.- $pow = 10 ** $currency->decimal_places;- $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);+ $pow = 10 ** $currency->decimal_places;+ $correct = bcdiv((string)round($value * $pow), (string)$pow, 12);$this->friendlyWarning(sprintf('Piggy bank #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct));/** @var null|PiggyBank $piggyBank */@@ -496,7 +501,7 @@ class ForcesDecimalSize extends Command{// select all transactions with this currency and issue./** @var Builder $query */- $query = Transaction::where('transaction_currency_id', $currency->id)->where(+ $query = Transaction::where('transaction_currency_id', $currency->id)->where(DB::raw(sprintf('CAST(amount as %s)', $this->cast)),$this->operator,DB::raw(sprintf($this->regularExpression, $currency->decimal_places))@@ -509,13 +514,13 @@ class ForcesDecimalSize extends Command/** @var Transaction $item */foreach ($result as $item) {- $value = $item->amount;+ $value = $item->amount;if ('' === $value) {continue;}// fix $field by rounding it down correctly.- $pow = 10.0 ** $currency->decimal_places;- $correct = bcdiv((string)round((float)$value * $pow), (string)$pow, 12);+ $pow = 10.0 ** $currency->decimal_places;+ $correct = bcdiv((string)round((float)$value * $pow), (string)$pow, 12);$this->friendlyWarning(sprintf('Transaction #%d has amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct));/** @var null|Transaction $transaction */@@ -525,7 +530,7 @@ class ForcesDecimalSize extends Command// select all transactions with this FOREIGN currency and issue./** @var Builder $query */- $query = Transaction::where('foreign_currency_id', $currency->id)->where(+ $query = Transaction::where('foreign_currency_id', $currency->id)->where(DB::raw(sprintf('CAST(foreign_amount as %s)', $this->cast)),$this->operator,DB::raw(sprintf($this->regularExpression, $currency->decimal_places))@@ -540,13 +545,13 @@ class ForcesDecimalSize extends Command/** @var Transaction $item */foreach ($result as $item) {- $value = $item->foreign_amount;+ $value = $item->foreign_amount;if (null === $value) {continue;}// fix $field by rounding it down correctly.- $pow = 10.0 ** $currency->decimal_places;- $correct = bcdiv((string)round((float)$value * $pow), (string)$pow, 12);+ $pow = 10.0 ** $currency->decimal_places;+ $correct = bcdiv((string)round((float)$value * $pow), (string)$pow, 12);$this->friendlyWarning(sprintf('Transaction #%d has foreign amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct));diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.phpindex 174328d275..289413e8fb 100644--- a/app/Http/Controllers/Account/IndexController.php+++ b/app/Http/Controllers/Account/IndexController.php@@ -167,7 +167,7 @@ class IndexController extends Controller/** @var Carbon $end */$end = clone session('end', today(config('app.timezone'))->endOfMonth());- $now = now();+ $now = now();if ($now->gt($end) || $now->lt($start)) {$now = $end;}diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.phpindex d9f2d77f77..f495e586c8 100644--- a/app/Http/Controllers/Account/ShowController.php+++ b/app/Http/Controllers/Account/ShowController.php@@ -221,7 +221,7 @@ class ShowController extends Controller// correctLog::debug(sprintf('showAll: Call accountsBalancesOptimized with date/time "%s"', $end->toIso8601String()));- $now = now();+ $now = now();if ($now->gt($end) || $now->lt($start)) {$now = $end;}diff --git a/app/Support/Navigation.php b/app/Support/Navigation.phpindex eeaa7714e2..b2d2c76f5d 100644--- a/app/Support/Navigation.php+++ b/app/Support/Navigation.php@@ -121,8 +121,8 @@ class Navigationif ($workEnd->gt($start)) {while ($workEnd->gt($start) && $loopCount < 20) {// make range:- $workStart = \FireflyIII\Support\Facades\Navigation::startOfPeriod($workStart, '1Y');- $workEnd = \FireflyIII\Support\Facades\Navigation::endOfPeriod($workStart, '1Y');+ $workStart = Facades\Navigation::startOfPeriod($workStart, '1Y');+ $workEnd = Facades\Navigation::endOfPeriod($workStart, '1Y');// make sure we don't go overboardif ($workEnd->gt($start)) {diff --git a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.phpindex 8a238e723b..2d4ee01702 100644--- a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php+++ b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php@@ -43,10 +43,10 @@ trait RecalculatesAvailableBudgetsTrait{private function calculateAmount(AvailableBudget $availableBudget): void{- $repository = app(BudgetLimitRepositoryInterface::class);+ $repository = app(BudgetLimitRepositoryInterface::class);$repository->setUser($availableBudget->user);- $newAmount = '0';- $abPeriod = Period::make($availableBudget->start_date, $availableBudget->end_date, Precision::DAY());+ $newAmount = '0';+ $abPeriod = Period::make($availableBudget->start_date, $availableBudget->end_date, Precision::DAY());Log::debug(sprintf('Now at AB #%d, ("%s" to "%s")',@@ -56,7 +56,7 @@ trait RecalculatesAvailableBudgetsTrait));// have to recalculate everything just in case.- $set = $repository->getAllBudgetLimitsByCurrency($availableBudget->transactionCurrency, $availableBudget->start_date, $availableBudget->end_date);+ $set = $repository->getAllBudgetLimitsByCurrency($availableBudget->transactionCurrency, $availableBudget->start_date, $availableBudget->end_date);Log::debug(sprintf('Found %d interesting budget limit(s).', $set->count()));/** @var BudgetLimit $budgetLimit */@@ -71,8 +71,8 @@ trait RecalculatesAvailableBudgetsTrait);// overlap in days:$limitPeriod = Period::make(- $budgetLimit->start_date,- $budgetLimit->end_date,+ $budgetLimit->start_date,+ $budgetLimit->end_date,precision : Precision::DAY(),boundaries: Boundaries::EXCLUDE_NONE());@@ -113,8 +113,8 @@ trait RecalculatesAvailableBudgetsTraitreturn '0';}$limitPeriod = Period::make(- $budgetLimit->start_date,- $budgetLimit->end_date,+ $budgetLimit->start_date,+ $budgetLimit->end_date,precision : Precision::DAY(),boundaries: Boundaries::EXCLUDE_NONE());@@ -132,7 +132,7 @@ trait RecalculatesAvailableBudgetsTraitLog::debug(sprintf('Now in updateAvailableBudget(limit #%d)', $budgetLimit->id));/** @var null|Budget $budget */- $budget = Budget::find($budgetLimit->budget_id);+ $budget = Budget::find($budgetLimit->budget_id);if (null === $budget) {Log::warning('Budget is null, probably deleted, find deleted version.');@@ -147,7 +147,7 @@ trait RecalculatesAvailableBudgetsTrait}/** @var null|User $user */- $user = $budget->user;+ $user = $budget->user;// sanity check. It happens when the budget has been deleted so the original user is unknown.if (null === $user) {@@ -163,7 +163,7 @@ trait RecalculatesAvailableBudgetsTrait// all have to be created or updated.try {$viewRange = app('preferences')->getForUser($user, 'viewRange', '1M')->data;- } catch (ContainerExceptionInterface | NotFoundExceptionInterface $e) {+ } catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) {Log::error($e->getMessage());$viewRange = '1M';}@@ -171,13 +171,13 @@ trait RecalculatesAvailableBudgetsTraitif (null === $viewRange || is_array($viewRange)) {$viewRange = '1M';}- $viewRange = (string)$viewRange;+ $viewRange = (string)$viewRange;- $start = Navigation::startOfPeriod($budgetLimit->start_date, $viewRange);- $end = Navigation::startOfPeriod($budgetLimit->end_date, $viewRange);- $end = Navigation::endOfPeriod($end, $viewRange);+ $start = Navigation::startOfPeriod($budgetLimit->start_date, $viewRange);+ $end = Navigation::startOfPeriod($budgetLimit->end_date, $viewRange);+ $end = Navigation::endOfPeriod($end, $viewRange);if ($end < $start) {- [$start, $end] = [$end, $start];+ [$start, $end] = [$end, $start];$budgetLimit->start_date = $start;$budgetLimit->end_date = $end;$budgetLimit->saveQuietly();@@ -189,9 +189,9 @@ trait RecalculatesAvailableBudgetsTraitLog::debug(sprintf('Limit period is from %s to %s', $start->format('Y-m-d'), $end->format('Y-m-d')));// from the start until the end of the budget limit, need to loop!- $current = clone $start;+ $current = clone $start;while ($current <= $end) {- $currentEnd = Navigation::endOfPeriod($current, $viewRange);+ $currentEnd = Navigation::endOfPeriod($current, $viewRange);// create or find AB for this particular period, and set the amount accordingly./** @var null|AvailableBudget $availableBudget */@@ -203,12 +203,14 @@ trait RecalculatesAvailableBudgetsTrait}if (null === $availableBudget) {Log::debug('No AB found, will create.');+// if not exists:try {$currentPeriod = Period::make($current, $currentEnd, precision: Precision::DAY(), boundaries: Boundaries::EXCLUDE_NONE());} catch (InvalidPeriod $e) {Log::error('Tried to make invalid period.');Log::error($e->getMessage());+continue;}$daily = $this->getDailyAmount($budgetLimit);@@ -242,7 +244,7 @@ trait RecalculatesAvailableBudgetsTrait}// prep for next loop- $current = Navigation::addPeriod($current, $viewRange);+ $current = Navigation::addPeriod($current, $viewRange);}}}diff --git a/app/TransactionRules/Actions/AddTag.php b/app/TransactionRules/Actions/AddTag.phpindex c7bcea80ee..ba07470d45 100644--- a/app/TransactionRules/Actions/AddTag.php+++ b/app/TransactionRules/Actions/AddTag.php@@ -55,8 +55,8 @@ class AddTag implements ActionInterface$tagName = $this->action->getValue($journal);$tag = $factory->findOrCreate($tagName);- $type = $journal['transaction_type_type'];- if(TransactionTypeEnum::OPENING_BALANCE->value === $type || TransactionTypeEnum::LIABILITY_CREDIT->value === $type || TransactionTypeEnum::INVALID->value === $type) {+ $type = $journal['transaction_type_type'];+ if (TransactionTypeEnum::OPENING_BALANCE->value === $type || TransactionTypeEnum::LIABILITY_CREDIT->value === $type || TransactionTypeEnum::INVALID->value === $type) {// fail silently on invalid transaction types.return false;diff --git a/composer.lock b/composer.lockindex 9ef7ac18d8..78730a5800 100644--- a/composer.lock+++ b/composer.lock@@ -130,16 +130,16 @@},{"name": "brick/math",- "version": "0.14.0",+ "version": "0.14.1","source": {"type": "git","url": "https://github.com/brick/math.git",- "reference": "113a8ee2656b882d4c3164fa31aa6e12cbb7aaa2"+ "reference": "f05858549e5f9d7bb45875a75583240a38a281d0"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/brick/math/zipball/113a8ee2656b882d4c3164fa31aa6e12cbb7aaa2",- "reference": "113a8ee2656b882d4c3164fa31aa6e12cbb7aaa2",+ "url": "https://api.github.com/repos/brick/math/zipball/f05858549e5f9d7bb45875a75583240a38a281d0",+ "reference": "f05858549e5f9d7bb45875a75583240a38a281d0","shasum": ""},"require": {@@ -178,7 +178,7 @@],"support": {"issues": "https://github.com/brick/math/issues",- "source": "https://github.com/brick/math/tree/0.14.0"+ "source": "https://github.com/brick/math/tree/0.14.1"},"funding": [{@@ -186,7 +186,7 @@"type": "github"}],- "time": "2025-08-29T12:40:03+00:00"+ "time": "2025-11-24T14:40:29+00:00"},{"name": "carbonphp/carbon-doctrine-types",@@ -1938,16 +1938,16 @@},{"name": "laravel/framework",- "version": "v12.39.0",+ "version": "v12.40.1","source": {"type": "git","url": "https://github.com/laravel/framework.git",- "reference": "1a6176129ef28eaf42b6b4a6250025120c3d8dac"+ "reference": "2e986acbf9acf62cba13400bc23c4d639bf188b9"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/framework/zipball/1a6176129ef28eaf42b6b4a6250025120c3d8dac",- "reference": "1a6176129ef28eaf42b6b4a6250025120c3d8dac",+ "url": "https://api.github.com/repos/laravel/framework/zipball/2e986acbf9acf62cba13400bc23c4d639bf188b9",+ "reference": "2e986acbf9acf62cba13400bc23c4d639bf188b9","shasum": ""},"require": {@@ -2059,7 +2059,7 @@"league/flysystem-sftp-v3": "^3.25.1","mockery/mockery": "^1.6.10","opis/json-schema": "^2.4.1",- "orchestra/testbench-core": "^10.7.0",+ "orchestra/testbench-core": "^10.8.0","pda/pheanstalk": "^5.0.6|^7.0.0","php-http/discovery": "^1.15","phpstan/phpstan": "^2.0",@@ -2153,7 +2153,7 @@"issues": "https://github.com/laravel/framework/issues","source": "https://github.com/laravel/framework"},- "time": "2025-11-18T15:16:10+00:00"+ "time": "2025-11-25T16:16:33+00:00"},{"name": "laravel/passport",@@ -2233,16 +2233,16 @@},{"name": "laravel/prompts",- "version": "v0.3.7",+ "version": "v0.3.8","source": {"type": "git","url": "https://github.com/laravel/prompts.git",- "reference": "a1891d362714bc40c8d23b0b1d7090f022ea27cc"+ "reference": "096748cdfb81988f60090bbb839ce3205ace0d35"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/prompts/zipball/a1891d362714bc40c8d23b0b1d7090f022ea27cc",- "reference": "a1891d362714bc40c8d23b0b1d7090f022ea27cc",+ "url": "https://api.github.com/repos/laravel/prompts/zipball/096748cdfb81988f60090bbb839ce3205ace0d35",+ "reference": "096748cdfb81988f60090bbb839ce3205ace0d35","shasum": ""},"require": {@@ -2258,7 +2258,7 @@"require-dev": {"illuminate/collections": "^10.0|^11.0|^12.0","mockery/mockery": "^1.5",- "pestphp/pest": "^2.3|^3.4",+ "pestphp/pest": "^2.3|^3.4|^4.0","phpstan/phpstan": "^1.12.28","phpstan/phpstan-mockery": "^1.1.3"},@@ -2286,22 +2286,22 @@"description": "Add beautiful and user-friendly forms to your command-line applications.","support": {"issues": "https://github.com/laravel/prompts/issues",- "source": "https://github.com/laravel/prompts/tree/v0.3.7"+ "source": "https://github.com/laravel/prompts/tree/v0.3.8"},- "time": "2025-09-19T13:47:56+00:00"+ "time": "2025-11-21T20:52:52+00:00"},{"name": "laravel/sanctum",- "version": "v4.2.0",+ "version": "v4.2.1","source": {"type": "git","url": "https://github.com/laravel/sanctum.git",- "reference": "fd6df4f79f48a72992e8d29a9c0ee25422a0d677"+ "reference": "f5fb373be39a246c74a060f2cf2ae2c2145b3664"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/sanctum/zipball/fd6df4f79f48a72992e8d29a9c0ee25422a0d677",- "reference": "fd6df4f79f48a72992e8d29a9c0ee25422a0d677",+ "url": "https://api.github.com/repos/laravel/sanctum/zipball/f5fb373be39a246c74a060f2cf2ae2c2145b3664",+ "reference": "f5fb373be39a246c74a060f2cf2ae2c2145b3664","shasum": ""},"require": {@@ -2315,9 +2315,8 @@},"require-dev": {"mockery/mockery": "^1.6",- "orchestra/testbench": "^9.0|^10.0",- "phpstan/phpstan": "^1.10",- "phpunit/phpunit": "^11.3"+ "orchestra/testbench": "^9.15|^10.8",+ "phpstan/phpstan": "^1.10"},"type": "library","extra": {@@ -2352,20 +2351,20 @@"issues": "https://github.com/laravel/sanctum/issues","source": "https://github.com/laravel/sanctum"},- "time": "2025-07-09T19:45:24+00:00"+ "time": "2025-11-21T13:59:03+00:00"},{"name": "laravel/serializable-closure",- "version": "v2.0.6",+ "version": "v2.0.7","source": {"type": "git","url": "https://github.com/laravel/serializable-closure.git",- "reference": "038ce42edee619599a1debb7e81d7b3759492819"+ "reference": "cb291e4c998ac50637c7eeb58189c14f5de5b9dd"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/038ce42edee619599a1debb7e81d7b3759492819",- "reference": "038ce42edee619599a1debb7e81d7b3759492819",+ "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/cb291e4c998ac50637c7eeb58189c14f5de5b9dd",+ "reference": "cb291e4c998ac50637c7eeb58189c14f5de5b9dd","shasum": ""},"require": {@@ -2374,7 +2373,7 @@"require-dev": {"illuminate/support": "^10.0|^11.0|^12.0","nesbot/carbon": "^2.67|^3.0",- "pestphp/pest": "^2.36|^3.0",+ "pestphp/pest": "^2.36|^3.0|^4.0","phpstan/phpstan": "^2.0","symfony/var-dumper": "^6.2.0|^7.0.0"},@@ -2413,20 +2412,20 @@"issues": "https://github.com/laravel/serializable-closure/issues","source": "https://github.com/laravel/serializable-closure"},- "time": "2025-10-09T13:42:30+00:00"+ "time": "2025-11-21T20:52:36+00:00"},{"name": "laravel/slack-notification-channel",- "version": "v3.6.0",+ "version": "v3.7.0","source": {"type": "git","url": "https://github.com/laravel/slack-notification-channel.git",- "reference": "642677a57490eebccb7e9fb666f5a5379c6e3459"+ "reference": "414aec57b487bfbac7f90fc30f50a2f0a2df4caa"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/642677a57490eebccb7e9fb666f5a5379c6e3459",- "reference": "642677a57490eebccb7e9fb666f5a5379c6e3459",+ "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/414aec57b487bfbac7f90fc30f50a2f0a2df4caa",+ "reference": "414aec57b487bfbac7f90fc30f50a2f0a2df4caa","shasum": ""},"require": {@@ -2476,9 +2475,9 @@],"support": {"issues": "https://github.com/laravel/slack-notification-channel/issues",- "source": "https://github.com/laravel/slack-notification-channel/tree/v3.6.0"+ "source": "https://github.com/laravel/slack-notification-channel/tree/v3.7.0"},- "time": "2025-06-26T16:51:38+00:00"+ "time": "2025-11-20T17:26:07+00:00"},{"name": "laravel/ui",@@ -3544,22 +3543,22 @@},{"name": "mailersend/laravel-driver",- "version": "v2.9.1",+ "version": "v2.12.0","source": {"type": "git","url": "https://github.com/mailersend/mailersend-laravel-driver.git",- "reference": "87fd5ab76808bbaac9221be0d306baef13e98725"+ "reference": "15e1ec41e29e65d3ca226929c65804190aaa93eb"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/87fd5ab76808bbaac9221be0d306baef13e98725",- "reference": "87fd5ab76808bbaac9221be0d306baef13e98725",+ "url": "https://api.github.com/repos/mailersend/mailersend-laravel-driver/zipball/15e1ec41e29e65d3ca226929c65804190aaa93eb",+ "reference": "15e1ec41e29e65d3ca226929c65804190aaa93eb","shasum": ""},"require": {"ext-json": "*","illuminate/support": "^9.0 || ^10.0 || ^11.0 || ^12.0",- "mailersend/mailersend": "^0.31.0",+ "mailersend/mailersend": "^0.35.0","nyholm/psr7": "^1.5","php": ">=8.0","php-http/guzzle7-adapter": "^1.0",@@ -3607,29 +3606,28 @@],"support": {"issues": "https://github.com/mailersend/mailersend-laravel-driver/issues",- "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.9.1"+ "source": "https://github.com/mailersend/mailersend-laravel-driver/tree/v2.12.0"},- "time": "2025-04-09T09:33:07+00:00"+ "time": "2025-10-28T14:59:16+00:00"},{"name": "mailersend/mailersend",- "version": "v0.31.0",+ "version": "v0.35.0","source": {"type": "git","url": "https://github.com/mailersend/mailersend-php.git",- "reference": "513ff83ee768526055ad52987cde401ea7218c67"+ "reference": "f1696cf9e727e9503fbc5882d2a111bd966ad276"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/513ff83ee768526055ad52987cde401ea7218c67",- "reference": "513ff83ee768526055ad52987cde401ea7218c67",+ "url": "https://api.github.com/repos/mailersend/mailersend-php/zipball/f1696cf9e727e9503fbc5882d2a111bd966ad276",+ "reference": "f1696cf9e727e9503fbc5882d2a111bd966ad276","shasum": ""},"require": {"beberlei/assert": "^3.2","ext-json": "*",- "illuminate/collections": "^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",- "php": "^7.4|^8.0",+ "php": "^7.4 || ^8.0 <8.5","php-http/client-common": "^2.2","php-http/discovery": "^1.9","php-http/httplug": "^2.1",@@ -3674,9 +3672,9 @@],"support": {"issues": "https://github.com/mailersend/mailersend-php/issues",- "source": "https://github.com/mailersend/mailersend-php/tree/v0.31.0"+ "source": "https://github.com/mailersend/mailersend-php/tree/v0.35.0"},- "time": "2025-04-03T12:16:11+00:00"+ "time": "2025-10-28T13:11:43+00:00"},{"name": "monolog/monolog",@@ -5181,16 +5179,16 @@},{"name": "predis/predis",- "version": "v3.2.0",+ "version": "v3.3.0","source": {"type": "git","url": "https://github.com/predis/predis.git",- "reference": "9e9deec4dfd3ebf65d32eb368f498c646ba2ecd8"+ "reference": "153097374b39a2f737fe700ebcd725642526cdec"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/predis/predis/zipball/9e9deec4dfd3ebf65d32eb368f498c646ba2ecd8",- "reference": "9e9deec4dfd3ebf65d32eb368f498c646ba2ecd8",+ "url": "https://api.github.com/repos/predis/predis/zipball/153097374b39a2f737fe700ebcd725642526cdec",+ "reference": "153097374b39a2f737fe700ebcd725642526cdec","shasum": ""},"require": {@@ -5232,7 +5230,7 @@],"support": {"issues": "https://github.com/predis/predis/issues",- "source": "https://github.com/predis/predis/tree/v3.2.0"+ "source": "https://github.com/predis/predis/tree/v3.3.0"},"funding": [{@@ -5240,7 +5238,7 @@"type": "github"}],- "time": "2025-08-06T06:41:24+00:00"+ "time": "2025-11-24T17:48:50+00:00"},{"name": "psr/cache",diff --git a/config/firefly.php b/config/firefly.phpindex a8151ad390..b372972378 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,8 +78,8 @@ return ['running_balance_column' => env('USE_RUNNING_BALANCE', false),// see cer.php for exchange rates feature flag.],-'version' => 'develop/2025-11-24',-'build_time' => 1763955176,+ 'version' => 'develop/2025-11-26',+ 'build_time' => 1764136346,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/package-lock.json b/package-lock.jsonindex 42c12bdcad..c34128d7a8 100644--- a/package-lock.json+++ b/package-lock.json@@ -3291,42 +3291,42 @@}},"node_modules/@vue/compiler-core": {- "version": "3.5.24",- "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.24.tgz",- "integrity": "sha512-eDl5H57AOpNakGNAkFDH+y7kTqrQpJkZFXhWZQGyx/5Wh7B1uQYvcWkvZi11BDhscPgj8N7XV3oRwiPnx1Vrig==",+ "version": "3.5.25",+ "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.25.tgz",+ "integrity": "sha512-vay5/oQJdsNHmliWoZfHPoVZZRmnSWhug0BYT34njkYTPqClh3DNWLkZNJBVSjsNMrg0CCrBfoKkjZQPM/QVUw==","dev": true,"license": "MIT","dependencies": {"@babel/parser": "^7.28.5",- "@vue/shared": "3.5.24",+ "@vue/shared": "3.5.25","entities": "^4.5.0","estree-walker": "^2.0.2","source-map-js": "^1.2.1"}},"node_modules/@vue/compiler-dom": {- "version": "3.5.24",- "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz",- "integrity": "sha512-1QHGAvs53gXkWdd3ZMGYuvQFXHW4ksKWPG8HP8/2BscrbZ0brw183q2oNWjMrSWImYLHxHrx1ItBQr50I/q2zw==",+ "version": "3.5.25",+ "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.25.tgz",+ "integrity": "sha512-4We0OAcMZsKgYoGlMjzYvaoErltdFI2/25wqanuTu+S4gismOTRTBPi4IASOjxWdzIwrYSjnqONfKvuqkXzE2Q==","dev": true,"license": "MIT","dependencies": {- "@vue/compiler-core": "3.5.24",- "@vue/shared": "3.5.24"+ "@vue/compiler-core": "3.5.25",+ "@vue/shared": "3.5.25"}},"node_modules/@vue/compiler-sfc": {- "version": "3.5.24",- "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz",- "integrity": "sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==",+ "version": "3.5.25",+ "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.25.tgz",+ "integrity": "sha512-PUgKp2rn8fFsI++lF2sO7gwO2d9Yj57Utr5yEsDf3GNaQcowCLKL7sf+LvVFvtJDXUp/03+dC6f2+LCv5aK1ag==","dev": true,"license": "MIT","dependencies": {"@babel/parser": "^7.28.5",- "@vue/compiler-core": "3.5.24",- "@vue/compiler-dom": "3.5.24",- "@vue/compiler-ssr": "3.5.24",- "@vue/shared": "3.5.24",+ "@vue/compiler-core": "3.5.25",+ "@vue/compiler-dom": "3.5.25",+ "@vue/compiler-ssr": "3.5.25",+ "@vue/shared": "3.5.25","estree-walker": "^2.0.2","magic-string": "^0.30.21","postcss": "^8.5.6",@@ -3334,14 +3334,14 @@}},"node_modules/@vue/compiler-ssr": {- "version": "3.5.24",- "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz",- "integrity": "sha512-trOvMWNBMQ/odMRHW7Ae1CdfYx+7MuiQu62Jtu36gMLXcaoqKvAyh+P73sYG9ll+6jLB6QPovqoKGGZROzkFFg==",+ "version": "3.5.25",+ "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.25.tgz",+ "integrity": "sha512-ritPSKLBcParnsKYi+GNtbdbrIE1mtuFEJ4U1sWeuOMlIziK5GtOL85t5RhsNy4uWIXPgk+OUdpnXiTdzn8o3A==","dev": true,"license": "MIT","dependencies": {- "@vue/compiler-dom": "3.5.24",- "@vue/shared": "3.5.24"+ "@vue/compiler-dom": "3.5.25",+ "@vue/shared": "3.5.25"}},"node_modules/@vue/component-compiler-utils": {@@ -3423,9 +3423,9 @@"license": "MIT"},"node_modules/@vue/shared": {- "version": "3.5.24",- "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz",- "integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==",+ "version": "3.5.25",+ "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.25.tgz",+ "integrity": "sha512-AbOPdQQnAnzs58H2FrrDxYj/TJfmeS2jdfEEhgiKINy+bnOANmVizIEgq1r+C5zsbs6l1CCQxtcj71rwNQ4jWg==","dev": true,"license": "MIT"},@@ -4521,9 +4521,9 @@}},"node_modules/caniuse-lite": {- "version": "1.0.30001756",- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001756.tgz",- "integrity": "sha512-4HnCNKbMLkLdhJz3TToeVWHSnfJvPaq6vu/eRP0Ahub/07n484XHhBF5AJoSGHdVrS8tKFauUQz8Bp9P7LVx7A==",+ "version": "1.0.30001757",+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001757.tgz",+ "integrity": "sha512-r0nnL/I28Zi/yjk1el6ilj27tKcdjLsNqAOZr0yVjWPrSQyHgKI2INaEWw21bAQSv2LXRt1XuCS/GomNpWOxsQ==","dev": true,"funding": [{@@ -5736,9 +5736,9 @@"license": "MIT"},"node_modules/electron-to-chromium": {- "version": "1.5.259",- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.259.tgz",- "integrity": "sha512-I+oLXgpEJzD6Cwuwt1gYjxsDmu/S/Kd41mmLA3O+/uH2pFRO/DvOjUyGozL8j3KeLV6WyZ7ssPwELMsXCcsJAQ==",+ "version": "1.5.260",+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.260.tgz",+ "integrity": "sha512-ov8rBoOBhVawpzdre+Cmz4FB+y66Eqrk6Gwqd8NGxuhv99GQ8XqMAr351KEkOt7gukXWDg6gJWEMKgL2RLMPtA==","dev": true,"license": "ISC"},@@ -8400,9 +8400,9 @@}},"node_modules/node-forge": {- "version": "1.3.1",- "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",- "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",+ "version": "1.3.2",+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.2.tgz",+ "integrity": "sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==","dev": true,"license": "(BSD-3-Clause OR GPL-2.0)","engines": {