Skip to content

Commit

Permalink
Update copy for option 2
Browse files Browse the repository at this point in the history 
Co-authored-by: Mike Rotondo <mrotondo@codeforamerica.org>
  • Loading branch information
@squanto @mrotondo
squanto and mrotondo committed Nov 13, 2024
1 parent 74c158f commit 16fe2ce
Show file tree
Hide file tree
Showing 9 changed files with 253 additions and 223 deletions.
42 changes: 22 additions & 20 deletions app/models/state_file_dependent.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,28 @@
#
# Table name: state_file_dependents
#
# id :bigint not null, primary key
# ctc_qualifying :boolean
# dob :date
# eic_disability :integer default("unfilled")
# eic_qualifying :boolean
# eic_student :integer default("unfilled")
# first_name :string
# intake_type :string not null
# last_name :string
# middle_initial :string
# months_in_home :integer
# needed_assistance :integer default("unfilled"), not null
# odc_qualifying :boolean
# passed_away :integer default("unfilled"), not null
# relationship :string
# ssn :string
# suffix :string
# created_at :datetime not null
# updated_at :datetime not null
# intake_id :bigint not null
# id :bigint not null, primary key
# ctc_qualifying :boolean
# dob :date
# eic_disability :integer default("unfilled")
# eic_qualifying :boolean
# eic_student :integer default("unfilled")
# first_name :string
# id_has_grocery_credit_ineligible_months :integer default("unfilled"), not null
# id_months_ineligible_for_grocery_credit :integer
# intake_type :string not null
# last_name :string
# middle_initial :string
# months_in_home :integer
# needed_assistance :integer default("unfilled"), not null
# odc_qualifying :boolean
# passed_away :integer default("unfilled"), not null
# relationship :string
# ssn :string
# suffix :string
# created_at :datetime not null
# updated_at :datetime not null
# intake_id :bigint not null
#
# Indexes
#
Expand Down
124 changes: 65 additions & 59 deletions app/models/state_file_id_intake.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,71 @@
#
# Table name: state_file_id_intakes
#
# id :bigint not null, primary key
# account_number :string
# account_type :integer default("unfilled"), not null
# bank_name :string
# consented_to_terms_and_conditions :integer default("unfilled"), not null
# contact_preference :integer default("unfilled"), not null
# current_sign_in_at :datetime
# current_sign_in_ip :inet
# current_step :string
# date_electronic_withdrawal :date
# df_data_import_failed_at :datetime
# df_data_imported_at :datetime
# eligibility_emergency_rental_assistance :integer default("unfilled"), not null
# eligibility_withdrew_msa_fthb :integer default("unfilled"), not null
# email_address :citext
# email_address_verified_at :datetime
# failed_attempts :integer default(0), not null
# federal_return_status :string
# has_health_insurance_premium :integer default("unfilled"), not null
# has_unpaid_sales_use_tax :integer default("unfilled"), not null
# hashed_ssn :string
# health_insurance_paid_amount :decimal(12, 2)
# last_sign_in_at :datetime
# last_sign_in_ip :inet
# locale :string default("en")
# locked_at :datetime
# message_tracker :jsonb
# payment_or_deposit_type :integer default("unfilled"), not null
# phone_number :string
# phone_number_verified_at :datetime
# primary_birth_date :date
# primary_esigned :integer default("unfilled"), not null
# primary_esigned_at :datetime
# primary_first_name :string
# primary_last_name :string
# primary_middle_initial :string
# primary_suffix :string
# raw_direct_file_data :text
# raw_direct_file_intake_data :jsonb
# referrer :string
# routing_number :integer
# sign_in_count :integer default(0), not null
# source :string
# spouse_birth_date :date
# spouse_esigned :integer default("unfilled"), not null
# spouse_esigned_at :datetime
# spouse_first_name :string
# spouse_last_name :string
# spouse_middle_initial :string
# spouse_suffix :string
# total_purchase_amount :decimal(12, 2)
# unsubscribed_from_email :boolean default(FALSE), not null
# withdraw_amount :integer
# created_at :datetime not null
# updated_at :datetime not null
# federal_submission_id :string
# primary_state_id_id :bigint
# spouse_state_id_id :bigint
# visitor_id :string
# id :bigint not null, primary key
# account_number :string
# account_type :integer default("unfilled"), not null
# bank_name :string
# consented_to_terms_and_conditions :integer default("unfilled"), not null
# contact_preference :integer default("unfilled"), not null
# current_sign_in_at :datetime
# current_sign_in_ip :inet
# current_step :string
# date_electronic_withdrawal :date
# df_data_import_failed_at :datetime
# df_data_imported_at :datetime
# donate_grocery_credit :integer default("unfilled"), not null
# eligibility_emergency_rental_assistance :integer default("unfilled"), not null
# eligibility_withdrew_msa_fthb :integer default("unfilled"), not null
# email_address :citext
# email_address_verified_at :datetime
# failed_attempts :integer default(0), not null
# federal_return_status :string
# has_health_insurance_premium :integer default("unfilled"), not null
# has_unpaid_sales_use_tax :integer default("unfilled"), not null
# hashed_ssn :string
# health_insurance_paid_amount :decimal(12, 2)
# household_has_grocery_credit_ineligible_months :integer default("unfilled"), not null
# last_sign_in_at :datetime
# last_sign_in_ip :inet
# locale :string default("en")
# locked_at :datetime
# message_tracker :jsonb
# payment_or_deposit_type :integer default("unfilled"), not null
# phone_number :string
# phone_number_verified_at :datetime
# primary_birth_date :date
# primary_esigned :integer default("unfilled"), not null
# primary_esigned_at :datetime
# primary_first_name :string
# primary_has_grocery_credit_ineligible_months :integer default("unfilled"), not null
# primary_last_name :string
# primary_middle_initial :string
# primary_months_ineligible_for_grocery_credit :integer
# primary_suffix :string
# raw_direct_file_data :text
# raw_direct_file_intake_data :jsonb
# referrer :string
# routing_number :integer
# sign_in_count :integer default(0), not null
# source :string
# spouse_birth_date :date
# spouse_esigned :integer default("unfilled"), not null
# spouse_esigned_at :datetime
# spouse_first_name :string
# spouse_has_grocery_credit_ineligible_months :integer default("unfilled"), not null
# spouse_last_name :string
# spouse_middle_initial :string
# spouse_months_ineligible_for_grocery_credit :integer
# spouse_suffix :string
# total_purchase_amount :decimal(12, 2)
# unsubscribed_from_email :boolean default(FALSE), not null
# withdraw_amount :integer
# created_at :datetime not null
# updated_at :datetime not null
# federal_submission_id :string
# primary_state_id_id :bigint
# spouse_state_id_id :bigint
# visitor_id :string
#
# Indexes
#
Expand Down
4 changes: 2 additions & 2 deletions app/views/state_file/questions/md_two_income_subtractions/edit.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

