kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-21 09:00:07 +00:00
Code Issues Projects Releases Wiki Activity

Remove references to "balances".

Browse Source
This commit is contained in:
James Cole
2025-08-02 11:07:35 +02:00
parent 3745d79f1f
commit 47d697c7dc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Controllers/Chart/BudgetController.php
View File

@@ -291,7 +291,7 @@ class BudgetController extends Controller
} }
if ($current->transaction_currency_id !== $this->primaryCurrency->id) { if ($current->transaction_currency_id !== $this->primaryCurrency->id) {
// convert and then add it. // convert and then add it.
$converted = $converter->convert($current->transactionCurrency, $this->primaryCurrency, $limit->start_date, $limit->amount); $converted = $converter->convert($current->transactionCurrency, $this->primaryCurrency, $current->start_date, $current->amount);
$amount = bcadd($amount, $converted); $amount = bcadd($amount, $converted);
Log::debug(sprintf('Budgeted in limit #%d: %s %s, converted to %s %s', $current->id, $current->transactionCurrency->code, $current->amount, $this->primaryCurrency->code, $converted)); Log::debug(sprintf('Budgeted in limit #%d: %s %s, converted to %s %s', $current->id, $current->transactionCurrency->code, $current->amount, $this->primaryCurrency->code, $converted));
Log::debug(sprintf('Set amount in limit to %s', $amount)); Log::debug(sprintf('Set amount in limit to %s', $amount));

8
resources/assets/v2/src/pages/dashboard/accounts.js
View File

@@ -212,10 +212,10 @@ export default () => ({
let parent = response.data.data; let parent = response.data.data;
// apply function to each element of parent: // apply function to each element of parent:
parent.attributes.balances = parent.attributes.balances.map((balance) => { // parent.attributes.balances = parent.attributes.balances.map((balance) => {
balance.amount_formatted = formatMoney(balance.amount, balance.currency_code); // balance.amount_formatted = formatMoney(balance.amount, balance.currency_code);
return balance; // return balance;
}); // });
// console.log(parent); // console.log(parent);