Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Remove references to "balances".
James Cole47d697c7dc63
diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.phpindex fc89c129b7..e58d657d5b 100644--- a/app/Api/V1/Controllers/Chart/BudgetController.php+++ b/app/Api/V1/Controllers/Chart/BudgetController.php@@ -291,7 +291,7 @@ class BudgetController extends Controller}if ($current->transaction_currency_id !== $this->primaryCurrency->id) {// 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);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));diff --git a/resources/assets/v2/src/pages/dashboard/accounts.js b/resources/assets/v2/src/pages/dashboard/accounts.jsindex 1934c73f63..5aab5eba4d 100644--- a/resources/assets/v2/src/pages/dashboard/accounts.js+++ b/resources/assets/v2/src/pages/dashboard/accounts.js@@ -212,10 +212,10 @@ export default () => ({let parent = response.data.data;// apply function to each element of parent:- parent.attributes.balances = parent.attributes.balances.map((balance) => {- balance.amount_formatted = formatMoney(balance.amount, balance.currency_code);- return balance;- });+ // parent.attributes.balances = parent.attributes.balances.map((balance) => {+ // balance.amount_formatted = formatMoney(balance.amount, balance.currency_code);+ // return balance;+ // });// console.log(parent);