<%= form_with model: @form, url: claim_path(current_journey_routing_name), method: :patch, builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
+ <%= f.govuk_error_summary %>
+
<%= f.govuk_text_field :paye_reference,
label: { text: @form.t(:question, nursery_name: @form.nursery_name), tag: "h1", size: "l" },
hint: { text: @form.t(:hint) },
diff --git a/app/views/early_years_payment/provider/authenticated/submissions/show.html.erb b/app/views/early_years_payment/provider/authenticated/submissions/show.html.erb
new file mode 100644
index 0000000000..bccaa2110b
--- /dev/null
+++ b/app/views/early_years_payment/provider/authenticated/submissions/show.html.erb
@@ -0,0 +1,37 @@
+<% content_for(:page_title, page_title("Claim submitted", journey: current_journey_routing_name)) %>
+
+
+
+
+
+
Claim submitted
+
+
+ Your claim reference
+ <%= submitted_claim.reference %>
+
+
+
+
+ You’ve successfully submitted a claim for an early years financial
+ incentive payment on behalf of <%= submitted_claim.first_name %> <%= submitted_claim.surname %>.
+
+
+
+ We’ve sent a confirmation email to <%= submitted_claim.email_address %>.
+
+
+
What happens next
+
+
+ We’ll send an email to your employee asking for them to provide some
+ further information. We’ll also ask them to provide their payment details.
+
+
+
+ For more information, read more about the
+ <%= govuk_link_to("early years financial incentive", "#") %>.
+
+
+
+
diff --git a/config/analytics.yml b/config/analytics.yml
index 1bb528b256..071d906938 100644
--- a/config/analytics.yml
+++ b/config/analytics.yml
@@ -306,5 +306,9 @@ shared:
- updated_at
:early_years_payment_eligibilities:
- id
+ - nursery_urn
+ - start_date
+ - child_facing_confirmation_given
+ - first_job_within_6_months
- created_at
- updated_at
diff --git a/config/analytics_blocklist.yml b/config/analytics_blocklist.yml
index ff3998d33f..ac734c1f16 100644
--- a/config/analytics_blocklist.yml
+++ b/config/analytics_blocklist.yml
@@ -28,6 +28,9 @@
- teacher_id_user_info
- onelogin_credentials
- onelogin_user_info
+ - paye_reference
+ - practitioner_email_address
+ - provider_contact_name
:claim_decisions:
- trn
- claimant_age
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 46dd8210a0..57f082f177 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1202,6 +1202,15 @@ en:
hint: We’ll use this to ask your employee to provide their payment details.
errors:
valid: Enter a valid email address
+ check_your_answers:
+ errors:
+ valid: You cannot submit this claim without providing your full name
+ check_your_answers:
+ title: Check your answers before submitting this claim
+ heading_send_application: Before submitting this claim
+ statement:
+ By submitting this claim you’re confirming that, to the best of your knowledge, the details you’re providing are correct.
+ btn_text: Accept and send
early_years_payments:
<<: *early_years_payment_provider_authenticated
claim_subject: "Early Years Payment"
diff --git a/db/migrate/20240821110005_add_answer_fields_to_claims.rb b/db/migrate/20240821110005_add_answer_fields_to_claims.rb
new file mode 100644
index 0000000000..b3ae0b1a4d
--- /dev/null
+++ b/db/migrate/20240821110005_add_answer_fields_to_claims.rb
@@ -0,0 +1,7 @@
+class AddAnswerFieldsToClaims < ActiveRecord::Migration[7.0]
+ def change
+ add_column :claims, :paye_reference, :string
+ add_column :claims, :practitioner_email_address, :string
+ add_column :claims, :provider_contact_name, :string
+ end
+end
diff --git a/db/migrate/20240821110027_add_answer_fields_to_ey_eligibilities.rb b/db/migrate/20240821110027_add_answer_fields_to_ey_eligibilities.rb
new file mode 100644
index 0000000000..a5bf5500f4
--- /dev/null
+++ b/db/migrate/20240821110027_add_answer_fields_to_ey_eligibilities.rb
@@ -0,0 +1,8 @@
+class AddAnswerFieldsToEyEligibilities < ActiveRecord::Migration[7.0]
+ def change
+ add_column :early_years_payment_eligibilities, :nursery_urn, :string
+ add_column :early_years_payment_eligibilities, :start_date, :date
+ add_column :early_years_payment_eligibilities, :child_facing_confirmation_given, :boolean
+ add_column :early_years_payment_eligibilities, :first_job_within_6_months, :boolean
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 58012cdeb7..4ed500a64b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -102,6 +102,9 @@
t.boolean "logged_in_with_onelogin"
t.jsonb "onelogin_credentials", default: {}
t.jsonb "onelogin_user_info", default: {}
+ t.string "paye_reference"
+ t.string "practitioner_email_address"
+ t.string "provider_contact_name"
t.index ["academic_year"], name: "index_claims_on_academic_year"
t.index ["created_at"], name: "index_claims_on_created_at"
t.index ["eligibility_type", "eligibility_id"], name: "index_claims_on_eligibility_type_and_eligibility_id"
@@ -183,6 +186,10 @@
create_table "early_years_payment_eligibilities", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.string "nursery_urn"
+ t.date "start_date"
+ t.boolean "child_facing_confirmation_given"
+ t.boolean "first_job_within_6_months"
end
create_table "eligible_ey_providers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
diff --git a/spec/factories/journeys/early_years_payment/provider/authenticated/early_years_payment_provider_authenticated_answers.rb b/spec/factories/journeys/early_years_payment/provider/authenticated/early_years_payment_provider_authenticated_answers.rb
new file mode 100644
index 0000000000..f2344fc4f0
--- /dev/null
+++ b/spec/factories/journeys/early_years_payment/provider/authenticated/early_years_payment_provider_authenticated_answers.rb
@@ -0,0 +1,24 @@
+FactoryBot.define do
+ factory :early_years_payment_provider_authenticated_answers, class: "Journeys::EarlyYearsPayment::Provider::Authenticated::SessionAnswers" do
+ trait :eligible do
+ academic_year { AcademicYear.current }
+ email_address { "provider@example.com" }
+ email_verified { true }
+ consent_given { true }
+ nursery_urn { create(:eligible_ey_provider).urn }
+ paye_reference { "123/A" }
+ first_name { "John" }
+ surname { "Doe" }
+ start_date { Date.parse("1/1/2024") }
+ child_facing_confirmation_given { true }
+ first_job_within_6_months { true }
+ practitioner_email_address { "johndoe@example.com" }
+ provide_mobile_number { false }
+ end
+
+ trait :submittable do
+ eligible
+ provider_contact_name { "John Doe" }
+ end
+ end
+end
diff --git a/spec/features/early_years_payment/provider/authenticated/changing_answers_spec.rb b/spec/features/early_years_payment/provider/authenticated/changing_answers_spec.rb
new file mode 100644
index 0000000000..3b97d2104e
--- /dev/null
+++ b/spec/features/early_years_payment/provider/authenticated/changing_answers_spec.rb
@@ -0,0 +1,22 @@
+require "rails_helper"
+
+RSpec.feature "Early years payment provider" do
+ let(:email_address) { "johndoe@example.com" }
+ let(:journey_session) { Journeys::EarlyYearsPayment::Provider::Authenticated::Session.last }
+ let(:mail) { ActionMailer::Base.deliveries.last }
+ let(:magic_link) { mail[:personalisation].unparsed_value[:magic_link] }
+ let!(:nursery) { create(:eligible_ey_provider, primary_key_contact_email_address: email_address) }
+
+ scenario "changing answers on the check-your-answers page" do
+ when_early_years_payment_provider_authenticated_journey_configuration_exists
+ when_early_years_payment_provider_start_journey_completed
+ when_early_years_payment_provider_authenticated_journey_ready_to_submit
+
+ find("a[href='#{claim_path(Journeys::EarlyYearsPayment::Provider::Authenticated::ROUTING_NAME, "paye-reference")}']").click
+ expect(page).to have_content("What is #{nursery.nursery_name}’s employer PAYE reference?")
+ fill_in "claim-paye-reference-field", with: "123/A"
+ click_button "Continue"
+
+ expect(page.current_path).to eq "/early-years-payment-provider/check-your-answers"
+ end
+end
diff --git a/spec/features/early_years_payment/provider/authenticated/happy_path_spec.rb b/spec/features/early_years_payment/provider/authenticated/happy_path_spec.rb
index a7e2d5252a..3cba38300a 100644
--- a/spec/features/early_years_payment/provider/authenticated/happy_path_spec.rb
+++ b/spec/features/early_years_payment/provider/authenticated/happy_path_spec.rb
@@ -53,6 +53,15 @@
click_button "Continue"
expect(page.current_path).to eq "/early-years-payment-provider/check-your-answers"
+ expect(page).to have_content("Check your answers before submitting this claim")
+ fill_in "claim-provider-contact-name-field", with: "John Doe"
+ click_button "Accept and send"
+
+ expect(page.current_path).to eq claim_confirmation_path(Journeys::EarlyYearsPayment::Provider::Authenticated::ROUTING_NAME)
+
+ claim = Claim.last
+ expect(claim.provider_contact_name).to eq "John Doe"
+ expect(page).to have_content(claim.reference)
end
scenario "using magic link after having completed some of the journey" do
diff --git a/spec/features/early_years_payment/provider/authenticated/submitter_name_omitted_spec.rb b/spec/features/early_years_payment/provider/authenticated/submitter_name_omitted_spec.rb
new file mode 100644
index 0000000000..31c3b0aa01
--- /dev/null
+++ b/spec/features/early_years_payment/provider/authenticated/submitter_name_omitted_spec.rb
@@ -0,0 +1,24 @@
+require "rails_helper"
+
+RSpec.feature "Early years payment provider" do
+ let(:email_address) { "johndoe@example.com" }
+ let(:journey_session) { Journeys::EarlyYearsPayment::Provider::Authenticated::Session.last }
+ let(:mail) { ActionMailer::Base.deliveries.last }
+ let(:magic_link) { mail[:personalisation].unparsed_value[:magic_link] }
+ let!(:nursery) { create(:eligible_ey_provider, primary_key_contact_email_address: email_address) }
+
+ scenario "when the submitter name is omitted on the check-your-answers page" do
+ when_early_years_payment_provider_authenticated_journey_configuration_exists
+ when_early_years_payment_provider_start_journey_completed
+ when_early_years_payment_provider_authenticated_journey_ready_to_submit
+ click_button "Accept and send"
+
+ expect(page.current_path).to eq "/early-years-payment-provider/check-your-answers"
+ expect(page).to have_content "You cannot submit this claim without providing your full name"
+
+ fill_in "claim-provider-contact-name-field-error", with: "John Doe"
+ click_button "Accept and send"
+
+ expect(page.current_path).to eq claim_confirmation_path(Journeys::EarlyYearsPayment::Provider::Authenticated::ROUTING_NAME)
+ end
+end
diff --git a/spec/forms/journeys/early_years_payment/provider/authenticated/check_your_answers_form_spec.rb b/spec/forms/journeys/early_years_payment/provider/authenticated/check_your_answers_form_spec.rb
new file mode 100644
index 0000000000..04d8f2ffc2
--- /dev/null
+++ b/spec/forms/journeys/early_years_payment/provider/authenticated/check_your_answers_form_spec.rb
@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe Journeys::EarlyYearsPayment::Provider::Authenticated::CheckYourAnswersForm, type: :model do
+ let(:journey) { Journeys::EarlyYearsPayment::Provider::Authenticated }
+ let(:journey_session) { create(:early_years_payment_provider_authenticated_session) }
+ let(:provider_contact_name) { nil }
+
+ let(:params) do
+ ActionController::Parameters.new(
+ claim: {
+ provider_contact_name:
+ }
+ )
+ end
+
+ subject do
+ described_class.new(journey_session:, journey:, params:)
+ end
+
+ describe "validations" do
+ it do
+ is_expected.not_to(
+ allow_value(provider_contact_name)
+ .for(:provider_contact_name)
+ .with_message("You cannot submit this claim without providing your full name")
+ )
+ end
+ end
+
+ describe "#save" do
+ let(:provider_contact_name) { "John Doe" }
+
+ it "updates the journey session" do
+ expect { expect(subject.save).to be(true) }.to(
+ change { journey_session.reload.answers.provider_contact_name }.to("John Doe")
+ )
+ end
+ end
+end
diff --git a/spec/forms/journeys/early_years_payment/provider/authenticated/claim_submission_form_spec.rb b/spec/forms/journeys/early_years_payment/provider/authenticated/claim_submission_form_spec.rb
new file mode 100644
index 0000000000..539a5d3235
--- /dev/null
+++ b/spec/forms/journeys/early_years_payment/provider/authenticated/claim_submission_form_spec.rb
@@ -0,0 +1,42 @@
+require "rails_helper"
+
+RSpec.describe Journeys::EarlyYearsPayment::Provider::Authenticated::ClaimSubmissionForm do
+ before do
+ create(:journey_configuration, :early_years_payment_provider_authenticated)
+ end
+
+ let(:journey) { Journeys::EarlyYearsPayment::Provider::Authenticated }
+
+ let(:journey_session) { create(:early_years_payment_provider_authenticated_session, answers: answers) }
+ let(:form) { described_class.new(journey_session: journey_session) }
+
+ describe "#save" do
+ subject { form.save }
+
+ let(:claim) { form.claim }
+ let(:eligibility) { claim.eligibility }
+ let(:answers) { build(:early_years_payment_provider_authenticated_answers, :submittable) }
+
+ it { is_expected.to be_truthy }
+
+ it "saves some answers into the Claim model" do
+ subject
+ expect(claim.email_address).to eq answers.email_address
+ expect(claim.submitted_at).to be_present
+ expect(claim.eligibility_type).to eq "Policies::EarlyYearsPayments::Eligibility"
+ expect(claim.first_name).to eq answers.first_name
+ expect(claim.surname).to eq answers.surname
+ expect(claim.paye_reference).to eq answers.paye_reference
+ expect(claim.practitioner_email_address).to eq answers.practitioner_email_address
+ expect(claim.provider_contact_name).to eq "John Doe"
+ end
+
+ it "saves some answers into the Eligibility model" do
+ subject
+ expect(eligibility.nursery_urn).to eq answers.nursery_urn
+ expect(eligibility.child_facing_confirmation_given).to eq answers.child_facing_confirmation_given
+ expect(eligibility.first_job_within_6_months).to eq answers.first_job_within_6_months
+ expect(eligibility.start_date).to eq answers.start_date
+ end
+ end
+end
diff --git a/spec/models/claim_spec.rb b/spec/models/claim_spec.rb
index 07797e91a1..8ff0154012 100644
--- a/spec/models/claim_spec.rb
+++ b/spec/models/claim_spec.rb
@@ -604,7 +604,10 @@
:qualifications_details_check,
:column_to_remove_teacher_reference_number,
:onelogin_credentials,
- :onelogin_user_info
+ :onelogin_user_info,
+ :paye_reference,
+ :practitioner_email_address,
+ :provider_contact_name
])
end
end
diff --git a/spec/models/journeys/early_years_payment/provider/authenticated/answers_presenter_spec.rb b/spec/models/journeys/early_years_payment/provider/authenticated/answers_presenter_spec.rb
new file mode 100644
index 0000000000..77c7cf1ded
--- /dev/null
+++ b/spec/models/journeys/early_years_payment/provider/authenticated/answers_presenter_spec.rb
@@ -0,0 +1,55 @@
+require "rails_helper"
+
+RSpec.describe Journeys::EarlyYearsPayment::Provider::Authenticated::AnswersPresenter do
+ let(:journey_session) do
+ create(:early_years_payment_provider_authenticated_session, answers: answers)
+ end
+
+ let(:presenter) { described_class.new(journey_session) }
+
+ describe "#claim_answers" do
+ subject { presenter.claim_answers }
+
+ let(:answers) { build(:early_years_payment_provider_authenticated_answers, :eligible) }
+
+ it do
+ is_expected.to include(
+ [
+ "Employee’s workplace",
+ EligibleEyProvider.first.nursery_name,
+ "current-nursery"
+ ],
+ [
+ "Employer’s PAYE reference number",
+ "123/A",
+ "paye-reference"
+ ],
+ [
+ "Employee’s name",
+ "John Doe",
+ "claimant-name"
+ ],
+ [
+ "Employee’s start date",
+ "1 January 2024",
+ "start-date"
+ ],
+ [
+ "Confirmation that employee spends most of their time in their job working directly with children",
+ "Yes",
+ "child-facing"
+ ],
+ [
+ "Confirmation that employee worked in an early years setting 6 months before the start date",
+ "Yes",
+ "returner"
+ ],
+ [
+ "Employee’s email address",
+ "johndoe@example.com",
+ "employee-email"
+ ]
+ )
+ end
+ end
+end
diff --git a/spec/support/steps/eligible_ey_journey_authenticated.rb b/spec/support/steps/eligible_ey_journey_authenticated.rb
new file mode 100644
index 0000000000..805648d7fa
--- /dev/null
+++ b/spec/support/steps/eligible_ey_journey_authenticated.rb
@@ -0,0 +1,30 @@
+def when_early_years_payment_provider_authenticated_journey_ready_to_submit
+ visit magic_link
+ check "I confirm that I have obtained consent from my employee and have provided them with the relevant privacy notice."
+ click_button "Continue"
+
+ choose nursery.nursery_name
+ click_button "Continue"
+
+ fill_in "claim-paye-reference-field", with: "123/123456SE90"
+ click_button "Continue"
+
+ fill_in "First name", with: "Bobby"
+ fill_in "Last name", with: "Bobberson"
+ click_button "Continue"
+
+ date = Date.yesterday
+ fill_in("Day", with: date.day)
+ fill_in("Month", with: date.month)
+ fill_in("Year", with: date.year)
+ click_button "Continue"
+
+ check "I confirm that at least 70% of Bobby’s time in their job is spent working directly with children."
+ click_button "Continue"
+
+ choose "No"
+ click_button "Continue"
+
+ fill_in "claim-practitioner-email-address-field", with: "practitioner@example.com"
+ click_button "Continue"
+end