Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-09-13
JC508ce50190b89
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.phpindex 94be2ae461..df99eef909 100644--- a/app/Api/V1/Controllers/Insight/Income/TagController.php+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php@@ -158,10 +158,7 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd(- (string) $response[$foreignKey]['difference'],- Steam::positive($journal['foreign_amount'])- );+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];}}diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.phpindex b7b85fd376..f92a7aa9f0 100644--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php@@ -155,10 +155,7 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd(- (string) $response[$foreignKey]['difference'],- Steam::positive($journal['foreign_amount'])- );+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float}}diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex d461374baa..2edb4f5531 100644--- a/app/Http/Controllers/Budget/BudgetLimitController.php+++ b/app/Http/Controllers/Budget/BudgetLimitController.php@@ -198,13 +198,7 @@ final class BudgetLimitController extends Controllerif ($request->expectsJson()) {$array = $limit->toArray();// add some extra metadata:- $spentArr = $this->opsRepository->sumExpenses(- $limit->start_date,- $limit->end_date,- null,- new Collection()->push($budget),- $currency- );+ $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);$array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';$array['left_formatted'] = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));$array['amount_formatted'] = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.phpindex d40d4432a3..215ebbd484 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -284,10 +284,7 @@ final class IndexController extends Controllerif (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {$array['spent'][$currency->id]['spent'] = $spentArr[$currency->id]['sum'];- $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub(- $spentInLimits[$currency->id],- $spentArr[$currency->id]['sum']- ));+ $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']));$array['spent'][$currency->id]['currency_id'] = $currency->id;$array['spent'][$currency->id]['currency_symbol'] = $currency->symbol;$array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.phpindex f4b32fe5c5..ad724137dc 100644--- a/app/Http/Controllers/Chart/BudgetController.php+++ b/app/Http/Controllers/Chart/BudgetController.php@@ -539,13 +539,7 @@ final class BudgetController extends Controller}// get spent amount in this period for this currency.- $sum = $this->opsRepository->sumExpenses(- $currentStart,- $currentEnd,- $accounts,- new Collection()->push($budget),- $currency- );+ $sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');$chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.phpindex affea656a0..476da65ac3 100644--- a/app/Jobs/CreateAutoBudgetLimits.php+++ b/app/Jobs/CreateAutoBudgetLimits.php@@ -132,13 +132,7 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses(- $previousStart,- $previousEnd,- null,- new Collection()->push($autoBudget->budget),- $autoBudget->transactionCurrency- );+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));@@ -228,13 +222,7 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses(- $previousStart,- $previousEnd,- null,- new Collection()->push($autoBudget->budget),- $autoBudget->transactionCurrency- );+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.phpindex a507156873..a3a940b1ba 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -222,14 +222,7 @@ trait AugumentData$currentEnd->addMonth();}// primary currency amount.- $expenses = $opsRepository->sumExpenses(- $currentStart,- $currentEnd,- null,- $budgetCollection,- $entry->transactionCurrency,- $this->convertToPrimary- );+ $expenses = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToPrimary);$spent = $expenses[$currency->id]['sum'] ?? '0';$entry->pc_spent = $spent;diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.phpindex 2428353cb0..d0c09bf027 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -354,11 +354,7 @@ class RecurringEnrichment implements EnrichmentInterface/** @var RecurrenceRepetition $repetition */foreach ($set as $repetition) {- $recurrence = $this->collection->filter(- static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id- )- ->first()- ;+ $recurrence = $this->collection->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)->first();$fromDate = clone ($recurrence->latest_date ?? $recurrence->first_date);$recurrenceId = (int) $repetition->recurrence_id;$repId = (int) $repetition->id;diff --git a/config/firefly.php b/config/firefly.phpindex 13e4ce6fe7..43ca4abf89 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -79,7 +79,7 @@ return [// see cer.php for exchange rates feature flag.],'version' => 'develop/2026-09-13',-'build_time' => 1789309572,+'build_time' => 1789313992,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/resources/assets/v3/js/boot/bootstrap.js b/resources/assets/v3/js/boot/bootstrap.jsindex aa1570c7a8..b8b45ef922 100644--- a/resources/assets/v3/js/boot/bootstrap.js+++ b/resources/assets/v3/js/boot/bootstrap.js@@ -78,7 +78,12 @@ getFreshVariable("lastActivity")window.__localeId__ = values.locale;store.set("language", values.language);store.set("locale", values.locale);- console.log('Language is ' + values.language + ', locale is ' + values.locale);+ console.log(+ "Language is " ++ values.language ++ ", locale is " ++ values.locale,+ );loadTranslations(values.locale).then(() => {const event = new Event("firefly-iii-bootstrapped");document.dispatchEvent(event);diff --git a/resources/assets/v3/js/pages/dashboard/dashboard.js b/resources/assets/v3/js/pages/dashboard/dashboard.jsindex 1c1f5cd210..0a038bbd9d 100644--- a/resources/assets/v3/js/pages/dashboard/dashboard.js+++ b/resources/assets/v3/js/pages/dashboard/dashboard.js@@ -25,8 +25,8 @@ import boxes from "./boxes.js";import Alpine from "alpinejs";import Get from "../../api/model/piggy-bank/get.js";import formatMoney from "../../util/format-money.js";-import {getVariable} from "../../store/get-variable.js";-import {drawMultiCurrencyChart} from "../../shared/draw-chart.js";+import { getVariable } from "../../store/get-variable.js";+import { drawMultiCurrencyChart } from "../../shared/draw-chart.js";import format from "../../util/format.js";let index = function () {@@ -37,11 +37,14 @@ let index = function () {this.loadPiggyBanks();console.log("Dashboard");getVariable("anonymous").then((value) => {- let start = new Date(window.store.get('start'));- let end = new Date(window.store.get('end'));+ let start = new Date(window.store.get("start"));+ let end = new Date(window.store.get("end"));drawMultiCurrencyChart("line",- "api/v1/chart/account/overview?period=1D&start=" + format(start,"yyyy-LL-dd") + "&end=" + format(end,"yyyy-LL-dd"),+ "api/v1/chart/account/overview?period=1D&start=" ++ format(start, "yyyy-LL-dd") ++ "&end=" ++ format(end, "yyyy-LL-dd"),"accounts-chart",value,);@@ -55,17 +58,38 @@ let index = function () {for (let i = 0; i < response.data.data.length; i++) {if (Object.hasOwn(response.data.data, i)) {let current = response.data.data[i];- let currentAmount = null === current.attributes.current_amount ? '0': current.attributes.current_amount;- let targetAmount = null === current.attributes.target_amount ? '0': current.attributes.target_amount;+ let currentAmount =+ null === current.attributes.current_amount+ ? "0"+ : current.attributes.current_amount;+ let targetAmount =+ null === current.attributes.target_amount+ ? "0"+ : current.attributes.target_amount;let piggy = {id: current.id,name: current.attributes.name,- percentage: null === current.attributes.percentage ? 0 : parseInt(current.attributes.percentage),- amount: formatMoney(currentAmount, current.attributes.currency_code) + ' / ' + formatMoney(targetAmount, current.attributes.currency_code)+ percentage:+ null === current.attributes.percentage+ ? 0+ : parseInt(current.attributes.percentage),+ amount:+ formatMoney(+ currentAmount,+ current.attributes.currency_code,+ ) ++ " / " ++ formatMoney(+ targetAmount,+ current.attributes.currency_code,+ ),};- if(null === current.attributes.target_amount) {- piggy.amount = formatMoney(currentAmount, current.attributes.currency_code) + ' / ∞';-+ if (null === current.attributes.target_amount) {+ piggy.amount =+ formatMoney(+ currentAmount,+ current.attributes.currency_code,+ ) + " / ∞";}this.piggyBanks.push(piggy);diff --git a/resources/assets/v3/js/shared/draw-chart.js b/resources/assets/v3/js/shared/draw-chart.jsindex 83686c27c4..c7124366ff 100644--- a/resources/assets/v3/js/shared/draw-chart.js+++ b/resources/assets/v3/js/shared/draw-chart.js@@ -21,7 +21,7 @@import Chart from "chart.js/auto";import formatMoney from "../util/format-money.js";import i18next from "i18next";-import format from '../util/format.js';+import format from "../util/format.js";let defaultChartOptions = {elements: {@@ -67,72 +67,86 @@ export function drawSingleCurrencyChart(type, url, holder, anonymous) {function drawMultiCurrencyLineChart(url, holder, anonymous) {document.getElementById(holder).classList.remove("general-chart-error");- window.axios.get(url).then((response) => {+ window.axios+ .get(url)+ .then((response) => {let all = response.data;- let options = { ...defaultChartOptions };- let data = {- datasets: [],- labels: [],- };- let axes = {};+ let options = { ...defaultChartOptions };+ let data = {+ datasets: [],+ labels: [],+ };+ let axes = {};// collect all Y axes from the data.- for (let i = 0; i < all.length; i++) {- if(Object.hasOwn(all, i)) {- let current = all[i];- // take the labels from index 0.- if(0 === i) {- for(let j in current.entries) {- if(Object.hasOwn(current.entries, j)) {- let date = new Date(j);- data.labels.push(format(date,i18next.t('config.month_and_day_fns')));+ for (let i = 0; i < all.length; i++) {+ if (Object.hasOwn(all, i)) {+ let current = all[i];+ // take the labels from index 0.+ if (0 === i) {+ for (let j in current.entries) {+ if (Object.hasOwn(current.entries, j)) {+ let date = new Date(j);+ data.labels.push(+ format(+ date,+ i18next.t("config.month_and_day_fns"),+ ),+ );+ }}}- }- // add the dataset.- let dataset = {- label: current.label,- currency_code: current.currency_code,- data: [],- yAxisID: 'y' + current.currency_code,- };- for(let j in current.entries) {- if(Object.hasOwn(current.entries, j)) {- dataset.data.push(current.entries[j]);- }- }- data.datasets.push(dataset);-- let currencyCode = current.currency_code;- let axisId = 'y' + currencyCode;- if(!Object.hasOwn(axes, axisId)) {- axes[axisId] = {- id: axisId,- type: "linear",- position: Object.keys(axes).length < 1 ? "left": 'right',- ticks: {- callback: function (value) {- if (anonymous) {- value = "0";- }- return formatMoney(value, currencyCode);- }+ // add the dataset.+ let dataset = {+ label: current.label,+ currency_code: current.currency_code,+ data: [],+ yAxisID: "y" + current.currency_code,+ };+ for (let j in current.entries) {+ if (Object.hasOwn(current.entries, j)) {+ dataset.data.push(current.entries[j]);}}+ data.datasets.push(dataset);++ let currencyCode = current.currency_code;+ let axisId = "y" + currencyCode;+ if (!Object.hasOwn(axes, axisId)) {+ axes[axisId] = {+ id: axisId,+ type: "linear",+ position:+ Object.keys(axes).length < 1 ? "left" : "right",+ ticks: {+ callback: function (value) {+ if (anonymous) {+ value = "0";+ }+ return formatMoney(value, currencyCode);+ },+ },+ };+ }}}- }- console.log(data);- delete options.scales.y;- options.scales = { ...options.scales, ...axes };+ console.log(data);+ delete options.scales.y;+ options.scales = { ...options.scales, ...axes };let labelCallback = function (tooltipItem) {"use strict";let index = tooltipItem.dataIndex;let amount = tooltipItem.dataset.data[index];- let string = formatMoney(amount, tooltipItem.dataset.currency_code);+ let string = formatMoney(+ amount,+ tooltipItem.dataset.currency_code,+ );if (anonymous) {- string = formatMoney("0", tooltipItem.dataset.currency_code);+ string = formatMoney(+ "0",+ tooltipItem.dataset.currency_code,+ );}return tooltipItem.dataset.label + ": " + string;};diff --git a/resources/assets/v3/js/util/format.js b/resources/assets/v3/js/util/format.jsindex 87a51270e8..4c916a0220 100644--- a/resources/assets/v3/js/util/format.js+++ b/resources/assets/v3/js/util/format.js@@ -93,7 +93,7 @@ const locales = {// it will format dates in whichever way is appropriate to the localeexport default function (date, formatStr = "PP") {let locale = window.__localeId__.replace("_", "");- console.log('Locale is ' + locale);+ console.log("Locale is " + locale);return format(date, formatStr, {locale:locales[locale] ?? locales[locale.slice(0, 2)] ?? locales["enUS"], // or global.__localeId__