From 5e6034fc860aa81c6f8199fe2b33fa251b201200 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 3 Aug 2024 07:51:30 +0200
Subject: [PATCH] Add some translations.

---
 config/translations.php                       |  3 ++
 .../assets/v2/src/pages/accounts/index.js     | 14 ++++----
 resources/views/v2/accounts/index.blade.php   | 36 ++++++++++---------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/config/translations.php b/config/translations.php
index 68f48e52b2..0bd8467142 100644
--- a/config/translations.php
+++ b/config/translations.php
@@ -54,8 +54,10 @@ return [
             'firefly'    => [
                 'liability_direction_debit_short',
                 'liability_direction_credit_short',
+                'liability_direction_null_short',
                 'interest_calc_yearly',
                 'interest_calc_',
+                'interest_calc_null',
                 'interest_calc_daily',
                 'interest_calc_monthly',
                 'interest_calc_weekly',
@@ -105,6 +107,7 @@ return [
                 'expense_account',
                 'revenue_account',
                 'budget',
+                'account_type_undefined',
                 'account_type_Asset account',
                 'account_type_Expense account',
                 'account_type_Revenue account',
diff --git a/resources/assets/v2/src/pages/accounts/index.js b/resources/assets/v2/src/pages/accounts/index.js
index 65bf1cfc1e..57641d7909 100644
--- a/resources/assets/v2/src/pages/accounts/index.js
+++ b/resources/assets/v2/src/pages/accounts/index.js
@@ -339,7 +339,7 @@ let index = function () {
             this.pageOptions.isLoading = true;
             // sort instructions (only one column)
             let sorting = this.pageOptions.sortingColumn;
-            if('ASC' === this.pageOptions.sortDirection) {
+            if('asc' === this.pageOptions.sortDirection) {
                 sorting = '-' + sorting;
             }
             //const sorting = [{column: this.pageOptions.sortingColumn, direction: this.pageOptions.sortDirection}];
@@ -391,16 +391,18 @@ let index = function () {
                             account_number: null === current.attributes.account_number ? '' : current.attributes.account_number,
                             current_balance: current.attributes.current_balance,
                             currency_code: current.attributes.currency_code,
-                            native_current_balance: current.attributes.native_current_balance,
-                            native_currency_code: current.attributes.native_currency_code,
+                            //native_current_balance: current.attributes.native_current_balance,
+                            //native_currency_code: current.attributes.native_currency_code,
                             last_activity: null === current.attributes.last_activity ? '' : format(new Date(current.attributes.last_activity), i18next.t('config.month_and_day_fns')),
-                            balance_difference: current.attributes.balance_difference,
-                            native_balance_difference: current.attributes.native_balance_difference,
+                            //balance_difference: current.attributes.balance_difference,
+                            //native_balance_difference: current.attributes.native_balance_difference,
                             liability_type: current.attributes.liability_type,
                             liability_direction: current.attributes.liability_direction,
                             interest: current.attributes.interest,
                             interest_period: current.attributes.interest_period,
-                            current_debt: current.attributes.current_debt,
+                            //current_debt: current.attributes.current_debt,
+                            balance: current.attributes.balance,
+                            native_balance: current.attributes.native_balance,
                         };
 
                         // get group info:
diff --git a/resources/views/v2/accounts/index.blade.php b/resources/views/v2/accounts/index.blade.php
index 634035d014..93f3080ce6 100644
--- a/resources/views/v2/accounts/index.blade.php
+++ b/resources/views/v2/accounts/index.blade.php
@@ -262,34 +262,36 @@
                                             </template>
                                         </td>
                                         <td x-show="tableColumns.current_balance.visible && tableColumns.current_balance.enabled">
-
-                                            <span x-show="account.native_current_balance < 0" class="text-danger"
-                                                x-text="formatMoney(account.native_current_balance, account.currency_code)"></span>
-                                            <span x-show="account.native_current_balance == 0" class="text-muted"
-                                                  x-text="formatMoney(account.native_current_balance, account.currency_code)"></span>
-                                            <span x-show="account.native_current_balance > 0" class="text-success"
-                                                  x-text="formatMoney(account.native_current_balance, account.currency_code)"></span>
-
+                                            <template x-for="balance in account.balance">
+                                                <span x-show="balance.balance < 0" class="text-danger"
+                                                      x-text="formatMoney(balance.balance, balance.currency_code)"></span>
+                                                <span x-show="balance.balance == 0" class="text-muted"
+                                                      x-text="formatMoney(balance.balance, balance.currency_code)"></span>
+                                                <span x-show="balance.balance > 0" class="text-success"
+                                                      x-text="formatMoney(balance.balance, balance.currency_code)"></span>
+                                            </template>
                                         </td>
                                         <td x-show="tableColumns.amount_due.visible && tableColumns.amount_due.enabled">
+                                            <!--
                                             <template x-if="null !== account.current_debt">
                                                 <span class="text-info"
                                                     x-text="formatMoney(account.current_debt, account.currency_code)"></span>
                                             </template>
+                                            -->
+                                            FIXME
                                         </td>
                                         <td x-show="tableColumns.last_activity.visible && tableColumns.last_activity.enabled">
                                             <span x-text="account.last_activity"></span>
                                         </td>
                                         <td x-show="tableColumns.balance_difference.visible && tableColumns.balance_difference.enabled">
-                                            <template x-if="null !== account.balance_difference">
-                                                <span>
-                                                <span x-show="account.balance_difference < 0" class="text-danger"
-                                                    x-text="formatMoney(account.balance_difference, account.currency_code)"></span>
-                                                    <span x-show="account.balance_difference > 0" class="text-success"
-                                                        x-text="formatMoney(account.balance_difference, account.currency_code)"></span>
-                                                    <span x-show="account.balance_difference == 0" class="text-muted"
-                                                          x-text="formatMoney(account.balance_difference, account.currency_code)"></span>
-                                                    </span>
+
+                                            <template x-for="balance in account.balance">
+                                                <span x-show="null != balance.balance_difference && balance.balance_difference < 0" class="text-danger"
+                                                      x-text="formatMoney(balance.balance_difference, balance.currency_code)"></span>
+                                                <span x-show="null != balance.balance_difference && balance.balance_difference == 0" class="text-muted"
+                                                      x-text="formatMoney(balance.balance_difference, balance.currency_code)"></span>
+                                                <span x-show="null != balance.balance_difference && balance.balance_difference > 0" class="text-success"
+                                                      x-text="formatMoney(balance.balance_difference, balance.currency_code)"></span>
                                             </template>
                                         </td>
                                         <td x-show="tableColumns.menu.visible && tableColumns.menu.enabled">