+ <%= event.ce_hours_details_label %> +
+ <% if event.ce_hours_request_deadline %> ++ Request CE credit by <%= event.ce_hours_request_deadline.strftime("%B %-d, %Y") %> +
+ <% end %> + <% if event.ce_payment_due_deadline %> ++ CE payment due by <%= event.ce_payment_due_deadline.strftime("%B %-d, %Y") %> +
+ <% end %> +diff --git a/app/views/event_mailer/event_registration_confirmation.text.erb b/app/views/event_mailer/event_registration_confirmation.text.erb index 1b0c5bc8cc..0cdf4aab69 100644 --- a/app/views/event_mailer/event_registration_confirmation.text.erb +++ b/app/views/event_mailer/event_registration_confirmation.text.erb @@ -27,6 +27,7 @@ Videoconference: <%= event_platform_label(@event) %> View your ticket: <%= registration_ticket_url(@event_registration.slug) %> +<%= render "ce_deadlines", event: @event %> <% if @event.registration_close_date %> Registration closes on diff --git a/app/views/event_mailer/event_registration_reminder.html.erb b/app/views/event_mailer/event_registration_reminder.html.erb index 121e44363e..42d78a0e70 100644 --- a/app/views/event_mailer/event_registration_reminder.html.erb +++ b/app/views/event_mailer/event_registration_reminder.html.erb @@ -18,6 +18,8 @@ <% end %> <%= render "event_details_card", event: @event, time_zone: @time_zone %> + + <%= render "ce_deadlines", event: @event %> <% if @event_registration.persisted? && @event_registration.slug.present? %> diff --git a/app/views/event_mailer/event_registration_reminder.text.erb b/app/views/event_mailer/event_registration_reminder.text.erb index 8aeb3b1302..913170528a 100644 --- a/app/views/event_mailer/event_registration_reminder.text.erb +++ b/app/views/event_mailer/event_registration_reminder.text.erb @@ -22,7 +22,7 @@ Location: <%= event_location_label(@event.object) %> <% if @event.labelled_cost.present? %> <%= @event.labelled_cost %> <% end %> - +<%= render "ce_deadlines", event: @event %> <% if @event_registration.slug.present? %> View your ticket for event details, directions, and calendar links: <%= registration_ticket_url(@event_registration.slug) %> diff --git a/app/views/events/_ce_config_fields.html.erb b/app/views/events/_ce_config_fields.html.erb new file mode 100644 index 0000000000..fae0139cfd --- /dev/null +++ b/app/views/events/_ce_config_fields.html.erb @@ -0,0 +1,35 @@ +<%# The CE settings an admin edits once continuing education is enabled: hours + offered, total cost, and the two optional deadlines. Rendered inside each + "Enable continuing education" box (single-form and multi-form variants). + Each field is labelled above its own white input so they read as distinct + fields; the date inputs match the event start/end date style. locals: f + (event form builder). %> +
Allow registrants to request CE hours.
-Edit the CE hours ticket card and its details below, under Registration ticket callouts.
<% if @event.continuing_education_form.present? %> @@ -495,13 +491,8 @@ <% end %>Select a continuing education form for registrants to request CE hours.
-The app overrides this with a live-status color when the registrant has action to take (e.g. amber while something's outstanding, orange while a balance is due).
+This callout will be a different color when the registrant has action to take (e.g. amber if something's outstanding, orange if a balance is due).
<% end %>Payment due by <%= @event.ce_payment_due_deadline.to_fs(:long) %>
+ <% end %>You haven't requested continuing education credit for this training. CE hours are available for an additional fee.
+ <% if @event.ce_hours_request_deadline %> +Request CE credit by <%= @event.ce_hours_request_deadline.to_fs(:long) %>.
+ <% end %> <%= form_with url: registration_ce_request_path(@event_registration.slug), method: :post, data: { turbo: false }, class: "mt-4" do |form| %> <%= form.submit "Request CE credit", class: "rounded-lg bg-teal-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-teal-700 focus:outline-none focus:ring-2 focus:ring-teal-300 cursor-pointer" %> <% end %> diff --git a/app/views/events/ce_hours.html.erb b/app/views/events/ce_hours.html.erb index 35a8af9d20..8dc651515b 100644 --- a/app/views/events/ce_hours.html.erb +++ b/app/views/events/ce_hours.html.erb @@ -25,6 +25,22 @@Questions about continuing education? Reach out and our team will follow up with details.
+Questions about continuing education? Reach out by email or Portal contact us form, and our team will follow up with details.
HTML end diff --git a/spec/mailers/event_mailer_spec.rb b/spec/mailers/event_mailer_spec.rb index 4f7bbad5ee..d9d4bfdd76 100644 --- a/spec/mailers/event_mailer_spec.rb +++ b/spec/mailers/event_mailer_spec.rb @@ -90,6 +90,31 @@ expect(body).not_to include("Meeting ID") end end + + context "when the event is CE-eligible and has deadlines" do + let(:event) do + create(:event, ce_hours_offered: 6, + ce_hours_request_deadline: Date.new(2026, 7, 1), + ce_payment_due_deadline: Date.new(2026, 8, 15)) + end + let(:event_registration) { create(:event_registration, event: event) } + + it "surfaces both CE deadlines in the body" do + expect(mail.body.encoded).to include("Request CE credit by") + expect(mail.body.encoded).to include("July 1, 2026") + expect(mail.body.encoded).to include("CE payment due by") + expect(mail.body.encoded).to include("August 15, 2026") + end + end + + context "when the event is not CE-eligible" do + let(:event) { create(:event, ce_hours_offered: nil, ce_hours_request_deadline: Date.new(2026, 7, 1)) } + let(:event_registration) { create(:event_registration, event: event) } + + it "omits the CE deadlines" do + expect(mail.body.encoded).not_to include("Request CE credit by") + end + end end describe "#bulk_payment_confirmation" do @@ -156,6 +181,22 @@ expect(mail.body.encoded).to include(event_registration.registrant.full_name) end + context "when the event is CE-eligible and has deadlines" do + let(:event) do + create(:event, ce_hours_offered: 6, + ce_hours_request_deadline: Date.new(2026, 7, 1), + ce_payment_due_deadline: Date.new(2026, 8, 15)) + end + let(:event_registration) { create(:event_registration, event: event) } + + it "surfaces both CE deadlines in the body" do + expect(mail.body.encoded).to include("Request CE credit by") + expect(mail.body.encoded).to include("July 1, 2026") + expect(mail.body.encoded).to include("CE payment due by") + expect(mail.body.encoded).to include("August 15, 2026") + end + end + context "with a custom subject" do let(:mail) { described_class.event_registration_reminder(event_registration, custom_subject: "Don't forget us tomorrow!") } diff --git a/spec/models/professional_license_spec.rb b/spec/models/professional_license_spec.rb index ad43d763b6..cf979e7873 100644 --- a/spec/models/professional_license_spec.rb +++ b/spec/models/professional_license_spec.rb @@ -27,6 +27,13 @@ expect(first.number).to be_nil expect(person.professional_licenses.count).to eq(1) end + + it "records the license type when given" do + license = described_class.find_or_create_for(person: person, number: "ABC-1", kind: "LCSW") + + expect(license.kind).to eq("LCSW") + expect(license.number).to eq("ABC-1") + end end describe "#number_known?" do diff --git a/spec/requests/events/public_registrations_spec.rb b/spec/requests/events/public_registrations_spec.rb index b07b0aca37..85514692c1 100644 --- a/spec/requests/events/public_registrations_spec.rb +++ b/spec/requests/events/public_registrations_spec.rb @@ -250,6 +250,32 @@ def post_with_scholarship(scholarship_answer) expect(response.body).to include("Minimum of 5 words.") end + it "surfaces the CE deadlines on the continuing education section" do + ce = FormBuilderService.new(name: "CE", sections: %i[continuing_education], role: "continuing_education").call + event.event_forms.create!(form: ce, role: "continuing_education") + event.update!(ce_hours_request_deadline: Date.new(2026, 7, 1), ce_payment_due_deadline: Date.new(2026, 8, 15)) + + get new_event_public_registration_path(event) + + expect(response.body).to include("Request CE credit by") + expect(response.body).to include("July 1, 2026") + expect(response.body).to include("Payment due by") + expect(response.body).to include("August 15, 2026") + end + + it "renders the CE license type, issuing-state dropdown, expiry date, and provide-later note" do + ce = FormBuilderService.new(name: "CE", sections: %i[continuing_education], role: "continuing_education").call + event.event_forms.create!(form: ce, role: "continuing_education") + + get new_event_public_registration_path(event) + + expect(response.body).to include("what is your license type?") + expect(response.body).to include("In which state was your license issued?") + expect(response.body).to include("Select a state") # issuing state renders as the US-states dropdown + expect(response.body).to include('type="date"') # expiry renders as a date input + expect(response.body).to include("add or update them later") + end + it "renders a structured details panel from known event data when enabled" do pacific = ActiveSupport::TimeZone["Pacific Time (US & Canada)"] event.update!( diff --git a/spec/requests/events_spec.rb b/spec/requests/events_spec.rb index efb5c1eaa9..7c6a2e6b5d 100644 --- a/spec/requests/events_spec.rb +++ b/spec/requests/events_spec.rb @@ -226,6 +226,17 @@ def offer_ce!(target_event) get ce_hours_event_path(event) expect(response).to redirect_to(event_path(event)) end + + it "surfaces the CE deadlines when set" do + event.update!(ce_hours_offered: 6, ce_hours_details: "CE info
", + ce_hours_request_deadline: Date.new(2026, 7, 1), + ce_payment_due_deadline: Date.new(2026, 8, 15)) + get ce_hours_event_path(event) + expect(response.body).to include("Request CE credit by") + expect(response.body).to include("July 1, 2026") + expect(response.body).to include("Payment due by") + expect(response.body).to include("August 15, 2026") + end end describe "GET /new" do @@ -287,6 +298,14 @@ def offer_ce!(target_event) get edit_event_path(event) expect(response.body).to include("Frequently asked questions") end + + it "renders the CE deadline fields in the continuing education settings" do + create(:form, :standalone, role: "continuing_education", name: "CE") + get edit_event_path(event) + expect(response.body).to include('name="event[ce_hours_request_deadline]"') + expect(response.body).to include('name="event[ce_payment_due_deadline]"') + expect(response.body).to include("Request CE credit by") + end end describe "POST /create" do @@ -446,6 +465,15 @@ def offer_ce!(target_event) expect(event.reload.hint_dates).to eq("must attend both days") expect(event.hint_registration_cost).to eq("due within 3 weeks of registration") end + + it "persists the CE deadlines" do + patch event_path(event), params: { event: { + ce_hours_request_deadline: "2026-07-01", + ce_payment_due_deadline: "2026-08-15" + } } + expect(event.reload.ce_hours_request_deadline).to eq(Date.new(2026, 7, 1)) + expect(event.ce_payment_due_deadline).to eq(Date.new(2026, 8, 15)) + end end context "as non-admin" do diff --git a/spec/services/event_registration_services/public_registration_spec.rb b/spec/services/event_registration_services/public_registration_spec.rb index 4a75db2ab3..24bec6c872 100644 --- a/spec/services/event_registration_services/public_registration_spec.rb +++ b/spec/services/event_registration_services/public_registration_spec.rb @@ -542,15 +542,23 @@ def ce_field_id(key) ce_form.form_fields.find_by!(field_identifier: key).id.to_s end - def register_with_ce(answer, license: nil) + def register_with_ce(answer, license: nil, kind: nil, issuing_state: nil, expires_on: nil) params = base_form_params(first_name: "Cy", last_name: "Reed", email: "cy@example.com") ce_params = {} ce_params[ce_field_id(described_class::CE_CREDIT_INTEREST_IDENTIFIER)] = answer unless answer.nil? ce_params[ce_field_id(described_class::CE_LICENSE_NUMBER_IDENTIFIER)] = license if license + ce_params[ce_field_id(described_class::CE_LICENSE_KIND_IDENTIFIER)] = kind if kind + ce_params[ce_field_id(described_class::CE_LICENSE_ISSUING_STATE_IDENTIFIER)] = issuing_state if issuing_state + ce_params[ce_field_id(described_class::CE_LICENSE_EXPIRES_ON_IDENTIFIER)] = expires_on if expires_on described_class.call(event: event, registration_form: form, form_params: params, continuing_education_form: ce_form, continuing_education_params: ce_params) end + it "marks the CE interest question as required" do + field = ce_form.form_fields.find_by!(field_identifier: described_class::CE_CREDIT_INTEREST_IDENTIFIER) + expect(field.required).to be(true) + end + it "creates a CE registration when answered Yes" do result = register_with_ce("Yes") expect(result.event_registration.continuing_education_registrations.count).to eq(1) @@ -595,6 +603,20 @@ def register_with_ce(answer, license: nil) expect(license.person).to eq(result.event_registration.registrant) end + it "records the typed license type alongside the number" do + result = register_with_ce("Yes", license: "555", kind: "LCSW") + license = result.event_registration.continuing_education_registrations.first.professional_license + expect(license.kind).to eq("LCSW") + expect(license.number).to eq("555") + end + + it "records the license issuing state and expiry when given" do + result = register_with_ce("Yes", license: "555", issuing_state: "CA", expires_on: "2027-05-31") + license = result.event_registration.continuing_education_registrations.first.professional_license + expect(license.issuing_state).to eq("CA") + expect(license.expires_on).to eq(Date.new(2027, 5, 31)) + end + it "uses a placeholder license when no number is given" do result = register_with_ce("Yes") expect(result.event_registration.continuing_education_registrations.first.professional_license.number).to be_nil @@ -615,9 +637,11 @@ def register_with_ce(answer, license: nil) expect(answers[described_class::CE_LICENSE_NUMBER_IDENTIFIER]).to eq("LMFT 555") end - it "does not persist a continuing_education submission when answered No" do + it "persists the CE interest answer even when answered No" do register_with_ce("No") - expect(FormSubmission.find_by(role: "continuing_education", event: event)).to be_nil + submission = FormSubmission.find_by(role: "continuing_education", event: event) + expect(submission).to be_present + expect(submission.answers_by_identifier[described_class::CE_CREDIT_INTEREST_IDENTIFIER]).to eq("No") end end diff --git a/spec/services/magic_ticket_callouts_spec.rb b/spec/services/magic_ticket_callouts_spec.rb index 793ea27089..ee24ef2ce5 100644 --- a/spec/services/magic_ticket_callouts_spec.rb +++ b/spec/services/magic_ticket_callouts_spec.rb @@ -107,6 +107,23 @@ def card(reg, title) expect(paid.badge).to be_nil end + it "names the CE request deadline on the license-needed badge" do + event.update!(ce_hours_cost_cents: 15_000, ce_hours_request_deadline: Date.new(2026, 7, 1)) + license = create(:professional_license, :placeholder, person: registration.registrant) + create(:continuing_education_registration, event_registration: registration, professional_license: license) + expect(card(registration.reload, event.ce_hours_details_label).badge).to eq("$150 · License number needed by Jul 1") + end + + it "appends the CE payment deadline to the amount-due badge, dropping it once paid" do + event.update!(ce_hours_cost_cents: 15_000, ce_payment_due_deadline: Date.new(2026, 8, 15)) + license = create(:professional_license, person: registration.registrant, number: "LIC123") + ce_reg = create(:continuing_education_registration, event_registration: registration, professional_license: license) + expect(card(registration.reload, event.ce_hours_details_label).badge).to eq("$150 due by Aug 15") + + create(:allocation, source: create(:payment), allocatable: ce_reg, amount: ce_reg.cost_cents) + expect(card(registration.reload, event.ce_hours_details_label).badge).to be_nil + end + it "shows the scholarship card only when requested, without an amount chip until awarded" do expect(card_titles(registration)).not_to include("Scholarship") registration.update!(scholarship_requested: true) @@ -204,5 +221,16 @@ def card(reg, title) # Certificate isn't unlocked (event not ended, not attended). expect(described_class.new(registration).card_for(callout)).to be_nil end + + it "keeps the live CE deadline badge on a materialized CE row" do + event.update!(ce_hours_cost_cents: 15_000, ce_payment_due_deadline: Date.new(2026, 8, 15)) + license = create(:professional_license, person: registration.registrant, number: "LIC123") + create(:continuing_education_registration, event_registration: registration, professional_license: license) + callout = create(:registration_ticket_callout, event:, magic_key: "ce_hours", title: "CE credit") + + card = described_class.new(registration.reload).card_for(callout) + expect(card.title).to eq("CE credit") # row owns the text + expect(card.badge).to eq("$150 due by Aug 15") # app keeps the live deadline badge + end end end diff --git a/spec/system/public_registration_form_submission_spec.rb b/spec/system/public_registration_form_submission_spec.rb index 85b66cb545..381f0e2be0 100644 --- a/spec/system/public_registration_form_submission_spec.rb +++ b/spec/system/public_registration_form_submission_spec.rb @@ -144,6 +144,7 @@ choose_pr_radio reg_field("racial_ethnic_identity"), "Asian" choose_pr_radio reg_field("referral_source"), "Social Media" choose_pr_radio reg_field("payment_method"), "Check" + choose_pr_radio ce_field("ce_credit_interest"), "No" check_pr_box reg_field("communication_consent"), "Yes" expect { click_button "Register" }.not_to change(Person, :count) @@ -174,6 +175,7 @@ fill_full_registration choose_pr_radio reg_field("payment_method"), "Check" + choose_pr_radio ce_field("ce_credit_interest"), "No" choose_pr_radio schol_field("scholarship_eligibility"), "Yes" fill_pr_text schol_field("scholarship_contribution"), with: "Our agency can pay $200." @@ -205,6 +207,7 @@ visit new_event_public_registration_path(event, scholarship_requested: true) choose_pr_radio reg_field("payment_method"), "Check" + choose_pr_radio ce_field("ce_credit_interest"), "No" check_pr_box reg_field("communication_consent"), "Yes" choose_pr_radio schol_field("scholarship_eligibility"), "Yes" diff --git a/test/mailers/previews/event_mailer_preview.rb b/test/mailers/previews/event_mailer_preview.rb index ebcda85e09..065b3f0725 100644 --- a/test/mailers/previews/event_mailer_preview.rb +++ b/test/mailers/previews/event_mailer_preview.rb @@ -47,7 +47,14 @@ def sample_event_registration event = Event.first || create_event person = Person.first || create_person - EventRegistration.find_or_create_by!(event: event, registrant: person) + registration = EventRegistration.find_or_create_by!(event: event, registrant: person) + # Showcase the CE deadlines block (set in memory only, not persisted). The email + # gates on the event being CE-eligible, so give it offered hours + deadlines. Set + # on registration.event — the object the mailer decorates and reads. + registration.event.ce_hours_offered ||= 6 + registration.event.ce_hours_request_deadline ||= 2.weeks.from_now.to_date + registration.event.ce_payment_due_deadline ||= 3.weeks.from_now.to_date + registration end def create_event