diff --git a/app/models/import.rb b/app/models/import.rb index 55a33c32..c29ec6ab 100644 --- a/app/models/import.rb +++ b/app/models/import.rb @@ -56,6 +56,8 @@ class Import < ApplicationRecord end end + self.account.sync + update!(status: "complete") rescue => e update!(status: "failed") diff --git a/app/views/imports/_sample_table.html.erb b/app/views/imports/_sample_table.html.erb index 83a16f5c..f4b82143 100644 --- a/app/views/imports/_sample_table.html.erb +++ b/app/views/imports/_sample_table.html.erb @@ -1,22 +1,26 @@ -
-
Date
-
Name
-
Category
-
Amount
+
+
date
+
name
+
category
+
tags
+
amount
2024-01-01
Amazon
Shopping
+
Tag1|Tag2
-24.99
2024-03-01
Spotify
+
-16.32
2023-01-06
Acme
Income
+
Tag3
151.22
diff --git a/app/views/imports/load.html.erb b/app/views/imports/load.html.erb index 68fab9b9..0565077a 100644 --- a/app/views/imports/load.html.erb +++ b/app/views/imports/load.html.erb @@ -1,6 +1,6 @@ <%= content_for :return_to_path, return_to_path(params, imports_path) %> -
+

<%= t(".load_title") %>

@@ -30,6 +30,7 @@
  • <%= t(".requirement1") %>
  • <%= t(".requirement2") %>
  • +
  • <%= t(".requirement3") %>
diff --git a/config/locales/views/imports/en.yml b/config/locales/views/imports/en.yml index 8a089ca5..2cb90411 100644 --- a/config/locales/views/imports/en.yml +++ b/config/locales/views/imports/en.yml @@ -68,6 +68,7 @@ en: requirement1: Dates must be in ISO 8601 format (YYYY-MM-DD) requirement2: Negative transaction is an "outflow" (expense), positive is an "inflow" (income) + requirement3: Can have 0 or more tags separated by | subtitle: Import your transactions load_csv: import_loaded: Import CSV loaded diff --git a/test/jobs/import_job_test.rb b/test/jobs/import_job_test.rb index 14c21339..35a0f3b5 100644 --- a/test/jobs/import_job_test.rb +++ b/test/jobs/import_job_test.rb @@ -14,5 +14,6 @@ class ImportJobTest < ActiveJob::TestCase end assert import.reload.complete? + assert import.account.balances.present? end end