Merge branch 'main' into copy-ui-updates

Author: jenny-heath

app/controllers/state_file/questions/base_review_controller.rb

@@ -4,10 +4,20 @@ class BaseReviewController < QuestionsController
       def edit
         @refund_or_owed_amount = current_intake.calculated_refund_or_owed_amount
         @refund_or_owed_label = @refund_or_owed_amount.positive? ? I18n.t("state_file.questions.shared.review_header.your_refund") : I18n.t("state_file.questions.shared.review_header.your_tax_owed")
+        @income_documents_present = income_documents_present?
       end
 
       private
 
+      def income_documents_present?
+        current_intake.state_file1099_rs.present? ||
+          current_intake.state_file_w2s.present? ||
+          current_intake.direct_file_json_data.interest_reports.count.positive? ||
+          current_intake.direct_file_data.fed_unemployment.positive? ||
+          current_intake.direct_file_data.fed_ssb.positive? || 
+          current_intake.direct_file_data.fed_taxable_ssb.positive?
+      end
+
       def form_class
         NullForm
       end

…s/nc_eligibility_residence_controller.rb …e/questions/nc_eligibility_controller.rbapp/controllers/state_file/questions/nc_eligibility_residence_controller.rb renamed to app/controllers/state_file/questions/nc_eligibility_controller.rb app/controllers/state_file/questions/nc_eligibility_residence_controller.rb renamed to app/controllers/state_file/questions/nc_eligibility_controller.rb

@@ -1,7 +1,7 @@
 module StateFile
   module Questions
-    class NcEligibilityResidenceController < QuestionsController
+    class NcEligibilityController < QuestionsController
       include EligibilityOffboardingConcern
     end
   end
-end
+end

app/controllers/state_file/questions/nc_eligibility_out_of_state_income_controller.rb

@@ -1,14 +1,13 @@
 module StateFile
   module Questions
     class ReturnStatusController < QuestionsController
-      before_action :redirect_if_from_efile
       before_action :redirect_if_no_submission
       skip_before_action :redirect_if_in_progress_intakes_ended
 
       def edit
-        @submission_to_show = submission_to_show
-        @error = submission_error
+        @submission_to_show = current_intake.latest_submission
         @return_status = return_status
+        @error = submission_error
         @tax_refund_url = StateFile::StateInformationService.tax_refund_url(current_state_code)
         @tax_payment_url = StateFile::StateInformationService.tax_payment_url(current_state_code)
         @voucher_form_name = StateFile::StateInformationService.voucher_form_name(current_state_code)
@@ -23,28 +22,16 @@ def prev_path
 
       private
 
-      def submission_to_show
-        is_az_intake = current_intake.is_a?(StateFileAzIntake)
-        latest_submission_has_901_error = current_intake.latest_submission&.efile_submission_transitions&.where(to_state: "rejected")&.last&.efile_errors&.pluck(:code)&.include?("901")
-        accepted_submissions = current_intake.efile_submissions.filter { |submission| submission.in_state?(:accepted) }
-
-        if is_az_intake && latest_submission_has_901_error && accepted_submissions.present?
-          accepted_submissions.last
-        else
-          current_intake.latest_submission
-        end
-      end
-
       def submission_error
         return nil unless return_status == 'rejected'
         # in the case that its in the notified_of_rejection or waiting state
         # we can't just grab the efile errors from the last transition
-        submission_to_show&.efile_submission_transitions&.where(to_state: 'rejected')&.last&.efile_errors&.last
+        @submission_to_show&.efile_submission_transitions&.where(to_state: 'rejected')&.last&.efile_errors&.last
       end
 
       def return_status
         # return status for display
-        case submission_to_show.current_state
+        case @submission_to_show.current_state
         when 'accepted'
           'accepted'
         when 'notified_of_rejection', 'waiting'
@@ -61,15 +48,6 @@ def redirect_if_no_submission
           redirect_to StateFile::Questions::InitiateDataTransferController.to_path_helper
         end
       end
-
-      def redirect_if_from_efile
-        # We had a situation where we gave the wrong URL to direct file, and they were redirecting
-        # here when the federal return was not yet approved.
-        # We have alerted them, and once they have updated their URL we can probably remove this
-        if params[:ref_location] == "df_authorize_state"
-          redirect_to StateFile::Questions::PendingFederalReturnController.to_path_helper
-        end
-      end
     end
   end
 end

