QT/sure
1
0
Fork 0
mirror of https://github.com/we-promise/sure.git synced 2026-04-19 12:04:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Transfers should always total to zero (#1859)

Browse Source
This commit is contained in:
Tony Vincent
2025-02-17 17:42:30 +01:00
committed by GitHub
parent 8e339dcbe0
commit f35b70e936
3 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/helpers/application_helper.rb
View File

@@ -154,7 +154,7 @@ module ApplicationHelper
def totals_by_currency(collection:, money_method:, separator: " | ", negate: false)
collection.group_by(&:currency)
.transform_values { |item| negate ? item.sum(&money_method) * -1 : item.sum(&money_method) }
.transform_values { |item| calculate_total(item, money_method, negate) }
.map { |_currency, money| format_money(money) }
.join(separator)
end
@@ -166,4 +166,12 @@ module ApplicationHelper
cookies[:admin] == "true"
end
private
def calculate_total(item, money_method, negate)
items = item.reject { |i| i.respond_to?(:entryable) && i.entryable.transfer? }
total = items.sum(&money_method)
negate ? -total : total
end
end

4
app/views/account/entries/_entry_group.html.erb
View File

@@ -17,7 +17,9 @@
</div>
<% if totals %>
<%= totals_by_currency(collection: entries, money_method: :amount_money, negate: true) %>
<div id="entry-group-<%= date %>-totals">
<%= totals_by_currency(collection: entries, money_method: :amount_money, negate: true) %>
</div>
<% end %>
</div>
<div class="bg-white shadow-xs rounded-md border border-alpha-black-25 divide-y divide-alpha-black-50">