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

Merge pull request #12635 from firefly-iii/release-1787320093

Browse Source 
🤖 Automatically merge the PR into the develop branch.
This commit is contained in:
github-actions[bot]
2026-08-21 15:48:25 +02:00
committed by GitHub
parent c3fe1d95e7 637ac335dc
commit 7fa7ea7a64
12 changed files with 100 additions and 54 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/Requests/Models/Transaction/UpdateRequest.php
+2 -2
View File
@@ -79,12 +79,12 @@ class UpdateRequest extends FormRequest
'category_id',
'bill_id',
'recurrence_id',
'zoom_level'
'zoom_level',
];
$this->dateFields = ['date', 'interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
$this->textareaFields = ['notes'];
// not really floats, for validation.
$this->floatFields = ['amount', 'foreign_amount','longitude','latitude'];
$this->floatFields = ['amount', 'foreign_amount', 'longitude', 'latitude'];
$this->stringFields = [
'type',
'currency_code',
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/Jobs/CreateAutoBudgetLimits.php
+14 -2
View File
@@ -135,7 +135,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));
@@ -225,7 +231,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/Services/Internal/Update/JournalUpdateService.php
+26 -24
View File
@@ -803,6 +803,32 @@ class JournalUpdateService
$this->destinationTransaction->refresh();
}
private function updateLocation(): void
{
if ($this->hasFields(['longitude', 'latitude', 'zoom_level'])) {
// if all are null or zero, delete current location.
if (null === $this->data['longitude'] && null === $this->data['latitude'] && null === $this->data['zoom_level']) {
$this->transactionJournal->locations()->delete();
return;
}
if ('' === $this->data['longitude'] && '' === $this->data['latitude'] && null === $this->data['zoom_level']) {
$this->transactionJournal->locations()->delete();
return;
}
$location = $this->transactionJournal->locations()->first();
if (null === $location) {
$location = new Location();
$location->locatable()->associate($this->transactionJournal);
}
$location->longitude = $this->data['longitude'] ?? null;
$location->latitude = $this->data['latitude'];
$location->zoom_level = $this->data['zoom_level'];
$location->save();
}
}
private function updateMeta(): void
{
// update meta fields.
@@ -913,28 +939,4 @@ class JournalUpdateService
}
Log::debug('No type field present.');
}
private function updateLocation(): void
{
if($this->hasFields(['longitude','latitude','zoom_level'])) {
// if all are null or zero, delete current location.
if(null === $this->data['longitude'] && null === $this->data['latitude'] && null === $this->data['zoom_level']) {
$this->transactionJournal->locations()->delete();
return;
}
if('' === $this->data['longitude'] && '' === $this->data['latitude'] && null === $this->data['zoom_level']) {
$this->transactionJournal->locations()->delete();
return;
}
$location = $this->transactionJournal->locations()->first();
if(null === $location) {
$location = new Location();
$location->locatable()->associate($this->transactionJournal);
}
$location->longitude = $this->data['longitude'] ?? null;
$location->latitude = $this->data['latitude'];
$location->zoom_level = $this->data['zoom_level'];
$location->save();
}
}
}
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
+1 -1
View File
@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-08-21',
'build_time' => 1787286909,
'build_time' => 1787320093,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.
package-lock.json
Generated
+18 -18
View File
@@ -1,5 +1,5 @@
{
"name": "release",
"name": "firefly-iii",
"lockfileVersion": 3,
"requires": true,
"packages": {
@@ -2278,6 +2278,23 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/shepherd.js": {
"version": "11.2.0",
"resolved": "https://registry.npmjs.org/shepherd.js/-/shepherd.js-11.2.0.tgz",
"integrity": "sha512-2hbz3N7GuuTjI7y3sfnoqKnH0cNhExx67IJtCTGQI2KhBEyvegsDYW5qjj5BlvvVtQjmL/O/J1GQEciwfoZWpw==",
"license": "MIT",
"dependencies": {
"@floating-ui/dom": "^1.5.1",
"deepmerge": "^4.3.1"
},
"engines": {
"node": "16.* || >= 18"
},
"funding": {
"type": "individual",
"url": "https://github.com/sponsors/RobbieTheWagner"
}
},
"node_modules/slash": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
@@ -2723,23 +2740,6 @@
"vite": "^8.0.0",
"vite-plugin-manifest-sri": "^0.2.0"
}
},
"resources/assets/v3/node_modules/shepherd.js": {
"version": "11.2.0",
"resolved": "https://registry.npmjs.org/shepherd.js/-/shepherd.js-11.2.0.tgz",
"integrity": "sha512-2hbz3N7GuuTjI7y3sfnoqKnH0cNhExx67IJtCTGQI2KhBEyvegsDYW5qjj5BlvvVtQjmL/O/J1GQEciwfoZWpw==",
"license": "MIT",
"dependencies": {
"@floating-ui/dom": "^1.5.1",
"deepmerge": "^4.3.1"
},
"engines": {
"node": "16.* || >= 18"
},
"funding": {
"type": "individual",
"url": "https://github.com/sponsors/RobbieTheWagner"
}
}
}
}