Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-19 05:09:38 +02:00
Code Issues Releases Activity Actions 1

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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">

16
test/system/transactions_test.rb
View file

@ -196,10 +196,22 @@ class TransactionsTest < ApplicationSystemTestCase
end
end
test "transfers should always sum to zero" do
asset_account = accounts(:other_asset)
investment_account = accounts(:investment)
outflow_entry = create_transaction("outflow", Date.current, 500, account: asset_account)
inflow_entry = create_transaction("inflow", 1.day.ago.to_date, -500, account: investment_account)
asset_account.auto_match_transfers!
visit transactions_url
within "#entry-group-" + Date.current.to_s + "-totals" do
assert_text "-$100.00" # transaction eleven from setup
end
end
private
def create_transaction(name, date, amount, category: nil, merchant: nil, tags: [])
account = accounts(:depository)
def create_transaction(name, date, amount, category: nil, merchant: nil, tags: [], account: nil)
account ||= accounts(:depository)
account.entries.create! \
name: name,