From 50c32ac6ffe1f4d61c802396372a331124cc062f Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Sun, 31 Mar 2024 18:20:20 +0300 Subject: [PATCH] replace date value --- lib/submitters/submit_values.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb index eafbb23e..6c7e1e5c 100644 --- a/lib/submitters/submit_values.rb +++ b/lib/submitters/submit_values.rb @@ -38,6 +38,9 @@ module Submitters submitter.ua = request.user_agent submitter.values = merge_default_values(submitter) submitter.values = merge_formula_values(submitter) + submitter.values = submitter.values.transform_values do |v| + v == '{{date}}' ? Time.current.in_time_zone(submitter.account.timezone).to_date.to_s : v + end end ApplicationRecord.transaction do @@ -121,11 +124,11 @@ module Submitters replace_default_variables(value, submitter.attributes.merge('role' => role), - submitter.submission.template, + submitter.submission, with_time:) end - def replace_default_variables(value, attrs, template, with_time: false) + def replace_default_variables(value, attrs, submission, with_time: false) return value if value.in?([true, false]) return if value.blank? @@ -135,13 +138,14 @@ module Submitters attrs['submission_id'] when 'time' if with_time - I18n.l(Time.current.in_time_zone(template.account.timezone), format: :long, locale: template.account.locale) + I18n.l(Time.current.in_time_zone(submission.account.timezone), + format: :long, locale: submission.account.locale) else e end when 'date' if with_time - I18n.l(Time.current.in_time_zone(template.account.timezone).to_date) + I18n.l(Time.current.in_time_zone(submission.account.timezone).to_date) else e end