adjust create event
This commit is contained in:
@@ -26,12 +26,13 @@ module SubmissionEvents
|
|||||||
).first(TRACKING_PARAM_LENGTH)
|
).first(TRACKING_PARAM_LENGTH)
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_with_tracking_data(submitter, event_type, request)
|
def create_with_tracking_data(submitter, event_type, request, data = {})
|
||||||
SubmissionEvent.create!(submitter:, event_type:, data: {
|
SubmissionEvent.create!(submitter:, event_type:, data: {
|
||||||
ip: request.remote_ip,
|
ip: request.remote_ip,
|
||||||
ua: request.user_agent,
|
ua: request.user_agent,
|
||||||
sid: request.session.id.to_s,
|
sid: request.session.id.to_s,
|
||||||
uid: request.env['warden'].user(:user)&.id
|
uid: request.env['warden'].user(:user)&.id,
|
||||||
|
**data
|
||||||
}.compact_blank)
|
}.compact_blank)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -279,7 +279,7 @@ module Submissions
|
|||||||
font: [FONT_BOLD_NAME, { variant: :bold }] },
|
font: [FONT_BOLD_NAME, { variant: :bold }] },
|
||||||
event.event_type.include?('send_') ? ' to ' : ' by ',
|
event.event_type.include?('send_') ? ' to ' : ' by ',
|
||||||
if event.event_type.include?('sms') || event.event_type.include?('phone')
|
if event.event_type.include?('sms') || event.event_type.include?('phone')
|
||||||
submitter.phone
|
event.data['phone'] || submitter.phone
|
||||||
else
|
else
|
||||||
submitter.name || submitter.email || submitter.phone
|
submitter.name || submitter.email || submitter.phone
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user