IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-26 13:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-07-10

Browse Source
This commit is contained in:
JC5
2026-07-10 08:52:04 +02:00
parent 4605923338
commit d26eef073e
18 changed files with 151 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Api/V1/Controllers/Insight/Income/TagController.php
+4 -1
View File
@@ -158,7 +158,10 @@ 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'];
}
}
app/Api/V1/Controllers/Insight/Transfer/TagController.php
+4 -1
View File
@@ -155,7 +155,10 @@ 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
}
}
app/Api/V1/Controllers/User/PreferencesController.php
+2 -2
View File
@@ -62,7 +62,7 @@ final class PreferencesController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($preferences, $count, $pageSize, $this->parameters->get('page'));
$paginator->setPath(route('api.v1.preferences.index') . $this->buildParams());
$paginator->setPath(route('api.v1.preferences.index').$this->buildParams());
/** @var PreferenceTransformer $transformer */
$transformer = app(PreferenceTransformer::class);
@@ -105,7 +105,7 @@ final class PreferencesController extends Controller
// make paginator:
$paginator = new LengthAwarePaginator($preferenceList, $count, 31_337, 1);
$paginator->setPath(route('api.v1.preferences-list.show', [$names]) . $this->buildParams());
$paginator->setPath(route('api.v1.preferences-list.show', [$names]).$this->buildParams());
/** @var PreferenceTransformer $transformer */
$transformer = app(PreferenceTransformer::class);
app/Http/Controllers/Bill/IndexController.php
+4 -1
View File
@@ -255,7 +255,10 @@ final class IndexController extends Controller
if (count($bill['paid_dates']) < count($bill['pay_dates'])) {
$count = count($bill['pay_dates']) - count($bill['paid_dates']);
if ($count > 0) {
$avg = bcdiv(bcadd((string) $bill['amount_min'], (string) $bill['amount_max']), '2');
$avg = bcdiv(
bcadd((string) $bill['amount_min'], (string) $bill['amount_max']),
'2'
);
$avg = bcmul($avg, (string) $count);
$sums[$groupOrder][$currencyId]['total_left_to_pay'] = bcadd($sums[$groupOrder][$currencyId]['total_left_to_pay'], $avg);
Log::debug(
app/Http/Controllers/Budget/BudgetLimitController.php
+7 -1
View File
@@ -198,7 +198,13 @@ final class BudgetLimitController extends Controller
if ($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']);
app/Http/Controllers/Budget/IndexController.php
+4 -1
View File
@@ -284,7 +284,10 @@ final class IndexController extends Controller
if (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;
app/Http/Controllers/Chart/BudgetController.php
+7 -1
View File
@@ -539,7 +539,13 @@ 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);
app/Http/Controllers/System/InstallController.php
+2 -3
View File
@@ -31,7 +31,6 @@ use FireflyIII\Support\Facades\AppConfiguration;
use FireflyIII\Support\Facades\Preferences;
use FireflyIII\Support\Http\Controllers\GetConfigurationData;
use FireflyIII\Support\System\IsOldVersion;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
@@ -39,7 +38,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
use Laravel\Passport\Passport;
use phpseclib3\Crypt\RSA;
@@ -78,6 +76,7 @@ final class InstallController extends Controller
return view('install.index');
}
return response()->redirectToRoute('home');
}
@@ -133,7 +132,7 @@ final class InstallController extends Controller
$response['hasNextCommand'] = array_key_exists($requestIndex + 1, $indexes);
$response['previous'] = $command;
if(false === $response['hasNextCommand']) {
if (false === $response['hasNextCommand']) {
// if no next command, set the things
try {
AppConfiguration::set('ff3_version', (string) config('firefly.version'));
app/Http/Middleware/Installer.php
+1
View File
@@ -68,6 +68,7 @@ class Installer
// or when old firefly version
if ($this->hasNoTables() || $this->isOldVersionInstalled()) {
Log::debug('Will redirect to installer.');
return response()->redirectTo(route('installer.index'));
}
OAuthKeys::verifyKeysRoutine();
app/Jobs/CreateAutoBudgetLimits.php
+14 -2
View File
@@ -122,7 +122,13 @@ 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));
@@ -212,7 +218,13 @@ 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));
app/Support/Binder/PreferenceList.php
+4 -5
View File
@@ -23,8 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Support\Binder;
use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Support\Facades\Preferences;
use Illuminate\Routing\Route;
use Illuminate\Support\Collection;
@@ -50,15 +48,16 @@ class PreferenceList implements BinderInterface
$list = array_unique(explode(',', $value));
Log::debug('List of preferences is', $list);
$result = new Collection;
foreach($list as $item) {
$result = new Collection();
foreach ($list as $item) {
$current = Preferences::get($item);
if(null !== $current) {
if (null !== $current) {
Log::debug(sprintf('Add %s to the result', $item));
$result->push($current);
}
}
Log::debug('List of preferences is', $result->toArray());
return $result;
}
Log::error('PreferenceList: user is not logged in.');
app/Support/Http/Controllers/AugumentData.php
+8 -1
View File
@@ -222,7 +222,14 @@ 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;
app/Support/JsonApi/Enrichments/RecurringEnrichment.php
+5 -1
View File
@@ -354,7 +354,11 @@ 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;
config/firefly.php
+2 -2
View File
@@ -78,8 +78,8 @@ return [
'running_balance_column' => (bool)env_default_when_empty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-07-09',
'build_time' => 1783626404,
'version' => 'develop/2026-07-10',
'build_time' => 1783666324,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.
routes/api.php
+3 -3
View File
@@ -829,11 +829,11 @@ Route::group(
'as' => 'api.v1.preferences-list.',
],
static function (): void {
// Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']);
// Route::post('', ['uses' => 'PreferencesController@store', 'as' => 'store']);
// Route::get('', ['uses' => 'PreferencesController@index', 'as' => 'index']);
// Route::post('', ['uses' => 'PreferencesController@store', 'as' => 'store']);
// Route::get('{preferenceList}', ['uses' => 'PreferencesController@showList', 'as' => 'show-list'])->where('preferenceList', ',+');
Route::get('{preferenceList}', ['uses' => 'PreferencesController@showList', 'as' => 'show']);
// Route::put('{preferenceName}', ['uses' => 'PreferencesController@update', 'as' => 'update']);
// Route::put('{preferenceName}', ['uses' => 'PreferencesController@update', 'as' => 'update']);
}
);