diff --git a/app/controllers/state_file/questions/return_status_controller.rb b/app/controllers/state_file/questions/return_status_controller.rb index 860dda79b8..1ae746df5f 100644 --- a/app/controllers/state_file/questions/return_status_controller.rb +++ b/app/controllers/state_file/questions/return_status_controller.rb @@ -12,7 +12,8 @@ def edit @department_of_taxation = StateFile::StateInformationService.department_of_taxation(current_state_code) @department_of_taxation_initials = @department_of_taxation.split(" ").map(&:first).join.upcase @tax_refund_url = StateFile::StateInformationService.tax_refund_url(current_state_code) - @tax_payment_url = StateFile::StateInformationService.tax_payment_url(current_state_code) + @tax_payment_info_text = StateFile::StateInformationService.tax_payment_info_text(current_state_code) + @tax_payment_info_url = StateFile::StateInformationService.tax_payment_info_url(current_state_code) @voucher_form_name = StateFile::StateInformationService.voucher_form_name(current_state_code) @mail_voucher_address = StateFile::StateInformationService.mail_voucher_address(current_state_code) @voucher_path = StateFile::StateInformationService.voucher_path(current_state_code) diff --git a/app/services/state_file/state_information_service.rb b/app/services/state_file/state_information_service.rb index e7dfecd079..e507dd07dd 100644 --- a/app/services/state_file/state_information_service.rb +++ b/app/services/state_file/state_information_service.rb @@ -19,7 +19,7 @@ class StateInformationService :submission_type, :survey_link, :tax_payment_info_url, - :tax_payment_url, + :tax_payment_info_text, :tax_refund_url, :timezone, :vita_link_en, @@ -76,8 +76,8 @@ def state_intake_class_names submission_builder_class: SubmissionBuilder::Ty2022::States::Az::AzReturnXml, survey_link: "https://codeforamerica.co1.qualtrics.com/jfe/form/SV_0v0BnYNRoLIqzhY", submission_type: "Form140", + tax_payment_info_text: "https://azdor.gov/make-payment-online", tax_payment_info_url: "https://azdor.gov/making-payments-late-payments-and-filing-extensions", - tax_payment_url: "https://azdor.gov/make-payment-online", tax_refund_url: "https://aztaxes.gov/home/checkrefund", department_of_taxation: "Arizona Department of Revenue", timezone: 'America/Phoenix', @@ -105,8 +105,8 @@ def state_intake_class_names submission_type: "Form40", submission_builder_class: SubmissionBuilder::Ty2024::States::Id::IdReturnXml, survey_link: "https://codeforamerica.co1.qualtrics.com/jfe/form/SV_0URdKLyW7K53rZc", + tax_payment_info_text: "https://tax.idaho.gov/e-pay/", tax_payment_info_url: "https://tax.idaho.gov/online-services/e-pay/", - tax_payment_url: "https://tax.idaho.gov/e-pay/", tax_refund_url: "https://tax.idaho.gov/taxes/income-tax/individual-income/refund/", department_of_taxation: "Idaho State Tax Commission", timezone: 'America/Boise', @@ -135,8 +135,8 @@ def state_intake_class_names submission_type: "MD502", submission_builder_class: SubmissionBuilder::Ty2024::States::Md::MdReturnXml, survey_link: "https://codeforamerica.co1.qualtrics.com/jfe/form/SV_24BAmNMNrpkhLwy", + tax_payment_info_text: "Marylandtaxes.gov", tax_payment_info_url: "https://www.marylandtaxes.gov/individual/individual-payments.php", - tax_payment_url: "Marylandtaxes.gov", tax_refund_url: "https://interactive.marylandtaxes.gov/INDIV/refundstatus/home.aspx", department_of_taxation: "Comptroller of Maryland", timezone: 'America/New_York', @@ -164,10 +164,10 @@ def state_intake_class_names submission_type: "FormNCD400", submission_builder_class: SubmissionBuilder::Ty2024::States::Nc::NcReturnXml, survey_link: "https://codeforamerica.co1.qualtrics.com/jfe/form/SV_1MM0vBfZ5N2OMLA", + tax_payment_info_text: "NCDOR.gov", tax_payment_info_url: "https://www.ncdor.gov/file-pay/pay-individual-income-tax", - tax_payment_url: "https://www.ncdor.gov/file-pay/pay-individual-income-tax", tax_refund_url: "https://eservices.dor.nc.gov/wheresmyrefund/SelectionServlet", - department_of_taxation: "North Carolina Department of Revenue", + department_of_taxation: "N.C. Department of Revenue", timezone: 'America/New_York', vita_link_en: "https://airtable.com/appqG5OGbTLBiQ408/pagJPN5iPinERGb3Q/form", vita_link_es: "https://airtable.com/appqG5OGbTLBiQ408/pagS982AjKEml809R/form", @@ -194,8 +194,8 @@ def state_intake_class_names pay_taxes_link: "https://www1.state.nj.us/TYTR_RevTaxPortal/jsp/IndTaxLoginJsp.jsp", survey_link: "https://codeforamerica.co1.qualtrics.com/jfe/form/SV_82CJgtfW0HFEPIi", submission_type: "Resident", + tax_payment_info_text: "https://www1.state.nj.us/TYTR_RevTaxPortal/jsp/IndTaxLoginJsp.jsp", tax_payment_info_url: "https://www.state.nj.us/treasury/taxation/payments-notices.shtml", - tax_payment_url: "https://www1.state.nj.us/TYTR_RevTaxPortal/jsp/IndTaxLoginJsp.jsp", tax_refund_url: "https://www20.state.nj.us/TYTR_TGI_INQ/jsp/prompt.jsp", department_of_taxation: "New Jersey Division of Taxation", timezone: 'America/New_York', @@ -224,8 +224,8 @@ def state_intake_class_names software_id_key: "sin", submission_builder_class: SubmissionBuilder::Ty2022::States::Ny::NyReturnXml, survey_link: "https://codeforamerica.co1.qualtrics.com/jfe/form/SV_3pXUfy2c3SScmgu", + tax_payment_info_text: "Tax.NY.gov", tax_payment_info_url: "https://www.tax.ny.gov/pay/ind/pay-income-tax-online.htm", - tax_payment_url: "Tax.NY.gov", tax_refund_url: "https://www.tax.ny.gov/pit/file/refund.htm", department_of_taxation: "", timezone: 'America/New_York', diff --git a/app/views/state_file/questions/eligible/_az_credits_unsupported.html.erb b/app/views/state_file/questions/eligible/_az_credits_unsupported.html.erb index bfd947b52f..95025942e4 100644 --- a/app/views/state_file/questions/eligible/_az_credits_unsupported.html.erb +++ b/app/views/state_file/questions/eligible/_az_credits_unsupported.html.erb @@ -1,27 +1,33 @@ -
- <%=t('.public_school_tax_credit_heading_html') %> - -
+
+

