diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb index f90720bb..52a66632 100644 --- a/lib/submissions/create_from_submitters.rb +++ b/lib/submissions/create_from_submitters.rb @@ -331,8 +331,8 @@ module Submissions end end - def assign_completed_attributes(submitter) - submitter.values = Submitters::SubmitValues.merge_default_values(submitter) + def assign_completed_attributes(submitter, with_verification: true) + submitter.values = Submitters::SubmitValues.merge_default_values(submitter, with_verification:) submitter.values = Submitters::SubmitValues.maybe_remove_condition_values(submitter) formula_values = Submitters::SubmitValues.build_formula_values(submitter) diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb index 3262633d..3663de16 100644 --- a/lib/submitters/submit_values.rb +++ b/lib/submitters/submit_values.rb @@ -143,7 +143,7 @@ module Submitters end end - def merge_default_values(submitter) + def merge_default_values(submitter, with_verification: true) default_values = submitter.submission.template_fields.each_with_object({}) do |field, acc| next if field['submitter_uuid'] != submitter.uuid @@ -157,7 +157,7 @@ module Submitters next end - if field['type'] == 'verification' + if field['type'] == 'verification' && with_verification acc[field['uuid']] = if submitter.submission_events.exists?(event_type: :complete_verification) I18n.t(:verified, locale: :en)