diff --git a/app/models/payroll/payment_csv_row.rb b/app/models/payroll/payment_csv_row.rb index 3cabfe91f6..5854942a32 100644 --- a/app/models/payroll/payment_csv_row.rb +++ b/app/models/payroll/payment_csv_row.rb @@ -126,10 +126,6 @@ def scheme_amount model.award_amount.to_s end - def roll_number - model.building_society_roll_number - end - def payment_id model.id end diff --git a/app/models/payroll/payments_csv.rb b/app/models/payroll/payments_csv.rb index 527eb84943..e2bf9601c7 100644 --- a/app/models/payroll/payments_csv.rb +++ b/app/models/payroll/payments_csv.rb @@ -33,7 +33,6 @@ class PaymentsCsv banking_name: "BANK_NAME", bank_sort_code: "SORT_CODE", bank_account_number: "ACCOUNT_NUMBER", - roll_number: "ROLL_NUMBER", scheme_amount: "SCHEME_AMOUNT", payment_id: "PAYMENT_ID", policies_in_payment: "CLAIM_POLICIES", diff --git a/app/views/claims/_account_details.html.erb b/app/views/claims/_account_details.html.erb index ea0a4ad6a7..9bfaf4a70c 100644 --- a/app/views/claims/_account_details.html.erb +++ b/app/views/claims/_account_details.html.erb @@ -2,7 +2,7 @@ <%= f.govuk_error_summary %> <%= f.govuk_fieldset legend: { - text: t("questions.account_details", bank_or_building_society: bank_or_building_society), + text: t("questions.account_details"), tag: "h1", size: "l" } do %> diff --git a/app/views/claims/building_society_account.html.erb b/app/views/claims/building_society_account.html.erb deleted file mode 100644 index 6e85311bff..0000000000 --- a/app/views/claims/building_society_account.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%= content_for(:page_title, page_title(t("questions.account_details", bank_or_building_society: "personal bank account"), journey: current_journey_routing_name, show_error: @form.errors.any?)) %> - -
-
- <%= render partial: "account_details", locals: { bank_or_building_society: "personal bank account", current_journey_routing_name: current_journey_routing_name} %> -
-
diff --git a/app/views/claims/personal_bank_account.html.erb b/app/views/claims/personal_bank_account.html.erb index fed7a86cbe..4076d7b6bf 100644 --- a/app/views/claims/personal_bank_account.html.erb +++ b/app/views/claims/personal_bank_account.html.erb @@ -1,8 +1,7 @@ -<% bank_or_building_society = "personal bank account" %> -<% content_for(:page_title, page_title(t("questions.account_details", bank_or_building_society: bank_or_building_society), journey: current_journey_routing_name, show_error: @form.errors.any?)) %> +<% content_for(:page_title, page_title(t("questions.account_details"), journey: current_journey_routing_name, show_error: @form.errors.any?)) %>
- <%= render partial: "account_details", locals: { bank_or_building_society: bank_or_building_society, current_journey_routing_name: current_journey_routing_name} %> + <%= render partial: "account_details", locals: { current_journey_routing_name: current_journey_routing_name} %>
diff --git a/spec/models/payroll/payment_csv_row_spec.rb b/spec/models/payroll/payment_csv_row_spec.rb index e306b8356e..c5445b3984 100644 --- a/spec/models/payroll/payment_csv_row_spec.rb +++ b/spec/models/payroll/payment_csv_row_spec.rb @@ -87,7 +87,6 @@ claim.banking_name, "00-11-22", claim.bank_account_number, - claim.building_society_roll_number, payment_award_amount.to_s, payment.id, payment.policies_in_payment, @@ -163,7 +162,6 @@ claim.banking_name, "33-09-90", claim.bank_account_number, - nil, payment_award_amount.to_s, payment.id, payment.policies_in_payment, @@ -236,7 +234,6 @@ claim.banking_name, "21-09-09", claim.bank_account_number, - nil, payment_award_amount.to_s, payment.id, payment.policies_in_payment, @@ -259,7 +256,7 @@ describe "PAYMENT_ID" do it "is 36 characters long, satisfying DfE Payroll’s length validation" do - expect(row[30].length).to eq(36) + expect(row[29].length).to eq(36) end end