Merge remote-tracking branch 'origin/main' into GYR1-566-bug-crowd-restrict-editing-client-tax-returns-from-previous-years

Author: embarnard

app/controllers/state_file/questions/md_permanently_disabled_controller.rb

@@ -2,15 +2,10 @@ module StateFile
   module Questions
     class MdPermanentlyDisabledController < QuestionsController
       include ReturnToReviewConcern
+
       def self.show?(intake)
         Flipper.enabled?(:show_retirement_ui) && intake.state_file1099_rs.length.positive?
       end
-
-      private
-
-      def form_params
-        params.require(:state_file_md_permanently_disabled_form).permit(:mfj_disability, :primary_disabled, :spouse_disabled, :proof_of_disability_submitted)
-      end
     end
   end
 end

app/forms/state_file/md_permanently_disabled_form.rb

@@ -1,39 +1,50 @@
 module StateFile
   class MdPermanentlyDisabledForm < QuestionsForm
-    set_attributes_for :intake, :primary_disabled, :spouse_disabled, :proof_of_disability_submitted
+    set_attributes_for :intake, :mfj_disability, :primary_disabled, :spouse_disabled, :primary_proof_of_disability_submitted, :spouse_proof_of_disability_submitted
 
-    attr_accessor :mfj_disability
-    validates_presence_of :mfj_disability, if: -> { intake.filing_status_mfj?}
+    validates_presence_of :mfj_disability, if: -> { intake.filing_status_mfj? }
     validates :primary_disabled, inclusion: { in: %w[yes no], message: :blank }, unless: -> { intake.filing_status_mfj? }
-    validates :proof_of_disability_submitted, inclusion: { in: %w[yes no], message: :blank }, if: :disability_selected?
-
+    validates :primary_proof_of_disability_submitted, inclusion: { in: %w[yes no], message: :blank }, if: :primary_requires_proof?
+    validates :spouse_proof_of_disability_submitted, inclusion: { in: %w[yes no], message: :blank }, if: :spouse_requires_proof?
 
     def save
+      attributes_to_save = attributes_for(:intake).except(:mfj_disability)
+      if mfj_disability.present?
+        attributes_to_save = case mfj_disability
+                             when "primary"
+                               attributes_to_save.merge(primary_disabled: "yes", spouse_disabled: "no")
+                             when "spouse"
+                               attributes_to_save.merge(primary_disabled: "no", spouse_disabled: "yes")
+                             when "both"
+                               attributes_to_save.merge(primary_disabled: "yes", spouse_disabled: "yes")
+                             when "none"
+                               attributes_to_save.merge(primary_disabled: "no", spouse_disabled: "no")
+                             end
+      end
+
+      @intake.update(attributes_to_save)
+    end
+
+    private
+
+    def proof_not_required?
       if intake.filing_status_mfj?
-        case mfj_disability
-        when "me"
-          @intake.update(primary_disabled: "yes", spouse_disabled: "no", proof_of_disability_submitted: proof_of_disability_submitted)
-        when "spouse"
-          @intake.update(primary_disabled: "no", spouse_disabled: "yes", proof_of_disability_submitted: proof_of_disability_submitted)
-        when "both"
-          @intake.update(primary_disabled: "yes", spouse_disabled: "yes", proof_of_disability_submitted: proof_of_disability_submitted)
-        when "none"
-          @intake.update(primary_disabled: "no", spouse_disabled: "no", proof_of_disability_submitted: nil)
-        end
-      elsif primary_disabled == "no"
-        @intake.update(
-            primary_disabled: "no",
-            proof_of_disability_submitted: nil
-          )
+        intake.primary_senior? && intake.spouse_senior?
       else
-        @intake.update(attributes_for(:intake))
+        intake.primary_senior?
       end
     end
 
-    private
+    def primary_requires_proof?
+      return false if proof_not_required?
+
+      mfj_disability.in?(%w[primary both]) || primary_disabled == "yes"
+    end
+
+    def spouse_requires_proof?
+      return false if proof_not_required?
 
