From 134c551c1211942f26840a480583946e37eada19 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 25 Dec 2024 08:23:17 +0100 Subject: [PATCH] Remove some comments, add others. --- resources/views/list/accounts.twig | 2 ++ resources/views/list/groups.twig | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig index b9bf401d13..b77a9ac711 100644 --- a/resources/views/list/accounts.twig +++ b/resources/views/list/accounts.twig @@ -67,11 +67,13 @@ {% for key, balance in account.endBalances %} + {% if 'balance' == key or 'native_balance' == key %} {{ formatAmountBySymbol(balance, defaultCurrency.symbol, defaultCurrency.currency.decimal_places) }} {% else %} ({{ formatAmountByCode(balance, key) }}) {% endif %} + {% endfor %} diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig index d103c0cea6..ae6211df75 100644 --- a/resources/views/list/groups.twig +++ b/resources/views/list/groups.twig @@ -59,14 +59,14 @@ {% for sum in group.sums %} {% if group.transaction_type == 'Deposit' %} - {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}(TODO NATIVE){% if loop.index != group.sums|length %},{% endif %} + {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}{# (TODO NATIVE1) #}{% if loop.index != group.sums|length %},{% endif %} {% elseif group.transaction_type == 'Transfer' %} - {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places, false) }}(TODO NATIVE){% if loop.index != group.sums|length %},{% endif %} + {{ formatAmountBySymbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places, false) }}{# (TODO NATIVE2) #}{% if loop.index != group.sums|length %},{% endif %} {% else %} - {{ formatAmountBySymbol(sum.amount, sum.currency_symbol, sum.currency_decimal_places) }}(TODO NATIVE){% if loop.index != group.sums|length %},{% endif %} + {{ formatAmountBySymbol(sum.amount, sum.currency_symbol, sum.currency_decimal_places) }}{# (TODO NATIVE3) #}{% if loop.index != group.sums|length %},{% endif %} {% endif %} {% endfor %} @@ -154,7 +154,7 @@ {% if null != transaction.foreign_amount %} ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}) {% endif %} - (TODO NATIVE1) + {# (TODO NATIVE1) #} {# transfer #} {% elseif transaction.transaction_type_type == 'Transfer' %} @@ -162,7 +162,7 @@ {% if null != transaction.foreign_amount %} ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }}) {% endif %} - (TODO NATIVE2) + {# (TODO NATIVE2) #} {# opening balance #} {% elseif transaction.transaction_type_type == 'Opening balance' %} @@ -171,13 +171,13 @@ {% if null != transaction.foreign_amount %} ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}) {% endif %} - (TODO NATIVE3) + {# (TODO NATIVE3) #} {% else %} {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }} {% if null != transaction.foreign_amount %} ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}) {% endif %} - (TODO NATIVE4) + {# (TODO NATIVE4) #} {% endif %} {# reconciliation #} {% elseif transaction.transaction_type_type == 'Reconciliation' %} @@ -186,13 +186,13 @@ {% if null != transaction.foreign_amount %} ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}) {% endif %} - (TODO NATIVE5) + {# (TODO NATIVE5) #} {% else %} {{ formatAmountBySymbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }} {% if null != transaction.foreign_amount %} ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}) {% endif %} - (TODO NATIVE6) + {# (TODO NATIVE6) #} {% endif %} {# liability credit #} {% elseif transaction.transaction_type_type == 'Liability credit' %} @@ -201,13 +201,13 @@ {% if null != transaction.foreign_amount %} ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}) {% endif %} - (TODO NATIVE7) + {# (TODO NATIVE7) #} {% else %} {{ formatAmountBySymbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }} {% if null != transaction.foreign_amount %} ({{ formatAmountBySymbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}) {% endif %} - (TODO NATIVE8) + {# (TODO NATIVE8) #} {% endif %} @@ -217,7 +217,7 @@ {% if null != transaction.foreign_amount %} ({{ formatAmountBySymbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}) {% endif %} - (TODO NATIVE9) + {# (TODO NATIVE9) #} {% endif %}