diff --git a/app/controllers/submissions_controller.rb b/app/controllers/submissions_controller.rb index 64d8df23..dda8a829 100644 --- a/app/controllers/submissions_controller.rb +++ b/app/controllers/submissions_controller.rb @@ -46,7 +46,7 @@ class SubmissionsController < ApplicationController source: :invite, mark_as_sent: params[:send_email] == '1', emails: params[:emails], - params:) + params: params.merge('send_completed_email' => true)) else Submissions.create_from_submitters(template: @template, user: current_user, @@ -54,7 +54,7 @@ class SubmissionsController < ApplicationController submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random', mark_as_sent: params[:send_email] == '1', submissions_attrs: submissions_params[:submission].to_h.values, - params:) + params: params.merge('send_completed_email' => true)) end Submissions.send_signature_requests(submissions) diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb index f56074d2..df4f5f2c 100644 --- a/lib/submissions/create_from_submitters.rb +++ b/lib/submissions/create_from_submitters.rb @@ -8,8 +8,14 @@ module Submissions preferences = Submitters.normalize_preferences(template.account, user, params) 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:, - preferences: preferences.slice('send_email'), + preferences: set_submission_preferences, template_submitters: [], submitters_order:) maybe_set_template_fields(submission, attrs[:submitters]) @@ -23,8 +29,6 @@ module Submissions is_order_sent = submitters_order == 'random' || index.zero? - submission_preferences = Submitters.normalize_preferences(template.account, user, attrs) - build_submitter(submission:, attrs: submitter_attrs, uuid:, is_order_sent:, mark_as_sent:, user:, preferences: preferences.merge(submission_preferences))