diff --git a/app/models/import.rb b/app/models/import.rb index 6887103b..55a33c32 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -122,7 +122,7 @@ class Import < ApplicationRecord tags << tag_cache[tag_string] ||= account.family.tags.find_or_initialize_by(name: tag_string) end - category = category_cache[category_name] ||= account.family.transaction_categories.find_or_initialize_by(name: category_name) + category = category_cache[category_name] ||= account.family.transaction_categories.find_or_initialize_by(name: category_name) if category_name.present? txn = account.transactions.build \ name: row["name"].presence || FALLBACK_TRANSACTION_NAME, diff --git a/app/views/imports/transactions/_transaction.html.erb b/app/views/imports/transactions/_transaction.html.erb index 3d221d96..9fbcdef3 100644 --- a/app/views/imports/transactions/_transaction.html.erb +++ b/app/views/imports/transactions/_transaction.html.erb @@ -6,6 +6,12 @@ <%= render partial: "transactions/categories/badge", locals: { category: transaction.category } %> +
+ <% transaction.tags.each do |tag| %> + <%= render partial: "tags/badge", locals: { tag: tag } %> + <% end %> +
+
<%= 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"] %>