<%= form_with model: @form, url: { action: :update }, local: true, method: "put", builder: VitaMinFormBuilder do |f| %>
<div class="white-group">
<p class="text--bold spacing-below-5"><%= t(".subtitle") %></p>
<p class="spacing-below-5"><%= t(".total", total_deduction: number_to_currency(@total_deduction)) %></p>
<p class="spacing-below-5"><%= t(".subtitle") %></p>
<p class="text--small spacing-below-5"><%= t(".total", total_deduction: number_to_currency(@total_deduction)) %></p>
<div class="form-question spacing-below-25">
<%= f.vita_min_money_field(:primary_student_loan_interest_ded_amount, "Your portion of the student loan interest deduction", classes: ["form-width--long"]) %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions config/locales/en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2695,11 +2695,11 @@ en:
account_holder_name: Account Holder Name
md_two_income_subtractions:
edit:
description: Enter the portions of the federal student loan interest deduction allocated between you and your spouse to see if you qualify and calculate the subtraction.
description: In order to know if you qualify and calculate the subtraction, we need more information about the student loan interest deduction you took on your federal tax return.
student_loan_deduction_copy: This amount is based on interest paid on student loans and it limited to $2,500 per tax return.
student_loan_deduction_copy2: See Form(s) 1098-E for more information.
student_loan_deduction_heading: What is the federal student loan interest deduction?
subtitle: Student loan interest deduction
subtitle: Enter the portions of the federal student loan interest deduction allocated between you and your spouse.
sum_form_error: The total of you and/or your spouse's student loan interest deduction must equal %{total_deduction}
title: You might qualify for the Maryland two-income subtraction
total: The total student loan interest deduction for you and your spouse's federal return is %{total_deduction}.
Expand Down
4 changes: 2 additions & 2 deletions config/locales/es.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2667,11 +2667,11 @@ es:
account_holder_name: Nombre del titular de la cuenta
md_two_income_subtractions:
edit:
description: Ingrese las porciones de la deducción de intereses de préstamos estudiantiles federales asignadas entre usted y su cónyuge para ver si califica y calcular la resta.
description: Para saber si califica y calcular la deducción, necesitamos más información sobre la deducción de intereses de préstamos estudiantiles que tomó en su declaración de impuestos federales.
student_loan_deduction_copy: Esta cantidad se basa en los intereses pagados por préstamos estudiantiles y está limitada a $2,500 por declaración de impuestos.
student_loan_deduction_copy2: Consulte el formulario 1098-E para obtener más información.
student_loan_deduction_heading: "¿Qué es la deducción de intereses de préstamos federales para estudiantes?"
subtitle: Deducción de intereses de préstamos estudiantiles
subtitle: Ingrese las porciones de la deducción de intereses de préstamos estudiantiles federales asignadas entre usted y su cónyuge.
sum_form_error: El total de la deducción de intereses de préstamos estudiantiles de usted y/o su cónyuge debe ser igual al %{total_deduction}
title: Es posible que califique para la deducción por dos ingresos de Maryland
total: La deducción total de intereses de préstamos estudiantiles para su declaración federal y la de su cónyuge es %{total_deduction}.
Expand Down
8 changes: 8 additions & 0 deletions db/schema.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1776,6 +1776,8 @@
t.boolean "eic_qualifying"
t.integer "eic_student", default: 0
t.string "first_name"
t.integer "id_has_grocery_credit_ineligible_months", default: 0, null: false
t.integer "id_months_ineligible_for_grocery_credit"
t.bigint "intake_id", null: false
t.string "intake_type", null: false
t.string "last_name"
Expand Down Expand Up @@ -1820,6 +1822,7 @@
t.date "date_electronic_withdrawal"
t.datetime "df_data_import_failed_at"
t.datetime "df_data_imported_at"
t.integer "donate_grocery_credit", default: 0, null: false
t.integer "eligibility_emergency_rental_assistance", default: 0, null: false
t.integer "eligibility_withdrew_msa_fthb", default: 0, null: false
t.citext "email_address"
Expand All @@ -1831,6 +1834,7 @@
t.integer "has_unpaid_sales_use_tax", default: 0, null: false
t.string "hashed_ssn"
t.decimal "health_insurance_paid_amount", precision: 12, scale: 2
t.integer "household_has_grocery_credit_ineligible_months", default: 0, null: false
t.datetime "last_sign_in_at"
t.inet "last_sign_in_ip"
t.string "locale", default: "en"
Expand All @@ -1843,8 +1847,10 @@
t.integer "primary_esigned", default: 0, null: false
t.datetime "primary_esigned_at"
t.string "primary_first_name"
t.integer "primary_has_grocery_credit_ineligible_months", default: 0, null: false
t.string "primary_last_name"
t.string "primary_middle_initial"
t.integer "primary_months_ineligible_for_grocery_credit"
t.bigint "primary_state_id_id"
t.string "primary_suffix"
t.text "raw_direct_file_data"
Expand All @@ -1857,8 +1863,10 @@
t.integer "spouse_esigned", default: 0, null: false
t.datetime "spouse_esigned_at"
t.string "spouse_first_name"
t.integer "spouse_has_grocery_credit_ineligible_months", default: 0, null: false
t.string "spouse_last_name"
t.string "spouse_middle_initial"
t.integer "spouse_months_ineligible_for_grocery_credit"
t.bigint "spouse_state_id_id"
t.string "spouse_suffix"
t.decimal "total_purchase_amount", precision: 12, scale: 2
Expand Down
42 changes: 22 additions & 20 deletions spec/factories/state_file_dependents.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,28 @@
#
# Table name: state_file_dependents
#
# id :bigint not null, primary key
# ctc_qualifying :boolean
# dob :date
# eic_disability :integer default("unfilled")
# eic_qualifying :boolean
# eic_student :integer default("unfilled")
# first_name :string
# intake_type :string not null
# last_name :string
# middle_initial :string
# months_in_home :integer
# needed_assistance :integer default("unfilled"), not null
# odc_qualifying :boolean
# passed_away :integer default("unfilled"), not null
# relationship :string
# ssn :string
# suffix :string
# created_at :datetime not null
# updated_at :datetime not null
# intake_id :bigint not null
# id :bigint not null, primary key
# ctc_qualifying :boolean
# dob :date
# eic_disability :integer default("unfilled")
# eic_qualifying :boolean
# eic_student :integer default("unfilled")
# first_name :string
# id_has_grocery_credit_ineligible_months :integer default("unfilled"), not null
# id_months_ineligible_for_grocery_credit :integer
# intake_type :string not null
# last_name :string
# middle_initial :string
# months_in_home :integer
# needed_assistance :integer default("unfilled"), not null
# odc_qualifying :boolean
# passed_away :integer default("unfilled"), not null
# relationship :string
# ssn :string
# suffix :string
# created_at :datetime not null
# updated_at :datetime not null
# intake_id :bigint not null
#
# Indexes
#
Expand Down
Loading

0 comments on commit 16fe2ce

Please sign in to comment.