-
- <%=t('.property_tax_credit_heading_html') %> - -
+
+
+ <%=t('.public_school_tax_credit_heading_html') %> +
    +
  • <%=t('.public_school_tax_credit_paid_fees') %>
  • +
  • <%=t('.public_school_tax_credit_provide_info_html') %>
  • +
+
-
- <%=t('.other_credits_heading') %> -
    -
  • <%=t('.other_credits_529_html') %>
  • -
  • <%=t('.other_credits_301_html') %>
  • -
  • <%=t('.other_credits_itemized_deductions') %>
  • -
  • <%=t('.other_credits_add_dependents') %>
  • -
  • <%=t('.other_credits_change_filing_status') %>
  • -
+
+ <%=t('.property_tax_credit_heading_html') %> +
    +
  • <%=t('.property_tax_credit_age') %>
  • +
  • <%=t('.property_tax_credit_income') %>
  • +
  • <%=t('.property_tax_credit_paid') %>
  • +
+
+ +
+ <%=t('.other_credits_heading') %> +
    +
  • <%=t('.other_credits_529_html') %>
  • +
  • <%=t('.other_credits_301_html') %>
  • +
  • <%=t('.other_credits_itemized_deductions') %>
  • +
  • <%=t('.other_credits_add_dependents') %>
  • +
  • <%=t('.other_credits_change_filing_status') %>
  • +
