From eab04ad2985c30ac5d9f8a7ff2dff4a40f5fd3fd Mon Sep 17 00:00:00 2001
From: Herculino Trotta <netotrotta@gmail.com>
Date: Mon, 11 Nov 2024 00:35:09 -0300
Subject: [PATCH] fix: Summing exchanged transactions sums both amount and the
 exchanged amount

---
 app/templates/cotton/transaction/item.html    | 28 +++++++++++--------
 .../cotton/ui/transactions_action_bar.html    |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/templates/cotton/transaction/item.html b/app/templates/cotton/transaction/item.html
index 6e99e74..4873630 100644
--- a/app/templates/cotton/transaction/item.html
+++ b/app/templates/cotton/transaction/item.html
@@ -66,21 +66,25 @@
       </div>
     </div>
     <div class="col-lg-3 col-12 text-lg-end align-self-end">
-        <c-amount.display 
-            :amount="transaction.amount"
-            :prefix="transaction.account.currency.prefix"
-            :suffix="transaction.account.currency.suffix"
-            :decimal_places="transaction.account.currency.decimal_places"
-            color="{% if transaction.type == "EX" %}red{% else %}green{% endif %}"></c-amount.display>
+        <div class="main-amount">
+          <c-amount.display 
+              :amount="transaction.amount"
+              :prefix="transaction.account.currency.prefix"
+              :suffix="transaction.account.currency.suffix"
+              :decimal_places="transaction.account.currency.decimal_places"
+              color="{% if transaction.type == "EX" %}red{% else %}green{% endif %}"></c-amount.display>
+        </div>
         {#    Exchange Rate#}
         {% with exchanged=transaction.exchanged_amount %}
         {% if exchanged %}
-        <c-amount.display 
-            :amount="exchanged.amount"
-            :prefix="exchanged.prefix"
-            :suffix="exchanged.suffix"
-            :decimal_places="exchanged.decimal_places"
-            color="grey"></c-amount.display>
+        <div class="exchanged-amount">
+          <c-amount.display 
+              :amount="exchanged.amount"
+              :prefix="exchanged.prefix"
+              :suffix="exchanged.suffix"
+              :decimal_places="exchanged.decimal_places"
+              color="grey"></c-amount.display>
+        </div>
         {% endif %}
         {% endwith %}
         <div>{% if transaction.account.group %}{{ transaction.account.group.name }} • {% endif %}{{ transaction.account.name }}</div>
diff --git a/app/templates/cotton/ui/transactions_action_bar.html b/app/templates/cotton/ui/transactions_action_bar.html
index 824d3d3..d4500de 100644
--- a/app/templates/cotton/ui/transactions_action_bar.html
+++ b/app/templates/cotton/ui/transactions_action_bar.html
@@ -58,7 +58,7 @@ _="on change from #transactions-list or htmx:afterSettle
       <div class="vr mx-3 tw-align-middle"></div>
       <span _="on selected_transactions_updated from #actions-bar
                 set total to 0.0
-                for amt in <.transaction:has(input[name='transactions']:checked) .amount/>
+                for amt in <.transaction:has(input[name='transactions']:checked) .main-amount .amount/>
                   set amountValue to parseFloat(amt.getAttribute('data-amount'))
                   if not isNaN(amountValue)
                     set total to total + amountValue