<%= button_to button_title(title: submitter.sent_at? ? t('re_send_email') : t('send_email'), disabled_with: t('sending')), submitter_send_email_index_path(submitter_slug: submitter.slug), class: 'btn btn-sm btn-primary w-full' %>
@@ -225,6 +235,13 @@
<%= button_to t('resubmit'), submitters_resubmit_path(submitter), method: :put, class: 'btn btn-sm btn-primary w-full', form: { target: '_blank' }, data: { turbo: false } %>
<% end %>
+ <% if signed_in? && submitter && submitter.completed_at? && !submitter.declined_at? && !submitter.changes_requested_at? && current_user == @submission.created_by_user %>
+
+ <%= link_to 'Request Changes', request_changes_submitter_path(submitter.slug),
+ class: 'btn btn-sm btn-warning w-full',
+ data: { turbo_frame: :modal } %>
+
+ <% end %>
diff --git a/app/views/submitter_mailer/changes_requested_email.html.erb b/app/views/submitter_mailer/changes_requested_email.html.erb
new file mode 100644
index 00000000..a71159f3
--- /dev/null
+++ b/app/views/submitter_mailer/changes_requested_email.html.erb
@@ -0,0 +1,10 @@
+
Hello <%= @submitter.name || @submitter.email %>,
+
+
<%= [@user.first_name, @user.last_name].join(' ').strip.presence || @user.email %> has requested changes to your submission for "<%= @submission.name || @submission.template.name %>".
+
+
Message from <%= [@user.first_name, @user.last_name].join(' ').strip.presence || @user.email %>:
+<%= simple_format(h(@reason)) %>
+
+
To make the requested changes, please log in to your account and resubmit the form.
+
+
If you have any questions, please reply to this email.
diff --git a/app/views/submitters_request_changes/request_changes.html.erb b/app/views/submitters_request_changes/request_changes.html.erb
new file mode 100644
index 00000000..29fb2cf8
--- /dev/null
+++ b/app/views/submitters_request_changes/request_changes.html.erb
@@ -0,0 +1,34 @@
+
+
+
+
✕
+
Request Changes
+
+
+ Request changes from <%= @submitter.name || @submitter.email %> for this submission.
+ They will receive an email with your message and be able to resubmit the form.
+
+
+ <%= form_for '', url: request_changes_submitter_path(@submitter.slug), method: :post do |f| %>
+
+
+ Message (required)
+
+ <%= f.text_area :reason,
+ required: true,
+ class: 'textarea textarea-bordered w-full',
+ dir: 'auto',
+ placeholder: 'Please provide specific details about what needs to be changed...',
+ rows: '6' %>
+
+
+
+ Cancel
+
+ <%= f.button 'Request Changes', class: 'btn btn-warning' %>
+
+
+ <% end %>
+
+
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 8fe4ca46..3ffb9b95 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -134,6 +134,7 @@ en: &en
download: Download
decline: Decline
declined: Declined
+ changes_requested: Changes Requested
decline_reason: Decline reason
provide_a_reason: Provide a reason
notify_the_sender_with_the_reason_you_declined: Notify the sender with the reason you declined
diff --git a/config/routes.rb b/config/routes.rb
index 18390c8a..d76fba77 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -170,6 +170,11 @@ Rails.application.routes.draw do
resources :download, only: %i[index], controller: 'submissions_download'
resources :send_email, only: %i[create], controller: 'submitters_send_email'
resources :debug, only: %i[index], controller: 'submissions_debug' if Rails.env.development?
+
+ member do
+ get :request_changes, controller: 'submitters_request_changes'
+ post :request_changes, controller: 'submitters_request_changes'
+ end
end
scope '/settings', as: :settings do
diff --git a/db/migrate/20250811211829_add_changes_requested_at_to_submitters.rb b/db/migrate/20250811211829_add_changes_requested_at_to_submitters.rb
new file mode 100644
index 00000000..a29946b7
--- /dev/null
+++ b/db/migrate/20250811211829_add_changes_requested_at_to_submitters.rb
@@ -0,0 +1,5 @@
+class AddChangesRequestedAtToSubmitters < ActiveRecord::Migration[8.0]
+ def change
+ add_column :submitters, :changes_requested_at, :datetime
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 326eb62d..658ea3bd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.0].define(version: 2025_07_08_172115) do
+ActiveRecord::Schema[8.0].define(version: 2025_08_11_211829) do
# These are extensions that must be enabled in order to support this database
enable_extension "btree_gin"
enable_extension "pg_catalog.plpgsql"
@@ -341,6 +341,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_07_08_172115) do
t.integer "account_id", null: false
t.datetime "declined_at"
t.string "timezone"
+ t.datetime "changes_requested_at"
t.index ["account_id", "id"], name: "index_submitters_on_account_id_and_id"
t.index ["completed_at", "account_id"], name: "index_submitters_on_completed_at_and_account_id"
t.index ["email"], name: "index_submitters_on_email"
diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb
index 8775f26e..4e6d201d 100644
--- a/lib/submitters/submit_values.rb
+++ b/lib/submitters/submit_values.rb
@@ -55,6 +55,7 @@ module Submitters
def assign_completed_attributes(submitter, request, validate_required: true)
submitter.completed_at = Time.current
+ submitter.changes_requested_at = nil
submitter.ip = request.remote_ip
submitter.ua = request.user_agent
submitter.timezone = request.params[:timezone]
diff --git a/spec/jobs/send_form_changes_requested_webhook_request_job_spec.rb b/spec/jobs/send_form_changes_requested_webhook_request_job_spec.rb
new file mode 100644
index 00000000..787f8986
--- /dev/null
+++ b/spec/jobs/send_form_changes_requested_webhook_request_job_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe SendFormChangesRequestedWebhookRequestJob do
+ let(:account) { create(:account) }
+ let(:user) { create(:user, account: account) }
+ let(:template) { create(:template, account: account, author: user) }
+ let(:submission) { create(:submission, template: template, created_by_user: user) }
+ let(:submitter) do
+ create(
+ :submitter, submission: submission, uuid: template.submitters.first['uuid'], changes_requested_at: Time.current
+ )
+ end
+ let(:webhook_url) { create(:webhook_url, account: account, events: ['form.changes_requested']) }
+
+ before do
+ create(:encrypted_config, key: EncryptedConfig::ESIGN_CERTS_KEY,
+ value: GenerateCertificate.call.transform_values(&:to_pem))
+ end
+
+ describe '#perform' do
+ before do
+ stub_request(:post, webhook_url.url).to_return(status: 200)
+ end
+
+ it 'sends a webhook request' do
+ described_class.new.perform('submitter_id' => submitter.id, 'webhook_url_id' => webhook_url.id)
+
+ expect(WebMock).to have_requested(:post, webhook_url.url).with(
+ body: {
+ 'event_type' => 'form.changes_requested',
+ 'timestamp' => /.*/,
+ 'data' => JSON.parse(Submitters::SerializeForWebhook.call(submitter.reload).to_json)
+ },
+ headers: {
+ 'Content-Type' => 'application/json',
+ 'User-Agent' => 'DocuSeal.com Webhook'
+ }
+ ).once
+ end
+
+ it "doesn't send a webhook request if the event is not in the webhook's events" do
+ webhook_url.update!(events: ['form.completed'])
+
+ described_class.new.perform('submitter_id' => submitter.id, 'webhook_url_id' => webhook_url.id)
+
+ expect(WebMock).not_to have_requested(:post, webhook_url.url)
+ end
+
+ it 'retries on failure' do
+ stub_request(:post, webhook_url.url).to_return(status: 500)
+
+ expect do
+ described_class.new.perform('submitter_id' => submitter.id, 'webhook_url_id' => webhook_url.id)
+ end.to change(described_class.jobs, :size).by(1)
+
+ expect(WebMock).to have_requested(:post, webhook_url.url).once
+ end
+ end
+end
diff --git a/spec/mailers/submitter_mailer_spec.rb b/spec/mailers/submitter_mailer_spec.rb
new file mode 100644
index 00000000..2fa599d2
--- /dev/null
+++ b/spec/mailers/submitter_mailer_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe SubmitterMailer, type: :mailer do
+ let(:account) { create(:account) }
+ let(:user) { create(:user, account: account, first_name: 'John', last_name: 'Doe') }
+ let(:template) { create(:template, account: account, author: user) }
+ let(:submission) { create(:submission, template: template, account: account, created_by_user: user) }
+ let(:submitter) do
+ create(
+ :submitter,
+ submission: submission,
+ account: account,
+ email: 'test@example.com',
+ name: 'Jane Smith',
+ uuid: template.submitters.first['uuid']
+ )
+ end
+
+ describe '#changes_requested_email' do
+ let(:reason) { 'Please fix the signature field' }
+ let(:mail) { described_class.changes_requested_email(submitter, user, reason) }
+
+ it 'sets the correct email attributes' do
+ expect(mail.to).to eq(['test@example.com'])
+ expect(mail.subject).to include('Changes requested')
+ expect(mail.from).to be_present
+ end
+
+ it 'includes the reason in the email body' do
+ expect(mail.body.encoded).to include(reason)
+ end
+
+ it 'includes the user name in the email body' do
+ expect(mail.body.encoded).to include('John Doe')
+ end
+
+ it 'includes the submitter name in the greeting' do
+ expect(mail.body.encoded).to include('Jane Smith')
+ end
+
+ it 'includes resubmit instructions' do
+ expect(mail.body.encoded).to include('resubmit')
+ end
+ end
+end
diff --git a/spec/models/submitter_spec.rb b/spec/models/submitter_spec.rb
index d595aca0..7618dc07 100644
--- a/spec/models/submitter_spec.rb
+++ b/spec/models/submitter_spec.rb
@@ -70,6 +70,27 @@ RSpec.describe Submitter do
expect(submitter.status).to eq('declined')
end
end
+
+ context 'when submitter has changes requested' do
+ before { submitter.update!(changes_requested_at: Time.current) }
+
+ it 'returns changes_requested' do
+ expect(submitter.status).to eq('changes_requested')
+ end
+ end
+
+ context 'when submitter has changes requested but is also completed' do
+ before do
+ submitter.update!(
+ completed_at: Time.current,
+ changes_requested_at: Time.current
+ )
+ end
+
+ it 'returns changes_requested (changes_requested takes precedence over completed)' do
+ expect(submitter.status).to eq('changes_requested')
+ end
+ end
end
describe '#export_submission_on_status_change' do
diff --git a/spec/requests/request_changes_spec.rb b/spec/requests/request_changes_spec.rb
new file mode 100644
index 00000000..2e140134
--- /dev/null
+++ b/spec/requests/request_changes_spec.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Request Changes' do
+ let(:account) { create(:account) }
+ let(:user) { create(:user, account: account) }
+ let(:template) { create(:template, account: account, author: user) }
+ let(:submission) { create(:submission, template: template, account: account, created_by_user: user) }
+ let(:submitter) do
+ create(
+ :submitter,
+ submission: submission,
+ account: account,
+ completed_at: 1.hour.ago,
+ uuid: template.submitters.first['uuid']
+ )
+ end
+
+ before do
+ sign_in user
+ end
+
+ describe 'GET /submitters/:slug/request_changes' do
+ it 'renders the request changes modal when xhr request' do
+ get "/submitters/#{submitter.slug}/request_changes",
+ headers: { 'X-Requested-With' => 'XMLHttpRequest' }
+
+ expect(response).to have_http_status(:ok)
+ end
+ end
+
+ describe 'POST /submitters/:slug/request_changes' do
+ context 'when user can request changes' do
+ it 'updates submitter and sends notifications' do
+ expect do
+ post "/submitters/#{submitter.slug}/request_changes",
+ params: { reason: 'Please fix the signature' }
+ end.to change { submitter.reload.changes_requested_at }.from(nil)
+ .and change { submitter.reload.completed_at }.to(nil)
+
+ expect(response).to have_http_status(:found)
+ end
+
+ it 'creates submission event' do
+ expect do
+ post "/submitters/#{submitter.slug}/request_changes",
+ params: { reason: 'Fix this' }
+ end.to change(SubmissionEvent, :count).by(1)
+
+ event = SubmissionEvent.last
+ expect(event.event_type).to eq('request_changes')
+ expect(event.data['reason']).to eq('Fix this')
+ end
+ end
+
+ context 'when user cannot request changes' do
+ let(:other_user) { create(:user, account: account) }
+
+ before do
+ sign_out user
+ sign_in other_user
+ end
+
+ it 'redirects with alert' do
+ post "/submitters/#{submitter.slug}/request_changes",
+ params: { reason: 'Fix this' }
+
+ expect(response).to have_http_status(:found)
+ end
+ end
+ end
+end
diff --git a/spec/services/export_submission_service_spec.rb b/spec/services/export_submission_service_spec.rb
index 441fb6e2..0bbc2900 100644
--- a/spec/services/export_submission_service_spec.rb
+++ b/spec/services/export_submission_service_spec.rb
@@ -191,6 +191,30 @@ RSpec.describe ExportSubmissionService do
service.call
end
+ context 'when one submitter has changes requested' do
+ before do
+ submission.submitters.first.update!(name: 'John Doe', email: 'john@example.com',
+ changes_requested_at: Time.current)
+ submission.submitters << create(
+ :submitter,
+ submission: submission,
+ account: account,
+ name: 'Jane Smith',
+ email: 'jane@example.com',
+ completed_at: Time.current,
+ uuid: SecureRandom.uuid
+ )
+ end
+
+ it 'sets overall status to changes_requested' do
+ allow(request_double).to receive(:body=) do |body|
+ parsed_body = JSON.parse(body)
+ expect(parsed_body['status']).to eq('changes_requested')
+ end
+ service.call
+ end
+ end
+
context 'when template is nil' do
before do
allow(submission).to receive(:template).and_return(nil)