diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index bfa87e9b80..63e17bceeb 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -172,6 +172,7 @@ class MonthReportGenerator implements ReportGeneratorInterface } $locale = app('steam')->getLocale(); Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String())); + return [ 'journals' => $journals, 'currency' => $currency, diff --git a/app/Helpers/Collector/Extensions/AccountCollection.php b/app/Helpers/Collector/Extensions/AccountCollection.php index aa1ae451d9..2a755dba2e 100644 --- a/app/Helpers/Collector/Extensions/AccountCollection.php +++ b/app/Helpers/Collector/Extensions/AccountCollection.php @@ -260,7 +260,7 @@ trait AccountCollection } // the balance must be found BEFORE the transaction date. // so sub one second. This is not perfect, but works well enough. - $date = clone $transaction['date']; + $date = clone $transaction['date']; $date->subSecond(); Log::debug(sprintf('accountBalanceIs: Call finalAccountBalance with date/time "%s"', $date->toIso8601String())); $balance = Steam::finalAccountBalance($account, $date); diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index a0ba4aa517..1e1a048313 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -103,7 +103,7 @@ class ReportController extends Controller $balanceCurrent = clone $current; $balanceCurrent->subDay()->endOfDay(); // go to correct moment. Log::debug(sprintf('Call byAccounts("%s")', $balanceCurrent->format('Y-m-d H:i:s'))); - $result = $helper->byAccounts($filtered, $balanceCurrent); + $result = $helper->byAccounts($filtered, $balanceCurrent); // loop result, add to array. /** @var array $netWorthItem */ diff --git a/app/Http/Controllers/Preferences/NotificationsController.php b/app/Http/Controllers/Preferences/NotificationsController.php index 5efde16e49..3d416ec136 100644 --- a/app/Http/Controllers/Preferences/NotificationsController.php +++ b/app/Http/Controllers/Preferences/NotificationsController.php @@ -1,4 +1,5 @@ endOfDay(); + $date = today()->endOfDay(); Log::debug(sprintf('getLiabilities: Call finalAccountBalance with date/time "%s"', $date->toIso8601String())); $balance = Steam::finalAccountBalance($account, $date)['balance']; $currency = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency; @@ -248,7 +248,7 @@ class ConvertController extends Controller // group accounts: /** @var Account $account */ foreach ($accountList as $account) { - $date = today()->endOfDay(); + $date = today()->endOfDay(); Log::debug(sprintf('getAssetAccounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String())); $balance = Steam::finalAccountBalance($account, $date)['balance']; $currency = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency; diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index 6f8f18ac90..b5765f181c 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -659,10 +659,10 @@ trait AccountServiceTrait // submit to factory: $submission = [ - 'group_title' => null, - 'user' => $account->user, - 'user_group' => $account->user->userGroup, - 'transactions' => [ + 'group_title' => null, + 'user' => $account->user, + 'user_group' => $account->user->userGroup, + 'transactions' => [ [ 'type' => 'Opening balance', 'date' => $openingBalanceDate, @@ -671,7 +671,7 @@ trait AccountServiceTrait 'destination_id' => $destId, 'destination_name' => $destName, 'user' => $account->user, - 'user_group' => $account->user->userGroup, + 'user_group' => $account->user->userGroup, 'currency_id' => $currency->id, 'order' => 0, 'amount' => $amount, diff --git a/app/Support/Chart/Budget/FrontpageChartGenerator.php b/app/Support/Chart/Budget/FrontpageChartGenerator.php index f3dc2c2b0c..530ffbd8c9 100644 --- a/app/Support/Chart/Budget/FrontpageChartGenerator.php +++ b/app/Support/Chart/Budget/FrontpageChartGenerator.php @@ -203,7 +203,7 @@ class FrontpageChartGenerator $amount = $limit->native_amount; Log::debug(sprintf('Amount is now "%s".', $amount)); } - $amount = null === $amount ? '0' : $amount; + $amount = null === $amount ? '0' : $amount; $sumSpent = bcmul($entry['sum'], '-1'); // spent $data[0]['entries'][$title] ??= '0'; $data[1]['entries'][$title] ??= '0'; diff --git a/app/Support/Steam.php b/app/Support/Steam.php index dadd51debe..23820d14a7 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -282,7 +282,7 @@ class Steam $cache->addProperty($date); if ($cache->has()) { // Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s'))); - return $cache->get(); + return $cache->get(); } Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s'))); diff --git a/composer.lock b/composer.lock index 7a2181acbb..bbe03ef7cc 100644 --- a/composer.lock +++ b/composer.lock @@ -11344,16 +11344,16 @@ }, { "name": "phpstan/phpstan", - "version": "2.1.3", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "64ae44e48214f3deebdaeebf2694297a10a2bea9" + "reference": "8f99e18eb775dbaf6460c95fa0b65312da9c746a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/64ae44e48214f3deebdaeebf2694297a10a2bea9", - "reference": "64ae44e48214f3deebdaeebf2694297a10a2bea9", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8f99e18eb775dbaf6460c95fa0b65312da9c746a", + "reference": "8f99e18eb775dbaf6460c95fa0b65312da9c746a", "shasum": "" }, "require": { @@ -11398,7 +11398,7 @@ "type": "github" } ], - "time": "2025-02-07T15:05:24+00:00" + "time": "2025-02-10T08:25:21+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/config/firefly.php b/config/firefly.php index 314e74bc47..87dc04ae8d 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -81,7 +81,7 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2025-02-10', + 'version' => 'develop/2025-02-11', 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 25, diff --git a/package-lock.json b/package-lock.json index b68973aa4c..f2e4fc9e6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4757,9 +4757,9 @@ } }, "node_modules/compression": { - "version": "1.7.5", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz", - "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz", + "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==", "dev": true, "license": "MIT", "dependencies": { @@ -5685,9 +5685,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.96", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.96.tgz", - "integrity": "sha512-8AJUW6dh75Fm/ny8+kZKJzI1pgoE8bKLZlzDU2W1ENd+DXKJrx7I7l9hb8UWR4ojlnb5OlixMt00QWiYJoVw1w==", + "version": "1.5.97", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.97.tgz", + "integrity": "sha512-HKLtaH02augM7ZOdYRuO19rWDeY+QSJ1VxnXFa/XDFLf07HvM90pALIJFgrO+UVaajI3+aJMMpojoUTLZyQ7JQ==", "dev": true, "license": "ISC" }, @@ -8876,9 +8876,9 @@ } }, "node_modules/postcss": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz", - "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==", + "version": "8.5.2", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz", + "integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==", "dev": true, "funding": [ { diff --git a/resources/assets/v1/src/locales/hu.json b/resources/assets/v1/src/locales/hu.json index 72337f82e1..2916f713b9 100644 --- a/resources/assets/v1/src/locales/hu.json +++ b/resources/assets/v1/src/locales/hu.json @@ -18,8 +18,8 @@ "is_reconciled": "Is reconciled", "split": "Feloszt\u00e1s", "single_split": "Feloszt\u00e1s", - "not_enough_currencies": "Not enough currencies", - "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.", + "not_enough_currencies": "Nincs el\u00e9g p\u00e9nznem", + "not_enough_currencies_enabled": "Amennyiben csak egyetlen p\u00e9nznem enged\u00e9lyezett, akkor nincs sz\u00fcks\u00e9g \u00e1rfolyam be\u00e1ll\u00edt\u00e1sokra.", "transaction_stored_link": "Transaction #{ID} (\"{title}\")<\/a> mentve.", "webhook_stored_link": "Webhook #{ID} (\"{title}\")<\/a> elt\u00e1rolva.", "webhook_updated_link": "Webhook #{ID}<\/a> (\"{title}\") friss\u00edtve.", diff --git a/resources/assets/v1/src/locales/ru.json b/resources/assets/v1/src/locales/ru.json index ca9a6561ae..dd3a5f3d8a 100644 --- a/resources/assets/v1/src/locales/ru.json +++ b/resources/assets/v1/src/locales/ru.json @@ -182,6 +182,6 @@ }, "config": { "html_language": "ru", - "date_time_fns": "D MMMM yyyy, @ HH:mm:ss" + "date_time_fns": "d MMMM yyyy, @ HH:mm:ss" } } \ No newline at end of file diff --git a/resources/assets/v1/src/locales/sl.json b/resources/assets/v1/src/locales/sl.json index 62db75ce7b..00be58db83 100644 --- a/resources/assets/v1/src/locales/sl.json +++ b/resources/assets/v1/src/locales/sl.json @@ -18,8 +18,8 @@ "is_reconciled": "Je usklajena", "split": "Razdeli", "single_split": "Razdeli", - "not_enough_currencies": "Not enough currencies", - "not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.", + "not_enough_currencies": "Ni dovolj valut", + "not_enough_currencies_enabled": "\u010ce imate omogo\u010deno samo eno valuto, menjalnih te\u010dajev ni treba dodajati.", "transaction_stored_link": "Transakcija \u0161t. #{ID} (\"{title}\")<\/a> je bila shranjena.", "webhook_stored_link": "Webhook #{ID} (\"{title}\")<\/a> je bil shranjen.", "webhook_updated_link": "Webhook #{ID}<\/a> (\"{title}\") je bil posodobljen.", diff --git a/resources/assets/v1/src/locales/zh-tw.json b/resources/assets/v1/src/locales/zh-tw.json index 2f53bce1a6..990aaf387a 100644 --- a/resources/assets/v1/src/locales/zh-tw.json +++ b/resources/assets/v1/src/locales/zh-tw.json @@ -6,7 +6,7 @@ "administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.", "administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"", "table": "\u8868\u683c", - "welcome_back": "What's playing?", + "welcome_back": "\u6b61\u8fce\u56de\u4f86\u7e7c\u7e8c\u7406\u8ca1\uff01", "flash_error": "\u932f\u8aa4\uff01", "flash_warning": "\u8b66\u544a\uff01", "flash_success": "\u6210\u529f\uff01",