+
+
\ No newline at end of file diff --git a/app/views/state_file/questions/eligible/_id_credits_unsupported.html.erb b/app/views/state_file/questions/eligible/_id_credits_unsupported.html.erb index 97aa133fff..b19f2eb1b9 100644 --- a/app/views/state_file/questions/eligible/_id_credits_unsupported.html.erb +++ b/app/views/state_file/questions/eligible/_id_credits_unsupported.html.erb @@ -1,14 +1,17 @@ -
- +
+

+
+
    +
  • <%=t('.id_college_savings_program') %>
  • +
  • <%=t('.id_youth_rehab_contributions') %>
  • +
  • <%=t('.maintaining_elderly_disabled_credit') %>
  • +
  • <%=t('.long_term_care_insurance_subtraction') %>
  • +
  • <%=t('.earned_on_reservation') %>
  • +
  • <%=t('.education_contribution_credit') %>
  • +
  • <%=t('.itemized_deductions') %>
  • +
  • <%=t('.dependents_not_claimed_fed_return') %>
  • +
  • <%=t('.voluntary_donations') %>
  • +
  • <%=t('.change_in_filing_status') %>
  • +
+
\ No newline at end of file diff --git a/app/views/state_file/questions/eligible/_nc_credits_unsupported.html.erb b/app/views/state_file/questions/eligible/_nc_credits_unsupported.html.erb index a582f15570..ba8764b995 100644 --- a/app/views/state_file/questions/eligible/_nc_credits_unsupported.html.erb +++ b/app/views/state_file/questions/eligible/_nc_credits_unsupported.html.erb @@ -1,10 +1,13 @@ -
-
    -
  • <%=t('.personal_education') %>
  • -
  • <%=t('.college_savings_account')%>
  • -
  • <%=t('.extension_payment')%>
  • -
  • <%=t('.estimated_income_tax_payments') %>
  • -
  • <%=t('.credits_for_rehabilitating') %>
  • -
  • <%=t('.credits_carried') %>
  • -
+
+

+
+
    +
  • <%=t('.personal_education') %>
  • +
  • <%=t('.college_savings_account')%>
  • +
  • <%=t('.extension_payment')%>
  • +
  • <%=t('.estimated_income_tax_payments') %>
  • +
  • <%=t('.credits_for_rehabilitating') %>
  • +
  • <%=t('.credits_carried') %>
  • +
+
diff --git a/app/views/state_file/questions/eligible/_ny_credits_unsupported.html.erb b/app/views/state_file/questions/eligible/_ny_credits_unsupported.html.erb index 46074ad1d0..5acdfd0783 100644 --- a/app/views/state_file/questions/eligible/_ny_credits_unsupported.html.erb +++ b/app/views/state_file/questions/eligible/_ny_credits_unsupported.html.erb @@ -1,30 +1,36 @@ - +
+

-
- <%=t('.subtractions_225_heading_html') %> -
    -
  • <%=t('.subtractions_225_military') %>
  • -
  • <%=t('.subtractions_225_native_american') %>
  • -
  • <%=t('.subtractions_225_help_loan') %>
  • -
  • <%=t('.subtractions_225_student_loan') %>
  • -
  • <%=t('.subtractions_225_health_care_worker') %>
  • -
-
+
+ -
- <%=t('.other_credits_heading') %> -
    -
  • <%=t('.other_credits_itemized_deductions') %>
  • -
  • <%=t('.other_credits_change_filing_status') %>
  • -
  • <%=t('.other_credits_est_tax_etc') %>
  • -
