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

Fix currency when importing to foreign accounts (#762)

Browse source
This commit is contained in:
Jakub Kottnauer 2024-05-20 15:55:45 +02:00 • committed by GitHub
parent 5fa34b4111
commit 34811d8fd8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/import.rb
View file

@ -115,7 +115,8 @@ class Import < ApplicationRecord
name: row["name"] || "Imported transaction", name: row["name"] || "Imported transaction",
date: Date.iso8601(row["date"]), date: Date.iso8601(row["date"]),
category: category, category: category,
amount: BigDecimal(row["amount"]) * -1 # User inputs amounts with opposite signage of our internal representation amount: BigDecimal(row["amount"]) * -1, # User inputs amounts with opposite signage of our internal representation
currency: account.currency
transactions << txn transactions << txn
end end

2
app/views/imports/transactions/_transaction.html.erb
View file

@ -7,6 +7,6 @@
</div> </div>
<div class="ml-auto"> <div class="ml-auto">
<%= content_tag :p, format_money(-transaction.amount), class: ["whitespace-nowrap", BigDecimal(transaction.amount).negative? ? "text-green-600" : "text-red-600"] %> <%= content_tag :p, format_money(Money.new(-transaction.amount, @import.account.currency)), class: ["whitespace-nowrap", BigDecimal(transaction.amount).negative? ? "text-green-600" : "text-red-600"] %>
</div> </div>
</div> </div>

2
app/views/imports/transactions/_transaction_group.html.erb
View file

@ -5,7 +5,7 @@
<div class="bg-gray-25 rounded-xl p-1 w-full"> <div class="bg-gray-25 rounded-xl p-1 w-full">
<div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-gray-500"> <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-gray-500">
<h4><%= date.strftime("%b %d, %Y") %> &middot; <%= transactions.size %></h4> <h4><%= date.strftime("%b %d, %Y") %> &middot; <%= transactions.size %></h4>
<span><%= format_money -transactions.sum { |t| t.amount } %></span> <span><%= format_money Money.new(-transactions.sum { |t| t.amount }, @import.account.currency) %></span>
</div> </div>
<div class="bg-white shadow-xs rounded-md border border-alpha-black-25 divide-y divide-alpha-black-50"> <div class="bg-white shadow-xs rounded-md border border-alpha-black-25 divide-y divide-alpha-black-50">
<%= render partial: "imports/transactions/transaction", collection: transactions %> <%= render partial: "imports/transactions/transaction", collection: transactions %>