app/controllers/state_file/questions/return_status_controller.rb

@@ -0,0 +1,30 @@
+module StateFile
+  class NcEligibilityForm < QuestionsForm
+    set_attributes_for :intake, :eligibility_ed_loan_cancelled, :eligibility_ed_loan_emp_payment, :nc_eligiblity_none
+
+    validate :at_most_one_option_selected
+    validate :at_least_one_option_selected
+
+    def save
+      @intake.update(attributes_for(:intake))
+    end
+
+    private
+
+    def at_least_one_option_selected
+      values = attributes_for(:intake).values_at(:eligibility_ed_loan_emp_payment, :eligibility_ed_loan_cancelled, :nc_eligiblity_none)
+      selected = values.select { |value| value == "yes" }
+      if selected.count < 1
+        errors.add(:nc_eligiblity_none, I18n.t("forms.errors.nc_eligibility_form.at_most_one_option_selected"))
+      end
+    end
+
+    def at_most_one_option_selected
+      if attributes_for(:intake)[:nc_eligiblity_none] == "yes"
+        if attributes_for(:intake).values_at(:eligibility_ed_loan_emp_payment, :eligibility_ed_loan_cancelled).any? { |value| value == "yes" }
+          errors.add(:nc_eligiblity_none, I18n.t("forms.errors.nc_eligibility_form.at_most_one_option_selected"))
+        end
+      end
+    end
+  end
+end

app/forms/state_file/nc_eligibility_form.rb

@@ -283,7 +283,9 @@ def calculate_line_56
           max_credit = 100
           max_credit -= @intake.household_excise_credit_claimed_amount&.round if @intake.household_excise_credit_claimed_yes?
 
-          [wrksht_line_4, max_credit].min
+          result = [wrksht_line_4, max_credit].min
+          result = 0 if result < 0
+          result
         end
       end
 

app/forms/state_file/nc_eligibility_out_of_state_income_form.rb

@@ -24,6 +24,7 @@ def calculate
         set_line(:ID40_LINE_9, :calculate_line_9)
         set_line(:ID40_LINE_10, :calculate_line_10)
         set_line(:ID40_LINE_11, :calculate_line_11)
+        set_line(:ID40_LINE_16, :calculate_line_16)
         set_line(:ID40_LINE_19, :calculate_line_19)
         set_line(:ID40_LINE_20, :calculate_line_20)
         set_line(:ID40_LINE_21, :calculate_line_20)
@@ -103,10 +104,14 @@ def calculate_line_11
         [line_or_zero(:ID40_LINE_9) - line_or_zero(:ID40_LINE_10), 0].max
       end
 
+      def calculate_line_16
+        @direct_file_data.total_itemized_or_standard_deduction_amount
+      end
+
       # Subtract the larger of L15 or L16 from L11 but L15 is always 0
       # L16 is pulled from df data
       def calculate_line_19
-        [line_or_zero(:ID40_LINE_11) - @direct_file_data.total_itemized_or_standard_deduction_amount, 0].max
+        [line_or_zero(:ID40_LINE_11) - line_or_zero(:ID40_LINE_16), 0].max
       end
 
       WK_LINE_2_AMTS = {

app/forms/state_file/nc_eligibility_residence_form.rb

@@ -200,6 +200,8 @@ ID40_LINE_10:
   label: '10. Subtractions from Form 39R, Part B, line 24'
 ID40_LINE_11:
   label: '11. Total Adjusted Income. Subtract line 10 from line 9'
+ID40_LINE_16:
+  label: '16. Standard deduction'
 ID40_LINE_19:
   label: '19. Taxable state income'
 ID40_LINE_20:
@@ -836,6 +838,8 @@ NJ1040_LINE_51:
   label: '51 Use Tax Due on Internet, Mail-Order, or Other Out-of-State Purchases (See instructions) If no Use Tax, enter 0.00'
 NJ1040_LINE_54:
   label: '54 Total Tax Due (Add lines 50 through 53c)'
+NJ1040_LINE_55:
+  label: '55 Total NJ Income Tax Withheld (Enclose Forms W-2 and 1099) (Part-year residents, see instr.)'
 NJ1040_LINE_56:
   label: '56 Property Tax Credit (See instructions page 25)'
 NJ1040_LINE_57: