Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

app/Handlers/Observer/BudgetObserver.php

@@ -36,7 +36,7 @@ class BudgetObserver
     {
         app('log')->debug('Observe "deleting" of a budget.');
 
-        $repository = app(AttachmentRepositoryInterface::class);
+        $repository   = app(AttachmentRepositoryInterface::class);
         $repository->setUser($budget->user);
 
         foreach ($budget->attachments()->get() as $attachment) {

app/Http/Controllers/Chart/AccountController.php

@@ -427,7 +427,7 @@ class AccountController extends Controller
         $cache->addProperty($this->convertToNative);
         $cache->addProperty($account->id);
         if ($cache->has()) {
-             return response()->json($cache->get());
+            return response()->json($cache->get());
         }
 
         // collect and filter balances for the entire period.

app/Support/Http/Controllers/ChartGeneration.php

@@ -55,7 +55,7 @@ trait ChartGeneration
         $cache->addProperty($accounts);
         $cache->addProperty($convertToNative);
         if ($cache->has()) {
-             return $cache->get();
+            return $cache->get();
         }
         app('log')->debug('Regenerate chart.account.account-balance-chart from scratch.');
         $locale          = app('steam')->getLocale();

app/Support/Steam.php

@@ -41,8 +41,8 @@ class Steam
 {
     public function getAccountCurrency(Account $account): ?TransactionCurrency
     {
-        $type = $account->accountType->type;
+        $type   = $account->accountType->type;
-        $list = config('firefly.valid_currency_account_types');
+        $list   = config('firefly.valid_currency_account_types');
 
         // return null if not in this list.
         if (!in_array($type, $list, true)) {
@@ -64,22 +64,22 @@ class Steam
         Log::debug(sprintf('finalAccountBalanceInRange(#%d, %s, %s)', $account->id, $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
 
         // set up cache
-        $cache = new CacheProperties();
+        $cache                = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty('final-balance-in-range');
         $cache->addProperty($start);
         $cache->addProperty($end);
         if ($cache->has()) {
-             return $cache->get();
+            return $cache->get();
         }
 
-        $balances        = [];
+        $balances             = [];
-        $formatted       = $start->format('Y-m-d');
+        $formatted            = $start->format('Y-m-d');
-        $startBalance    = $this->finalAccountBalance($account, $start);
+        $startBalance         = $this->finalAccountBalance($account, $start);
-        $nativeCurrency  = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
+        $nativeCurrency       = app('amount')->getNativeCurrencyByUserGroup($account->user->userGroup);
-        $accountCurrency = $this->getAccountCurrency($account);
+        $accountCurrency      = $this->getAccountCurrency($account);
-        $hasCurrency     = null !== $accountCurrency;
+        $hasCurrency          = null !== $accountCurrency;
-        $currency        = $accountCurrency ?? $nativeCurrency;
+        $currency             = $accountCurrency ?? $nativeCurrency;
         Log::debug(sprintf('Currency is %s', $currency->code));
 
         // set start balances:
@@ -91,7 +91,7 @@ class Steam
             Log::debug(sprintf('Also set start balance in %s', $nativeCurrency->code));
             $startBalance[$nativeCurrency->code] ??= '0';
         }
-        $currencies = [
+        $currencies           = [
             $currency->id       => $currency,
             $nativeCurrency->id => $nativeCurrency,
         ];
@@ -100,42 +100,43 @@ class Steam
         Log::debug('Final start balance: ', $startBalance);
 
         // sums up the balance changes per day.
-        $set = $account->transactions()
+        $set                  = $account->transactions()
-                       ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
-                       ->where('transaction_journals.date', '>=', $start->format('Y-m-d H:i:s'))
+            ->where('transaction_journals.date', '>=', $start->format('Y-m-d H:i:s'))
-                       ->where('transaction_journals.date', '<=', $end->format('Y-m-d  H:i:s'))
+            ->where('transaction_journals.date', '<=', $end->format('Y-m-d  H:i:s'))
-                       ->groupBy('transaction_journals.date')
+            ->groupBy('transaction_journals.date')
-                       ->groupBy('transactions.transaction_currency_id')
+            ->groupBy('transactions.transaction_currency_id')
-                       ->orderBy('transaction_journals.date', 'ASC')
+            ->orderBy('transaction_journals.date', 'ASC')
-                       ->whereNull('transaction_journals.deleted_at')
+            ->whereNull('transaction_journals.deleted_at')
-                       ->get(
+            ->get(
-                           [ // @phpstan-ignore-line
+                [ // @phpstan-ignore-line
-                             'transaction_journals.date',
+                    'transaction_journals.date',
-                             'transactions.transaction_currency_id',
+                    'transactions.transaction_currency_id',
-                             DB::raw('SUM(transactions.amount) AS sum_of_day'),
+                    DB::raw('SUM(transactions.amount) AS sum_of_day'),
-                           ]
+                ]
-                       );
+            )
+        ;
 
-        $currentBalance = $startBalance;
+        $currentBalance       = $startBalance;
-        $converter      = new ExchangeRateConverter();
+        $converter            = new ExchangeRateConverter();
 
 
         /** @var Transaction $entry */
         foreach ($set as $entry) {
             // get date object
-            $carbon = new Carbon($entry->date, $entry->date_tz);
+            $carbon                               = new Carbon($entry->date, $entry->date_tz);
             // make sure sum is a string:
-            $sumOfDay = (string) (null === $entry->sum_of_day ? '0' : $entry->sum_of_day);
+            $sumOfDay                             = (string) (null === $entry->sum_of_day ? '0' : $entry->sum_of_day);
 
             // find currency of this entry, does not have to exist.
             $currencies[$entry->transaction_currency_id] ??= TransactionCurrency::find($entry->transaction_currency_id);
 
             // make sure this $entry has its own $entryCurrency
             /** @var TransactionCurrency $entryCurrency */
-            $entryCurrency = $currencies[$entry->transaction_currency_id];
+            $entryCurrency                        = $currencies[$entry->transaction_currency_id];
 
             Log::debug(sprintf('Processing transaction(s) on date %s', $carbon->format('Y-m-d H:i:s')));
-            $currentBalance[$entryCurrency->code] ??= '0';
+            $currentBalance[$entryCurrency->code]        ??= '0';
             $currentBalance[$entryCurrency->code] = bcadd($sumOfDay, $currentBalance[$entryCurrency->code]);
 
             // if not convert to native, add the amount to "balance", do nothing else.
@@ -148,7 +149,7 @@ class Steam
                 $currentBalance['native_balance'] = bcadd($currentBalance['native_balance'], $nativeSumOfDay);
             }
             // add final $currentBalance array to the big one.
-            $balances[$carbon->format('Y-m-d')] = $currentBalance;
+            $balances[$carbon->format('Y-m-d')]   = $currentBalance;
             Log::debug('Updated entry', $currentBalance);
         }
         $cache->store($balances);
@@ -186,10 +187,10 @@ class Steam
         // Log::debug(sprintf('Trying bcround("%s",%d)', $number, $precision));
         if (str_contains($number, '.')) {
             if ('-' !== $number[0]) {
-                return bcadd($number, '0.' . str_repeat('0', $precision) . '5', $precision);
+                return bcadd($number, '0.'.str_repeat('0', $precision).'5', $precision);
             }
 
-            return bcsub($number, '0.' . str_repeat('0', $precision) . '5', $precision);
+            return bcsub($number, '0.'.str_repeat('0', $precision).'5', $precision);
         }
 
         return $number;
@@ -264,64 +265,64 @@ class Steam
      * "balance": balance in the account's currency OR user's native currency if the account has no currency
      * --> "native_balance": balance in the user's native balance, with all amounts converted to native.
      * "EUR": balance in EUR (or whatever currencies the account has balance in)
-     *
      */
     public function finalAccountBalance(Account $account, Carbon $date): array
     {
-        $cache = new CacheProperties();
+        $cache             = new CacheProperties();
         $cache->addProperty($account->id);
         $cache->addProperty($date);
         if ($cache->has()) {
-             return $cache->get();
+            return $cache->get();
         }
 
         Log::debug(sprintf('Now in finalAccountBalance(#%d, "%s", "%s")', $account->id, $account->name, $date->format('Y-m-d H:i:s')));
 
-        $native          = Amount::getNativeCurrencyByUserGroup($account->user->userGroup);
+        $native            = Amount::getNativeCurrencyByUserGroup($account->user->userGroup);
-        $convertToNative = Amount::convertToNative($account->user);
+        $convertToNative   = Amount::convertToNative($account->user);
-        $accountCurrency = $this->getAccountCurrency($account);
+        $accountCurrency   = $this->getAccountCurrency($account);
-        $hasCurrency     = null !== $accountCurrency;
+        $hasCurrency       = null !== $accountCurrency;
-        $currency        = $hasCurrency ? $accountCurrency : $native;
+        $currency          = $hasCurrency ? $accountCurrency : $native;
-        $return          = [
+        $return            = [
             'native_balance' => '0',
             'balance'        => '0', // this key is overwritten right away, but I must remember it is always created.
         ];
         // balance(s) in all currencies.
-        $array  = $account->transactions()
+        $array             = $account->transactions()
-                          ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
+            ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
-                          ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
+            ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transactions.transaction_currency_id')
-                          ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
+            ->where('transaction_journals.date', '<=', $date->format('Y-m-d H:i:s'))
-                          ->get(['transaction_currencies.code', 'transactions.amount'])->toArray();
+            ->get(['transaction_currencies.code', 'transactions.amount'])->toArray()
-        $others = $this->groupAndSumTransactions($array, 'code', 'amount');
+        ;
-        //Log::debug('All balances are (joined)', $others);
+        $others            = $this->groupAndSumTransactions($array, 'code', 'amount');
+        // Log::debug('All balances are (joined)', $others);
         // if there is no request to convert, take this as "balance" and "native_balance".
         $return['balance'] = $others[$currency->code] ?? '0';
         if (!$convertToNative) {
             unset($return['native_balance']);
-            //Log::debug(sprintf('Set balance to %s, unset native_balance', $return['balance']));
+            // Log::debug(sprintf('Set balance to %s, unset native_balance', $return['balance']));
         }
         // if there is a request to convert, convert to "native_balance" and use "balance" for whichever amount is in the native currency.
         if ($convertToNative) {
             $return['native_balance'] = $this->convertAllBalances($others, $native, $date); // todo sum all and convert.
-            //Log::debug(sprintf('Set native_balance to %s', $return['native_balance']));
+            // Log::debug(sprintf('Set native_balance to %s', $return['native_balance']));
         }
 
         // either way, the balance is always combined with the virtual balance:
-        $virtualBalance = (string) ('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance);
+        $virtualBalance    = (string) ('' === (string) $account->virtual_balance ? '0' : $account->virtual_balance);
 
         if ($convertToNative) {
             // the native balance is combined with a converted virtual_balance:
             $converter                = new ExchangeRateConverter();
             $nativeVirtualBalance     = $converter->convert($currency, $native, $date, $virtualBalance);
             $return['native_balance'] = bcadd($nativeVirtualBalance, $return['native_balance']);
-            //Log::debug(sprintf('Native virtual balance makes the native total %s', $return['native_balance']));
+            // Log::debug(sprintf('Native virtual balance makes the native total %s', $return['native_balance']));
         }
         if (!$convertToNative) {
             // if not, also increase the balance + native balance for consistency.
             $return['balance'] = bcadd($return['balance'], $virtualBalance);
-            //Log::debug(sprintf('Virtual balance makes the (native) total %s', $return['balance']));
+            // Log::debug(sprintf('Virtual balance makes the (native) total %s', $return['balance']));
         }
-        $final = array_merge($return, $others);
+        $final             = array_merge($return, $others);
         Log::debug('Final balance is', $final);
         $cache->store($final);
 
@@ -374,7 +375,7 @@ class Steam
             }
 
             if (null !== $currency) {
-                 Log::debug(sprintf('Unset [%s] + [%s] balance for account #%d', $defaultCurrency->code, $currency->code, $account->id));
+                Log::debug(sprintf('Unset [%s] + [%s] balance for account #%d', $defaultCurrency->code, $currency->code, $account->id));
                 unset($set[$defaultCurrency->code], $set[$currency->code]);
             }
         }
@@ -428,15 +429,15 @@ class Steam
     {
         $list = [];
 
-        $set = auth()->user()->transactions()
+        $set  = auth()->user()->transactions()
-                     ->whereIn('transactions.account_id', $accounts)
+            ->whereIn('transactions.account_id', $accounts)
-                     ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])
+            ->groupBy(['transactions.account_id', 'transaction_journals.user_id'])
-                     ->get(['transactions.account_id', \DB::raw('MAX(transaction_journals.date) AS max_date')]) // @phpstan-ignore-line
+            ->get(['transactions.account_id', \DB::raw('MAX(transaction_journals.date) AS max_date')]) // @phpstan-ignore-line
         ;
 
         /** @var Transaction $entry */
         foreach ($set as $entry) {
-            $date = new Carbon($entry->max_date, config('app.timezone'));
+            $date                           = new Carbon($entry->max_date, config('app.timezone'));
             $date->setTimezone(config('app.timezone'));
             $list[(int) $entry->account_id] = $date;
         }
@@ -511,9 +512,9 @@ class Steam
     public function getSafeUrl(string $unknownUrl, string $safeUrl): string
     {
         // Log::debug(sprintf('getSafeUrl(%s, %s)', $unknownUrl, $safeUrl));
-        $returnUrl   = $safeUrl;
+        $returnUrl      = $safeUrl;
-        $unknownHost = parse_url($unknownUrl, PHP_URL_HOST);
+        $unknownHost    = parse_url($unknownUrl, PHP_URL_HOST);
-        $safeHost    = parse_url($safeUrl, PHP_URL_HOST);
+        $safeHost       = parse_url($safeUrl, PHP_URL_HOST);
 
         if (null !== $unknownHost && $unknownHost === $safeHost) {
             $returnUrl = $unknownUrl;
@@ -550,7 +551,7 @@ class Steam
      */
     public function floatalize(string $value): string
     {
-        $value = strtoupper($value);
+        $value  = strtoupper($value);
         if (!str_contains($value, 'E')) {
             return $value;
         }
@@ -638,9 +639,9 @@ class Steam
             if (null === $currency) {
                 continue;
             }
-            $current = $converter->convert($currency, $native, $date, $amount);
+            $current  = $converter->convert($currency, $native, $date, $amount);
             Log::debug(sprintf('Convert %s %s to %s %s', $currency->code, $amount, $native->code, $current));
-            $total = bcadd($current, $total);
+            $total    = bcadd($current, $total);
         }
 
         return $total;

changelog.md

@@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
-- #9327
+- [Issue 9327](https://github.com/firefly-iii/firefly-iii/issues/9327) (Add Link to Search-Page to the help file) reported by @nottheend
 - [Issue 9713](https://github.com/firefly-iii/firefly-iii/issues/9713) (Many decimal points in amounts) reported by @memo-567
 - [Issue 9736](https://github.com/firefly-iii/firefly-iii/issues/9736) (Wrong `finalAccountBalance` result) reported by @gthbusrr
 - #9737

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-04',
+    'version'                      => 'develop/2025-02-05',
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 25,
 

database/migrations/2024_12_19_061003_add_native_amount_column.php

@@ -52,7 +52,7 @@ return new class () extends Migration {
             foreach ($fields as $field) {
                 Schema::table($table, static function (Blueprint $tableObject) use ($table, $field): void {
                     // add amount column
-                    if(!Schema::hasColumn($table, $field)) {
+                    if (!Schema::hasColumn($table, $field)) {
                         $tableObject->decimal($field, 32, 12)->nullable();
                     }
                 });

package-lock.json

@@ -5663,9 +5663,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.91",
+            "version": "1.5.92",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.91.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.92.tgz",
-            "integrity": "sha512-sNSHHyq048PFmZY4S90ax61q+gLCs0X0YmcOII9wG9S2XwbVr+h4VW2wWhnbp/Eys3cCwTxVF292W3qPaxIapQ==",
+            "integrity": "sha512-BeHgmNobs05N1HMmMZ7YIuHfYBGlq/UmvlsTgg+fsbFs9xVMj+xJHFg19GN04+9Q+r8Xnh9LXqaYIyEWElnNgQ==",
             "dev": true,
             "license": "ISC"
         },
@@ -8387,9 +8387,9 @@
             }
         },
         "node_modules/object-inspect": {
-            "version": "1.13.3",
+            "version": "1.13.4",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-            "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
+            "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
             "dev": true,
             "license": "MIT",
             "engines": {