Skip to content

Commit 043e672

Browse files
authored
Revert "FYST-450 Fix nc subtractions page limit (#5066)"
This reverts commit 6c18465.
1 parent 6c18465 commit 043e672

File tree

5 files changed

+5
-16
lines changed

5 files changed

+5
-16
lines changed

app/controllers/state_file/questions/nc_subtractions_controller.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ module StateFile
22
module Questions
33
class NcSubtractionsController < QuestionsController
44
include ReturnToReviewConcern
5-
before_action :set_ivars, only: [:edit, :update]
6-
7-
def set_ivars
8-
@subtractions_limit = current_intake.calculator.subtractions_limit
9-
end
105
end
116
end
127
end

app/forms/state_file/nc_subtractions_form.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class NcSubtractionsForm < QuestionsForm
44

55
validates :tribal_member, inclusion: { in: %w[yes no], message: :blank }
66
validates :tribal_wages_amount, presence: true, allow_blank: false, numericality: { greater_than_or_equal_to: 1 }, if: -> { tribal_member == "yes" }
7-
validate :below_subtractions_limit, if: -> { tribal_wages_amount.present? }
7+
validate :below_fed_wages_salaries_tips, if: -> { tribal_wages_amount.present? }
88

99
def save
1010
if tribal_member == "no"
@@ -16,8 +16,8 @@ def save
1616

1717
private
1818

19-
def below_subtractions_limit
20-
amount_limit = @intake.calculator.subtractions_limit
19+
def below_fed_wages_salaries_tips
20+
amount_limit = @intake.direct_file_data.fed_wages_salaries_tips
2121
if self.tribal_wages_amount.to_d > amount_limit
2222
errors.add(:tribal_wages_amount, I18n.t("forms.errors.state_credit.exceeds_limit", limit: amount_limit))
2323
end

app/lib/efile/nc/d400_calculator.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ def calculate_use_tax(nc_taxable_income)
6060
end
6161
end
6262

63-
def subtractions_limit
64-
@direct_file_data.fed_agi - (line_or_zero(:NCD400_S_LINE_18) + line_or_zero(:NCD400_S_LINE_19) + line_or_zero(:NCD400_S_LINE_20) + line_or_zero(:NCD400_S_LINE_21))
65-
end
66-
6763
def analytics_attrs
6864
{}
6965
end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<div class="question-with-follow-up__follow-up" id="tribal_member">
1717
<div class="white-group">
1818
<div class="form-group-tight">
19-
<p><%= t(".tribal_wages_question_html", amount_limit: @subtractions_limit) %></p>
19+
<p><%= t(".tribal_wages_question_html", amount_limit: current_intake.direct_file_data.fed_wages_salaries_tips) %></p>
2020
<%= f.vita_min_money_field(:tribal_wages_amount, t(".tribal_wages_field_html"), classes: ["form-width--long"]) %>
2121
</div>
2222
</div>

spec/forms/state_file/nc_subtractions_form_spec.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
let(:intake) { create :state_file_nc_intake }
66
let(:form) { described_class.new(intake, params) }
77
before do
8-
intake.direct_file_data.fed_agi = 1060
9-
intake.direct_file_data.fed_taxable_income = 30
10-
intake.direct_file_data.fed_taxable_ssb = 30
8+
intake.direct_file_data.fed_wages_salaries_tips = 1000
119
end
1210

1311
context "with no radio selected" do

0 commit comments

Comments
 (0)