parse date using format

app/controllers/api/submissions_controller.rb

@@ -145,7 +145,7 @@ module Api
                         { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
                           fields: [:name, :uuid, :default_value, :value, :title, :description,
                                    :readonly, :redacted, :validation_pattern, :invalid_message,
-                                   { default_value: [], value: [] }] }]]
+                                   { default_value: [], value: [], preferences: {} }] }]]
         }
       ]
 

app/controllers/api/submitters_controller.rb

@@ -85,7 +85,7 @@ module Api
         { metadata: {}, values: {}, readonly_fields: [], message: %i[subject body],
           fields: [[:name, :uuid, :default_value, :value,
                     :readonly, :redacted, :validation_pattern, :invalid_message,
-                    { default_value: [], value: [] }]] }
+                    { default_value: [], value: [], preferences: {} }]] }
       )
     end
 

app/controllers/application_controller.rb

@@ -52,7 +52,8 @@ class ApplicationController < ActionController::Base
   private
 
   def with_browser_locale(&)
-    locale = request.env['HTTP_ACCEPT_LANGUAGE'].to_s[BROWSER_LOCALE_REGEXP].to_s
+    locale   = params[:lang].presence
+    locale ||= request.env['HTTP_ACCEPT_LANGUAGE'].to_s[BROWSER_LOCALE_REGEXP].to_s
 
     locale =
       if locale.starts_with?('en-') && locale != 'en-US'

app/controllers/sessions_controller.rb

@@ -3,6 +3,8 @@
 class SessionsController < Devise::SessionsController
   before_action :configure_permitted_parameters
 
+  around_action :with_browser_locale
+
   def create
     email = sign_in_params[:email].to_s.downcase
 

app/javascript/submission_form/payment_step.vue

