Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FYST-1881] Make html consistent between az and id review of 1099 r subtractions #5660

Open
wants to merge 4 commits into
base: FYST-902-az-add-1099-r-sub-to-final-review
Choose a base branch
from
+39 −37
Open

[FYST-1881] Make html consistent between az and id review of 1099 r subtractions #5660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c881cc
Move id retirement subtractions card into the reivew_header
arinchoi03 Feb 28, 2025
7735ba2
Remove repeated flipper check
arinchoi03 Feb 28, 2025
426ba68
Fix the specs I broke
arinchoi03 Feb 28, 2025
0bd1cf3
Fix more tests
arinchoi03 Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions app/views/state_file/questions/id_review/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,6 @@
<% content_for :card do %>
<%= render "state_file/questions/shared/review_header" %>

<% if Flipper.enabled?(:show_retirement_ui) && current_intake.calculator.line_or_zero(:ID39R_B_LINE_8e).positive? %>
<div id="qualified-retirement-benefits-deduction" class="white-group">
<div class="spacing-below-5">
<p class="text--bold spacing-below-5"><%= t(".qualified_retirement_benefits_deduction") %></p>
<p class="text spacing-below-2"><%= t(".qualified_retirement_benefits_deduction_explain") %></p>

<p class="text--bold spacing-below-5"><%= t(".qualified_disabled_retirement_benefits") %></p>
<p><%= number_to_currency(current_intake.calculator.line_or_zero(:ID39R_B_LINE_8f), precision: 2) %></p>
<% id_disability_or_retirement_link = current_intake.has_filer_between_62_and_65_years_old? ? StateFile::Questions::IdDisabilityController.to_path_helper(return_to_review: "y") : StateFile::Questions::IdRetirementAndPensionIncomeController.to_path_helper(return_to_review: "y", index: 0) %>
<%= link_to t("general.review_and_edit"), id_disability_or_retirement_link, class: "button--small" %>
</div>
</div>
<% end %>

<section class="review-section">
<div class="spacing-below-25">
<h2 class="text--body text--bold spacing-below-5"><%=t("state_file.questions.shared.review_header.state_details_title") %></h2>
Expand Down
14 changes: 14 additions & 0 deletions ...views/state_file/questions/shared/_id_retirement_income_deductions_review_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<% if current_intake.calculator.line_or_zero(:ID39R_B_LINE_8e).positive? %>
<div id="qualified-retirement-benefits-deduction" class="white-group">
<div class="spacing-below-5">
<p class="text--bold spacing-below-5"><%= t(".qualified_retirement_benefits_deduction") %></p>
<p class="text spacing-below-2"><%= t(".qualified_retirement_benefits_deduction_explain") %></p>

<p class="text--bold spacing-below-5"><%= t(".qualified_disabled_retirement_benefits") %></p>
<p><%= number_to_currency(current_intake.calculator.line_or_zero(:ID39R_B_LINE_8f), precision: 2) %></p>
<% id_disability_or_retirement_link = current_intake.has_filer_between_62_and_65_years_old? ? StateFile::Questions::IdDisabilityController.to_path_helper(return_to_review: "y") : StateFile::Questions::IdRetirementAndPensionIncomeController.to_path_helper(return_to_review: "y", index: 0) %>
<%= link_to t("general.review_and_edit"), id_disability_or_retirement_link, class: "button--small" %>
</div>
</div>
<% end %>

7 changes: 4 additions & 3 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3074,9 +3074,6 @@ en:
no_donations_selected: "<strong>No donations selected</strong>"
permanent_building_fund_tax: Permanent Building Fund Tax
purchases_without_sales_tax: Purchases without paying sales tax
qualified_disabled_retirement_benefits: Qualified disabled retirement benefits
qualified_retirement_benefits_deduction: Qualified Retirement Benefits Deduction
qualified_retirement_benefits_deduction_explain: These allow people to deduct all or a portion of their retirement income from their taxes.
voluntary_charitable_donations: Voluntary Charitable Donations
id_sales_use_tax:
edit:
Expand Down Expand Up @@ -4062,6 +4059,10 @@ en:
subtitle: These allow people to deduct all or a portion of their retirement income from their taxes.
title: Arizona retirement income deductions
uniformed_services: Retired or retainer pay of the uniformed services of the United States
id_retirement_income_deductions_review_header:
qualified_disabled_retirement_benefits: Qualified disabled retirement benefits
qualified_retirement_benefits_deduction: Qualified Retirement Benefits Deduction
qualified_retirement_benefits_deduction_explain: These allow people to deduct all or a portion of their retirement income from their taxes.
review_header:
income_details: Income Details
income_forms_collected: 'Income form(s) collected:'
Expand Down
7 changes: 4 additions & 3 deletions config/locales/es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3043,9 +3043,6 @@ es:
no_donations_selected: "<strong>No hay donaciones seleccionadas</strong>"
permanent_building_fund_tax: Impuesto sobre el Fondo de Edificios Permanentes
purchases_without_sales_tax: Compras sin pagar impuesto de ventas
qualified_disabled_retirement_benefits: Beneficios calificados de jubilación para personas con discapacidad
qualified_retirement_benefits_deduction: Deducción por Beneficios Calificados de Jubilación
qualified_retirement_benefits_deduction_explain: Estos permiten a las personas deducir de sus impuestos la totalidad o una parte de sus ingresos por jubilación.
voluntary_charitable_donations: Donaciones caritativas voluntarias
id_sales_use_tax:
edit:
Expand Down Expand Up @@ -4048,6 +4045,10 @@ es:
subtitle: These allow people to deduct all or a portion of their retirement income from their taxes.
title: Arizona retirement income deductions
uniformed_services: Retired or retainer pay of the uniformed services of the United States
id_retirement_income_deductions_review_header:
qualified_disabled_retirement_benefits: Beneficios calificados de jubilación para personas con discapacidad
qualified_retirement_benefits_deduction: Deducción por Beneficios Calificados de Jubilación
qualified_retirement_benefits_deduction_explain: Estos permiten a las personas deducir de sus impuestos la totalidad o una parte de sus ingresos por jubilación.
review_header:
income_details: Detalles de ingresos
income_forms_collected: 'Formulario(s) de ingresos recogidos:'
Expand Down
34 changes: 17 additions & 17 deletions spec/features/state_file/review_page_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,9 @@

expect(page).to have_text I18n.t("state_file.questions.shared.abstract_review_header.title")
within "#qualified-retirement-benefits-deduction" do
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_disabled_retirement_benefits")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_disabled_retirement_benefits")
expect(page).to have_text "$250.00"

click_on I18n.t("general.review_and_edit")
Expand All @@ -405,9 +405,9 @@

expect(page).to have_text I18n.t("state_file.questions.shared.abstract_review_header.title")
within "#qualified-retirement-benefits-deduction" do
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_disabled_retirement_benefits")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_disabled_retirement_benefits")
expect(page).to have_text "$200.00" # $50 less eligible
end
end
Expand All @@ -418,9 +418,9 @@

expect(page).to have_text I18n.t("state_file.questions.shared.abstract_review_header.title")
within "#qualified-retirement-benefits-deduction" do
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_disabled_retirement_benefits")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_disabled_retirement_benefits")
expect(page).to have_text "$250.00"

click_on I18n.t("general.review_and_edit")
Expand All @@ -441,9 +441,9 @@

expect(page).to have_text I18n.t("state_file.questions.shared.abstract_review_header.title")
within "#qualified-retirement-benefits-deduction" do
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_disabled_retirement_benefits")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_disabled_retirement_benefits")
expect(page).to have_text "$200.00" # $50 less eligible
end
end
Expand All @@ -460,9 +460,9 @@

expect(page).to have_text I18n.t("state_file.questions.shared.abstract_review_header.title")
within "#qualified-retirement-benefits-deduction" do
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.id_review.edit.qualified_disabled_retirement_benefits")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction_explain")
expect(page).to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_disabled_retirement_benefits")
expect(page).to have_text "$250.00"

click_on I18n.t("general.review_and_edit")
Expand All @@ -473,7 +473,7 @@
click_on I18n.t("general.continue")

expect(page).to have_text I18n.t("state_file.questions.shared.abstract_review_header.title")
expect(page).not_to have_text I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction")
expect(page).not_to have_text I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction")
end
end
end
Expand All @@ -483,7 +483,7 @@
visit "/questions/id-review"

expect(page).to have_text I18n.t("state_file.questions.shared.abstract_review_header.title")
expect(page).not_to have_text(I18n.t("state_file.questions.id_review.edit.qualified_retirement_benefits_deduction"))
expect(page).not_to have_text(I18n.t("state_file.questions.shared.id_retirement_income_deductions_review_header.qualified_retirement_benefits_deduction"))
end
end

Expand Down