-    def disability_selected?
-      mfj_disability.in?(%w[me spouse both]) || primary_disabled == "yes"
+      mfj_disability.in?(%w[spouse both])
     end
   end
 end

app/lib/efile/nj/nj1040_calculator.rb

@@ -468,7 +468,7 @@ def calculate_line_55
         return nil if @intake.state_file_w2s.empty? && @intake.state_file1099_rs.empty?
 
         (
-          @intake.state_file_w2s.sum(&:state_income_tax_amount) +
+          @intake.state_file_w2s.sum{ |item| item.state_income_tax_amount || 0} +
           @intake.state_file1099_rs.sum(&:state_tax_withheld_amount)
         ).round
       end

app/lib/submission_builder/state1099_r.rb

@@ -11,6 +11,7 @@ def document
         if form1099r.payer_name.present?
           xml.PayerName do
             xml.BusinessNameLine1Txt sanitize_for_xml(form1099r.payer_name.tr('-', ' '), 75)
+            xml.BusinessNameLine2Txt sanitize_for_xml(form1099r.payer_name2&.tr('-', ' '), 75) if form1099r.payer_name2.present?
           end
           xml.PayerUSAddress do
             xml.AddressLine1Txt sanitize_for_xml(form1099r.payer_address_line1, 35) if form1099r.payer_address_line1.present?
@@ -36,7 +37,7 @@ def document
           xml.F1099RStateLocalTaxGrp do
             xml.F1099RStateTaxGrp do
               xml.StateTaxWithheldAmt form1099r.state_tax_withheld_amount&.round
-              xml.StateAbbreviationCd form1099r.state_code if form1099r.state_code.present?
+              xml.StateAbbreviationCd form1099r.state_code || state_abbreviation
               xml.PayerStateIdNum form1099r.payer_state_identification_number if form1099r.payer_state_identification_number.present?
               xml.StateDistributionAmt form1099r.state_distribution_amount&.round
             end

app/models/df_1099r_accessor.rb

