fix mark sent
This commit is contained in:
@@ -121,7 +121,6 @@ module Api
|
|||||||
template:,
|
template:,
|
||||||
user: current_user,
|
user: current_user,
|
||||||
source: :api,
|
source: :api,
|
||||||
mark_as_sent: is_send_email,
|
|
||||||
submitters_order: params[:submitters_order] || params[:order] || 'preserved',
|
submitters_order: params[:submitters_order] || params[:order] || 'preserved',
|
||||||
submissions_attrs:,
|
submissions_attrs:,
|
||||||
params:
|
params:
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ class SubmissionsController < ApplicationController
|
|||||||
user: current_user,
|
user: current_user,
|
||||||
source: :invite,
|
source: :invite,
|
||||||
submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random',
|
submitters_order: params[:preserve_order] == '1' ? 'preserved' : 'random',
|
||||||
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.merge('send_completed_email' => true))
|
params: params.merge('send_completed_email' => true))
|
||||||
end
|
end
|
||||||
|
|||||||
+2
-2
@@ -80,10 +80,10 @@ module Submissions
|
|||||||
emails
|
emails
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_from_submitters(template:, user:, submissions_attrs:, source:, mark_as_sent: false,
|
def create_from_submitters(template:, user:, submissions_attrs:, source:,
|
||||||
submitters_order: DEFAULT_SUBMITTERS_ORDER, params: {})
|
submitters_order: DEFAULT_SUBMITTERS_ORDER, params: {})
|
||||||
Submissions::CreateFromSubmitters.call(
|
Submissions::CreateFromSubmitters.call(
|
||||||
template:, user:, submissions_attrs:, source:, mark_as_sent:, submitters_order:, params:
|
template:, user:, submissions_attrs:, source:, submitters_order:, params:
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ module Submissions
|
|||||||
module CreateFromSubmitters
|
module CreateFromSubmitters
|
||||||
module_function
|
module_function
|
||||||
|
|
||||||
def call(template:, user:, submissions_attrs:, source:, submitters_order:, mark_as_sent: false, params: {})
|
def call(template:, user:, submissions_attrs:, source:, submitters_order:, params: {})
|
||||||
preferences = Submitters.normalize_preferences(user.account, user, params)
|
preferences = Submitters.normalize_preferences(user.account, user, params)
|
||||||
|
|
||||||
Array.wrap(submissions_attrs).filter_map do |attrs|
|
Array.wrap(submissions_attrs).filter_map do |attrs|
|
||||||
@@ -32,7 +32,7 @@ module Submissions
|
|||||||
is_order_sent = submitters_order == 'random' || index.zero?
|
is_order_sent = submitters_order == 'random' || index.zero?
|
||||||
|
|
||||||
build_submitter(submission:, attrs: submitter_attrs, uuid:,
|
build_submitter(submission:, attrs: submitter_attrs, uuid:,
|
||||||
is_order_sent:, mark_as_sent:, user:,
|
is_order_sent:, user:,
|
||||||
preferences: preferences.merge(submission_preferences))
|
preferences: preferences.merge(submission_preferences))
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -149,7 +149,7 @@ module Submissions
|
|||||||
uuid || template.submitters[index]&.dig('uuid')
|
uuid || template.submitters[index]&.dig('uuid')
|
||||||
end
|
end
|
||||||
|
|
||||||
def build_submitter(submission:, attrs:, uuid:, is_order_sent:, mark_as_sent:, user:, preferences:)
|
def build_submitter(submission:, attrs:, uuid:, is_order_sent:, user:, preferences:)
|
||||||
email = Submissions.normalize_email(attrs[:email])
|
email = Submissions.normalize_email(attrs[:email])
|
||||||
submitter_preferences = Submitters.normalize_preferences(submission.account, user, attrs)
|
submitter_preferences = Submitters.normalize_preferences(submission.account, user, attrs)
|
||||||
values = attrs[:values] || {}
|
values = attrs[:values] || {}
|
||||||
@@ -166,7 +166,6 @@ module Submissions
|
|||||||
name: attrs[:name],
|
name: attrs[:name],
|
||||||
external_id: attrs[:external_id].presence || attrs[:application_key],
|
external_id: attrs[:external_id].presence || attrs[:application_key],
|
||||||
completed_at: attrs[:completed].present? ? Time.current : nil,
|
completed_at: attrs[:completed].present? ? Time.current : nil,
|
||||||
sent_at: mark_as_sent && email.present? && is_order_sent ? Time.current : nil,
|
|
||||||
values: values.except(phone_field_uuid),
|
values: values.except(phone_field_uuid),
|
||||||
metadata: attrs[:metadata] || {},
|
metadata: attrs[:metadata] || {},
|
||||||
preferences: preferences.merge(submitter_preferences)
|
preferences: preferences.merge(submitter_preferences)
|
||||||
@@ -175,6 +174,9 @@ module Submissions
|
|||||||
uuid:
|
uuid:
|
||||||
)
|
)
|
||||||
|
|
||||||
|
submitter.sent_at =
|
||||||
|
submitter.preferences['send_email'] != false && email.present? && is_order_sent ? Time.current : nil
|
||||||
|
|
||||||
assign_completed_attributes(submitter) if submitter.completed_at?
|
assign_completed_attributes(submitter) if submitter.completed_at?
|
||||||
|
|
||||||
submitter
|
submitter
|
||||||
|
|||||||
Reference in New Issue
Block a user