<% unless only_detailed %>
<%= render 'email_form', template: @template, variables_form:, can_send_emails:, viewer_submitter_uuids: %>
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index b432b436a..55ae36830 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -1028,6 +1028,8 @@ en: &en
failed_to_scan_the_document: Failed to scan the document
document_scanning_is_not_available_on_this_device: Document scanning is not available on this device
click_to_upload: Click to upload
+ cc_view_only: CC View-only
+ bcc_completed: BCC Completed
devise:
confirmations:
confirmed: Your email address has been successfully confirmed.
@@ -2176,6 +2178,8 @@ es: &es
failed_to_save_the_scan: No se pudo guardar el escaneo
failed_to_scan_the_document: No se pudo escanear el documento
document_scanning_is_not_available_on_this_device: El escaneo de documentos no está disponible en este dispositivo
+ cc_view_only: CC Solo lectura
+ bcc_completed: CCO Completado
devise:
confirmations:
confirmed: Tu dirección de correo electrónico ha sido confirmada correctamente.
@@ -3338,6 +3342,8 @@ it: &it
failed_to_save_the_scan: Impossibile salvare la scansione
failed_to_scan_the_document: Impossibile scansionare il documento
document_scanning_is_not_available_on_this_device: La scansione dei documenti non è disponibile su questo dispositivo
+ cc_view_only: CC Sola lettura
+ bcc_completed: BCC Completato
devise:
confirmations:
confirmed: Il tuo indirizzo email è stato confermato con successo.
@@ -4483,6 +4489,8 @@ fr: &fr
failed_to_save_the_scan: Impossible d’enregistrer la numérisation
failed_to_scan_the_document: Impossible de numériser le document
document_scanning_is_not_available_on_this_device: La numérisation de documents n’est pas disponible sur cet appareil
+ cc_view_only: Cc Lecture seule
+ bcc_completed: Cci Terminé
devise:
confirmations:
confirmed: Votre adresse e-mail a été confirmée avec succès.
@@ -5644,6 +5652,8 @@ pt: &pt
failed_to_save_the_scan: Não foi possível salvar a digitalização
failed_to_scan_the_document: Não foi possível digitalizar o documento
document_scanning_is_not_available_on_this_device: A digitalização de documentos não está disponível neste dispositivo
+ cc_view_only: CC Somente leitura
+ bcc_completed: BCC Concluído
devise:
confirmations:
confirmed: Seu endereço de e-mail foi confirmado com sucesso.
@@ -6805,6 +6815,8 @@ de: &de
failed_to_save_the_scan: Scan konnte nicht gespeichert werden
failed_to_scan_the_document: Dokument konnte nicht gescannt werden
document_scanning_is_not_available_on_this_device: Das Scannen von Dokumenten ist auf diesem Gerät nicht verfügbar
+ cc_view_only: CC Nur Ansicht
+ bcc_completed: BCC Abgeschlossen
devise:
confirmations:
confirmed: Ihre E-Mail-Adresse wurde erfolgreich bestätigt.
@@ -8490,6 +8502,8 @@ nl: &nl
failed_to_save_the_scan: Scan kon niet worden opgeslagen
failed_to_scan_the_document: Document kon niet worden gescand
document_scanning_is_not_available_on_this_device: Documenten scannen is niet beschikbaar op dit apparaat
+ cc_view_only: CC Alleen bekijken
+ bcc_completed: BCC Voltooid
devise:
confirmations:
confirmed: Uw e-mailadres is succesvol bevestigd.
diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb
index 10117e33d..dd2780537 100644
--- a/lib/submissions/create_from_submitters.rb
+++ b/lib/submissions/create_from_submitters.rb
@@ -90,6 +90,10 @@ module Submissions
maybe_add_invite_submitters(submission, template, attrs[:submitters])
+ maybe_add_cc_submitters(submission, params[:cc_recipients],
+ submitters_order:, user:, params:,
+ preferences: preferences.merge(submission_preferences))
+
assign_submitters_is_viewer(submission)
submission.template = nil unless with_template
@@ -211,6 +215,25 @@ module Submissions
end
end
+ def maybe_add_cc_submitters(submission, recipients, submitters_order:, user:, params:, preferences:)
+ order = submission.template_submitters.filter_map { |s| s['order'] }.max
+
+ Array.wrap(recipients).each do |recipient|
+ attrs = recipient.is_a?(String) ? { email: recipient } : recipient.slice(:name, :email, :phone)
+
+ next if attrs.compact_blank.blank?
+
+ uuid = SecureRandom.uuid
+
+ submission.template_submitters <<
+ { 'name' => 'CC', 'uuid' => uuid, 'is_viewer' => true, 'order' => order }.compact
+
+ build_submitter(submission:, attrs:, uuid:, user:, params:,
+ is_order_sent: submitters_order == 'random',
+ preferences: preferences.except('email_message_uuid'))
+ end
+ end
+
def submitter_message_preferences(uuid, params)
return {} if params[:request_email_per_submitter] != '1'
return {} if params[:is_custom_message] != '1'
diff --git a/lib/submitters.rb b/lib/submitters.rb
index 4dcd1ebd0..d191421d2 100644
--- a/lib/submitters.rb
+++ b/lib/submitters.rb
@@ -152,7 +152,7 @@ module Submitters
preferences['send_sms'] = params['send_sms'].in?(TRUE_VALUES) if params.key?('send_sms')
preferences['require_phone_2fa'] = params['require_phone_2fa'].in?(TRUE_VALUES) if params.key?('require_phone_2fa')
preferences['require_email_2fa'] = params['require_email_2fa'].in?(TRUE_VALUES) if params.key?('require_email_2fa')
- preferences['bcc_completed'] = params['bcc_completed'] if params.key?('bcc_completed')
+ preferences['bcc_completed'] = normalize_bcc_completed(params['bcc_completed']) if params.key?('bcc_completed')
preferences['reply_to'] = params['reply_to'] if params.key?('reply_to')
preferences['go_to_last'] = params['go_to_last'] if params.key?('go_to_last')
preferences['completed_redirect_url'] = params['completed_redirect_url'] if params.key?('completed_redirect_url')
@@ -160,6 +160,14 @@ module Submitters
preferences
end
+ def normalize_bcc_completed(value)
+ if value.is_a?(Array)
+ value.compact_blank.uniq.join(', ')
+ else
+ value
+ end
+ end
+
def fetch_values_for_delegate(submitter)
fields = submitter.submission.template_fields || submitter.template.fields
default_values = submitter.preferences['default_values'] || {}