diff --git a/app/views/scholarships/_recipient_row.html.erb b/app/views/scholarships/_recipient_row.html.erb
index 8fbf9aed13..25abf7fbac 100644
--- a/app/views/scholarships/_recipient_row.html.erb
+++ b/app/views/scholarships/_recipient_row.html.erb
@@ -5,6 +5,9 @@
|
<%= link_to scholarship.recipient_name, edit_scholarship_path(scholarship), class: "font-medium text-blue-700 hover:text-blue-900 hover:underline after:absolute after:inset-0 after:content-['']" %>
+ <% if scholarship.agreement_declined? %>
+ <%= render "shared/badge", label: "Declined", classes: "bg-red-50 text-red-700 border-red-200", icon: "fa-solid fa-circle-xmark text-xs" %>
+ <% end %>
|
<%= scholarship.program_name %> |
<%= scholarship.program_location %> |
@@ -18,7 +21,8 @@
<% end %>
<%= scholarship.training_label %> |
- <%= scholarship.amount %> |
+ <%# Declined awards don't count toward totals, so the amount is struck through. %>
+ "><%= scholarship.amount %> |
<% if scholarship.tasks_completed? %>
<%= render "shared/badge",
diff --git a/app/views/scholarships/edit.html.erb b/app/views/scholarships/edit.html.erb
index b737edcab4..df7aa74867 100644
--- a/app/views/scholarships/edit.html.erb
+++ b/app/views/scholarships/edit.html.erb
@@ -59,6 +59,31 @@
event: (@allocatable.event if @allocatable.respond_to?(:event)),
person: @scholarship.recipient %>
+ <%# The recipient declined. This lives outside the edit form (a button_to renders
+ its own form, which can't nest) and is the one explicit path back to active:
+ re-offering sets the award to pending and re-funds it. %>
+ <% if @scholarship.agreement_declined? %>
+ <% declined_response = @scholarship.latest_agreement_response %>
+
+
+
+
+ Declined by recipient<% if declined_response&.responded_at %> · <%= declined_response.responded_at.strftime("%B %-d, %Y") %><% end %>
+ <% if declined_response&.reason.present? %>
+ “<%= declined_response.reason %>”
+ <% end %>
+ This award isn't counted in any totals while declined.
+ To re-offer at new terms, change the amount and save first — then click Re-offer.
+
+
+ <%= button_to reoffer_scholarship_path(@scholarship, return_to: params[:return_to].presence, participant: params[:participant].presence),
+ class: "inline-flex items-center gap-2 rounded-lg bg-red-600 px-4 py-2 text-sm font-semibold text-white shadow-sm hover:bg-red-700",
+ data: { turbo_confirm: "Re-offer this scholarship? It returns to pending and the award is re-funded until the recipient responds." } do %>
+ Re-offer
+ <% end %>
+
Agreement signed
<%= @scholarship.agreement_signed? ? "Yes" : "No" %>
- <% if @scholarship.agreement_signed_at %>
- · <%= @scholarship.agreement_signed_at.strftime("%B %d, %Y") %>
+ <% if @scholarship.agreement_signed? && latest_response&.responded_at %>
+ · <%= latest_response.responded_at.strftime("%B %d, %Y") %>
<% end %>
+ <% if @scholarship.agreement_declined? %>
+
+ Agreement declined
+
+ Declined
+ <% if latest_response&.responded_at %>
+ · <%= latest_response.responded_at.strftime("%B %d, %Y") %>
+ <% end %>
+ <% if latest_response&.reason.present? %>
+ “<%= latest_response.reason %>”
+ <% end %>
+
+
Grant
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index 785b764f14..c450852977 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -68,29 +68,6 @@
],
"note": "Admin-only reminder confirmation. Same as preview_reminder: the raw value is the server-rendered email HTML; the embedded custom message is sanitized via reminder_message_html (SafeListSanitizer) and the custom subject is shown escaped, separately, so no unsanitized user input reaches the page."
},
- {
- "warning_type": "Redirect",
- "warning_code": 18,
- "fingerprint": "6b0a218f30eb40af7b6cf4ec15de35003eb42e1cea35ecd6acb69139643a338b",
- "check_name": "Redirect",
- "message": "Possible unprotected redirect",
- "file": "app/controllers/events/callouts_controller.rb",
- "line": 257,
- "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
- "code": "redirect_to(EventRegistration.find_by!(:slug => params[:slug]).registrant.payment_processor.checkout(:mode => \"payment\", :metadata => ({ :ce_registration_id => ce_registration.id, :event_registration_id => EventRegistration.find_by!(:slug => params[:slug]).id, :event_id => EventRegistration.find_by!(:slug => params[:slug]).event.id }), :payment_intent_data => ({ :metadata => ({ :ce_registration_id => ce_registration.id, :event_registration_id => EventRegistration.find_by!(:slug => params[:slug]).id, :event_id => EventRegistration.find_by!(:slug => params[:slug]).event.id }), :description => (\"CE Hours: #{EventRegistration.find_by!(:slug => params[:slug]).event.title}\") }), :line_items => ([{ :price_data => ({ :currency => \"usd\", :product_data => ({ :name => (\"CE Hours: #{EventRegistration.find_by!(:slug => params[:slug]).event.title}\") }), :unit_amount => ce_registration.remaining_cost }), :quantity => 1 }]), :success_url => registration_ce_url(EventRegistration.find_by!(:slug => params[:slug]).slug, :checkout => \"success\"), :cancel_url => registration_ce_url(EventRegistration.find_by!(:slug => params[:slug]).slug, :checkout => \"cancelled\")).url, :allow_other_host => true, :status => :see_other)",
- "render_path": null,
- "location": {
- "type": "method",
- "class": "Events::CalloutsController",
- "method": "redirect_to_ce_stripe_checkout"
- },
- "user_input": "EventRegistration.find_by!(:slug => params[:slug]).registrant.payment_processor.checkout(:mode => \"payment\", :metadata => ({ :ce_registration_id => ce_registration.id, :event_registration_id => EventRegistration.find_by!(:slug => params[:slug]).id, :event_id => EventRegistration.find_by!(:slug => params[:slug]).event.id }), :payment_intent_data => ({ :metadata => ({ :ce_registration_id => ce_registration.id, :event_registration_id => EventRegistration.find_by!(:slug => params[:slug]).id, :event_id => EventRegistration.find_by!(:slug => params[:slug]).event.id }), :description => (\"CE Hours: #{EventRegistration.find_by!(:slug => params[:slug]).event.title}\") }), :line_items => ([{ :price_data => ({ :currency => \"usd\", :product_data => ({ :name => (\"CE Hours: #{EventRegistration.find_by!(:slug => params[:slug]).event.title}\") }), :unit_amount => ce_registration.remaining_cost }), :quantity => 1 }]), :success_url => registration_ce_url(EventRegistration.find_by!(:slug => params[:slug]).slug, :checkout => \"success\"), :cancel_url => registration_ce_url(EventRegistration.find_by!(:slug => params[:slug]).slug, :checkout => \"cancelled\")).url",
- "confidence": "Weak",
- "cwe_id": [
- 601
- ],
- "note": "known redirect for stripe"
- },
{
"warning_type": "Cross-Site Scripting",
"warning_code": 2,
diff --git a/config/routes.rb b/config/routes.rb
index 3764344ea3..93ae814014 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -82,6 +82,7 @@
get "registration/:slug/receipt", to: "events/registrations#receipt", as: :registration_receipt
get "registration/:slug/scholarship", to: "events/callouts#scholarship", as: :registration_scholarship
post "registration/:slug/scholarship/agreement", to: "events/callouts#sign_agreement", as: :registration_scholarship_agreement
+ post "registration/:slug/scholarship/decline", to: "events/callouts#decline_agreement", as: :registration_scholarship_decline
get "registration/:slug/faq", to: "events/callouts#faq", as: :registration_faq
get "registration/:slug/payment", to: "events/callouts#payment", as: :registration_payment
get "registration/:slug/certificate", to: "events/callouts#certificate", as: :registration_certificate
@@ -140,7 +141,10 @@
resources :form_submissions, only: [ :index, :show ]
resources :grants
resources :scholarships, only: [ :index, :new, :create, :show, :edit, :update, :destroy ] do
- member { patch :toggle_tasks }
+ member do
+ patch :toggle_tasks
+ post :reoffer
+ end
resources :comments, only: [ :create, :update ]
end
resources :continuing_education_registrations, only: [ :new, :create, :edit, :update, :destroy ] do
diff --git a/db/migrate/20260813121725_create_scholarship_agreement_responses.rb b/db/migrate/20260813121725_create_scholarship_agreement_responses.rb
new file mode 100644
index 0000000000..9b8c514faf
--- /dev/null
+++ b/db/migrate/20260813121725_create_scholarship_agreement_responses.rb
@@ -0,0 +1,21 @@
+class CreateScholarshipAgreementResponses < ActiveRecord::Migration[8.1]
+ # Append-only log of each agreement transition (accept ↔ decline ↔ re-offer).
+ # The scholarship's agreement_response_status (added next) is the denormalized
+ # cache of the latest row here; responded_at + reason live here, not on the
+ # scholarship.
+ def up
+ create_table :scholarship_agreement_responses do |t|
+ t.references :scholarship, null: false, foreign_key: true
+ t.string :status, null: false
+ t.text :reason
+ t.datetime :responded_at, null: false
+ t.string :responder
+ t.integer :amount_cents
+ t.timestamps
+ end
+ end
+
+ def down
+ drop_table :scholarship_agreement_responses, if_exists: true
+ end
+end
diff --git a/db/migrate/20260813121726_replace_scholarship_agreement_signed_at_with_response_status.rb b/db/migrate/20260813121726_replace_scholarship_agreement_signed_at_with_response_status.rb
new file mode 100644
index 0000000000..2459252419
--- /dev/null
+++ b/db/migrate/20260813121726_replace_scholarship_agreement_signed_at_with_response_status.rb
@@ -0,0 +1,15 @@
+class ReplaceScholarshipAgreementSignedAtWithResponseStatus < ActiveRecord::Migration[8.1]
+ # Replace the single agreement_signed_at timestamp with a tri-state status
+ # (pending/accepted/declined). No data backfill: there are no signed agreements
+ # in production, so every existing row correctly defaults to "pending". Going
+ # forward the date + reason live on the response rows, not on the scholarship.
+ def up
+ add_column :scholarships, :agreement_response_status, :string, null: false, default: "pending"
+ remove_column :scholarships, :agreement_signed_at
+ end
+
+ def down
+ add_column :scholarships, :agreement_signed_at, :datetime
+ remove_column :scholarships, :agreement_response_status
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d866821256..bcf6230a9f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1243,8 +1243,20 @@
t.index ["workshop_id"], name: "index_resources_on_workshop_id"
end
+ create_table "scholarship_agreement_responses", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
+ t.integer "amount_cents"
+ t.datetime "created_at", null: false
+ t.text "reason"
+ t.datetime "responded_at", null: false
+ t.string "responder"
+ t.bigint "scholarship_id", null: false
+ t.string "status", null: false
+ t.datetime "updated_at", null: false
+ t.index ["scholarship_id"], name: "index_scholarship_agreement_responses_on_scholarship_id"
+ end
+
create_table "scholarships", charset: "utf8mb4", collation: "utf8mb4_unicode_ci", force: :cascade do |t|
- t.datetime "agreement_signed_at"
+ t.string "agreement_response_status", default: "pending", null: false
t.integer "amount_cents", default: 0, null: false
t.datetime "created_at", null: false
t.bigint "grant_id"
@@ -1862,6 +1874,7 @@
add_foreign_key "resources", "users", column: "created_by_id"
add_foreign_key "resources", "windows_types"
add_foreign_key "resources", "workshops"
+ add_foreign_key "scholarship_agreement_responses", "scholarships"
add_foreign_key "scholarships", "grants"
add_foreign_key "scholarships", "people", column: "recipient_id"
add_foreign_key "sectorable_items", "sectors"
diff --git a/spec/factories/scholarship_agreement_responses.rb b/spec/factories/scholarship_agreement_responses.rb
new file mode 100644
index 0000000000..dcbf333aa5
--- /dev/null
+++ b/spec/factories/scholarship_agreement_responses.rb
@@ -0,0 +1,10 @@
+FactoryBot.define do
+ factory :scholarship_agreement_response do
+ association :scholarship
+ status { "declined" }
+ reason { "Timing no longer works" }
+ responded_at { Time.current }
+ responder { "recipient" }
+ amount_cents { 1000 }
+ end
+end
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 0f34837806..476a283bad 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -1,6 +1,63 @@
require "rails_helper"
RSpec.describe NotificationMailer, type: :mailer do
+ describe "scholarship agreement signed" do
+ let(:event) { create(:event, cost_cents: 10_000, title: "Facilitator Training") }
+ let(:registration) { create(:event_registration, event:) }
+ let(:person) { registration.registrant }
+ let(:scholarship) { create(:scholarship, recipient: person, amount_cents: 5_000) }
+ let!(:allocation) { create(:allocation, source: scholarship, allocatable: registration, amount: 5_000) }
+
+ describe "#scholarship_agreement_signed (to the recipient)" do
+ let(:notification) do
+ create(:notification, kind: "scholarship_agreement_signed", noticeable: Scholarship.find(scholarship.id),
+ recipient_role: "person", recipient_email: person.preferred_email)
+ end
+
+ it "is addressed to the recipient and links back to their ticket" do
+ mail = described_class.scholarship_agreement_signed(notification)
+ expect(mail.to).to eq([ person.preferred_email ])
+ expect(mail.subject).to include("Your scholarship agreement is confirmed")
+ expect(mail.body.encoded).to include("/registration/#{registration.slug}")
+ end
+ end
+
+ describe "#scholarship_agreement_signed_fyi (admin)" do
+ let(:notification) { create(:notification, kind: "scholarship_agreement_signed_fyi", noticeable: scholarship) }
+
+ it "names the recipient in the subject" do
+ expect(described_class.scholarship_agreement_signed_fyi(notification).subject).to include("Scholarship agreement signed by #{person.full_name}")
+ end
+ end
+ end
+
+ describe "#scholarship_agreement_declined_fyi" do
+ let(:event) { create(:event, cost_cents: 10_000, title: "Facilitator Training") }
+ let(:registration) { create(:event_registration, event:) }
+ let(:person) { registration.registrant }
+ let(:scholarship) { create(:scholarship, recipient: person, amount_cents: 5_000) }
+ let!(:allocation) { create(:allocation, source: scholarship, allocatable: registration, amount: 5_000) }
+ let(:notification) do
+ # Fresh load so notification.noticeable resolves its allocation from the DB
+ # (as the mailer job does), not a stale in-memory instance.
+ create(:notification, kind: "scholarship_agreement_declined_fyi", noticeable: Scholarship.find(scholarship.id), custom_message: "Timing no longer works")
+ end
+
+ it "renders without raising" do
+ expect { described_class.scholarship_agreement_declined_fyi(notification).deliver_now }.not_to raise_error
+ end
+
+ it "names the recipient in the subject" do
+ expect(described_class.scholarship_agreement_declined_fyi(notification).subject).to include("Scholarship declined by #{person.full_name}")
+ end
+
+ it "includes the reason and the event in the body" do
+ body = described_class.scholarship_agreement_declined_fyi(notification).body.encoded
+ expect(body).to include("Timing no longer works")
+ expect(body).to include("Facilitator Training")
+ end
+ end
+
describe "#bulk_payment_confirmation_fyi" do
let(:event) { create(:event) }
let(:form) do
diff --git a/spec/models/event_registration_spec.rb b/spec/models/event_registration_spec.rb
index 17c492fd0b..437d42a70b 100644
--- a/spec/models/event_registration_spec.rb
+++ b/spec/models/event_registration_spec.rb
@@ -367,11 +367,11 @@ def registration_with_scholarship
describe ".scholarship_status agreed" do
it "matches registrations with an agreement-signed scholarship" do
agreed_reg = create(:event_registration)
- agreed = create(:scholarship, recipient: agreed_reg.registrant, agreement_signed_at: Time.current)
+ agreed = create(:scholarship, recipient: agreed_reg.registrant, agreement_signed: true)
create(:allocation, source: agreed, allocatable: agreed_reg, amount: 0)
pending_reg = create(:event_registration)
- pending = create(:scholarship, recipient: pending_reg.registrant, agreement_signed_at: nil)
+ pending = create(:scholarship, recipient: pending_reg.registrant, agreement_signed: false)
create(:allocation, source: pending, allocatable: pending_reg, amount: 0)
results = EventRegistration.scholarship_status("agreed")
diff --git a/spec/models/grant_spec.rb b/spec/models/grant_spec.rb
index a07cfc691f..9c9a02d1a5 100644
--- a/spec/models/grant_spec.rb
+++ b/spec/models/grant_spec.rb
@@ -130,6 +130,23 @@
expect(grant.remaining_cents).to eq(60_000)
expect(grant.remaining_dollars).to eq(600)
end
+
+ it "excludes declined scholarships from the total and frees their funds" do
+ create(:scholarship, grant:, amount_cents: 30_000)
+ declined = create(:scholarship, grant:, amount_cents: 20_000)
+ declined.decline_agreement!("Not this year")
+
+ expect(grant.scholarships_total_cents).to eq(30_000)
+ expect(grant.remaining_cents).to eq(70_000)
+ end
+
+ it "excludes declined scholarships from the preloaded (in-memory) total too" do
+ create(:scholarship, grant:, amount_cents: 30_000)
+ create(:scholarship, grant:, amount_cents: 20_000).decline_agreement!("out")
+ preloaded = Grant.includes(:scholarships).find(grant.id)
+
+ expect(preloaded.scholarships_total_cents).to eq(30_000)
+ end
end
describe ".with_funds_remaining" do
diff --git a/spec/models/scholarship_agreement_response_spec.rb b/spec/models/scholarship_agreement_response_spec.rb
new file mode 100644
index 0000000000..1bd297973b
--- /dev/null
+++ b/spec/models/scholarship_agreement_response_spec.rb
@@ -0,0 +1,30 @@
+require "rails_helper"
+
+RSpec.describe ScholarshipAgreementResponse, type: :model do
+ it "belongs to a scholarship" do
+ expect(described_class.new).to respond_to(:scholarship)
+ end
+
+ it "validates status is one of the known values" do
+ response = build(:scholarship_agreement_response, status: "nope")
+ expect(response).not_to be_valid
+ expect(response.errors[:status]).to be_present
+ end
+
+ it "allows a nil responder but rejects an unknown one" do
+ expect(build(:scholarship_agreement_response, responder: nil)).to be_valid
+ expect(build(:scholarship_agreement_response, responder: "stranger")).not_to be_valid
+ end
+
+ it "requires responded_at" do
+ expect(build(:scholarship_agreement_response, responded_at: nil)).not_to be_valid
+ end
+
+ it ".chronological orders by responded_at" do
+ scholarship = create(:scholarship)
+ later = create(:scholarship_agreement_response, scholarship:, responded_at: 1.hour.ago)
+ earlier = create(:scholarship_agreement_response, scholarship:, responded_at: 2.hours.ago)
+
+ expect(scholarship.agreement_responses.chronological).to eq([ earlier, later ])
+ end
+end
diff --git a/spec/models/scholarship_spec.rb b/spec/models/scholarship_spec.rb
index a6486cff45..599af03ece 100644
--- a/spec/models/scholarship_spec.rb
+++ b/spec/models/scholarship_spec.rb
@@ -108,37 +108,154 @@
end
end
- describe "agreement_signed (virtual, backed by agreement_signed_at)" do
- it "infers the flag from the timestamp" do
+ describe "agreement response status (pending → accepted → declined)" do
+ it "starts pending" do
scholarship = create(:scholarship)
+ expect(scholarship.agreement_pending?).to be(true)
expect(scholarship.agreement_signed?).to be(false)
-
- scholarship.update!(agreement_signed_at: Time.current)
- expect(scholarship.agreement_signed?).to be(true)
+ expect(scholarship.agreement_declined?).to be(false)
end
- it "stamps the time when the agreement is first signed" do
+ it "accepts via the virtual agreement_signed setter and stamps the time" do
scholarship = create(:scholarship)
- expect(scholarship.agreement_signed_at).to be_nil
scholarship.update!(agreement_signed: true)
- expect(scholarship.agreement_signed_at).to be_present
+
+ expect(scholarship.agreement_signed?).to be(true)
+ expect(scholarship.latest_agreement_response.responded_at).to be_present
end
- it "clears the time when the agreement is unsigned" do
+ it "returns to pending when unsigned" do
scholarship = create(:scholarship, agreement_signed: true)
- expect(scholarship.agreement_signed_at).to be_present
scholarship.update!(agreement_signed: false)
- expect(scholarship.agreement_signed_at).to be_nil
+
+ expect(scholarship.agreement_signed?).to be(false)
+ expect(scholarship.agreement_pending?).to be(true)
+ end
+
+ it "#accept_agreement! is idempotent (no duplicate history row)" do
+ scholarship = create(:scholarship)
+ scholarship.accept_agreement!
+
+ expect { scholarship.accept_agreement! }.not_to change { scholarship.agreement_responses.count }
+ end
+ end
+
+ describe "declining" do
+ it "#decline_agreement! records the status, time, and reason" do
+ scholarship = create(:scholarship)
+
+ scholarship.decline_agreement!("Timing no longer works")
+
+ expect(scholarship.agreement_declined?).to be(true)
+ expect(scholarship.latest_agreement_response.responded_at).to be_present
+ expect(scholarship.latest_agreement_response.reason).to eq("Timing no longer works")
end
- it "preserves the original time when re-saved while still signed" do
+ it "#decline_agreement! clears any prior signed state (mutually exclusive)" do
scholarship = create(:scholarship, agreement_signed: true)
- original = scholarship.agreement_signed_at
- scholarship.update!(amount_cents: 2_000)
- expect(scholarship.reload.agreement_signed_at).to be_within(1.second).of(original)
+ scholarship.decline_agreement!("Changed my mind")
+
+ expect(scholarship.agreement_signed?).to be(false)
+ expect(scholarship.agreement_declined?).to be(true)
+ end
+
+ it "#decline_agreement! stores nil for a blank reason" do
+ scholarship = create(:scholarship)
+
+ scholarship.decline_agreement!("")
+
+ expect(scholarship.latest_agreement_response.reason).to be_nil
+ end
+
+ it "stays declined (allocation still zero) when only the amount is edited" do
+ event = create(:event, cost_cents: 10_000)
+ registration = create(:event_registration, event:)
+ scholarship = create(:scholarship, recipient: registration.registrant, amount_cents: 5_000)
+ create(:allocation, source: scholarship, allocatable: registration, amount: 5_000)
+ scholarship.reload
+ scholarship.decline_agreement!("No longer available")
+
+ scholarship.update!(amount_cents: 6_000)
+
+ # Editing the amount no longer reactivates a decline — that's the explicit
+ # Re-offer action now.
+ expect(scholarship.reload.agreement_declined?).to be(true)
+ expect(scholarship.allocation.reload.amount).to eq(0)
+ end
+
+ it "#reoffer_agreement! returns a declined award to pending and re-funds it" do
+ event = create(:event, cost_cents: 10_000)
+ registration = create(:event_registration, event:)
+ scholarship = create(:scholarship, recipient: registration.registrant, amount_cents: 5_000)
+ create(:allocation, source: scholarship, allocatable: registration, amount: 5_000)
+ scholarship.reload
+ scholarship.decline_agreement!("No longer available")
+ scholarship.update!(amount_cents: 6_000) # adjust terms first, still declined
+
+ scholarship.reoffer_agreement!
+
+ expect(scholarship.agreement_pending?).to be(true)
+ expect(scholarship.allocation.reload.amount).to eq(6_000)
+ expect(scholarship.latest_agreement_response).to have_attributes(status: "pending", responder: "admin")
+ end
+
+ it "excludes declined scholarships from the .not_declined scope" do
+ active = create(:scholarship)
+ declined = create(:scholarship)
+ declined.decline_agreement!("out")
+
+ expect(Scholarship.not_declined).to include(active)
+ expect(Scholarship.not_declined).not_to include(declined)
+ end
+
+ it "accepting a declined award reinstates it and re-funds the allocation" do
+ event = create(:event, cost_cents: 10_000)
+ registration = create(:event_registration, event:)
+ scholarship = create(:scholarship, recipient: registration.registrant, amount_cents: 5_000)
+ create(:allocation, source: scholarship, allocatable: registration, amount: 5_000)
+ scholarship.reload
+ scholarship.decline_agreement!("no")
+ expect(scholarship.allocation.reload.amount).to eq(0)
+
+ # The admin "Agreement signed" toggle routes through agreement_signed=.
+ scholarship.update!(agreement_signed: true)
+
+ expect(scholarship.agreement_signed?).to be(true)
+ expect(scholarship.agreement_declined?).to be(false)
+ expect(scholarship.allocation.reload.amount).to eq(5_000)
+ end
+ end
+
+ describe "agreement response history" do
+ it "appends a row on each transition, capturing status, reason, responder, and amount" do
+ scholarship = create(:scholarship, amount_cents: 5_000)
+
+ scholarship.decline_agreement!("Not this year", by: "recipient")
+ scholarship.reoffer_agreement!(by: "admin")
+ scholarship.accept_agreement!(by: "recipient")
+
+ history = scholarship.agreement_responses.chronological
+ expect(history.map(&:status)).to eq(%w[declined pending accepted])
+ expect(history.first).to have_attributes(reason: "Not this year", responder: "recipient", amount_cents: 5_000)
+ expect(history.last).to have_attributes(status: "accepted", responder: "recipient")
+ end
+ end
+
+ describe "#event" do
+ it "returns the event the scholarship was awarded at via its allocation" do
+ event = create(:event, cost_cents: 10_000)
+ registration = create(:event_registration, event:)
+ scholarship = create(:scholarship, recipient: registration.registrant, amount_cents: 5_000)
+ create(:allocation, source: scholarship, allocatable: registration, amount: 5_000)
+
+ expect(scholarship.reload.event).to eq(event)
+ end
+
+ it "returns nil when the scholarship has no event registration" do
+ expect(create(:scholarship).event).to be_nil
end
end
diff --git a/spec/requests/events/callouts_spec.rb b/spec/requests/events/callouts_spec.rb
index 5767af422e..a68fc0d7e2 100644
--- a/spec/requests/events/callouts_spec.rb
+++ b/spec/requests/events/callouts_spec.rb
@@ -568,6 +568,49 @@
expect(response.body).to include("Agreement signed")
expect(response.body).not_to include("Pending agreement")
end
+
+ it "shows the amount still owed after this scholarship (event cost minus allocations)" do
+ get registration_scholarship_path(registration.slug)
+
+ # $100 event cost − $50 scholarship allocation = $50 still owed.
+ expect(response.body).to include("you'll owe")
+ expect(response.body).to include("$50")
+ end
+
+ it "offers a Decline option with a reason box while unsigned" do
+ get registration_scholarship_path(registration.slug)
+
+ expect(response.body).to include("Decline")
+ expect(response.body).to match(/name="decline_reason"/)
+ end
+
+ it "shows the declined state instead of the buttons once declined" do
+ scholarship.decline_agreement!("Timing no longer works")
+ get registration_scholarship_path(registration.slug)
+
+ expect(response.body).to include("You declined this scholarship")
+ expect(response.body).not_to match(/name="agreement" value="yes"/)
+ end
+
+ it "hides the agreement history from a registrant (public view)" do
+ scholarship.decline_agreement!("Timing no longer works")
+ get registration_scholarship_path(registration.slug)
+
+ expect(response.body).not_to include("Agreement history")
+ end
+
+ context "when an admin is viewing" do
+ let(:admin) { create(:user, :with_person, super_user: true) }
+ before { sign_in admin }
+
+ it "shows the admin-only agreement history once there are responses" do
+ scholarship.decline_agreement!("Timing no longer works")
+ get registration_scholarship_path(registration.slug)
+
+ expect(response.body).to include("Agreement history")
+ expect(response.body).to include("Admin only")
+ end
+ end
end
describe "POST /registration/:slug/scholarship/agreement" do
@@ -578,7 +621,24 @@
expect(response).to redirect_to(registration_scholarship_path(registration.slug))
expect(scholarship.reload.agreement_signed?).to be(true)
- expect(scholarship.agreement_signed_at).to be_present
+ expect(scholarship.latest_agreement_response.responded_at).to be_present
+ end
+
+ it "confirms to the recipient and sends the team an FYI" do
+ recipient_email = registration.registrant.preferred_email
+
+ post registration_scholarship_agreement_path(registration.slug), params: { agreement: "yes" }
+
+ expect(Notification.where(kind: "scholarship_agreement_signed", recipient_email:)).to exist
+ expect(Notification.where(kind: "scholarship_agreement_signed_fyi", recipient_email: ENV.fetch("REPLY_TO_EMAIL", "programs@awbw.org"))).to exist
+ end
+
+ it "does not re-notify when the agreement is already signed" do
+ scholarship.update!(agreement_signed: true)
+
+ expect {
+ post registration_scholarship_agreement_path(registration.slug), params: { agreement: "yes" }
+ }.not_to change { Notification.where("kind LIKE 'scholarship_agreement_signed%'").count }
end
it "does not sign the agreement without an affirmative submission" do
@@ -596,6 +656,58 @@
expect(response).to redirect_to(registration_scholarship_path(other.slug))
end
end
+
+ describe "POST /registration/:slug/scholarship/decline" do
+ it "records the decline with the reason and clears any signed state" do
+ scholarship.update!(agreement_signed: true)
+
+ post registration_scholarship_decline_path(registration.slug), params: { decline_reason: "Timing no longer works" }
+
+ expect(response).to redirect_to(registration_scholarship_path(registration.slug))
+ scholarship.reload
+ expect(scholarship.agreement_declined?).to be(true)
+ expect(scholarship.latest_agreement_response.reason).to eq("Timing no longer works")
+ expect(scholarship.agreement_signed?).to be(false)
+ end
+
+ it "zeroes the scholarship allocation so it stops counting toward the balance" do
+ expect(registration.reload.remaining_cost).to eq(5_000)
+
+ post registration_scholarship_decline_path(registration.slug), params: { decline_reason: "No thanks" }
+
+ expect(allocation.reload.amount).to eq(0)
+ expect(registration.reload.remaining_cost).to eq(10_000)
+ end
+
+ it "emails the admin team an FYI with the reason" do
+ expect {
+ post registration_scholarship_decline_path(registration.slug), params: { decline_reason: "Moving away" }
+ }.to change { Notification.where(kind: "scholarship_agreement_declined_fyi").count }.by(1)
+
+ notification = Notification.where(kind: "scholarship_agreement_declined_fyi").last
+ expect(notification.recipient_email).to eq(ENV.fetch("REPLY_TO_EMAIL", "programs@awbw.org"))
+ expect(notification.custom_message).to eq("Moving away")
+ expect(notification.noticeable).to eq(scholarship)
+ end
+
+ it "does not email again when already declined" do
+ scholarship.decline_agreement!("first")
+
+ expect {
+ post registration_scholarship_decline_path(registration.slug), params: { decline_reason: "second" }
+ }.not_to change { Notification.where(kind: "scholarship_agreement_declined_fyi").count }
+
+ expect(response).to redirect_to(registration_scholarship_path(registration.slug))
+ end
+
+ it "redirects to the scholarship page when there is no awarded scholarship" do
+ other = create(:event_registration, event: event, scholarship_requested: true)
+
+ post registration_scholarship_decline_path(other.slug), params: { decline_reason: "n/a" }
+
+ expect(response).to redirect_to(registration_scholarship_path(other.slug))
+ end
+ end
end
describe "GET /registration/:slug/certificate" do
diff --git a/spec/requests/scholarships_spec.rb b/spec/requests/scholarships_spec.rb
index 5ff95b4701..be5d896b36 100644
--- a/spec/requests/scholarships_spec.rb
+++ b/spec/requests/scholarships_spec.rb
@@ -182,6 +182,27 @@
end
end
+ describe "re-offering a declined scholarship" do
+ before { scholarship.reload.decline_agreement!("Timing no longer works") }
+
+ it "shows the declined banner with a Re-offer button on the edit page" do
+ get edit_scholarship_path(scholarship)
+
+ expect(response.body).to include("Declined by recipient")
+ expect(response.body).to match(%r{action="#{Regexp.escape(reoffer_scholarship_path(scholarship))}"})
+ end
+
+ it "POST reoffer returns the award to pending and re-funds the allocation" do
+ expect(allocation.reload.amount).to eq(0)
+
+ post reoffer_scholarship_path(scholarship)
+
+ expect(response).to redirect_to(edit_scholarship_path(scholarship))
+ expect(scholarship.reload.agreement_pending?).to be(true)
+ expect(allocation.reload.amount).to eq(5_000)
+ end
+ end
+
describe "POST /scholarships from the registration Add link" do
it "returns to the event registration edit page on create (symmetric with View)" do
expect {
diff --git a/test/mailers/previews/notification_mailer_preview.rb b/test/mailers/previews/notification_mailer_preview.rb
index e10eecfed6..fac0ad801b 100644
--- a/test/mailers/previews/notification_mailer_preview.rb
+++ b/test/mailers/previews/notification_mailer_preview.rb
@@ -135,6 +135,58 @@ def workshop_log_submitted_fyi
NotificationMailer.workshop_log_submitted_fyi(notification)
end
+ def scholarship_agreement_declined_fyi
+ scholarship = Scholarship.agreement_declined.order(id: :desc).first ||
+ Scholarship.order(id: :desc).first ||
+ raise("Need a Scholarship to preview")
+
+ notification = find_valid_notification("scholarship_agreement_declined_fyi") ||
+ Notification.create!(
+ noticeable: scholarship,
+ notification_type: 0,
+ kind: "scholarship_agreement_declined_fyi",
+ recipient_role: "admin",
+ recipient_email: ENV.fetch("REPLY_TO_EMAIL", "programs@awbw.org"),
+ custom_message: scholarship.latest_agreement_response&.reason.presence || "The timing no longer works for me this year."
+ )
+
+ NotificationMailer.scholarship_agreement_declined_fyi(notification)
+ end
+
+ def scholarship_agreement_signed
+ scholarship = Scholarship.agreement_signed.order(id: :desc).first ||
+ Scholarship.order(id: :desc).first ||
+ raise("Need a Scholarship to preview")
+
+ notification = find_valid_notification("scholarship_agreement_signed") ||
+ Notification.create!(
+ noticeable: scholarship,
+ notification_type: 0,
+ kind: "scholarship_agreement_signed",
+ recipient_role: "person",
+ recipient_email: scholarship.recipient&.preferred_email || "preview@example.com"
+ )
+
+ NotificationMailer.scholarship_agreement_signed(notification)
+ end
+
+ def scholarship_agreement_signed_fyi
+ scholarship = Scholarship.agreement_signed.order(id: :desc).first ||
+ Scholarship.order(id: :desc).first ||
+ raise("Need a Scholarship to preview")
+
+ notification = find_valid_notification("scholarship_agreement_signed_fyi") ||
+ Notification.create!(
+ noticeable: scholarship,
+ notification_type: 0,
+ kind: "scholarship_agreement_signed_fyi",
+ recipient_role: "admin",
+ recipient_email: ENV.fetch("REPLY_TO_EMAIL", "programs@awbw.org")
+ )
+
+ NotificationMailer.scholarship_agreement_signed_fyi(notification)
+ end
+
private
def find_valid_notification(kind)
|