didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix submission email sending preferences

Browse Source
This commit is contained in:
Pete Matsyburka
2023-12-02 23:16:38 +02:00
parent 68be42a48d
commit 172513b96c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/submissions_controller.rb
+2 -2
View File
@@ -46,7 +46,7 @@ class SubmissionsController < ApplicationController
source: :invite, source: :invite,
mark_as_sent: params[:send_email] == '1', mark_as_sent: params[:send_email] == '1',
emails: params[:emails], emails: params[:emails],
params:) params: params.merge('send_completed_email' => true))
else else
Submissions.create_from_submitters(template: @template, Submissions.create_from_submitters(template: @template,
user: current_user, user: current_user,
@@ -54,7 +54,7 @@ class SubmissionsController < ApplicationController
submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random', submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random',
mark_as_sent: params[:send_email] == '1', mark_as_sent: params[:send_email] == '1',
submissions_attrs: submissions_params[:submission].to_h.values, submissions_attrs: submissions_params[:submission].to_h.values,
params:) params: params.merge('send_completed_email' => true))
end end
Submissions.send_signature_requests(submissions) Submissions.send_signature_requests(submissions)
lib/submissions/create_from_submitters.rb
+7 -3
View File
@@ -8,8 +8,14 @@ module Submissions
preferences = Submitters.normalize_preferences(template.account, user, params) preferences = Submitters.normalize_preferences(template.account, user, params)
Array.wrap(submissions_attrs).map do |attrs| Array.wrap(submissions_attrs).map do |attrs|
submission_preferences = Submitters.normalize_preferences(template.account, user, attrs)
submission_preferences = preferences.merge(submission_preferences)
set_submission_preferences = submission_preferences.slice('send_email')
set_submission_preferences['send_email'] = true if params['send_completed_email']
submission = template.submissions.new(created_by_user: user, source:, submission = template.submissions.new(created_by_user: user, source:,
preferences: preferences.slice('send_email'), preferences: set_submission_preferences,
template_submitters: [], submitters_order:) template_submitters: [], submitters_order:)
maybe_set_template_fields(submission, attrs[:submitters]) maybe_set_template_fields(submission, attrs[:submitters])
@@ -23,8 +29,6 @@ module Submissions
is_order_sent = submitters_order == 'random' || index.zero? is_order_sent = submitters_order == 'random' || index.zero?
submission_preferences = Submitters.normalize_preferences(template.account, user, attrs)
build_submitter(submission:, attrs: submitter_attrs, uuid:, build_submitter(submission:, attrs: submitter_attrs, uuid:,
is_order_sent:, mark_as_sent:, user:, is_order_sent:, mark_as_sent:, user:,
preferences: preferences.merge(submission_preferences)) preferences: preferences.merge(submission_preferences))