@@ -116,7 +116,7 @@ export default {
   methods: {
     async submit () {
       if (this.sessionId) {
-        return fetch((this.baseUrl || '/embed').replace('/embed', '/api/stripe_payments/' + this.sessionId), {
+        return fetch(this.baseUrl + '/api/stripe_payments/' + this.sessionId, {
           method: 'PUT',
           body: JSON.stringify({
             submitter_slug: this.submitterSlug
@@ -147,11 +147,12 @@ export default {
     startCheckout () {
       this.isCreatingCheckout = true
 
-      fetch((this.baseUrl || '/embed').replace('/embed', '/api/stripe_payments'), {
+      fetch(this.baseUrl + '/api/stripe_payments', {
         method: 'POST',
         body: JSON.stringify({
           submitter_slug: this.submitterSlug,
-          field_uuid: this.field.uuid
+          field_uuid: this.field.uuid,
+          referer: document.location.href
         }),
         headers: { 'Content-Type': 'application/json' }
       }).then(async (resp) => {

app/javascript/submission_form/signature_step.vue

@@ -83,15 +83,23 @@
           <IconReload :width="16" />
           {{ t('redraw') }}
         </a>
-        <a
-          v-else
-          href="#"
-          class="btn btn-outline btn-sm font-medium"
-          @click.prevent="[clear(), hideQr()]"
+        <span
+          v-if="withQrButton && !modelValue && !computedPreviousValue && field.preferences?.format !== 'typed'"
+          class=" tooltip"
+          :data-tip="t('drawn_signature_on_a_touchscreen_device')"
         >
-          <IconReload :width="16" />
-          {{ t('clear') }}
-        </a>
+          <a
+            href="#"
+            class="btn btn-sm btn-neutral font-medium hidden md:flex"
+            :class="{ 'btn-outline': !isShowQr, 'text-white': isShowQr }"
+            @click.prevent="isShowQr ? hideQr() : [isTextSignature = false, showQr()]"
+          >
+            <IconQrcode
+              :width="19"
+              :height="19"
+            />
+          </a>
+        </span>
         <a
           href="#"
           :title="t('minimize')"
@@ -125,17 +133,16 @@
     >
     <div class="relative">
       <div
-        v-if="withQrButton"
-        class="absolute top-1.5 right-1.5 tooltip hidden md:inline"
-        :data-tip="t('drawn_signature_on_a_touchscreen_device')"
+        v-if="!modelValue && !computedPreviousValue && !isShowQr && !isTextSignature && isSignatureStarted"
+        class="absolute top-0.5 right-0.5"
       >
         <a
-          v-if="!isShowQr && !isSignatureStarted && !isTextSignature && !modelValue"
           href="#"
-          class="btn btn-sm btn-circle btn-ghost"
-          @click.prevent="showQr"
+          class="btn btn-ghost font-medium btn-xs md:btn-sm"
+          @click.prevent="[clear(), hideQr()]"
         >
-          <IconQrcode />
+          <IconReload :width="16" />
+          {{ t('clear') }}
         </a>
       </div>
       <canvas
@@ -144,6 +151,10 @@
         style="padding: 1px; 0"
         class="bg-white border border-base-300 rounded-2xl w-full"
       />
+      <div
+        v-if="isShowQr"
+        class="top-0 bottom-0 right-0 left-0 absolute bg-white rounded-2xl m-0.5"
+      />
       <div
         v-show="isShowQr"
         class="top-0 bottom-0 right-0 left-0 absolute bg-base-content/10 rounded-2xl"
@@ -333,7 +344,7 @@ export default {
     if (this.$refs.canvas) {
       this.pad = new SignaturePad(this.$refs.canvas)
 
-      this.pad.addEventListener('beginStroke', () => {
+      this.pad.addEventListener('endStroke', () => {
         this.isSignatureStarted = true
 
         this.$emit('start')
@@ -421,6 +432,7 @@ export default {
 
       if (this.$refs.textInput) {
         this.$refs.textInput.value = ''
+        this.$refs.textInput.focus()
       }
     },
     updateWrittenSignature (e) {

app/javascript/template_builder/builder.vue

@@ -1129,6 +1129,15 @@ export default {
         e.preventDefault()
 
         alert('Please draw fields to prepare the document.')
+      } else {
+        const submitterWithoutFields =
+          this.template.submitters.find((submitter) => !this.template.fields.some((f) => f.submitter_uuid === submitter.uuid))
+
+        if (submitterWithoutFields) {
+          e.preventDefault()
+
+          alert(`Please add fields for ${submitterWithoutFields.name} to prepare the document or remove the party.`)
+        }
       }
     },
     onSaveClick () {
@@ -1142,16 +1151,23 @@ export default {
         }
       }
 
-      if (this.template.fields.length) {
-        this.isSaving = true
-
-        this.save().then(() => {
-          window.Turbo.visit(`/templates/${this.template.id}`)
-        }).finally(() => {
-          this.isSaving = false
-        })
-      } else {
+      if (!this.template.fields.length) {
         alert('Please draw fields to prepare the document.')
+      } else {
+        const submitterWithoutFields =
+          this.template.submitters.find((submitter) => !this.template.fields.some((f) => f.submitter_uuid === submitter.uuid))
+
+        if (submitterWithoutFields) {
+          alert(`Please add fields for ${submitterWithoutFields.name} to prepare the document or remove the party.`)
+        } else {
+          this.isSaving = true
+
+          this.save().then(() => {
+            window.Turbo.visit(`/templates/${this.template.id}`)
+          }).finally(() => {
+            this.isSaving = false
+          })
+        }
       }
     },
     scrollToArea (area) {

app/javascript/template_builder/conditions_modal.vue

@@ -29,21 +29,38 @@
           >Available in Pro</a>
         </div>
         <form @submit.prevent="validateSaveAndClose">
-          <div class="my-4">
-            <div class="space-y-4">
+          <div class="my-4 space-y-5">
+            <div
+              v-for="(condition, cindex) in conditions"
+              :key="cindex"
+              class="space-y-4 relative"
+            >
+              <div
+                v-if="conditions.length > 1"
+                class="flex justify-between border-b mx-1 -mb-1 pb-1"
+              >
+                <span class="text-sm">
+                  {{ t('condition') }} {{ cindex + 1 }}
+                </span>
+                <a
+                  href="#"
+                  class="link text-sm"
+                  @click.prevent="conditions.splice(cindex, 1)"
+                > {{ t('remove') }}</a>
+              </div>
               <select
                 class="select select-bordered select-sm w-full bg-white h-11 pl-4 text-base font-normal"
                 required
                 @change="[
-                  newCondition.field_uuid = $event.target.value,
-                  delete newCondition.value,
-                  (conditionActions.includes(newCondition.action) ? '' : newCondition.action = conditionActions[0])
+                  condition.field_uuid = $event.target.value,
+                  delete condition.value,
+                  (conditionActions(condition).includes(condition.action) ? '' : condition.action = conditionActions(condition)[0])
                 ]"
               >
                 <option
                   value=""
                   disabled
-                  :selected="!newCondition.field_uuid"
+                  :selected="!condition.field_uuid"
                 >
                   {{ t('select_field_') }}
                 </option>
@@ -51,19 +68,19 @@
                   v-for="f in fields"
                   :key="f.uuid"
                   :value="f.uuid"
-                  :selected="newCondition.field_uuid === f.uuid"
+                  :selected="condition.field_uuid === f.uuid"
                 >
                   {{ f.name || buildDefaultName(f, template.fields) }}
                 </option>
               </select>
               <select
-                v-model="newCondition.action"
+                v-model="condition.action"
                 class="select select-bordered select-sm w-full h-11 pl-4 text-base font-normal"
-                :class="{ 'bg-white': newCondition.field_uuid, 'bg-base-300': !newCondition.field_uuid }"
-                :required="newCondition.field_uuid"
+                :class="{ 'bg-white': condition.field_uuid, 'bg-base-300': !condition.field_uuid }"
+                :required="condition.field_uuid"
               >
                 <option
-                  v-for="action in conditionActions"
+                  v-for="action in conditionActions(condition)"
                   :key="action"
                   :value="action"
                 >
@@ -71,10 +88,10 @@
                 </option>
               </select>
               <select
-                v-if="conditionField?.options?.length"
+                v-if="conditionField(condition)?.options?.length"
                 class="select select-bordered select-sm w-full bg-white h-11 pl-4 text-base font-normal"
                 required
-                @change="newCondition.value = $event.target.value"
+                @change="condition.value = $event.target.value"
               >
                 <option
                   value=""
@@ -84,16 +101,21 @@
                   {{ t('select_value_') }}
                 </option>
                 <option
-                  v-for="(option, index) in conditionField.options"
+                  v-for="(option, index) in conditionField(condition).options"
                   :key="option.uuid"
                   :value="option.uuid"
-                  :selected="newCondition.value === option.uuid"
+                  :selected="condition.value === option.uuid"
                 >
                   {{ option.value || `${t('option')} ${index + 1}` }}
                 </option>
               </select>
             </div>
           </div>
+          <a
+            href="#"
+            class="inline float-right link text-right mb-3 px-2"
+            @click.prevent="conditions.push({})"
+          > + {{ t('add_condition') }}</a>
           <button
             class="base-button w-full mt-2"
           >
@@ -106,7 +128,7 @@
         >
           <button
             class="link"
-            @click="[newCondition.field_uuid = null, delete field.conditions, validateSaveAndClose()]"
+            @click="[conditions = [], delete field.conditions, validateSaveAndClose()]"
           >
             {{ t('remove_condition') }}
           </button>
@@ -133,16 +155,10 @@ export default {
   emits: ['close'],
   data () {
     return {
-      newCondition: this.field.conditions?.[0] || {}
+      conditions: this.field.conditions?.[0] ? JSON.parse(JSON.stringify(this.field.conditions)) : [{}]
     }
   },
   computed: {
-    conditionField () {
-      return this.fields.find((f) => f.uuid === this.newCondition.field_uuid)
-    },
-    conditionActions () {
-      return this.fieldActions(this.conditionField)
-    },
     fields () {
       return this.template.fields.reduce((acc, f) => {
         if (f !== this.field && f.submitter_uuid === this.field.submitter_uuid) {
@@ -157,6 +173,12 @@ export default {
     this.field.conditions ||= []
   },
   methods: {
+    conditionField (condition) {
+      return this.fields.find((f) => f.uuid === condition.field_uuid)
+    },
+    conditionActions (condition) {
+      return this.fieldActions(this.conditionField(condition))
+    },
     fieldActions (field) {
       const actions = []
 
@@ -181,8 +203,8 @@ export default {
         return alert('Available only in Pro')
       }
 
-      if (this.newCondition.field_uuid) {
-        this.field.conditions = [this.newCondition]
+      if (this.conditions.find((f) => f.field_uuid)) {
+        this.field.conditions = this.conditions
       } else {
         delete this.field.conditions
       }

app/javascript/template_builder/field.vue

@@ -92,6 +92,7 @@
           <PaymentSettings
             v-if="field.type === 'payment'"
             :field="field"
+            @click-condition="isShowConditionsModal = true"
           />
           <span
             v-else

app/javascript/template_builder/i18n.js

@@ -20,6 +20,7 @@ const en = {
   select_field_: 'Select field...',
   select_value_: 'Select value...',
   remove_condition: 'Remove condition',
+  add_condition: 'Add condition',
   are_you_sure: 'Are you sure?',
   sign_yourself: 'Sign Yourself',
   set_signing_date: 'Set signing date',

app/javascript/template_builder/payment_settings.vue

@@ -149,12 +149,26 @@
           data-turbo="false"
         >Learn more</a>
       </div>
+      <hr>
+      <li class="mt-1">
+        <label
+          class="label-text cursor-pointer text-center w-full flex items-center"
+          @click="$emit('click-condition')"
+        >
+          <IconRouteAltLeft
+            width="18"
+          />
+          <span class="text-sm">
+            {{ t('condition') }}
+          </span>
+        </label>
+      </li>
     </ul>
   </span>
 </template>
 
 <script>
-import { IconSettings, IconCircleCheck, IconBrandStripe, IconInnerShadowTop } from '@tabler/icons-vue'
+import { IconSettings, IconCircleCheck, IconBrandStripe, IconInnerShadowTop, IconRouteAltLeft } from '@tabler/icons-vue'
 import { ref } from 'vue'
 
 const isConnected = ref(false)
@@ -164,6 +178,7 @@ export default {
   components: {
     IconSettings,
     IconCircleCheck,
+    IconRouteAltLeft,
     IconInnerShadowTop,
     IconBrandStripe
   },
@@ -174,6 +189,7 @@ export default {
       required: true
     }
   },
+  emits: ['click-condition'],
   data () {
     return {
       isLoading: false

app/mailers/application_mailer.rb

@@ -6,11 +6,32 @@ class ApplicationMailer < ActionMailer::Base
 
   register_interceptor ActionMailerConfigsInterceptor
 
+  register_observer ActionMailerEventsObserver
+
   before_action do
     ActiveStorage::Current.url_options = Docuseal.default_url_options
   end
 
+  after_action :set_message_metadata
+  after_action :set_message_uuid
+
   def default_url_options
     Docuseal.default_url_options
   end
+
+  def set_message_metadata
+    message.instance_variable_set(:@message_metadata, @message_metadata)
+  end
+
+  def set_message_uuid
+    message['X-Message-Uuid'] = SecureRandom.uuid
+  end
+
+  def assign_message_metadata(tag, record)
+    @message_metadata = {
+      'tag' => tag,
+      'record_id' => record.id,
+      'record_type' => record.class.name
+    }
+  end
 end

app/mailers/submitter_mailer.rb

@@ -26,6 +26,8 @@ class SubmitterMailer < ApplicationMailer
         DEFAULT_INVITATION_SUBJECT
       end
 
+    assign_message_metadata('submitter_invitation', @submitter)
+
     mail(
       to: @submitter.friendly_name,
       from: from_address_for_submitter(submitter),
@@ -58,6 +60,8 @@ class SubmitterMailer < ApplicationMailer
         %(#{submitter.submission.template.name} has been completed by #{submitters})
       end
 
+    assign_message_metadata('submitter_completed', @submitter)
+
     mail(from: from_address_for_submitter(submitter),
          to: to || (user.role == 'integration' ? user.friendly_name.sub(/\+\w+@/, '@') : user.friendly_name),
          subject:)
@@ -89,6 +93,8 @@ class SubmitterMailer < ApplicationMailer
         'Your document copy'
       end
 
+    assign_message_metadata('submitter_documents_copy', @submitter)
+
     mail(from: from_address_for_submitter(submitter),
          to: to || @submitter.friendly_name,
          reply_to: @submitter.preferences['reply_to'].presence ||

app/mailers/user_mailer.rb

@@ -6,6 +6,8 @@ class UserMailer < ApplicationMailer
     @user = user
     @token = @user.send(:set_reset_password_token)
 
+    assign_message_metadata('user_invitation', @user)
+
     mail(to: @user.friendly_name,
          subject: 'You are invited to DocuSeal')
   end

app/models/account.rb

@@ -31,6 +31,7 @@ class Account < ApplicationRecord
   has_many :submissions, dependent: :destroy
   has_many :submitters, through: :submissions
   has_many :account_linked_accounts, dependent: :destroy
+  has_many :email_events, dependent: :destroy
   has_many :account_testing_accounts, -> { testing }, dependent: :destroy,
                                                       class_name: 'AccountLinkedAccount',
                                                       inverse_of: :account

app/models/email_event.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: email_events
+#
+#  id             :bigint           not null, primary key
+#  data           :text             not null
+#  email          :string           not null
+#  emailable_type :string           not null
+#  event_datetime :datetime         not null
+#  event_type     :string           not null
+#  tag            :string           not null
+#  created_at     :datetime         not null
+#  account_id     :bigint           not null
+#  emailable_id   :bigint           not null
+#  message_id     :string           not null
+#
+# Indexes
+#
+#  index_email_events_on_account_id  (account_id)
+#  index_email_events_on_emailable   (emailable_type,emailable_id)
+#  index_email_events_on_message_id  (message_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#
+class EmailEvent < ApplicationRecord
+  belongs_to :emailable, polymorphic: true
+  belongs_to :account
+
+  attribute :data, :string, default: -> { {} }
+
+  serialize :data, coder: JSON
+
+  before_validation :maybe_set_account, on: :create
+
+  def maybe_set_account
+    self.account ||= emailable.account
+  end
+end

app/views/accounts/show.html.erb

@@ -89,6 +89,7 @@
         <% end %>
       </div>
     <% end %>
+    <%= render 'integrations' %>
     <% if can?(:manage, current_account) && Docuseal.multitenant? && true_user == current_user %>
       <div class="px-1 mt-8">
         <h2 class="text-2xl font-bold mb-2">Danger Zone</h2>

app/views/devise/sessions/new.html.erb

@@ -1,22 +1,22 @@
 <div class="max-w-lg mx-auto px-2">
   <%= render 'devise/shared/select_server' if Docuseal.multitenant? %>
-  <h1 class="text-4xl font-bold text-center mt-8">Sign In</h1>
+  <h1 class="text-4xl font-bold text-center mt-8"><%= t('sign_in') %></h1>
   <%= form_for(resource, as: resource_name, html: { class: 'space-y-6' }, data: { turbo: params[:redir].blank? }, url: session_path(resource_name)) do |f| %>
     <% if params[:redir].present? %>
       <%= hidden_field_tag :redir, params[:redir] %>
     <% end %>
-    <div class="space-y-2">
+    <div class="space-y-2" dir="auto">
       <div class="form-control">
-        <%= f.label :email, class: 'label' %>
+        <%= f.label :email, t(:email), class: 'label' %>
         <%= f.email_field :email, autofocus: true, autocomplete: 'email', class: 'base-input' %>
       </div>
       <div class="form-control">
-        <%= f.label :password, class: 'label' %>
+        <%= f.label :password, t(:password), class: 'label' %>
         <%= f.password_field :password, autocomplete: 'current-password', class: 'base-input' %>
       </div>
     </div>
     <div class="form-control">
-      <%= f.button button_title(title: 'Sign In', disabled_with: 'Signing In'), class: 'base-button' %>
+      <%= f.button button_title(title: t(:sign_in), disabled_with: t(:signing_in)), class: 'base-button' %>
     </div>
   <% end %>
   <% if devise_mapping.omniauthable? %>
@@ -25,14 +25,14 @@
         <%= form_for '', url: omniauth_authorize_path(resource_name, :google_oauth2), data: { turbo: false }, method: :post do |f| %>
           <set-timezone data-input-id="state" data-params="true"></set-timezone>
           <%= hidden_field_tag :state, { redir: params[:redir].to_s }.compact_blank.to_query %>
-          <%= f.button button_title(title: 'Sign in with Google', icon: svg_icon('brand_google', class: 'w-6 h-6')), class: 'white-button w-full mt-4' %>
+          <%= f.button button_title(title: t('sign_in_with_google'), icon: svg_icon('brand_google', class: 'w-6 h-6')), class: 'white-button w-full mt-4' %>
         <% end %>
       <% end %>
       <% if User.omniauth_providers.include?(:microsoft_office365) %>
         <%= form_for '', url: omniauth_authorize_path(resource_name, :microsoft_office365), data: { turbo: false }, method: :post do |f| %>
           <set-timezone data-input-id="state_microsoft" data-params="true"></set-timezone>
           <%= hidden_field_tag :state, { redir: params[:redir].to_s }.compact_blank.to_query, id: 'state_microsoft' %>
-          <%= f.button button_title(title: 'Sign in with Microsoft', icon: svg_icon('brand_microsoft', class: 'w-6 h-6')), class: 'white-button w-full' %>
+          <%= f.button button_title(title: t('sign_in_with_microsoft'), icon: svg_icon('brand_microsoft', class: 'w-6 h-6')), class: 'white-button w-full' %>
         <% end %>
       <% end %>
     </div>

app/views/devise/shared/_links.html.erb

@@ -1,11 +1,19 @@
 <div class="flex justify-between mt-4">
   <%- if controller_name != 'sessions' %>
-    <%= link_to 'Already have an account?', new_session_path(resource_name), class: 'link link-hover mx-auto' %>
+    <%= link_to t('already_have_an_account'), new_session_path(resource_name, { lang: params[:lang] }.compact_blank), class: 'link link-hover mx-auto' %>
   <% end %>
   <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-    <%= link_to 'Create free account', registration_path({ redir: params[:redir] }.compact_blank), class: 'link link-hover' %>
+    <%= link_to t('create_free_account'), registration_path({ redir: params[:redir], lang: params[:lang] }.compact_blank), class: 'link link-hover' %>
   <% end %>
   <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-    <%= link_to 'Forgot your password?', new_password_path(resource_name), class: 'link link-hover' %>
+    <%= link_to t('forgot_your_password_'), new_password_path(resource_name, { lang: params[:lang] }.compact_blank), class: 'link link-hover' %>
+  <% end %>
+</div>
+<div class="text-center mt-10">
+  <%= form_with url: url_for, method: :get do %>
+    <% if params[:redir].present? %>
+      <%= hidden_field_tag :redir, params[:redir] %>
+    <% end %>
+    <%= select_tag :lang, options_for_select((I18n.available_locales - %i[en pt-PT de-DE fr-FR es-ES]).map { |code| [t("language_#{code}"), code] }, I18n.locale), onchange: 'this.form.requestSubmit();', class: 'select select-sm border-base-content/30 text-base' %>
   <% end %>
 </div>

app/views/layouts/application.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html data-theme="docuseal" lang="en">
+<html data-theme="docuseal" lang="<%= I18n.locale %>">
   <head>
     <%= render 'layouts/head_tags' %>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

app/views/layouts/form.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html data-theme="docuseal" lang="en">
+<html data-theme="docuseal" lang="<%= I18n.locale %>">
   <head>
     <%= render 'layouts/head_tags' %>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

app/views/layouts/plain.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html data-theme="docuseal" lang="en">
+<html data-theme="docuseal" lang="<%= I18n.locale %>">
   <head>
     <%= render 'layouts/head_tags' %>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">

app/views/shared/_navbar.html.erb

@@ -11,7 +11,7 @@
     <div class="space-x-4 flex items-center">
       <% if Docuseal.demo? %>
         <a href="https://docuseal.co/sign_up" class="btn btn-neutral btn-sm btn-outline inline-flex items-center justify-center" style="height: 37px">
-          Sign Up
+          <%= t('sign_up') %>
         </a>
         <span class="hidden sm:inline">
           <%= render 'shared/github_button' %>
@@ -61,18 +61,18 @@
   <% else %>
     <div class="flex space-x-2">
       <% if request.path != new_user_session_path %>
-        <%= link_to new_user_session_path, class: 'font-medium text-lg' do %>
+        <%= link_to new_user_session_path({ lang: params[:lang] }.compact_blank), class: 'font-medium text-lg' do %>
           <span class="flex items-center justify-center space-x-1">
             <%= svg_icon('login', class: 'w-6 h-6') %>
-            <span>Sign in</span>
+            <span><%= t('sign_in') %></span>
           </span>
         <% end %>
       <% end %>
       <% if Docuseal.multitenant? && !request.path.in?([registration_path, new_registration_path]) %>
-        <%= link_to registration_path, class: 'btn btn-neutral btn-sm btn-outline' do %>
+        <%= link_to registration_path({ lang: params[:lang] }.compact_blank), class: 'btn btn-neutral btn-sm btn-outline' do %>
           <span class="flex items-center justify-center space-x-1">
-            <span class="hidden sm:block">Create free Account</span>
-            <span class="md:hidden">Sign Up</span>
+            <span class="hidden sm:block"><%= t('create_free_account') %></span>
+            <span class="md:hidden"><%= t('sign_up') %></span>
           </span>
         <% end %>
       <% end %>

app/views/submissions/show.html.erb

@@ -144,15 +144,15 @@
                 <%= submitter&.completed_at? ? l(submitter.completed_at.in_time_zone(@submission.account.timezone), format: :long, locale: @submission.account.locale) : 'Not completed yet' %>
               </span>
             </div>
-            <% if signed_in? && submitter && submitter.email && !submitter.completed_at && can?(:update, submitter) && Accounts.can_send_emails?(current_account) %>
+            <% if signed_in? && submitter && submitter.email && !submitter.completed_at && !@submission.archived_at? && can?(:update, submitter) && Accounts.can_send_emails?(current_account) %>
               <div class="mt-2 mb-1">
                 <%= button_to button_title(title: submitter.sent_at? ? 'Re-send Email' : 'Send Email', disabled_with: 'Sending'), submitter_send_email_index_path(submitter_slug: submitter.slug), class: 'btn btn-sm btn-primary w-full' %>
               </div>
             <% end %>
-            <% if signed_in? && submitter && submitter.phone && !submitter.completed_at && can?(:update, submitter) %>
+            <% if signed_in? && submitter && submitter.phone && !submitter.completed_at && !@submission.archived_at? && can?(:update, submitter) %>
               <%= render 'submissions/send_sms_button', submitter: %>
             <% end %>
-            <% if signed_in? && submitter && !submitter.completed_at? && can?(:create, submitter) %>
+            <% if signed_in? && submitter && !submitter.completed_at? && !@submission.archived_at? && can?(:create, submitter) %>
               <div class="mt-2 mb-1">
                 <a class="btn btn-sm btn-primary w-full" target="_blank" href="<%= submit_form_path(slug: submitter.slug) %>">
                   Sign In-person

config/initializers/devise.rb

@@ -10,6 +10,19 @@ class FailureApp < Devise::FailureApp
   end
 end
 
+module Devise
+  module Mailers
+    module Helpers
+      def devise_mail(record, action, opts = {}, &)
+        assign_message_metadata(action, record)
+
+        initialize_from_record(record)
+        mail(headers_for(action, opts), &)
+      end
+    end
+  end
+end
+
 # Assuming you have not yet modified this file, each configuration option below
 # is set to its default value. Note that some are commented out while others
 # are not: uncommented lines are intended to protect your configuration from

config/locales/en.yml

@@ -1,4 +1,23 @@
 en: &en
+  language_en: English
+  language_en-US: English (US)
+  language_en-GB: English (UK)
+  language_es-ES: Español
+  language_fr-FR: Français
+  language_pt-PT: Português
+  language_de-DE: Deutsch
+  language_es: Español
+  language_it: Italiano
+  language_de: Deutsch
+  language_fr: Français
+  language_pl: Polski
+  language_uk: Українська
+  language_cs: Čeština
+  language_pt: Português
+  language_he: עברית
+  language_nl: Nederlands
+  language_ar: العربية
+  language_ko: 한국어
   email: Email
   verification_code_code: 'Verification code: %{code}'
   digitally_signed_by: Digitally signed by
@@ -19,6 +38,25 @@ en: &en
   download_documents: Download documents
   downloading: Downloading
   completed_successfully: Completed Successfully
+  password: Password
+  sign_in: Sign In
+  signing_in: Signing In
+  sign_in_with_microsoft: Sign in with Microsoft
+  sign_in_with_google: Sign in with Google
+  forgot_your_password_: Forgot your password?
+  create_free_account: Create free account
+  already_have_an_account: Already have an account?
+  first_name: First name
+  last_name: Last name
+  company_name_optional: Company name (optional)
+  sign_up: Sign up
+  signing_up: Signing up
+  profile_details: Profile Details
+  create_free_account: Create Free Account
+  sign_up_with_google: Sign up with Google
+  sign_up_with_microsoft: Sign up with Microsoft
+  by_creating_an_account_you_agree_to_our_html: 'By creating an account, you agree to our <a target="_blank" href="https://www.docuseal.co/privacy">Privacy Policy</a> and <a target="_blank" href="https://www.docuseal.co/terms">Terms of Service</a>.'
+  enter_email_to_continue: Enter email to continue
 
 es: &es
   role: Rol
@@ -41,6 +79,26 @@ es: &es
   download_documents: Descargar documentos
   downloading: Descargando
   completed_successfully: Completado exitosamente
+  password: Contraseña
+  email: Correo electrónico
+  sign_in: Iniciar sesión
+  signing_in: Iniciando sesión
+  sign_in_with_microsoft: Iniciar sesión con Microsoft
+  sign_in_with_google: Iniciar sesión con Google
+  forgot_your_password_: ¿Olvidaste tu contraseña?
+  create_free_account: Crear cuenta gratuita
+  already_have_an_account: ¿Ya tienes una cuenta?
+  first_name: Nombre
+  last_name: Apellido
+  company_name_optional: Nombre de la empresa (opcional)
+  sign_up: Registrarse
+  signing_up: Registrándose
+  profile_details: Detalles del perfil
+  create_free_account: Crear cuenta gratuita
+  sign_up_with_google: Registrarse con Google
+  sign_up_with_microsoft: Registrarse con Microsoft
+  by_creating_an_account_you_agree_to_our_html: 'Al crear una cuenta, aceptas nuestra <a target="_blank" href="https://www.docuseal.co/privacy">Política de Privacidad</a> y <a target="_blank" href="https://www.docuseal.co/terms">Términos de Servicio</a>.'
+  enter_email_to_continue: Ingresa tu correo electrónico para continuar
 
 it:
   role: Rôle
@@ -63,6 +121,25 @@ it:
   download_documents: Scarica documenti
   downloading: Scaricamento
   completed_successfully: Completato con successo
+  password: Password
+  sign_in: Accedi
+  signing_in: Accesso in corso
+  sign_in_with_microsoft: Accedi con Microsoft
+  sign_in_with_google: Accedi con Google
+  forgot_your_password_: Hai dimenticato la password?
+  create_free_account: Crea un account gratuito
+  already_have_an_account: Hai già un account?
+  first_name: Nome
+  last_name: Cognome
+  company_name_optional: Nome dell'azienda (opzionale)
+  sign_up: Registrati
+  signing_up: Registrazione in corso
+  profile_details: Dettagli del profilo
+  create_free_account: Crea un account gratuito
+  sign_up_with_google: Registrati con Google
+  sign_up_with_microsoft: Registrati con Microsoft
+  by_creating_an_account_you_agree_to_our_html: 'Creando un account, accetti la nostra <a target="_blank" href="https://www.docuseal.co/privacy">Privacy Policy</a> e i nostri <a target="_blank" href="https://www.docuseal.co/terms">Termini di servizio</a>.'
+  enter_email_to_continue: Inserisci l'email per continuare
 
 fr: &fr
   email: Email
@@ -84,6 +161,26 @@ fr: &fr
   download_documents: Télécharger les documents
   downloading: Téléchargement
   completed_successfully: Complété avec succès
+  password: Mot de passe
+  sign_in: Se connecter
+  signing_in: Connexion en cours
+  sign_in_with_microsoft: Se connecter avec Microsoft
+  sign_in_with_google: Se connecter avec Google
+  forgot_your_password_: Mot de passe oublié?
+  create_free_account: Créer un compte gratuit
+  already_have_an_account: Vous avez déjà un compte?
+  first_name: Prénom
+  last_name: Nom de famille
+  company_name_optional: Nom de l'entreprise (optionnel)
+  sign_up: S'inscrire
+  signing_up: Inscription en cours
+  profile_details: Détails du profil
+  create_free_account: Créer un compte gratuit
+  sign_up_with_google: S'inscrire avec Google
+  sign_up_with_microsoft: S'inscrire avec Microsoft
+  by_creating_an_account_you_agree_to_our_html: |
+    En créant un compte, vous acceptez notre <a target="_blank" href="https://www.docuseal.co/privacy">Politique de Confidentialité</a> et nos <a target="_blank" href="https://www.docuseal.co/terms">Conditions d'Utilisation</a>.
+  enter_email_to_continue: Entrez votre e-mail pour continuer
 
 pt: &pt
   role: Função
@@ -106,6 +203,25 @@ pt: &pt
   download_documents: Baixar documentos
   downloading: Baixando
   completed_successfully: Concluído com sucesso
+  password: Senha
+  sign_in: Entrar
+  signing_in: Entrando
+  sign_in_with_microsoft: Entrar com Microsoft
+  sign_in_with_google: Entrar com Google
+  forgot_your_password_: Esqueceu sua senha?
+  create_free_account: Criar conta gratuita
+  already_have_an_account: Já tem uma conta?
+  first_name: Nome
+  last_name: Sobrenome
+  company_name_optional: Nome da empresa (opcional)
+  sign_up: Inscrever-se
+  signing_up: Inscrevendo-se
+  profile_details: Detalhes do perfil
+  create_free_account: Criar conta gratuita
+  sign_up_with_google: Inscrever-se com Google
+  sign_up_with_microsoft: Inscrever-se com Microsoft
+  by_creating_an_account_you_agree_to_our_html: 'Ao criar uma conta, você concorda com nossa <a target="_blank" href="https://www.docuseal.co/privacy">Política de Privacidade</a> e <a target="_blank" href="https://www.docuseal.co/terms">Termos de Serviço</a>.'
+  enter_email_to_continue: Insira o e-mail para continuar
 
 de: &de
   role: Rolle
@@ -128,6 +244,25 @@ de: &de
   download_documents: Dokumente herunterladen
   downloading: Herunterladen
   completed_successfully: Erfolgreich abgeschlossen
+  password: Passwort
+  sign_in: Anmelden
+  signing_in: Anmeldung
+  sign_in_with_microsoft: Mit Microsoft anmelden
+  sign_in_with_google: Mit Google anmelden
+  forgot_your_password_: Passwort vergessen?
+  create_free_account: Kostenloses Konto erstellen
+  already_have_an_account: Hast du schon ein Konto?
+  first_name: Vorname
+  last_name: Nachname
+  company_name_optional: Firmenname (optional)
+  sign_up: Registrieren
+  signing_up: Registrierung
+  profile_details: Profildetails
+  create_free_account: Kostenloses Konto erstellen
+  sign_up_with_google: Mit Google registrieren
+  sign_up_with_microsoft: Mit Microsoft registrieren
+  by_creating_an_account_you_agree_to_our_html: 'Durch die Erstellung eines Kontos stimmst du unseren <a target="_blank" href="https://www.docuseal.co/privacy">Datenschutzrichtlinien</a> und <a target="_blank" href="https://www.docuseal.co/terms">Nutzungsbedingungen</a> zu.'
+  enter_email_to_continue: E-Mail eingeben, um fortzufahren
 
 pl:
   email: Email
@@ -149,6 +284,25 @@ pl:
   download_documents: Pobierz dokumenty
   downloading: Pobieranie
   completed_successfully: Zakończono pomyślnie
+  password: Hasło
+  sign_in: Zaloguj się
+  signing_in: Logowanie
+  sign_in_with_microsoft: Zaloguj się przez Microsoft
+  sign_in_with_google: Zaloguj się przez Google
+  forgot_your_password_: Zapomniałeś hasła?
+  create_free_account: Utwórz darmowe konto
+  already_have_an_account: Masz już konto?
+  first_name: Imię
+  last_name: Nazwisko
+  company_name_optional: Nazwa firmy (opcjonalnie)
+  sign_up: Zarejestruj się
+  signing_up: Rejestracja
+  profile_details: Szczegóły profilu
+  create_free_account: Utwórz darmowe konto
+  sign_up_with_google: Zarejestruj się przez Google
+  sign_up_with_microsoft: Zarejestruj się przez Microsoft
+  by_creating_an_account_you_agree_to_our_html: 'Tworząc konto, akceptujesz naszą <a target="_blank" href="https://www.docuseal.co/privacy">Politykę Prywatności</a> i <a target="_blank" href="https://www.docuseal.co/terms">Regulamin</a>.'
+  enter_email_to_continue: Wprowadź e-mail, aby kontynuować
 
 uk:
   email: Email
@@ -170,6 +324,25 @@ uk:
   download_documents: Завантажити документи
   downloading: Завантаження
   completed_successfully: Успішно завершено
+  password: Пароль
+  sign_in: Увійти
+  signing_in: Вхід
+  sign_in_with_microsoft: Увійти через Microsoft
+  sign_in_with_google: Увійти через Google
+  forgot_your_password_: Забули пароль?
+  create_free_account: Створити безкоштовний акаунт
+  already_have_an_account: Вже є акаунт?
+  first_name: Ім'я
+  last_name: Прізвище
+  company_name_optional: Назва компанії (необов'язково)
+  sign_up: Зареєструватися
+  signing_up: Реєстрація
+  profile_details: Дані профілю
+  create_free_account: Створити безкоштовний акаунт
+  sign_up_with_google: Зареєструватися через Google
+  sign_up_with_microsoft: Зареєструватися через Microsoft
+  by_creating_an_account_you_agree_to_our_html: 'Створюючи акаунт, ви погоджуєтесь з нашою <a target="_blank" href="https://www.docuseal.co/privacy">Політикою конфіденційності</a> і <a target="_blank" href="https://www.docuseal.co/terms">Умовами надання послуг</a>.'
+  enter_email_to_continue: Введіть електронну пошту, щоб продовжити
 
 cs:
   email: Email
@@ -191,6 +364,25 @@ cs:
   download_documents: Stáhnout dokumenty
   downloading: Stahování
   completed_successfully: Úspěšně dokončeno
+  password: Heslo
+  sign_in: Přihlásit se
+  signing_in: Přihlašování
+  sign_in_with_microsoft: Přihlásit se pomocí Microsoftu
+  sign_in_with_google: Přihlásit se pomocí Googlu
+  forgot_your_password_: Zapomněli jste heslo?
+  create_free_account: Vytvořit bezplatný účet
+  already_have_an_account: Už máte účet?
+  first_name: Jméno
+  last_name: Příjmení
+  company_name_optional: Název společnosti (volitelné)
+  sign_up: Zaregistrovat se
+  signing_up: Registrace
+  profile_details: Detaily profilu
+  create_free_account: Vytvořit bezplatný účet
+  sign_up_with_google: Zaregistrovat se pomocí Googlu
+  sign_up_with_microsoft: Zaregistrovat se pomocí Microsoftu
+  by_creating_an_account_you_agree_to_our_html: 'Vytvořením účtu souhlasíte s našimi <a target="_blank" href="https://www.docuseal.co/privacy">Zásadami ochrany osobních údajů</a> a <a target="_blank" href="https://www.docuseal.co/terms">Podmínkami služby</a>.'
+  enter_email_to_continue: Zadejte e-mail pro pokračování
 
 he:
   email: דוא"ל
@@ -212,6 +404,25 @@ he:
   download_documents: הורד מסמכים
   downloading: מוריד
   completed_successfully: הושלם בהצלחה
+  password: סיסמה
+  sign_in: התחבר
+  signing_in: מתחבר
+  sign_in_with_microsoft: התחבר עם מיקרוסופט
+  sign_in_with_google: התחבר עם גוגל
+  forgot_your_password_: שכחת את הסיסמה?
+  create_free_account: צור חשבון חינם
+  already_have_an_account: כבר יש לך חשבון?
+  first_name: שם פרטי
+  last_name: שם משפחה
+  company_name_optional: שם החברה (לא חובה)
+  sign_up: הירשם
+  signing_up: נרשם
+  profile_details: פרטי הפרופיל
+  create_free_account: צור חשבון חינם
+  sign_up_with_google: הירשם עם גוגל
+  sign_up_with_microsoft: הירשם עם מיקרוסופט
+  by_creating_an_account_you_agree_to_our_html: 'על ידי יצירת חשבון, אתה מסכים ל<a target="_blank" href="https://www.docuseal.co/privacy">מדיניות הפרטיות</a> ול<a target="_blank" href="https://www.docuseal.co/terms">תנאי השירות</a> שלנו.'
+  enter_email_to_continue: הכנס דוא"ל כדי להמשיך
 
 nl:
   email: E-mail
@@ -234,6 +445,25 @@ nl:
   download_documents: Documenten downloaden
   downloading: Downloaden
   completed_successfully: Succesvol voltooid
+  password: Wachtwoord
+  sign_in: Inloggen
+  signing_in: Aan het inloggen
+  sign_in_with_microsoft: Inloggen met Microsoft
+  sign_in_with_google: Inloggen met Google
+  forgot_your_password_: Wachtwoord vergeten?
+  create_free_account: Gratis account aanmaken
+  already_have_an_account: Heb je al een account?
+  first_name: Voornaam
+  last_name: Achternaam
+  company_name_optional: Bedrijfsnaam (optioneel)
+  sign_up: Aanmelden
+  signing_up: Aanmelden bezig
+  profile_details: Profielgegevens
+  create_free_account: Gratis account aanmaken
+  sign_up_with_google: Aanmelden met Google
+  sign_up_with_microsoft: Aanmelden met Microsoft
+  by_creating_an_account_you_agree_to_our_html: 'Door een account aan te maken, ga je akkoord met ons <a target="_blank" href="https://www.docuseal.co/privacy">Privacybeleid</a> en onze <a target="_blank" href="https://www.docuseal.co/terms">Gebruiksvoorwaarden</a>.'
+  enter_email_to_continue: Voer e-mail in om door te gaan
 
 ar:
   email: البريد الإلكتروني
@@ -256,6 +486,25 @@ ar:
   download_documents: تحميل الوثائق
   downloading: جارٍ التحميل
   completed_successfully: تم الانتهاء بنجاح
+  password: كلمة المرور
+  sign_in: تسجيل الدخول
+  signing_in: تسجيل الدخول
+  sign_in_with_microsoft: تسجيل الدخول باستخدام مايكروسوفت
+  sign_in_with_google: تسجيل الدخول باستخدام جوجل
+  forgot_your_password_: هل نسيت كلمة المرور؟
+  create_free_account: إنشاء حساب مجاني
+  already_have_an_account: هل لديك حساب؟
+  first_name: الاسم الأول
+  last_name: الاسم الأخير
+  company_name_optional: اسم الشركة (اختياري)
+  sign_up: اشتراك
+  signing_up: الاشتراك
+  profile_details: تفاصيل الملف الشخصي
+  create_free_account: إنشاء حساب مجاني
+  sign_up_with_google: الاشتراك باستخدام جوجل
+  sign_up_with_microsoft: الاشتراك باستخدام مايكروسوفت
+  by_creating_an_account_you_agree_to_our_html: 'من خلال إنشاء حساب، فإنك توافق على <a target="_blank" href="https://www.docuseal.co/privacy">سياسة الخصوصية</a> و<a target="_blank" href="https://www.docuseal.co/terms">شروط الخدمة</a> الخاصة بنا.'
+  enter_email_to_continue: أدخل البريد الإلكتروني للمتابعة
 
 ko:
   email: 이메일
@@ -278,6 +527,25 @@ ko:
   download_documents: 문서 다운로드
   downloading: 다운로드 중
   completed_successfully: 성공적으로 완료됨
+  password: 비밀번호
+  sign_in: 로그인
+  signing_in: 로그인 중
+  sign_in_with_microsoft: Microsoft로 로그인
+  sign_in_with_google: Google로 로그인
+  forgot_your_password_: 비밀번호를 잊으셨나요?
+  create_free_account: 무료 계정 생성
+  already_have_an_account: 이미 계정이 있으신가요?
+  first_name: 이름
+  last_name: 성
+  company_name_optional: 회사 이름 (선택 사항)
+  sign_up: 가입하기
+  signing_up: 가입 중
+  profile_details: 프로필 세부 정보
+  create_free_account: 무료 계정 생성
+  sign_up_with_google: Google로 가입
+  sign_up_with_microsoft: Microsoft로 가입
+  by_creating_an_account_you_agree_to_our_html: '계정을 생성함으로써, 귀하는 우리의 <a target="_blank" href="https://www.docuseal.co/privacy">개인정보 보호정책</a> 및 <a target="_blank" href="https://www.docuseal.co/terms">서비스 약관</a>에 동의하는 것입니다.'
+  enter_email_to_continue: 계속하려면 이메일을 입력하세요
 
 en-US:
   <<: *en

db/migrate/20240604070648_create_email_events.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateEmailEvents < ActiveRecord::Migration[7.1]
+  def change
+    create_table :email_events do |t|
+      t.references :account, null: false, foreign_key: true, index: true
+      t.references :emailable, polymorphic: true, index: true, null: false
+      t.string :message_id, null: false, index: true
+      t.string :tag, null: false
+      t.string :event_type, null: false
+      t.string :email, null: false
+      t.text :data, null: false
+      t.datetime :event_datetime, null: false
+      t.datetime :created_at, null: false
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_04_28_112400) do
+ActiveRecord::Schema[7.1].define(version: 2024_06_04_070648) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -98,6 +98,22 @@ ActiveRecord::Schema[7.1].define(version: 2024_04_28_112400) do
     t.index ["submitter_id"], name: "index_document_generation_events_on_submitter_id"
   end
 
+  create_table "email_events", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.string "emailable_type", null: false
+    t.bigint "emailable_id", null: false
+    t.string "message_id", null: false
+    t.string "tag", null: false
+    t.string "event_type", null: false
+    t.string "email", null: false
+    t.text "data", null: false
+    t.datetime "event_datetime", null: false
+    t.datetime "created_at", null: false
+    t.index ["account_id"], name: "index_email_events_on_account_id"
+    t.index ["emailable_type", "emailable_id"], name: "index_email_events_on_emailable"
+    t.index ["message_id"], name: "index_email_events_on_message_id"
+  end
+
   create_table "email_messages", force: :cascade do |t|
     t.string "uuid", null: false
     t.bigint "author_id", null: false
@@ -279,6 +295,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_04_28_112400) do
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "document_generation_events", "submitters"
+  add_foreign_key "email_events", "accounts"
   add_foreign_key "email_messages", "accounts"
   add_foreign_key "email_messages", "users", column: "author_id"
   add_foreign_key "encrypted_configs", "accounts"

lib/accounts.rb

@@ -81,8 +81,8 @@ module Accounts
   def load_webhook_url(account)
     configs = account.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
 
-    unless Docuseal.multitenant?
-      configs ||= Account.order(:id).first.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
+    if !configs && !Docuseal.multitenant? && !account.testing?
+      configs = Account.order(:id).first.encrypted_configs.find_by(key: EncryptedConfig::WEBHOOK_URL_KEY)
     end
 
     configs&.value.presence

lib/action_mailer_events_observer.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module ActionMailerEventsObserver
+  module_function
+
+  def delivered_email(mail)
+    data = mail.instance_variable_get(:@message_metadata)
+
+    return if data.blank?
+
+    tag, emailable_id, emailable_type = data.values_at('tag', 'record_id', 'record_type')
+
+    return if tag.blank? || emailable_type.blank? || emailable_id.blank?
+
+    message_id = fetch_message_id(mail)
+
+    all_emails(mail).each do |email|
+      EmailEvent.create!(
+        tag:,
+        message_id:,
+        emailable_id:,
+        emailable_type:,
+        event_type: :send,
+        email:,
+        data: { method: mail.delivery_method.class.name.underscore },
+        event_datetime: Time.current
+      )
+    end
+  rescue StandardError => e
+    Rollbar.error(e) if defined?(Rollbar)
+
+    raise if Rails.env.local?
+  end
+
+  def fetch_message_id(mail)
+    mail['X-Message-Uuid']&.value || SecureRandom.uuid
+  end
+
+  def all_emails(mail)
+    mail.to.to_a + mail.cc.to_a + mail.bcc.to_a
+  end
+end

lib/submissions/create_from_submitters.rb

@@ -130,6 +130,8 @@ module Submissions
         end
       end
 
+      field['preferences'] = (field['preferences'] || {}).merge(attrs['preferences']) if attrs['preferences'].present?
+
       return field if attrs['validation_pattern'].blank?
 
       field['validation'] = {

lib/submissions/generate_audit_trail.rb

@@ -229,16 +229,18 @@ module Submissions
 
           next if Array.wrap(value).compact_blank.blank?
 
+          field_name = field['title'].presence || field['name'].to_s
+
           [
             composer.formatted_text_box(
               [
                 {
-                  text: TextUtils.maybe_rtl_reverse(field['name'].to_s).upcase.presence ||
+                  text: TextUtils.maybe_rtl_reverse(field_name).upcase.presence ||
                         "#{field['type']} Field #{submitter_field_counters[field['type']]}\n".upcase,
                   font_size: 6
                 }
               ].compact_blank,
-              text_align: field['name'].to_s.match?(RTL_REGEXP) ? :right : :left,
+              text_align: field_name.to_s.match?(RTL_REGEXP) ? :right : :left,
               line_spacing: 1.3, padding: [0, 0, 2, 0]
             ),
             if field['type'].in?(%w[image signature initials stamp])

lib/submissions/generate_result_attachments.rb

@@ -25,6 +25,7 @@ module Submissions
       '▪' => '-',
       '✔️' => 'V',
       '✔' => 'V',
+      '✓' => 'V',
       '✅' => 'V'
     }.freeze
 
@@ -32,6 +33,7 @@ module Submissions
       '▪' => :bullet,
       '✔️' => :V,
       '✔' => :V,
+      '✓' => :V,
       '✅' => :V
     }.freeze
 

lib/submitters/create_stamp_attachment.rb

@@ -82,9 +82,9 @@ module Submitters
 
       digitally_signed_by = I18n.t(:digitally_signed_by, locale: submitter.account.locale)
 
-      text = %(<span size="90">#{digitally_signed_by}: <b>#{name}</b>\n#{role}#{time} #{timezone}</span>)
+      text = %(<span size="90">#{digitally_signed_by}:\n<b>#{name}</b>\n#{role}#{time} #{timezone}</span>)
 
-      Vips::Image.text(text, width: WIDTH, height: HEIGHT)
+      Vips::Image.text(text, width: WIDTH, height: HEIGHT, wrap: :'word-char')
     end
 
     def load_logo(_submitter)

lib/submitters/normalize_values.rb

@@ -56,7 +56,9 @@ module Submitters
         (value.to_f % 1).zero? ? value.to_i : value.to_f
       elsif field['type'] == 'date' && value.present? && value != '{{date}}'
         if value.is_a?(Integer)
-          Time.zone.at(value.to_s.first(10).to_i).to_date
+          Time.zone.at(value.to_s.first(10).to_i).to_date.to_s
+        elsif value.gsub(/\w/, '0') == field.dig('preferences', 'format').to_s.gsub(/\w/, '0')
+          TimeUtils.parse_date_string(value, field.dig('preferences', 'format')).to_s
         else
           Date.parse(value).to_s
         end

lib/submitters/serialize_for_webhook.rb

@@ -30,8 +30,8 @@ module Submitters
                       'audit_log_url' => submitter.submission.audit_log_url,
                       'submission_url' => r.submissions_preview_url(submitter.submission.slug,
                                                                     **Docuseal.default_url_options),
-                      'template' => submitter.template.as_json(only: %i[id name external_id created_at
-                                                                        updated_at]),
+                      'template' => submitter.template.as_json(only: %i[id name external_id created_at updated_at],
+                                                               methods: %i[folder_name]),
                       'submission' => {
                         **submitter.submission.slice(:id, :audit_log_url, :created_at),
                         status: submitter.submission.submitters.all?(&:completed_at?) ? 'completed' : 'pending',

lib/submitters/submit_values.rb

@@ -38,6 +38,7 @@ module Submitters
         submitter.ua = request.user_agent
         submitter.values = merge_default_values(submitter)
         submitter.values = merge_formula_values(submitter)
+        submitter.values = maybe_remove_condition_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
@@ -128,6 +129,47 @@ module Submitters
                                 with_time:)
     end
 
+    def maybe_remove_condition_values(submitter)
+      fields_uuid_index = submitter.submission.template_fields.index_by { |e| e['uuid'] }
+
+      submitter.submission.template_fields.each do |field|
+        next if field['submitter_uuid'] != submitter.uuid
+
+        submitter.values.delete(field['uuid']) unless check_field_condition(submitter, field, fields_uuid_index)
+      end
+
+      submitter.values
+    end
+
+    def check_field_condition(submitter, field, fields_uuid_index)
+      return true if field['conditions'].blank?
+
+      submitter_values = submitter.values
+
+      field['conditions'].reduce(true) do |acc, c|
+        case c['action']
+        when 'empty', 'unchecked'
+          acc && submitter_values[c['field_uuid']].blank?
+        when 'not_empty', 'checked'
+          acc && submitter_values[c['field_uuid']].present?
+        when 'equal', 'contains'
+          field = fields_uuid_index[c['field_uuid']]
+          option = field['options'].find { |o| o['uuid'] == c['value'] }
+          values = Array.wrap(submitter_values[c['field_uuid']])
+
+          acc && values.include?(option['value'].presence || "Option #{field['options'].index(option)}")
+        when 'not_equal', 'does_not_contain'
+          field = fields_uuid_index[c['field_uuid']]
+          option = field['options'].find { |o| o['uuid'] == c['value'] }
+          values = Array.wrap(submitter_values[c['field_uuid']])
+
+          acc && values.exclude?(option['value'].presence || "Option #{field['options'].index(option)}")
+        else
+          acc
+        end
+      end
+    end
+
     def replace_default_variables(value, attrs, submission, with_time: false)
       return value if value.in?([true, false])
       return if value.blank?

lib/time_utils.rb

@@ -32,6 +32,14 @@ module TimeUtils
     tz_info.abbreviation(time)
   end
 
+  def parse_date_string(string, pattern)
+    pattern = pattern.sub(/Y+/, YEAR_FORMATS)
+                     .sub(/M+/, MONTH_FORMATS)
+                     .sub(/D+/, DAY_FORMATS)
+
+    Date.strptime(string, pattern)
+  end
+
   def format_date_string(string, format, locale)
     date = Date.parse(string.to_s)