@@ -2,6 +2,7 @@ class Df1099rAccessor < DfXmlAccessor
   SELECTORS = {
     payer_name_control: "PayerNameControlTxt",
     payer_name: "PayerName BusinessNameLine1Txt",
+    payer_name2: "PayerName BusinessNameLine2Txt",
     payer_address_line1: "PayerUSAddress AddressLine1Txt",
     payer_address_line2: "PayerUSAddress AddressLine2Txt",
     payer_city_name: "PayerUSAddress CityNm",

app/models/state_file1099_r.rb

@@ -14,6 +14,7 @@
 #  payer_city_name                    :string
 #  payer_identification_number        :string
 #  payer_name                         :string
+#  payer_name2                        :string
 #  payer_name_control                 :string
 #  payer_state_code                   :string
 #  payer_state_identification_number  :string

app/models/state_file_md_intake.rb

@@ -62,13 +62,13 @@
 #  primary_first_name                         :string
 #  primary_last_name                          :string
 #  primary_middle_initial                     :string
+#  primary_proof_of_disability_submitted      :integer          default("unfilled"), not null
 #  primary_signature                          :string
 #  primary_signature_pin                      :text
 #  primary_ssb_amount                         :decimal(12, 2)   default(0.0), not null
 #  primary_ssn                                :string
 #  primary_student_loan_interest_ded_amount   :decimal(12, 2)   default(0.0), not null
 #  primary_suffix                             :string
-#  proof_of_disability_submitted              :integer          default("unfilled"), not null
 #  raw_direct_file_data                       :text
 #  raw_direct_file_intake_data                :jsonb
 #  referrer                                   :string
@@ -85,6 +85,7 @@
 #  spouse_first_name                          :string
 #  spouse_last_name                           :string
 #  spouse_middle_initial                      :string
+#  spouse_proof_of_disability_submitted       :integer          default("unfilled"), not null
 #  spouse_signature_pin                       :text
 #  spouse_ssb_amount                          :decimal(12, 2)   default(0.0), not null
 #  spouse_ssn                                 :string
@@ -130,7 +131,8 @@ class StateFileMdIntake < StateFileBaseIntake
   enum has_joint_account_holder: { unfilled: 0, yes: 1, no: 2 }, _prefix: :has_joint_account_holder
   enum primary_disabled: { unfilled: 0, yes: 1, no: 2 }, _prefix: :primary_disabled
   enum spouse_disabled: { unfilled: 0, yes: 1, no: 2 }, _prefix: :spouse_disabled
-  enum proof_of_disability_submitted: { unfilled: 0, yes: 1, no: 2 }, _prefix: :proof_of_disability_submitted
+  enum primary_proof_of_disability_submitted: { unfilled: 0, yes: 1, no: 2 }, _prefix: :primary_proof_of_disability_submitted
+  enum spouse_proof_of_disability_submitted: { unfilled: 0, yes: 1, no: 2 }, _prefix: :spouse_proof_of_disability_submitted
 
   def disqualifying_df_data_reason
     w2_states = direct_file_data.parsed_xml.css('W2StateLocalTaxGrp W2StateTaxGrp StateAbbreviationCd')
@@ -239,11 +241,7 @@ def allows_refund_amount_in_xml?
   end
 
   def at_least_one_disabled_filer_with_proof?
-    if filing_status_mfj?
-      (primary_disabled_yes? || spouse_disabled_yes?) && proof_of_disability_submitted_yes?
-    else
-      primary_disabled_yes? && proof_of_disability_submitted_yes?
-    end
+    primary_proof_of_disability_submitted_yes? || spouse_proof_of_disability_submitted_yes?
   end
 
   def qualifies_for_pension_exclusion?(filer)

app/views/state_file/questions/data_transfer_offboarding/edit.html.erb

@@ -13,13 +13,12 @@
     <p><%= vita_introduction %></p>
   <% end %>
 
-  <% vita_link = I18n.locale == :en ? StateFile::StateInformationService.vita_link_en(current_state_code) : StateFile::StateInformationService.vita_link_es(current_state_code) %>
-  <% if vita_link.present? %>
-    <p><%= link_to t("state_file.questions.eligible.faq_link"), state_faq_path(us_state: current_state_code) %></p>
-    <%= link_to(vita_link, class: "button button--primary button--wide spacing-below-15", target: "_blank", rel: "noopener noreferrer") do %>
-      <%= t('state_file.questions.eligible.vita_option.connect_to_vita') %>
-    <% end %>
-  <% end %>
+  <% # i18n-tasks-use t('state_file.questions.eligible.vita_option.connect_to_vita.nj') # hint for the i18n linter that, yes, we are using this key (sometimes) %>
+  <% vita_link_key = "state_file.questions.eligible.vita_option.connect_to_vita.#{current_state_code}" %>
+  <% vita_link_href = StateFile::StateInformationService.send("vita_link_#{I18n.locale}", current_state_code) %>
+  <% faq_link_href = state_faq_path(us_state: current_state_code) %>
+  <% vita_link = t(vita_link_key, faq_link_href: faq_link_href, vita_link_href: vita_link_href, default: '') %>
+  <%= vita_link.html_safe if vita_link.present? %>
 
   <%= render 'state_file/questions/eligible/other_filing_options' %>
 <% end %>

app/views/state_file/questions/eligibility_offboarding/edit.html.erb

@@ -16,13 +16,12 @@
     <p><%= vita_introduction %></p>
   <% end %>
 
-  <% vita_link = I18n.locale == :en ? StateFile::StateInformationService.vita_link_en(current_state_code) : StateFile::StateInformationService.vita_link_es(current_state_code) %>
-  <% if vita_link.present? %>
-    <p><%= link_to t("state_file.questions.eligible.faq_link"), state_faq_path(us_state: current_state_code), target: "_blank", rel: "noopener noreferrer" %></p>
-    <%= link_to(vita_link, class: "button button--primary button--wide spacing-below-25", target: "_blank", rel: "noopener noreferrer") do %>
-      <%= t('state_file.questions.eligible.vita_option.connect_to_vita') %>
-    <% end %>
-  <% end %>
+  <% # i18n-tasks-use t('state_file.questions.eligible.vita_option.connect_to_vita.nj') # hint for the i18n linter that, yes, we are using this key (sometimes) %>
+  <% vita_link_key = "state_file.questions.eligible.vita_option.connect_to_vita.#{current_state_code}" %>
+  <% vita_link_href = StateFile::StateInformationService.send("vita_link_#{I18n.locale}", current_state_code) %>
+  <% faq_link_href = state_faq_path(us_state: current_state_code) %>
+  <% vita_link = t(vita_link_key, faq_link_href: faq_link_href, vita_link_href: vita_link_href, default: '') %>
+  <%= vita_link.html_safe if vita_link.present? %>
 
   <%= render 'state_file/questions/eligible/other_filing_options' %>
 

app/views/state_file/questions/federal_info/_df_1099r.html.erb

@@ -7,6 +7,7 @@
     <table>
       <%= f.state_file_nested_xml_field :payer_name_control %>
       <%= f.state_file_nested_xml_field :payer_name %>
+      <%= f.state_file_nested_xml_field :payer_name2 %>
       <%= f.state_file_nested_xml_field :payer_address_line1 %>
       <%= f.state_file_nested_xml_field :payer_address_line2 %>
       <%= f.state_file_nested_xml_field :payer_city_name %>

app/views/state_file/questions/md_permanently_disabled/edit.html.erb

@@ -12,24 +12,55 @@
       <div class="question-with-follow-up__question">
         <div class="white-group">
           <% if current_intake.filing_status_mfj? %>
+            <% are_filers_under_65 = !(current_intake.primary_senior? && current_intake.spouse_senior?) %>
+            <% primary_data_followup = are_filers_under_65 ? "#primary-disability-proof" : nil %>
+            <% spouse_data_followup = are_filers_under_65 ? "#spouse-disability-proof" : nil %>
+            <% both_data_followup = are_filers_under_65 ? "#both-disability-proof" : nil %>
+
             <%= f.cfa_radio_set(:mfj_disability, collection: [
-              { value: "me", label: t(".yes_me"), input_html: { "data-follow-up": "#disability-proof" } },
-              { value: "spouse", label: t(".yes_spouse"), input_html: { "data-follow-up": "#disability-proof" } },
-              { value: "both", label: t(".yes_both"), input_html: { "data-follow-up": "#disability-proof" } },
+              { value: "primary", label: t(".yes_me"), input_html: { "data-follow-up": primary_data_followup } },
+              { value: "spouse", label: t(".yes_spouse"), input_html: { "data-follow-up": spouse_data_followup } },
+              { value: "both", label: t(".yes_both"), input_html: { "data-follow-up": both_data_followup } },
               { value: "none", label: t(".no_neither") }
             ]) %>
           <% else %>
+            <% primary_data_followup = !current_intake.primary_senior? ? "#primary-disability-proof" : nil %>
             <%= f.cfa_radio_set(:primary_disabled, collection: [
-              { value: "yes", label: t("general.affirmative"), input_html: { "data-follow-up": "#disability-proof" } },
+              { value: "yes", label: t("general.affirmative"), input_html: { "data-follow-up": primary_data_followup } },
               { value: "no", label: t("general.negative") }
             ], legend_class: "sr-only") %>
           <% end %>
         </div>
       </div>
 
-      <div class="question-with-follow-up__follow-up" id="disability-proof">
+      <div class="question-with-follow-up__follow-up" id="primary-disability-proof">
+        <div class="white-group">
+          <%= f.cfa_radio_set(:primary_proof_of_disability_submitted, label_text: t(".primary_proof_question_html"), collection: [
+            { value: "yes", label: t("general.affirmative") },
+            { value: "no", label: t("general.negative") },
+          ]) %>
+        </div>
+      </div>
+
+      <div class="question-with-follow-up__follow-up" id="spouse-disability-proof">
+        <div class="white-group">
+          <%= f.cfa_radio_set(:spouse_proof_of_disability_submitted, label_text: t(".spouse_proof_question_html"), collection: [
+            { value: "yes", label: t("general.affirmative") },
+            { value: "no", label: t("general.negative") },
+          ]) %>
+        </div>
+      </div>
+
+      <div class="question-with-follow-up__follow-up" id="both-disability-proof">
         <div class="white-group">
-          <%= f.cfa_radio_set(:proof_of_disability_submitted, label_text: t(".proof_question"), collection: [
+          <%= f.cfa_radio_set(:primary_proof_of_disability_submitted, label_text: t(".primary_proof_question_html"), collection: [
+            { value: "yes", label: t("general.affirmative") },
+            { value: "no", label: t("general.negative") },
+          ]) %>
+        </div>
+
+        <div class="white-group">
+          <%= f.cfa_radio_set(:spouse_proof_of_disability_submitted, label_text: t(".spouse_proof_question_html"), collection: [
             { value: "yes", label: t("general.affirmative") },
             { value: "no", label: t("general.negative") },
           ]) %>
@@ -49,4 +80,4 @@
     <% end %>
     <%= f.continue %>
   <% end %>
-<% end %>
+<% end %>

app/views/state_file/questions/md_review/edit.html.erb

@@ -80,9 +80,13 @@
         <% else %>
           <p><%=current_intake.primary_disabled_yes? ? t("general.affirmative") : t("general.negative") %></p>
         <% end %>
-        <% unless current_intake.proof_of_disability_submitted_unfilled? %>
-          <p class="text--bold spacing-below-5"><%=t(".proof_of_disability") %></p>
-          <p><%=current_intake.proof_of_disability_submitted_yes? ? t("general.affirmative") : t("general.negative") %></p>
+        <% unless current_intake.primary_proof_of_disability_submitted_unfilled? %>
+          <p class="text--bold spacing-below-5"><%=t(".primary_proof_of_disability") %></p>
+          <p><%=current_intake.primary_proof_of_disability_submitted_yes? ? t("general.affirmative") : t("general.negative") %></p>
+        <% end %>
+        <% unless current_intake.spouse_proof_of_disability_submitted_unfilled? %>
+          <p class="text--bold spacing-below-5"><%=t(".spouse_proof_of_disability") %></p>
+          <p><%=current_intake.spouse_proof_of_disability_submitted_yes? ? t("general.affirmative") : t("general.negative") %></p>
         <% end %>
         <%= link_to t("general.review_and_edit"), StateFile::Questions::MdPermanentlyDisabledController.to_path_helper(return_to_review: "y"), class: "button--small" %>
         <span class="sr-only"><%= t(".disability_status") %></span>

app/views/state_file/questions/nc_review/edit.html.erb

@@ -23,7 +23,7 @@
                     <% if followup.bailey_settlement_from_retirement_plan_yes? %>
                       <li><%= t(".bailey_settlement_from_retirement_plan") %></li>
                     <% end %>
-                    <% if !followup.bailey_settlement_from_retirement_plan_yes? && !followup.bailey_settlement_from_retirement_plan_yes? %>
+                    <% if !followup.bailey_settlement_from_retirement_plan_yes? && !followup.bailey_settlement_at_least_five_years_yes? %>
                       <li><%= t(".none_apply") %></li>
                     <% end %>
                   <% elsif followup.income_source_uniformed_services? %>