Nj 125 income editing

app/controllers/state_file/questions/w2_controller.rb

@@ -26,6 +26,7 @@ def form_params
 
       def load_w2
         @w2 = current_intake.state_file_w2s.find(params[:id])
+        @w2.box14_ui_wf_swf ||= @w2.box14_ui_hc_wd
         @box14_codes = StateFile::StateInformationService.w2_supported_box14_codes(current_state_code)
       end
     end

app/lib/submission_builder/return_w2.rb

@@ -27,7 +27,7 @@ def document
 
     def add_box_14_node(code, node_after_box_14_codes)
       field_name = "box14_#{code.downcase}".to_sym
-      field_as_desc = code.tr '_', '/' 
+      field_as_desc = code.delete '_'
 
       return if !@intake_w2[field_name].present? || !@intake_w2[field_name].positive?
 

app/models/state_file_base_intake.rb

@@ -135,8 +135,8 @@ def synchronize_df_w2s_to_database
         box_14_values[deduction[:other_description]] = deduction[:other_amount]
       end
       state_file_w2.assign_attributes(
-        box14_ui_wf_swf: box_14_values['UI/WF/SWF'],
-        box14_ui_hc_wd: box_14_values['UI/HC/WD'],
+        box14_ui_wf_swf: box_14_values['UIWFSWF'],
+        box14_ui_hc_wd: box_14_values['UIHCWD'],
         box14_fli: box_14_values['FLI'],
         box14_stpickup: box_14_values['STPICKUP'],
         employer_ein: direct_file_w2.EmployerEIN,

app/services/state_file/state_information_service.rb

@@ -202,7 +202,7 @@ def state_intake_class_names
         vita_link_es: "",
         voucher_form_name: "NJ Voucher Form",
         voucher_path: "",
-        w2_supported_box14_codes: ["UI_WF_SWF", "UI_HC_WD", "FLI"],
+        w2_supported_box14_codes: ["UI_WF_SWF", "FLI"],
         w2_include_local_income_boxes: false
       },
       ny: {

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

@@ -27,7 +27,11 @@
   <% if current_intake.direct_file_data.fed_unemployment > 0 %>
     <div class="white-group unemployment" id="form1099gs">
       <p class="text--bold spacing-below-0"><%= t(".unemployment_title") %></p>
-      <% if current_intake.state_file1099_gs.count > 0 %>
+      <% if current_state_code == "nj" %>
+        <p class="text--grey-bold spacing-above-15 spacing-below-0">
+          <%= t(".nj_not_taxed") %>
+        </p>
+      <% elsif current_intake.state_file1099_gs.count > 0 %>
         <% current_intake.state_file1099_gs.each do |state_1099g| %>
           <% recipient = current_intake.send(state_1099g.recipient) %>
           <div class="spacing-above-25">
@@ -72,7 +76,7 @@
   <% end %>
 
   <% if current_intake.direct_file_json_data.interest_reports.count > 0 %>
-    <div class="white-group">
+    <div class="white-group" id="form1099ints">
       <p class="text--bold spacing-below-0"><%= t(".interest_income_title") %></p>
       <p class="text--grey-bold spacing-above-15 spacing-below-0">
         <%= t(".interest_income_body") %>
@@ -81,10 +85,15 @@
   <% end %>
 
   <% if current_intake.direct_file_data.fed_ssb > 0 || current_intake.direct_file_data.fed_taxable_ssb > 0 %>
-    <div class="white-group">
+    <div class="white-group" id="formssa1099s">
       <p class="text--bold spacing-below-0"><%= t(".ssa_title") %></p>
       <p class="text--grey-bold spacing-above-15 spacing-below-0">
-        <%= t(".no_info_needed") %>
+        <%= case current_state_code
+        when "nj"
+          t(".nj_not_taxed")
+        else
+          t(".no_info_needed")
+        end %>
       </p>
     </div>
   <% end %>

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

@@ -9,6 +9,9 @@
       <p class="spacing-below-25"><%= @w2.employer_name %></p>
 
       <% if @box14_codes.present? %>
+        <% if @state_code == "nj" %>
+          <p><%= t(".box14_intro_nj_html") %></p>
+        <% end %>
         <fieldset>
           <legend class="spacing-below-5"><%= t(".box14_html") %></legend>
           <% @box14_codes.each do |code| %>
@@ -46,13 +49,17 @@
       <% end %>
     </div>
 
-    <% if t(".box14_explanation.#{@state_code}_html", default: nil) %>
+    <% explanation_key = ".box14_explanation_#{@state_code}_html" %>
+    <% button_text = @state_code == "nj" ? t(".what_is_box14_nj") : t(".what_is_box14") %>
+    <% explanation_text = t(explanation_key, year: MultiTenantService.statefile.current_tax_year, default: nil) %>
+
+    <% if explanation_text %>
       <div class="reveal spacing-above-35">
-        <p><button href="#" class="reveal__button"><%= t(".what_is_box14") %></button></p>
+        <button href="#" class="reveal__button"><%= button_text %></button>
         <div class="reveal__content">
-            <p class="spacing-below-15">
-              <%= t(".box14_explanation.#{@state_code}_html", year: MultiTenantService.statefile.current_tax_year) %>
-            </p>
+          <p class="spacing-below-15">
+            <%= explanation_text %>
+          </p>
         </div>
       </div>
     <% end %>

config/locales/en.yml

@@ -2870,6 +2870,7 @@ en:
           help_text: We will collect any missing information.
           interest_income_body: No additional state info needed
           interest_income_title: Interest income (1099-INT)
+          nj_not_taxed: This income is not taxed in New Jersey.
           no_info_needed: No additional state info needed
           retirement_income_title: Retirement income (1099-R)
           review_and_edit_state_info: Review and edit state info
@@ -3758,14 +3759,14 @@ en:
           verification_code_label: Enter the 6-digit code
       w2:
         edit:
-          box14_explanation:
-            md_html: For tax year %{year}, we will only process the <strong>STPICKUP</strong> code, which represents any contributions you made to the state retirement system.
+          box14_explanation_md_html: For tax year %{year}, we will only process the <strong>STPICKUP</strong> code, which represents any contributions you made to the state retirement system.
+          box14_explanation_nj_html: 'For this year, we will only need the amounts for <strong>UI/WF/SWF</strong> (may also appear as <strong>"UI/HC/WD"</strong> on your W2) and FLI.<br/><br/><strong>If you do not see these, please leave these fields blank.</strong><br/><br/><strong>Definitions:</strong><br/><br/><strong>UI/WF/SWF</strong> (may also appear as <strong>"UI/HC/WD"</strong> on your W2) represents:<ul><li><strong>UI</strong> refers to unemployment insurance contributions</li><li><strong>WF</strong> and <strong>WD</strong> refer to  workforce development partnership fund contributions</li><li><strong>SWF</strong> refers to supplemental workforce fund contributions</li><li><strong>HC</strong> refers to healthcare contributions</li><li><strong>WD</strong> refers to workforce development contributions</li></ul><strong>FLI</strong>: Represents contributions withheld for Family Leave Insurance. Family Leave Insurance (FLI) provides paid leave benefits to bond with a new child, care for a loved one, or cope with domestic/sexual violence. If you have a number for this on your paycheck, it means you have paid into this program and may be eligible to receive cash benefits.<br/><br/>We use the amounts to determine if you  might be eligible for a credit.<br/><br/>There may be other information in box 14 - those don''t need to be reported with this tool.'
           box14_fli_html: "<strong>FLI</strong>"
           box14_html: "<strong>Box 14,</strong> Other"
+          box14_intro_nj_html: Box 14 will have various letters in it. Those letters all represent program names.<br/><br/>For this year, we will only need the amounts for <strong>UI/WF/SWF</strong> (may also appear as <strong>"UI/HC/WD"</strong> on your W2) <strong>and FLI</strong>.<br/><br/><strong>If you do not see these, please leave these fields blank.</strong><br/><br/>There may be information for other programs in box 14 - those don't need to be reported with this tool.
           box14_stpickup_help_text: For %{year}, we will only process the STPICKUP code. If you do not see this code or have other codes in Box 14, please leave it blank.
           box14_stpickup_html: "<strong>STPICKUP</strong>"
-          box14_ui_hc_wd_html: "<strong>UI/HC/WD</strong>"
-          box14_ui_wf_swf_html: "<strong>UI/WF/SWF</strong>"
+          box14_ui_wf_swf_html: "<strong>UI/WF/SWF</strong> (This may also appear on your W2 as <strong>UI/HC/WD.</strong>)"
           box15_html: "<strong>Box 15,</strong> Employer’s state ID number"
           box16_html: "<strong>Box 16,</strong> State wages, tips, etc."
           box17_html: "<strong>Box 17,</strong> State income tax"
@@ -3783,6 +3784,7 @@ en:
           state_wages_exceed_amt_error: Total state wages and tips cannot be greater than $%{wages_amount}
           wages_amt_error: Total income tax cannot be greater than $%{wages_amount}
           what_is_box14: What could be in Box 14?
+          what_is_box14_nj: What should I put in Box 14?
       waiting_to_load_data:
         edit:
           subtitle_html: This usually takes a few minutes. Don’t close this page.<br><br> We’ll use your federal tax return information to complete sections of your state return.

config/locales/es.yml

@@ -2828,6 +2828,7 @@ es:
           help_text: Te pediremos que nos compartas la información que pueda faltar.
           interest_income_body: No se necesita información estatal adicional
           interest_income_title: Ingresos por intereses (1099-INT)
+          nj_not_taxed: This income is not taxed in New Jersey.
           no_info_needed: No se necesita información estatal adicional
           retirement_income_title: Jubilación (1099-R)
           review_and_edit_state_info: Revisar y editar la información estatal
@@ -3732,14 +3733,14 @@ es:
           verification_code_label: Ingresa el código de 6 dígitos
       w2:
         edit:
-          box14_explanation:
-            md_html: Para el año fiscal %{year}, solo procesaremos el código <strong>STPICKUP</strong>, que representa las contribuciones que hiciste al sistema de jubilación estatal.
+          box14_explanation_md_html: Para el año fiscal %{year}, solo procesaremos el código <strong>STPICKUP</strong>, que representa las contribuciones que hiciste al sistema de jubilación estatal.
+          box14_explanation_nj_html: 'For this year, we will only need the amounts for <strong>UI/WF/SWF</strong> (may also appear as <strong>"UI/HC/WD"</strong> on your W2) and FLI.<br/><br/><strong>If you do not see these, please leave these fields blank.</strong><br/><br/><strong>Definitions:</strong><br/><br/><strong>UI/WF/SWF</strong> (may also appear as <strong>"UI/HC/WD"</strong> on your W2) represents:<ul><li><strong>UI</strong> refers to unemployment insurance contributions</li><li><strong>WF</strong> and <strong>WD</strong> refer to  workforce development partnership fund contributions</li><li><strong>SWF</strong> refers to supplemental workforce fund contributions</li><li><strong>HC</strong> refers to healthcare contributions</li><li><strong>WD</strong> refers to workforce development contributions</li></ul><strong>FLI</strong>: Represents contributions withheld for Family Leave Insurance. Family Leave Insurance (FLI) provides paid leave benefits to bond with a new child, care for a loved one, or cope with domestic/sexual violence. If you have a number for this on your paycheck, it means you have paid into this program and may be eligible to receive cash benefits.<br/><br/>We use the amounts to determine if you  might be eligible for a credit.<br/><br/>There may be other information in box 14 - those don''t need to be reported with this tool.'
           box14_fli_html: "<strong>FLI</strong>"
           box14_html: "<strong>Box 14,</strong> Other"
+          box14_intro_nj_html: Box 14 will have various letters in it. Those letters all represent program names.<br/><br/>For this year, we will only need the amounts for <strong>UI/WF/SWF</strong> (may also appear as <strong>"UI/HC/WD"</strong> on your W2) <strong>and FLI</strong>.<br/><br/><strong>If you do not see these, please leave these fields blank.</strong><br/><br/>There may be information for other programs in box 14 - those don't need to be reported with this tool.
           box14_stpickup_help_text: Para %{year}, solo procesaremos el código STPICKUP. Si no ves este código o tienes otros códigos en Box 14, por favor déjalo en blanco.
           box14_stpickup_html: "<strong>STPICKUP</strong>"
-          box14_ui_hc_wd_html: "<strong>UI/HC/WD</strong>"
-          box14_ui_wf_swf_html: "<strong>UI/WF/SWF</strong>"
+          box14_ui_wf_swf_html: "<strong>UI/WF/SWF</strong> (This may also appear on your W2 as <strong>UI/HC/WD.</strong>)"
           box15_html: "<strong>Box 15,</strong> Employer’s state ID number"
           box16_html: "<strong>Box 16</strong>, State wages, tips, etc."
           box17_html: "<strong>Box 17</strong>, State income tax"
@@ -3757,6 +3758,7 @@ es:
           state_wages_exceed_amt_error: El total de salarios e ingresos estatales no puede ser mayor que $%{wages_amount}
           wages_amt_error: El impuesto sobre la renta total no puede ser mas de $%{wages_amount}
           what_is_box14: "¿Qué podría haber en Box 14?"
+          what_is_box14_nj: What should I put in Box 14?
       waiting_to_load_data:
         edit:
           subtitle_html: Esto suele tardar unos minutos. No cierres esta página<br><br> Usaremos la información de tu declaración de impuestos federal para completar secciones de tu declaración estatal.

spec/controllers/state_file/questions/w2_controller_spec.rb

@@ -198,4 +198,32 @@
       end
     end
   end
-end
+
+  describe "#load_w2" do
+    context "when box14_ui_wf_swf is nil and box14_ui_hc_wd is not" do
+      let(:intake) { create :state_file_nj_intake }
+      let!(:state_file_w2) do
+        create :state_file_w2, state_file_intake: intake, w2_index: 1,
+               box14_ui_wf_swf: nil, box14_ui_hc_wd: 340
+      end
+
+      it "sets box14_ui_wf_swf to box14_ui_hc_wd" do
+        get :edit, params: { id: state_file_w2.id }
+        expect(assigns(:w2).box14_ui_wf_swf).to eq 340
+      end
+    end
+
+    context "when both box14_ui_wf_swf and box14_ui_hc_wd are not nil" do
+      let(:intake) { create :state_file_nj_intake }
+      let!(:state_file_w2) do
+        create :state_file_w2, state_file_intake: intake, w2_index: 1,
+               box14_ui_wf_swf: 450, box14_ui_hc_wd: 340
+      end
+
+      it "sets box14_ui_wf_swf to box14_ui_wf_swf" do
+        get :edit, params: { id: state_file_w2.id }
+        expect(assigns(:w2).box14_ui_wf_swf).to eq 450
+      end
+    end
+  end
+end

spec/features/state_file/income_review_spec.rb

@@ -0,0 +1,74 @@
+require "rails_helper"
+
+RSpec.feature "Income Review", active_job: true do
+  include StateFileIntakeHelper
+
+  before do
+    allow_any_instance_of(Routes::StateFileDomain).to receive(:matches?).and_return(true)
+  end
+
+  context "NJ", :flow_explorer_screenshot, js: true do
+    def advance_to_data_transfer
+      visit "/"
+      click_on "Start Test NJ"
+      click_on "Get Started", id: "firstCta"
+      click_on I18n.t("general.continue")
+      step_through_initial_authentication(contact_preference: :email)
+      check "Text message"
+      fill_in "Your phone number", with: "+12025551212"
+      click_on "Continue"
+      click_on I18n.t("general.accept")
+      click_on I18n.t("state_file.questions.terms_and_conditions.edit.accept")
+    end
+
+    it(
+      "displays review and edit pages with w2s, unemployment, and social security income",
+      required_schema: "nj"
+    ) do
+      advance_to_data_transfer
+
+      step_through_df_data_transfer("Transfer Zeus box 14")
+
+      expect(page).to have_text I18n.t("state_file.questions.income_review.edit.title")
+      expect(page).to have_text I18n.t("state_file.questions.income_review.edit.w2s_title")
+
+      within '#form1099gs' do
+        expect(page).to have_text I18n.t("state_file.questions.income_review.edit.unemployment_title")
+        expect(page).to have_text I18n.t("state_file.questions.income_review.edit.nj_not_taxed")
+      end
+
+      within '#formssa1099s' do
+        expect(page).to have_text I18n.t("state_file.questions.income_review.edit.ssa_title")
+        expect(page).to have_text I18n.t("state_file.questions.income_review.edit.nj_not_taxed")
+      end
+
+      click_on I18n.t("state_file.questions.income_review.edit.review_and_edit_state_info")
+
+      # STPICKUP 250
+      # UIWFSWF 350
+      # UIHCWD 450
+      # FLI 550
+
+      expect(page).to have_field('state_file_w2_box14_ui_wf_swf', with: '350.0')
+      expect(page).to have_field('state_file_w2_box14_fli', with: '550.0')
+      expect(page).to have_field('state_file_w2_employer_state_id_num', with: '12345')
+      expect(page).to have_field('state_file_w2_state_wages_amount', with: '12345.0')
+      expect(page).to have_field('state_file_w2_state_income_tax_amount', with: '500.0')
+      expect(page).to have_button("What should I put in Box 14?")
+    end
+
+    it "displays with investment income", required_schema: "nj" do
+      advance_to_data_transfer
+
+      step_through_df_data_transfer("Transfer Streep single inv limit")
+
+      expect(page).to have_text I18n.t("state_file.questions.income_review.edit.title")
+      expect(page).to have_text I18n.t("state_file.questions.income_review.edit.w2s_title")
+
+      within '#form1099ints' do
+        expect(page).to have_text I18n.t("state_file.questions.income_review.edit.interest_income_title")
+        expect(page).to have_text I18n.t("state_file.questions.income_review.edit.no_info_needed")
+      end
+    end
+  end
+end

spec/features/state_file/review_page_spec.rb

@@ -8,7 +8,7 @@
     allow_any_instance_of(Routes::StateFileDomain).to receive(:matches?).and_return(true)
   end
 
-  StateFile::StateInformationService.active_state_codes.without("nc").each do |state_code|
+  StateFile::StateInformationService.active_state_codes.without("nc", "nj").each do |state_code|
     context "#{state_code.upcase}", js: true do
       it "allows user to navigate to income review page, edit an income form, and then navigate back to final review page", required_schema: state_code do
         set_up_intake_and_associated_records(state_code)

spec/fixtures/state_file/fed_return_xmls/nj/lucky_single.xml

@@ -66,7 +66,7 @@
             <SSN>400006306</SSN>
             <AlternativeMediaCd>01</AlternativeMediaCd>
         </IRS9000>
-        <IRSW2 documentId="W20001" documentName="IRSW2">
+        <IRSW2 documentName="IRSW2" documentId="W20001">
             <EmployeeSSN>400006306</EmployeeSSN>
             <EmployerEIN>221236333</EmployerEIN>
             <EmployerNameControlTxt>WEAR</EmployerNameControlTxt>
@@ -75,9 +75,9 @@
             </EmployerName>
             <EmployerUSAddress>
                 <AddressLine1Txt>1 Clothing St</AddressLine1Txt>
-                <CityNm>Fairfield</CityNm>
-                <StateAbbreviationCd>CT</StateAbbreviationCd>
-                <ZIPCd>06510</ZIPCd>
+                <CityNm>New Brunwick</CityNm>
+                <StateAbbreviationCd>NJ</StateAbbreviationCd>
+                <ZIPCd>08904</ZIPCd>
             </EmployerUSAddress>
             <EmployeeNm>Tess L Lucky</EmployeeNm>
             <EmployeeUSAddress>
@@ -87,15 +87,27 @@
                 <ZIPCd>08619</ZIPCd>
             </EmployeeUSAddress>
             <WagesAmt>40565</WagesAmt>
-            <WithholdingAmt>2000</WithholdingAmt>
+            <WithholdingAmt>8000</WithholdingAmt>
             <SocialSecurityWagesAmt>40565</SocialSecurityWagesAmt>
-            <SocialSecurityTaxAmt>1000</SocialSecurityTaxAmt>
+            <SocialSecurityTaxAmt>6000</SocialSecurityTaxAmt>
             <MedicareWagesAndTipsAmt>40565</MedicareWagesAndTipsAmt>
-            <MedicareTaxWithheldAmt>500</MedicareTaxWithheldAmt>
+            <MedicareTaxWithheldAmt>4000</MedicareTaxWithheldAmt>
+            <OtherDeductionsBenefitsGrp>
+                <Desc>FLI</Desc>
+                <Amt>145</Amt>
+            </OtherDeductionsBenefitsGrp>
+            <OtherDeductionsBenefitsGrp>
+                <Desc>UIHCWD</Desc>
+                <Amt>140</Amt>
+            </OtherDeductionsBenefitsGrp>
+            <OtherDeductionsBenefitsGrp>
+                <Desc>UIWFSWF</Desc>
+                <Amt>180</Amt>
+            </OtherDeductionsBenefitsGrp>
             <W2StateLocalTaxGrp>
                 <W2StateTaxGrp>
                     <StateAbbreviationCd>NJ</StateAbbreviationCd>
-                    <EmployerStateIdNum>654321</EmployerStateIdNum>
+                    <EmployerStateIdNum>221236333</EmployerStateIdNum>
                     <StateWagesAmt>40000</StateWagesAmt>
                     <StateIncomeTaxAmt>400</StateIncomeTaxAmt>
                     <W2LocalTaxGrp/>