+
+ <%=t('.subtractions_225_heading_html') %> +
    +
  • <%=t('.subtractions_225_military') %>
  • +
  • <%=t('.subtractions_225_native_american') %>
  • +
  • <%=t('.subtractions_225_help_loan') %>
  • +
  • <%=t('.subtractions_225_student_loan') %>
  • +
  • <%=t('.subtractions_225_health_care_worker') %>
  • +
+
+ +
+ <%=t('.other_credits_heading') %> +
    +
  • <%=t('.other_credits_itemized_deductions') %>
  • +
  • <%=t('.other_credits_change_filing_status') %>
  • +
  • <%=t('.other_credits_est_tax_etc') %>
  • +
+
+
\ No newline at end of file diff --git a/app/views/state_file/questions/eligible/edit.html.erb b/app/views/state_file/questions/eligible/edit.html.erb index 20d2fd0af9..e7d71a499b 100644 --- a/app/views/state_file/questions/eligible/edit.html.erb +++ b/app/views/state_file/questions/eligible/edit.html.erb @@ -19,12 +19,7 @@ <% if current_state_code == "md" %> <%= render partial: "state_file/questions/eligible/md_reveals" %> <% else %> -
-

-
- <%= render partial: "state_file/questions/eligible/#{current_state_code}_credits_unsupported" %> -
-
+ <%= render partial: "state_file/questions/eligible/#{current_state_code}_credits_unsupported" %>

diff --git a/app/views/state_file/questions/return_status/_accepted.html.erb b/app/views/state_file/questions/return_status/_accepted.html.erb index 0306cf0a00..9162a8830a 100644 --- a/app/views/state_file/questions/return_status/_accepted.html.erb +++ b/app/views/state_file/questions/return_status/_accepted.html.erb @@ -13,7 +13,7 @@ <% # i18n-tasks-use t('state_file.questions.return_status.accepted.refund_details_html') # hint for the i18n linter that, yes, we are using this key (sometimes) %>

<%= t(".#{current_state_code}.refund_details_html", default: :'.refund_details_html', website_name: @department_of_taxation_initials, tax_refund_url: @tax_refund_url) %>

<% elsif refund_or_owed_amount.negative? %> -

<%= t('.direct_debit_html', tax_payment_url: @tax_payment_url) %>

+

<%= t('.direct_debit_html', tax_payment_info_text: @tax_payment_info_text, tax_payment_info_url: @tax_payment_info_url) %>

<% end %>
diff --git a/app/views/state_file/questions/taxes_owed/edit.html.erb b/app/views/state_file/questions/taxes_owed/edit.html.erb index 03b4258d0e..6ecb3ba944 100644 --- a/app/views/state_file/questions/taxes_owed/edit.html.erb +++ b/app/views/state_file/questions/taxes_owed/edit.html.erb @@ -17,7 +17,7 @@ { value: :direct_deposit, label: t(".pay_bank"), input_html: { "data-follow-up": "#pay-from-bank" } }, { value: :mail, label: t(".pay_mail_online_html", tax_payment_info_url: StateFile::StateInformationService.tax_payment_info_url(current_state_code), - tax_payment_info_text: StateFile::StateInformationService.tax_payment_url(current_state_code), + tax_payment_info_text: StateFile::StateInformationService.tax_payment_info_text(current_state_code), ) }, ] ) %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 3f3434cc62..e431629691 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2644,6 +2644,7 @@ en: college_savings_account: 529 College Savings Account Contributions credits_carried: Credits carried forward from previous years credits_for_rehabilitating: Credits for Rehabilitating Historic Structures + credits_not_supported: What credits and deductions does this service not support this year? estimated_income_tax_payments: Estimated income tax payments extension_payment: Extension payments personal_education: Personal Education Student Account Deposits Deduction @@ -3574,7 +3575,7 @@ en:
  • Make your check or money order payable to %{payable_to}. Write your full SSN or ITIN, “%{filing_year} Tax”, and "Form %{form_number}" on your payment.
  • - direct_debit_html: If you have a remaining tax balance, remember to pay it online at %{tax_payment_url} or by mail before the April 15 filing deadline. + direct_debit_html: If you have a remaining tax balance, remember to pay it online at %{tax_payment_info_text} or by mail before the April 15 filing deadline. download_voucher: Download payment voucher form feedback: We value your feedback—let us know what you think of this service. include_payment: You'll need to include the payment voucher form. @@ -3694,8 +3695,8 @@ en: routing_number: Routing Number withdraw_amount: How much do you authorize to be withdrawn from your account? (Your total amount due is: $%{owed_amount}.) edit: - direct_deposit: Direct deposit (fastest) - mail: Mail my payment (slower) + direct_deposit: By direct deposit (fastest) + mail: By mail (slower) page_title: Good news, you're getting a tax refund. How would you like to receive your refund? title_html: Good news, you're getting a %{state_name} state tax refund of $%{refund_amount}. taxes_owed: diff --git a/config/locales/es.yml b/config/locales/es.yml index a929e8b7d9..9ee5148864 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -2600,6 +2600,7 @@ es: college_savings_account: Contribuciones a cuentas de ahorro 529 para la universidad credits_carried: Créditos acumulados de años anteriores credits_for_rehabilitating: Créditos por la rehabilitación de estructuras históricas + credits_not_supported: What credits and deductions does this service not support this year? estimated_income_tax_payments: Pagos de impuestos sobre la renta estimados extension_payment: Pagos por extensión personal_education: Deducción por depósitos en cuentas de estudiante de educación personal @@ -3548,7 +3549,7 @@ es:
  • Haz tu cheque o giro postal a nombre del %{payable_to}. Escribe tu SSN o ITIN completo, "%{filing_year} Tax", y "Form %{form_number}" en tu pago.
  • - direct_debit_html: Si tienes un saldo de impuestos pendiente, recuerda pagarlo en línea en %{tax_payment_url} o por correo antes de la fecha límite de declaración que es el 15 de abril. + direct_debit_html: Si tienes un saldo de impuestos pendiente, recuerda pagarlo en línea en %{tax_payment_info_text} o por correo antes de la fecha límite de declaración que es el 15 de abril. download_voucher: Descargar el formulario de comprobante de pago feedback: Valoramos sus comentarios; háganos saber lo que piensa de esta herramienta. include_payment: Debes incluir el formulario de comprobante de pago. diff --git a/spec/controllers/state_file/questions/return_status_controller_spec.rb b/spec/controllers/state_file/questions/return_status_controller_spec.rb index aef8e015bb..0f30a16606 100644 --- a/spec/controllers/state_file/questions/return_status_controller_spec.rb +++ b/spec/controllers/state_file/questions/return_status_controller_spec.rb @@ -17,7 +17,8 @@ get :edit expect(assigns(:tax_refund_url)).to eq StateFile::StateInformationService.tax_refund_url(state_code) - expect(assigns(:tax_payment_url)).to eq StateFile::StateInformationService.tax_payment_url(state_code) + expect(assigns(:tax_payment_info_url)).to eq StateFile::StateInformationService.tax_payment_info_url(state_code) + expect(assigns(:tax_payment_info_text)).to eq StateFile::StateInformationService.tax_payment_info_text(state_code) expect(assigns(:voucher_form_name)).to eq StateFile::StateInformationService.voucher_form_name(state_code) expect(assigns(:mail_voucher_address)).to eq StateFile::StateInformationService.mail_voucher_address(state_code) expect(assigns(:voucher_path)).to eq StateFile::StateInformationService.voucher_path(state_code) @@ -278,7 +279,7 @@ get :edit - expect(response.body).to include I18n.t("state_file.questions.return_status.accepted.direct_debit_html", tax_payment_url: assigns(:tax_payment_url)) + expect(response.body).to include I18n.t("state_file.questions.return_status.accepted.direct_debit_html", tax_payment_info_url: assigns(:tax_payment_info_url), tax_payment_info_text: assigns(:tax_payment_info_text)) expect(response.body).to include I18n.t("state_file.questions.return_status.accepted.pay_by_mail_or_moneyorder") end end