The personal finance app for everyone
Fix #910 (#917)
Tony Vincentbbcd3881dbd7
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rbindex 67082b18..a5e3af94 100644--- a/app/helpers/application_helper.rb+++ b/app/helpers/application_helper.rb@@ -122,4 +122,11 @@ module ApplicationHelperoptions.reverse_merge!(money.default_format_options)ActiveSupport::NumberHelper.number_to_delimited(money.amount.round(options[:precision] || 0), { delimiter: options[:delimiter], separator: options[:separator] })end++ def totals_by_currency(collection:, money_method:, separator: " | ", negate: false, options: {})+ collection.group_by(&:currency)+ .transform_values { |item| negate ? item.sum(&money_method) * -1 : item.sum(&money_method) }+ .map { |_currency, money| format_money(money) }+ .join(separator)+ endenddiff --git a/app/views/accounts/_accountable_group.html.erb b/app/views/accounts/_accountable_group.html.erbindex 199c8fe1..bef3069e 100644--- a/app/views/accounts/_accountable_group.html.erb+++ b/app/views/accounts/_accountable_group.html.erb@@ -6,7 +6,7 @@<p><%= to_accountable_title(Accountable.from_type(group)) %></p><span class="text-gray-400 mx-2">·</span><p><%= accounts.count %></p>- <p class="ml-auto"><%= format_money accounts.sum(&:balance_money) %></p>+ <p class="ml-auto"><%= totals_by_currency(collection: accounts, money_method: :balance_money) %></p></div><div class="bg-white"><% accounts.each do |account| %>diff --git a/app/views/transactions/_date_group.html.erb b/app/views/transactions/_date_group.html.erbindex 80de9bd9..a464cfc9 100644--- a/app/views/transactions/_date_group.html.erb+++ b/app/views/transactions/_date_group.html.erb@@ -11,13 +11,8 @@</div><div>- <% transactions_by_currency = group[:transactions].group_by(&:currency) %>- <% transactions_by_currency.each_with_index do |(_currency, transactions), idx| %>- <%= tag.span format_money(-transactions.sum(&:amount_money)) %>- <%= tag.span "|", class: "mx-2" if idx < transactions_by_currency.count - 1 %>- <% end %>+ <%= totals_by_currency(collection: group[:transactions], money_method: :amount_money, negate: true) %></div>-</div><div class="bg-white shadow-xs rounded-md border border-alpha-black-25 divide-y divide-alpha-black-50"><%= render group[:transactions] %>diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rbindex 14fafe8e..d25531aa 100644--- a/test/helpers/application_helper_test.rb+++ b/test/helpers/application_helper_test.rb@@ -16,4 +16,18 @@ class ApplicationHelperTest < ActionView::TestCaseassert_equal "user", permitted_accountable_partial("User")assert_equal "admin_user", permitted_accountable_partial("AdminUser")end++ def setup+ @account1 = Account.new(currency: "USD", balance: 1)+ @account2 = Account.new(currency: "USD", balance: 2)+ @account3 = Account.new(currency: "EUR", balance: -7)+ end++ test "#totals_by_currency(collection: collection, money_method: money_method)" do+ assert_equal "$3.00", totals_by_currency(collection: [ @account1, @account2 ], money_method: :balance_money)+ assert_equal "$3.00 | -€7,00", totals_by_currency(collection: [ @account1, @account2, @account3 ], money_method: :balance_money)+ assert_equal "", totals_by_currency(collection: [], money_method: :balance_money)+ assert_equal "$0.00", totals_by_currency(collection: [ Account.new(currency: "USD", balance: 0) ], money_method: :balance_money)+ assert_equal "-$3.00 | €7,00", totals_by_currency(collection: [ @account1, @account2, @account3 ], money_method: :balance_money, negate: true)+ endend